fixbug

deploy/index.js

@@ -41,7 +41,7 @@ if (!server) {
 }
 
 const basePath = '/home' //服务器网站根目录
-let baseDir =  '/changfa/app/apache-tomcat-8.5.56new/webapps/dist' //项目目录名称
+let baseDir =  '/changfa/app/apache-tomcat-8.5.5new/webapps/dist' //项目目录名称8.5.5new
 let back_up_dir = '' //备份目录名称,需手动创建，可选,注意目录名后有斜杠   比如    back_up/
 const bakDirName = baseDir + '.bak' + moment(new Date()).format('YYYY-M-D-HH:mm:ss') //备份文件名
 const buildPath = path.resolve('./dist') //本地项目编译后的文件目录

src/icons/svg/edit.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1648197448165" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3164" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M862.709333 116.042667a32 32 0 1 1 45.248 45.248L455.445333 613.813333a32 32 0 1 1-45.258666-45.258666L862.709333 116.053333zM853.333333 448a32 32 0 0 1 64 0v352c0 64.8-52.533333 117.333333-117.333333 117.333333H224c-64.8 0-117.333333-52.533333-117.333333-117.333333V224c0-64.8 52.533333-117.333333 117.333333-117.333333h341.333333a32 32 0 0 1 0 64H224a53.333333 53.333333 0 0 0-53.333333 53.333333v576a53.333333 53.333333 0 0 0 53.333333 53.333333h576a53.333333 53.333333 0 0 0 53.333333-53.333333V448z" p-id="3165"></path></svg>
\ No newline at end of file

src/icons/svg/save.svg

+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1648197436923" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2353" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M819.823 83.694H206.991c-67.703 0-122.588 54.885-122.588 122.588v612.833c0 67.703 54.885 122.588 122.588 122.588h612.833c67.703 0 122.588-54.885 122.588-122.588V206.282c-0.001-67.703-54.885-122.588-122.589-122.588z m-124.435 63.313v241.142H331.772V147.007h363.616z m185.787 672.274c0.027 33.765-27.323 61.158-61.088 61.185H207.133c-16.389 0-31.864-6.297-43.454-17.887s-18.039-26.91-18.039-43.298v-612.94c0.061-33.923 27.57-61.395 61.493-61.41h61.327v245.294c-0.05 33.771 27.286 61.187 61.057 61.237h367.888c33.853 0 61.299-27.387 61.299-61.237V144.931h61.206c33.872 0.036 61.301 27.524 61.265 61.396V819.281z" fill="" p-id="2354"></path><path d="M574.817 329.936c17.483 0 31.656-14.173 31.656-31.656v-61.292c0-17.483-14.173-31.656-31.656-31.656s-31.656 14.173-31.656 31.656v61.292c0 17.483 14.173 31.656 31.656 31.656z" fill="" p-id="2355"></path></svg>
\ No newline at end of file

src/styles/common.scss

@@ -103,4 +103,8 @@
   opacity: 1;
   margin-bottom: 20px;
 }
+.alarmbtn {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
 

src/views/dashboard/components/mixins.js

@@ -5,6 +5,7 @@ export const DetailMixins = {
     return {
       form: {},
       flag: true,
+     
       formFunc: null,
       isOpenSelect: [{
         key: 0,
@@ -43,13 +44,9 @@ export const DetailMixins = {
   computed: {
     statusList() {
       if (this.form.status) {
-
-
         for (let i = 0; i < this.form.status.length; i++) {
           if (i % 2 != 0) {
-
             this.form.status[i].value = this.dateFormat(this.form.status[i].value, 'yyyy-MM-dd HH:mm:ss')
-
           }
         }
         return this.form.status
@@ -67,6 +64,24 @@ export const DetailMixins = {
     editbtn() {
       this.flag = false
     },
+    levelcolor() {
+      let la = document.getElementsByClassName("levelData");
+      for (var i = 0; i < this.statusList.length; i++) {
+        if (la[i].innerHTML == "连接正常") {
+          la[i].style.color = "green";
+        } else if (la[i].innerHTML == "连接异常") {
+          la[i].style.color = "#f00";
+        } else if (la[i].innerHTML == "正常") {
+          la[i].style.color = "green";
+        } else if (la[i].innerHTML == "紧急") {
+          la[i].style.color = "#f00";
+        } else if (la[i].innerHTML == "重要") {
+          la[i].style.color = "#f89850";
+        } else if (la[i].innerHTML == "一般") {
+          la[i].style.color = "#ead906";
+        }
+      }
+    },
     dateFormat(date, format) {
       date = new Date(date);
       var o = {
@@ -85,6 +100,6 @@ export const DetailMixins = {
           format = format.replace(RegExp.$1, RegExp.$1.length == 1 ? o[k] : ('00' + o[k]).substr(('' + o[k]).length));
 
       return format;
-    }
+    },
   },
 }

src/views/dashboard/components/type1.vue

@@ -50,9 +50,9 @@
               </el-col>
               <el-col :span="10">
                 <el-row :gutter="20">
-                  <el-col :span="10" class="value_handle">告警</el-col>
+                  <el-col :span="10" class="value_handle" :style="acolor3">{{form.status.connectAlarm}}</el-col>
                   <el-col :span="10"
-                    ><el-button class="alarmbtn" type="primary" size="mini"
+                    ><el-button class="alarmbtn" type="primary" size="mini" v-if="form.status.connectAlarm != '连接正常'"
                       >处理告警</el-button
                     ></el-col
                   >
@@ -65,13 +65,14 @@
               </el-col>
               <el-col :span="10">
                 <el-row :gutter="20">
-                  <el-col :span="10" class="value_handle">紧急告警</el-col>
+                  <el-col :span="10" class="value_handle" :style="acolor">{{form.status.monitorAlarm}}</el-col>
                   <el-col :span="10"
-                    ><el-button class="alarmbtn" type="primary" size="mini"
+                    ><el-button class="alarmbtn" type="primary" size="mini" v-if="form.status.monitorAlarm != '正常'"
                       >处理告警</el-button
                     ></el-col
                   >
                 </el-row>
+                
               </el-col>
             </el-row>
           </div>
@@ -137,7 +138,9 @@
               class="savebtn"
               v-if="flag == true"
               @click="editbtn()"
-              >编辑</el-button
+              ><svg-icon
+              icon-class="edit"
+            /> 编辑</el-button
             >
             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
@@ -145,7 +148,9 @@
               class="savebtn"
               v-else
               @click="savebtn()"
-              >保存</el-button
+              ><svg-icon
+              icon-class="save"
+            /> 保存</el-button
             >
           </div>
           <div>
@@ -247,23 +252,58 @@ export default {
   mixins: [DetailMixins],
   data() {
     return {
-      colspan:14
+      colspan:14,
+      acolor:{
+        color:""
+      },
+       acolor3:{
+        color:""
+      },
     };
   },
   methods: {
     savebtn() {
       this.flag = true;
-      console.log(this.info());
       railWayOpen(this.info()).then((res) => {
         console.log("铁路线");
       });
     },
+    levelcolor2() {
+      if (this.form.status.monitorAlarm == '正常') {
+        this.acolor.color = 'green'
+      } else if (this.form.status.monitorAlarm == '紧急') {
+         this.acolor.color = '#f00'
+      } else if (this.form.status.monitorAlarm == '重要') {
+         this.acolor.color = '#f89850'
+       } else if (this.form.status.monitorAlarm == '一般') {
+         this.acolor.color = '#ead906'
+        } 
+  },
+   levelcolor3() {
+      if (this.form.status.connectAlarm == '连接正常') {
+         this.acolor3.color = 'green'
+      } else if (this.form.status.connectAlarm == '连接异常') {
+         this.acolor3.color = '#f00'
+      }
+  },
   },
   computed: {
     userName() {
       return getUserName();
     },
   },
+   watch: {
+    form: {
+      immediate: true,
+      handler(newV) {
+        if (newV) {
+          this.levelcolor2()
+          this.levelcolor3()
+        }
+      },
+    },
+    deep: true,
+  },
 };
 </script>
 
@@ -319,8 +359,8 @@ export default {
   }
 
   .value_handle {
-    color: red;
     margin-right: 10px;
+    min-width: 52px;
   }
   .alarmbtn {
     margin-top: 6px;

src/views/dashboard/components/type2.vue

 <template>
-  <div class="dashboard-container">
+  <div class="dashboard-container" v-if="form.status">
     <!-- 首页 -->
     <header class="header_title">站点({{ form.baseInfo.siteName }})</header>
     <el-row :gutter="24">
@@ -54,7 +54,7 @@
               class="savebtn"
               v-if="flag == true"
               @click="editbtn()"
-              >编辑</el-button
+              ><svg-icon icon-class="edit" /> 编辑</el-button
             >
             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
@@ -62,7 +62,7 @@
               class="savebtn"
               v-else
               @click="savebtn()"
-              >保存</el-button
+              ><svg-icon icon-class="save" /> 保存</el-button
             >
           </div>
           <div>
@@ -194,27 +194,24 @@
           </div>
         </el-card>
       </el-col>
-      <el-col :span="12" class="mb20 specialCard">
+      <el-col :span="12" class="mb20 specialCard" v-if="form.status">
         <el-card shadow="never">
           <div slot="header" class="clearfix posa">
             <span>当前状态</span>
           </div>
-          <div>
-            <el-row class="text" :gutter="24">
+           <div>
+             <el-row v-for="(item, i) in statusAlarmfun" class="text" :gutter="24">
               <el-col :span="10">
-                <div class="item_name">设备状态</div>
+                 <div class="item_name">{{ item.name }}</div>
               </el-col>
-              <el-col :span="10">
-                <div class="item_data">{{ form.status.connect }}</div>
-              </el-col>
-            </el-row>
-            <el-row class="text" :gutter="24">
-              <el-col :span="10">
-                <div class="item_name">漏缆状态</div>
-              </el-col>
-              <el-col :span="10">
-                <div class="item_data">{{ form.status.monitor }}</div>
+              <el-col :span="5">
+                <div class="item_data levelData"  >{{item.value}}</div>
               </el-col>
+              <el-col :span="9" 
+                    ><el-button class="alarmbtn" type="primary" size="mini"
+                      >处理告警</el-button
+                    ></el-col
+                  >
             </el-row>
           </div>
         </el-card>
@@ -232,7 +229,8 @@ export default {
   data() {
     return {
       flag: true,
-      colspan:14
+      colspan: 14,
+     
     };
   },
   methods: {
@@ -242,6 +240,48 @@ export default {
         console.log("站点");
       });
     },
+    levelcolor2() {
+      let la = document.getElementsByClassName("levelData");
+      for (var i = 0; i < this.statusAlarmfun.length; i++) {
+        if (la[i].innerHTML == "连接正常") {
+          la[i].style.color = "green";
+        } else if (la[i].innerHTML == "连接异常") {
+          la[i].style.color = "#f00";
+           la[i].innerHTML = "告警"
+        } else if (la[i].innerHTML == "正常") {
+          la[i].style.color = "green";
+        } else if (la[i].innerHTML == "紧急") {
+          la[i].style.color = "#f00";
+        } else if (la[i].innerHTML == "重要") {
+          la[i].style.color = "#f89850";
+          la[i].innerHTML = "重要告警"
+        } else if (la[i].innerHTML == "一般") {
+          la[i].style.color = "#ead906";
+        }
+      }
+    },
+  },
+  mounted() {},
+  computed: {
+    statusAlarmfun() {
+      if (this.form.status) {
+        return this.form.status;
+      }
+    },
+  },
+  watch: {
+    statusAlarmfun: {
+      immediate: true,
+      handler(newV) {
+        if (newV) {
+          this.$nextTick(function () {
+            this.levelcolor2();
+          });
+
+          
+        }
+      },
+    },
   },
 };
 </script>

src/views/dashboard/components/type3.vue

@@ -40,13 +40,15 @@
         <el-card shadow="never">
           <div slot="header" class="clearfix posa">
             <span>基础信息</span>
-            <el-button
+             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
               type="text"
               class="savebtn"
               v-if="flag == true"
               @click="editbtn()"
-              >编辑</el-button
+              ><svg-icon
+              icon-class="edit"
+            /> 编辑</el-button
             >
             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
@@ -54,7 +56,9 @@
               class="savebtn"
               v-else
               @click="savebtn()"
-              >保存</el-button
+              ><svg-icon
+              icon-class="save"
+            /> 保存</el-button
             >
           </div>
           <div>
@@ -222,9 +226,14 @@
               <el-col :span="10">
                 <div class="item_name">{{ item.name }}</div>
               </el-col>
-              <el-col :span="10">
-                <div class="item_data">{{ item.value }}</div>
+              <el-col :span="8">
+                <div class="item_data levelData">{{ item.value }}</div>
               </el-col>
+              <el-col :span="6" >
+                <el-button class="alarmbtn" type="primary" size="mini" 
+                v-if="item.value == '连接异常' || item.value == '紧急' || item.value == '重要' || item.value == '一般'"
+                     @click="toalarm(item)" >处理告警</el-button>
+                  </el-col>
             </el-row>
           </div>
         </el-card>
@@ -241,7 +250,8 @@ export default {
   name: "Dashboard",
   data() {
     return {
-      colspan:14
+      colspan:14,
+    
     };
   },
   mixins: [DetailMixins],
@@ -252,6 +262,23 @@ export default {
         console.log("fsu");
       });
     },
+  toalarm(item){
+     console.log(item);
+    },
+  },
+  
+  watch: {
+    statusList: {
+      immediate: true,
+      handler(newV) {
+        if (newV) {
+           this.$nextTick(function () {
+            this.levelcolor();
+          });
+         
+        }
+      },
+    },
   },
   mounted() {},
 };

src/views/dashboard/components/type4.vue

@@ -34,13 +34,15 @@
         <el-card shadow="never">
           <div slot="header" class="clearfix posa">
             <span>基础信息</span>
-            <el-button
+             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
               type="text"
               class="savebtn"
               v-if="flag == true"
               @click="editbtn()"
-              >编辑</el-button
+              ><svg-icon
+              icon-class="edit"
+            /> 编辑</el-button
             >
             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
@@ -48,7 +50,9 @@
               class="savebtn"
               v-else
               @click="savebtn()"
-              >保存</el-button
+              ><svg-icon
+              icon-class="save"
+            /> 保存</el-button
             >
           </div>
           <div>
@@ -186,13 +190,18 @@
             <span>当前状态</span>
           </div>
           <div>
-            <el-row v-for="(item, i) in statusList" class="text" :gutter="24">
+            <el-row v-for="(item, i) in testlist" class="text" :gutter="24">
               <el-col :span="10">
                 <div class="item_name">{{ item.name }}</div>
               </el-col>
-              <el-col :span="10">
-                <div class="item_data">{{ item.value }}</div>
+              <el-col :span="8">
+                <div class="item_data levelData">{{ item.value }}</div>
               </el-col>
+               <el-col :span="6" >
+                <el-button class="alarmbtn" type="primary" size="mini" 
+                v-if="item.value == '连接异常' || item.value == '紧急' || item.value == '重要' || item.value == '一般'"
+                     @click="toalarm(item)" >处理告警</el-button>
+                  </el-col>
             </el-row>
           </div>
         </el-card>
@@ -209,7 +218,17 @@ export default {
   name: "Dashboard",
   data() {
     return {
-      colspan:14
+      colspan:14,
+      testlist:[
+      {name:'eqwe',value:"连接正常"},
+      {name:'eq二位we',value:"连接异常"},
+      {name:'eq二个位we',value:"2022-12-25"},
+      {name:'eq2二位we',value:"正常"},
+      {name:'eq二21位we',value:"2022-12-36"},
+      {name:'eq444二位we',value:"重要"},
+      {name:'eq444二位we',value:"一般"},
+      {name:'eq444二位we',value:"紧急"},
+    ]
     };
   },
   mixins: [DetailMixins],
@@ -221,6 +240,43 @@ export default {
         console.log("监测设备");
       });
     },
+    toalarm(item){
+     console.log(item);
+    },
+     levelcolor1() {
+      let la = document.getElementsByClassName("levelData");
+      for (var i = 0; i < this.testlist.length; i++) {
+        if (la[i].innerHTML == "连接正常") {
+          la[i].style.color = "green";
+        } else if (la[i].innerHTML == "连接异常") {
+          la[i].style.color = "#f00";
+        } else if (la[i].innerHTML == "正常") {
+          la[i].style.color = "green";
+        } else if (la[i].innerHTML == "紧急") {
+          la[i].style.color = "#f00";
+          la[i].innerHTML = "紧急告警"
+        } else if (la[i].innerHTML == "重要") {
+          la[i].style.color = "#f89850";
+          la[i].innerHTML = "重要告警"
+        } else if (la[i].innerHTML == "一般") {
+          la[i].style.color = "#ead906";
+          la[i].innerHTML = "一般告警"
+        } 
+      }
+    },
+  },
+  watch: {
+    testlist: {
+      immediate: true,
+      handler(newV) {
+        if (newV) {
+           this.$nextTick(function () {
+            this.levelcolor1();
+          });
+         
+        }
+      },
+    },
   },
   mounted() {},
 };

src/views/dashboard/components/type5.vue

@@ -41,7 +41,9 @@
               class="savebtn"
               v-if="flag == true"
               @click="editbtn()"
-              >编辑</el-button
+              ><svg-icon
+              icon-class="edit"
+            /> 编辑</el-button
             >
             <el-button
               style="float: right; padding: 3px 0; margin-right: 20px"
@@ -49,7 +51,9 @@
               class="savebtn"
               v-else
               @click="savebtn()"
-              >保存</el-button
+              ><svg-icon
+              icon-class="save"
+            /> 保存</el-button
             >
           </div>
           <div>
@@ -220,15 +224,20 @@
               <el-col :span="10">
                 <div class="item_name">漏缆状态</div>
               </el-col>
-              <el-col :span="10">
-                <div class="item_data">{{ this.timeStatus.level }}</div>
+              <el-col :span="8">
+                <div class="item_data levelData" :style="acolor">{{ this.timeStatus.level }}</div>
               </el-col>
+               <el-col :span="6" >
+                <el-button class="alarmbtn" type="primary" size="mini" 
+                v-if="this.timeStatus.level != '正常'"
+                     @click="toalarm()" >处理告警</el-button>
+                  </el-col>
             </el-row>
             <el-row class="text" :gutter="24">
               <el-col :span="10">
                 <div class="item_name">最后更新时间</div>
               </el-col>
-              <el-col :span="10">
+              <el-col :span="colspan">
                 <div class="item_data">{{ this.timeStatus.time }}</div>
               </el-col>
             </el-row>
@@ -240,7 +249,7 @@
                   }}米
                 </div>
               </el-col>
-              <el-col :span="10">
+              <el-col :span="colspan">
                 <div class="item_data">驻波比：{{ item.value }}</div>
               </el-col>
             </el-row>
@@ -251,7 +260,7 @@
               <el-col :span="10">
                 <div class="item_name">百米损耗</div>
               </el-col>
-              <el-col :span="10">
+              <el-col :span="colspan">
                 <div class="item_data">
                   {{ form.baseInfo.hundredMetersLoss }}
                 </div>
@@ -273,6 +282,9 @@ export default {
   data() {
     return {
       colspan:14,
+      acolor:{
+        color:""
+      },
       leakyList: [],
       timeStatus: {},
     };
@@ -286,10 +298,32 @@ export default {
         console.log("漏缆");
       });
     },
+  levelcolor2() {
+      if (this.timeStatus.level == '正常') {
+        this.acolor.color = 'green'
+      } else if (this.timeStatus.level == '紧急') {
+         this.acolor.color = '#f00'
+      } else if (this.timeStatus.level == '重要') {
+         this.acolor.color = '#f89850'
+       } else if (this.timeStatus.level == '一般') {
+         this.acolor.color = '#ead906'
+      }
+  },
+    toalarm(){
+      console.log(this.form.baseInfo.id);
+       this.$router.push({
+        path: "/alarm/cableTime",
+        query: {
+          id: this.form.baseInfo.id,
+          
+        },
+      });
+    },
     trans() {
       var temp = [];
       var asd = [];
-      if (this.form.status) {
+      var isNull = (JSON.stringify(this.form.status) == "{}");
+      if (isNull==false) {
         for (var i in this.form.status) {
           for (var j in this.form.status[i]) {
             asd.push({ name: j, value: this.form.status[i][j] });
@@ -301,6 +335,9 @@ export default {
           this.timeStatus = { level: i, time: temp[0].value[i] };
         }
         this.leakyList = asd;
+      }else{
+        this.leakyList = []
+        this.timeStatus = {}
       }
     },
   },
@@ -311,6 +348,7 @@ export default {
       handler(newV) {
         if (newV) {
           this.trans();
+          this.levelcolor2()
         }
       },
     },

src/views/dashboard/const.js

@@ -47,7 +47,7 @@ export function formInit2(data = {}) {
     type3: 0,
     type4: 0,
     type5: 0,
-    status: '',
+    status: [],
     controlLimit: "",
     count: "",
     ...data

src/views/login/index.vue

@@ -353,3 +353,16 @@ $light_gray: #eee;
 }
 
 </style>
+<style>
+  /* 自动填充样式修改 */
+.login-container .el-input input:-webkit-autofill{
+  
+     -webkit-box-shadow: 0 0 0px 1000px transparent inset !important;
+    box-shadow: 0 0 0px 1000px transparent inset !important;
+}
+input:-internal-autofill-previewed,
+input:-internal-autofill-selected {
+  -webkit-text-fill-color: #FFFFFF !important;
+  transition: background-color 5000s ease-in-out 0s !important;
+}
+</style>