export

src/store/modules/user.js

@@ -45,7 +45,6 @@ const actions = {
     getInfo({type: 0}).then(res => {
       if (!res) return
       commit('SET_BASEINFO', res)
-    console.log(res);
     })
   },
 

src/views/alarm/cableTime/index.vue

@@ -72,11 +72,17 @@
         <template slot-scope="scope">
           <el-button
             type="text"
-            v-if="scope.row.confirmStatus === 1 && scope.row.alarmLevelName == '正常'"
+            v-if="
+              scope.row.confirmStatus === 1 &&
+              scope.row.alarmLevelName == '正常'
+            "
             @click="cancel2(scope.row)"
             >取消</el-button
           >
-          <el-button type="text" v-else-if="scope.row.confirmStatus === 0" @click="confirm2(scope.row)"
+          <el-button
+            type="text"
+            v-else-if="scope.row.confirmStatus === 0"
+            @click="confirm2(scope.row)"
             >确认</el-button
           >
         </template>
@@ -212,6 +218,8 @@ export default {
         return "emergency";
       } else if (row.alarmLevelName == "重要" && column.label == "告警级别") {
         return "important";
+      } else if (row.alarmLevelName == "一般" && column.label == "告警级别") {
+        return "common";
       }
       if (rowIndex % 2 == 1) {
         return "stripe";
@@ -280,7 +288,6 @@ export default {
     },
   },
   computed: {
-     
     // getWsMsg:{
     //   get(){
     //   return this.$store.state.websocket.webSocketMsg
@@ -289,7 +296,6 @@ export default {
     //     this.$store.state.websocket.webSocketMsg=a
     //   }
     // },
-   
   },
   watch: {
     // getWsMsg: {
@@ -303,10 +309,9 @@ export default {
   mounted() {
     this.getTableData();
   },
-   created(){
-    
-  //  socket({socketUrl:this.wsUrl});
-  }
+  created() {
+    //  socket({socketUrl:this.wsUrl});
+  },
 };
 </script>
 
@@ -342,6 +347,9 @@ export default {
   & ::v-deep .important {
     background-color: #f89850;
   }
+  & ::v-deep .common {
+    background-color: #ead906;
+  }
   .page {
     display: flex;
     align-items: center;

src/views/alarm/device/index.vue

@@ -16,7 +16,6 @@
         <el-button type="primary" @click="getTableData">刷新</el-button>
         <el-button type="primary" @click="isQuery = !isQuery">查询</el-button>
         <el-button type="primary" @click="exportList">导出</el-button>
-       
       </div>
     </div>
     <div v-if="isQuery">
@@ -50,11 +49,17 @@
         <template slot-scope="scope">
           <el-button
             type="text"
-            v-if="scope.row.confirmStatus === 1 && scope.row.connectStatusName == '连接正常'"
+            v-if="
+              scope.row.confirmStatus === 1 &&
+              scope.row.connectStatusName == '连接正常'
+            "
             @click="cancel2(scope.row)"
             >取消</el-button
           >
-          <el-button type="text" v-else-if="scope.row.confirmStatus === 0" @click="confirm2(scope.row)"
+          <el-button
+            type="text"
+            v-else-if="scope.row.confirmStatus === 0"
+            @click="confirm2(scope.row)"
             >确认</el-button
           >
         </template>
@@ -129,7 +134,6 @@
 </template>
 
 <script>
-
 import { deviceList, deviceConfirm, deviceCancel } from "../api";
 import { exportConnet } from "@/api/export";
 import search from "@/views/monitor/equipment/components/search.vue";
@@ -138,7 +142,7 @@ import socket from "@/utils/websocket";
 export default {
   data() {
     return {
-      alarmInfo:'',
+      alarmInfo: "",
       dialogInfo: [],
       centerDialogVisible: false,
       confirmStatus: 2,
@@ -251,17 +255,14 @@ export default {
         download(res, "vnd.ms-excel", `设备连接告警.xls`);
       });
     },
-  
   },
   mounted() {
     this.getTableData();
-   
   },
-  created(){
+  created() {
     //  socket({socketUrl:this.wsUrl});
-  }
+  },
 };
-
 </script>
 
 <style lang="scss" scoped>
@@ -294,16 +295,16 @@ export default {
     }
   }
 }
-.tips{
+.tips {
   width: 400px;
   height: 80px;
   background: #fff;
   box-shadow: 0px 2px 14px #888888;
   border-radius: 5px;
   padding: 0 20px 20px 20px;
-  position: absolute; 
+  position: absolute;
   text-align: center;
- top:calc(50% - 40px);
- left:calc(50% - 200px)
+  top: calc(50% - 40px);
+  left: calc(50% - 200px);
 }
 </style>

src/views/history/leakyCableRepair/index.vue

@@ -118,6 +118,8 @@ export default {
         return "emergency";
       } else if (row.alarmLevelName == "重要" && column.label == "告警级别") {
         return "important";
+      } else if (row.alarmLevelName == "一般" && column.label == "告警级别") {
+        return "common";
       }
       if (rowIndex % 2 == 1) {
         return "stripe";
@@ -165,6 +167,9 @@ export default {
   }
   & ::v-deep .important {
     background-color: #f89850;
+  }
+   & ::v-deep .common {
+    background-color: #ead906;
   }
   .page {
     display: flex;

src/views/history/leakyCableStatus/index.vue

@@ -71,6 +71,8 @@ export default {
         return "emergency";
       } else if (row.level === "重要" && column.label === "告警级别") {
         return "important";
+      } else if (row.level == "一般" && column.label == "告警级别") {
+        return "common";
       }
       if (rowIndex % 2 === 1) {
         return "stripe";
@@ -148,6 +150,9 @@ export default {
   & ::v-deep .important {
     background-color: #f89850;
   }
+  & ::v-deep .common {
+    background-color: #ead906;
+  }
   .page {
     display: flex;
     align-items: center;

src/views/monitor/leakageCable/index.vue

@@ -75,6 +75,8 @@ export default {
         return 'emergency'
       } else if (row.alarmLevelName == '重要' && column.label == '告警级别') {
         return 'important'
+     } else if (row.alarmLevelName == '一般' && column.label == '告警级别') {
+        return 'common'
       }
       if (rowIndex % 2 == 1) {
         return 'stripe'
@@ -145,6 +147,9 @@ export default {
   }
   & ::v-deep .important {
     background-color: #f89850;
+  }
+   & ::v-deep .common {
+    background-color: #ead906;
   }
   .page {
     display: flex;

src/views/setting/statistics/comp/fsuTable.vue

@@ -208,7 +208,6 @@ export default {
       // let ids = [];
       // this.ids.length != 0 ? (ids = this.ids) : (ids = this.exids);
       exportFsu({ ids: this.exids }).then((res) => {
-        console.log(ids);
         download(res, "vnd.ms-excel", `FSU表.xls`);
       });
     },