Merge remote-tracking branch 'origin/master'

src/components/belt_diagnosis/belt_benti/index.vue

@@ -81,7 +81,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/belt_protect/index.vue

@@ -111,7 +111,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 

src/components/belt_diagnosis/bianpin/index.vue

@@ -90,7 +90,7 @@ export default {
     
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 

src/components/belt_diagnosis/dajie_equipment_status/index.vue

@@ -106,14 +106,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
-  text-align: center;
-  margin-top: 10px;
-}
-.title1 {
-  color: #fff;
-  font-size: 21px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/dajie_equipment_status1/index.vue

@@ -105,14 +105,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
-  text-align: center;
-  margin-top: 10px;
-}
-.title1 {
-  color: #fff;
-  font-size: 21px;
-  font-weight: bolder;
+ 
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/dianji1/index.vue

@@ -115,7 +115,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/dianji2/index.vue

@@ -115,7 +115,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }
@@ -158,12 +158,4 @@ display: flex;
     color: #4adefe;
   }
 }
-
-
-.spanitem {
-  /* display: inline-block; */
-  /* width: 10px; */
-  color: #f3f5f7;
-  padding-left: 100px;
-}
 </style>

src/components/belt_diagnosis/equipment_status/index.vue

@@ -89,7 +89,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  /* font-weight: bolder; */
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/failure_hand/index.vue

@@ -39,7 +39,7 @@
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }
@@ -76,7 +76,7 @@
 .item {
   color: #f3db5c;
   font-size: 16px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 5px;
  

src/components/belt_diagnosis/failure_pre/index.vue

@@ -63,11 +63,12 @@ export default {
     methods: {
       handlervalue(val) {
         console.log('val :>> ', val);
-        this.data.paopian = this.getRandomNum(0, 80);
-        this.data.dahua = this.getRandomNum(0, 80);
-        this.data.duimei = this.getRandomNum(0, 80);
-        this.data.chaozai = this.getRandomNum(0, 80);
-      
+        if (val) {
+          this.data.paopian = this.getRandomNum(0, 80);
+          this.data.dahua = this.getRandomNum(0, 80);
+          this.data.duimei = this.getRandomNum(0, 80);
+          this.data.chaozai = this.getRandomNum(0, 80);
+        }
       },
         initWebSocket() {
             // 连接错误
@@ -149,7 +150,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/failure_pre/yuzhishezhi.vue

@@ -19,10 +19,10 @@
               <el-option label="管理员" value="4"></el-option>
             </el-select>
           </el-form-item> -->
-          <el-form-item label="驱动电机功率（单位：KW）" label-width="200px" prop="remark">
+          <el-form-item label="驱动电机功率（单位：KW）" label-width="200px" prop="dianjigonglv">
             <el-input v-model="form.dianjigonglv"  type="number" autocomplete="off"></el-input>
           </el-form-item>
-          <el-form-item label="驱动电机电流（单位：A）" label-width="200px" >
+          <el-form-item label="驱动电机电流（单位：A）" label-width="200px">
             <el-input v-model="form.dianjidianliu" type="number" autocomplete="off"></el-input>
           </el-form-item>
           <el-form-item label="传送带张力（单位：N）" label-width="200px" >
@@ -67,23 +67,24 @@
       ...mapState(["rowData"]),
     },
     watch: {
-        //监听vuex内rowData如果变了就赋值给form，从而从新渲染更新页面。
-      rowData() {
-        this.form = {
-          character: this.rowData.character,
-          remark: this.rowData.remark,
-          reason: this.rowData.reason,
-        };
-      },
+      form: {
+        handler(newValue, oldValue) {
+          this.flag = true;
+        },
+        deep: true
+      }
     },
     data() {
       return {
           //弹出框内容双向绑定
         form: {
-          character: "",
-          remark: "",
-          reason: "",
+          dianjigonglv: undefined,
+          dianjidianliu: undefined,
+          chuansongdaizhangli: undefined,
+          pidaiwendu: undefined,
+          guntongwendu: undefined
         },
+        flag: false,
         //规则：弹出框内容必填项等规则
         rules: {
           dianjigonglv: [
@@ -113,12 +114,13 @@
     methods: {
         //子传父，调用父组件方法改动显示隐藏从而动态控制子组件显示隐藏
       cancel() {
+        this.flag = false;
         this.$emit("hide");
       },
-      confirm(val){
-        this.$emit("handlervalue", val);
+      confirm(){
+        this.$emit("handlervalue", this.flag);
         this.$emit("hide");
-
+        this.flag = false;
       },
     },
   };

src/components/belt_diagnosis/guanlian_equipment_status/index1.vue

@@ -78,7 +78,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/guanlian_equipment_status/index2.vue

@@ -82,7 +82,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/guanlian_equipment_status/index3.vue

@@ -78,7 +78,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/guntong1/index.vue

@@ -82,7 +82,7 @@ export default {
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
 }

src/components/belt_diagnosis/guntong2/index.vue

@@ -82,7 +82,7 @@
   .title {
     color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  // font-weight: bolder;
   text-align: center;
   margin-top: 10px;
   }

src/components/belt_diagnosis/transfer_status/index.vue

@@ -57,7 +57,7 @@ export default{
 .title {
   color: #4adefe;
   font-size: 20px;
-  font-weight: bolder;
+  /* font-weight: bolder; */
   text-align: center;
   margin-top: 10px;
 }

src/views/app_belt_diagnosis/newMain.vue

@@ -136,7 +136,7 @@ export default {
   .two {
     display: grid;
     grid-template-columns: 1fr 1fr;
-    grid-gap: 10px;
+    grid-gap: 20px;
   }
   .three{
     display: grid;
@@ -152,19 +152,14 @@ export default {
   .item {
     position: relative;
     background-color: #303030;
-    border-radius: 20px;
-    padding: 0px;
+    // border-radius: 20px;
+    // padding: 0px;
     background-image: 
-     url(../../assets/img/tunneling/dataBg.png);
-      // url(../../assets/img/tunneling/dataBg.png), 
-      // url(../../assets/img/tunneling/dataBg.png), 
-      // url(../../assets/img/tunneling/dataBg.png), 
-      // url(../../assets/img/tunneling/dataBg.png),
-      // url(../../assets/img/tunneling/dataBg.png),  
-      // url(../../assets/img/tunneling/dataBg.png);
+     url(../../assets/img/tunneling/dataBg.png),
+      url(../../assets/img/tunneling/dataBg.png); 
     background-repeat: no-repeat;
-    background-size: 109% 100%;
-    background-clip: content-box;
+    background-size: 100% 100%;
+    // background-clip: content-box;
   }
 }
 </style>