Переглянути джерело

1.智慧检修绑点错误改;2.健康报告改

mw_666 3 роки тому
батько
коміт
b5b91c356c

+ 24 - 28
src/components/other/healthReport/index.vue

@@ -253,19 +253,15 @@
               yhbjcount.tdgtime
             }}分钟。
           </el-form-item>
-          <el-form-item class="text-indent-2" v-if="bjyhcount.length > 0"
-            >其中以{{ bjyhcount[0].yhmx }}发生频次最高,为{{
-              bjyhcount[0].count
-            }}次;{{ bjyhcount[1].yhmx }}次之,为{{ bjyhcount[1].count }}次;{{
-              bjyhcount[2].yhmx
-            }}第三,为{{ bjyhcount[0].count }}次。
+          <el-form-item class="text-indent-2" v-if="bjyhcount.length > 0">
+			<font v-if="bjyhcount[0].yhmx">其中以{{ bjyhcount[0].yhmx }}发生频次最高,为{{ bjyhcount[0].count }}次;</font>
+			<font v-if="bjyhcount[1].yhmx">{{ bjyhcount[1].yhmx }}次之,为{{ bjyhcount[1].count }}次;</font>
+			<font v-if="bjyhcount[2].yhmx">{{ bjyhcount[2].yhmx }}第三,为{{ bjyhcount[0].count }}次。</font>
           </el-form-item>
-          <el-form-item class="text-indent-2"
-            >其中以{{ bjyhcount[3].yhmx }}发生时长最长,为{{
-              bjyhcount[3].times
-            }}分钟;{{ bjyhcount[4].yhmx }}次之,为{{
-              bjyhcount[4].yhmx
-            }}分钟;{{ bjyhcount[5].yhmx }}第三,为{{ bjyhcount[5].yhmx }}分钟。
+          <el-form-item class="text-indent-2" >
+			<font v-if="bjyhcount[3].yhmx">其中以{{ bjyhcount[3].yhmx }}发生时长最长,为{{ bjyhcount[3].times }}分钟;</font>
+			<font v-if="bjyhcount[4].yhmx">{{ bjyhcount[4].yhmx }}次之,为{{ bjyhcount[4].yhmx }}分钟;</font>
+			<font v-if="bjyhcount[5].yhmx">{{ bjyhcount[5].yhmx }}第三,为{{ bjyhcount[5].yhmx }}分钟。</font>
           </el-form-item>
           <div class="logHead">部件隐患对比(次|分钟)</div>
           <el-table
@@ -1631,7 +1627,6 @@ export default {
       $(".bjyhdb .el-table__header-wrapper table .is-group tr").eq(1).remove();
     },
     yhmxdbMethod({ row, column, rowIndex, columnIndex }) {
-      //     console.log(rowIndex + "==" + columnIndex)
       if (rowIndex < 8) {
         if (rowIndex === 0 && columnIndex === 0) {
           return [8, 1];
@@ -1763,20 +1758,22 @@ export default {
                 value: [],
               },
             ];
-            let qxpcl = res.data.healthreport.qxpcls.sort(that.compare("date"));
-            if (qxpcl != null && qxpcl != undefined) {
-              for (var i = qxpcl.length - 1; i >= 0; i--) {
-                qxpcls[0].value.push({
-                  text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
-                  value: Number(qxpcl[i].qxpcl).toFixed(2),
-                });
-                qxpcls[1].value.push({
-                  text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
-                  value: Number(qxpcl[i].jzz).toFixed(2),
-                });
-              }
-              that.qxpcls = qxpcls;
-            }
+			if(res.data.healthreport.qxpcls){
+				let qxpcl = res.data.healthreport.qxpcls.sort(that.compare("date"));
+				if (qxpcl != null && qxpcl != undefined) {
+				  for (var i = qxpcl.length - 1; i >= 0; i--) {
+				    qxpcls[0].value.push({
+				      text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
+				      value: Number(qxpcl[i].qxpcl).toFixed(2),
+				    });
+				    qxpcls[1].value.push({
+				      text: new Date(qxpcl[i].date).formatDate("yyyy-MM-dd"),
+				      value: Number(qxpcl[i].jzz).toFixed(2),
+				    });
+				  }
+				  that.qxpcls = qxpcls;
+				}
+			}
  
             // 对风偏差
             that.dfpc = [];
@@ -1893,7 +1890,6 @@ export default {
                 that.bjyhcount.push(array2[2]);
               }
             }
- 
             //切入切出对比
             that.qrqcs = [];
             res.data.healthreport.qrqcs && res.data.healthreport.qrqcs.forEach((item) => {

+ 2 - 2
src/views/HealthControl/Health3.vue

@@ -46,7 +46,7 @@
             </div>
           </div>
           <div class="dashboard">
-            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="sourceMap.yfdl" />
+            <dashboard-2 :height="'7.5vh'" :width="'115px'" :value="sourceMap.yczqlmonth" />
             <div class="lengends">
               <div class="item">
                 <span class="label">本月发电量</span>
@@ -56,7 +56,7 @@
               <div class="item">
                 <span class="label">本月预测电量</span>
                 <span class="lengend green"></span>
-                <span class="value">{{sourceMap.yczqlmonth}}</span>
+                <span class="value">{{sourceMap.ycdl1month}}</span>
               </div>
             </div>
           </div>

+ 1 - 1
src/views/HealthControl/HealthTab1.vue

@@ -152,7 +152,7 @@ export default {
         wtId: item.wtid,
         recorddate: new Date(item.createdate).formatDate("yyyy-MM-dd"),
       };
-	  this.$refs.eport.getReport(item.wtid,recorddate);
+	  // this.$refs.eport.getReport(item.wtid,recorddate);
     },
     // 关闭健康报告
     closed() {