1.首页告警列表增加告警来源字段，序号

2.测风塔数据查询页面，对表格做了高度的限制
3.针对全局的滚动条的滑块做颜色更改操作

cpp-ui/src/assets/styles/dark.scss

@@ -74,7 +74,7 @@ $table-header-background-color: #284266;
   background-size: cover;
   background-position: center;
   background-repeat: no-repeat;
-  width: 100px;
+  //width: 100px;
   position: absolute !important;
   right: 0;
 

cpp-ui/src/layout/components/AppMain.vue

@@ -69,7 +69,8 @@ export default {
 }
 
 ::-webkit-scrollbar-thumb {
-  background-color: #c0c0c0;
+  //background-color: #c0c0c0;
+  background: #3e6b98;
   border-radius: 3px;
 }
 </style>

cpp-ui/src/views/largeScreen/index.vue

@@ -76,7 +76,7 @@
     </div>
 
     <div class="dark-el-dialog">
-      <el-dialog width="50%" style="top:15%" :visible.sync="outerVisible" :close-on-click-modal="false">
+      <el-dialog width="60%" style="top:15%" :visible.sync="outerVisible" :close-on-click-modal="false">
         <div slot="title" class="dialog-title flex justify-between">
           <div>
             <el-button  @click="acknowledgeAll()">全部确认</el-button>
@@ -101,10 +101,12 @@
           <el-table
             :data="tableDataAlarm"
             border max-height="300px"
+            element-loading-background="rgba(8, 61, 92,1)"
             v-loading="loadingAlarm"
             style="width: 100%">
+            <el-table-column label="序号" type="index" align="center" width="60"></el-table-column>
             <el-table-column
-              prop="stationCode" align="center"  :formatter="formatStation"
+              prop="stationCode" align="center"  :formatter="formatStation" :show-overflow-tooltip="true"
               label="场站名称"
             >
             </el-table-column>
@@ -119,20 +121,25 @@
             >
             </el-table-column>
             <el-table-column
-              prop="msg" align="center"
+              prop="msg" align="center" :show-overflow-tooltip="true"
               label="报警描述">
+            </el-table-column>\
+            <el-table-column
+              prop="alarmSource" align="center" :formatter="formatAlarmSource"
+              label="报警来源">
             </el-table-column>
             <el-table-column
               prop="operate" align="center"
-              label="操作">
+              label="操作" width="80">
               <template  v-slot="{ row }">
                 <img src="../../assets/images/svg/remind.svg" @click="acknowledge(row)" width="20px"/>
 <!--                <img src="../../assets/images/svg/right.svg" width="20px"/>-->
               </template>
             </el-table-column>
           </el-table>
-          <div class="block">
+          <div class="block flex" style="justify-content: end">
             <el-pagination
+              popper-class="cpp-popper"
               @size-change="handleSizeChangeAlarm"
               @current-change="handleCurrentChangeAlarm"
               :current-page=this.alarmPage.currentPage
@@ -214,6 +221,7 @@ export default {
         pageSize: 10 // 每页显示多少条
       },
       stationList:[],
+      alarmEnum:[],
       alarmType: ''
 
     }
@@ -250,6 +258,9 @@ export default {
       await this.$axios({url: '/electricfield/all', method: 'get'}).then(response => {
         this.stationList = response.data
       })
+      await this.$axios({url: '/enumSelect/alarmEnum', method: 'get'}).then(response => {
+        this.alarmEnum = response.data
+      })
     },
     drawTable() {
       // let data = [
@@ -353,6 +364,16 @@ export default {
       })
       return name
     },
+    formatAlarmSource(row) {
+      let name= '未知场站名称'
+      this.alarmEnum.forEach(s=>{
+        if(row.alarmSource === s.value){
+          name = s.label
+          return name
+        }
+      })
+      return name
+    },
     handleSizeChangeAlarm(val) {
       this.alarmPage.pageSize = val
       this.alarmPage.currentPage = 1
@@ -557,7 +578,7 @@ $top-container-height: 8rem;
 }
 
 .dialog-title-badge {
-  width: 10%;
+  //width: 10%;
 
   ::v-deep .el-badge__content.is-fixed {
     top: 10px;

cpp-ui/src/views/stationDataQuery/windtowerstatusdata/index.vue

@@ -43,6 +43,7 @@
             border
             resizable
             show-overflow
+            max-height="500px"
             :data="tableData.slice((currentPage-1) * pageSize,currentPage * pageSize)">
             <vxe-table-column field="stationCode" title="场站名称" :formatter="stationCodeFormat" width="200px" fixed="left"></vxe-table-column>
             <vxe-table-column field="time" title="时间" width="180px" fixed="left"></vxe-table-column>