1

src/views/home/yuxin.vue

@@ -91,13 +91,13 @@
               >+392 Pa</div
             > -->
             <!-- 锅炉下部温度组 -->
-            <div class="label data-box" style="left: 14%; top: 59%">{{
+            <div class="label data-box" style="left: 13.7%; top: 57.5%">{{
               lt.下端温度左.value.value + ' ' + lt.下端温度左.value.unit
             }}</div>
-            <div class="label data-box" style="left: 14%; top: 64%">{{
+            <div class="label data-box" style="left: 13.7%; top: 64%">{{
               lt.沸中温度左.value.value + ' ' + lt.沸中温度左.value.unit
             }}</div>
-            <div class="label data-box" style="left: 14%; top: 71%">{{
+            <div class="label data-box" style="left: 13.7%; top: 71%">{{
               lt.沸下温度左.value.value + ' ' + lt.沸下温度左.value.unit
             }}</div>
             <!-- <div class="label data-box" style="left: 15.8%; top: 79%">87%</div> -->
@@ -107,7 +107,7 @@
             <div class="label data-box" style="left: 17.5%; top: 81%">{{
               lc.料层差压右.value.value + ' ' + lc.料层差压右.value.unit
             }}</div>
-            <div class="label data-box" style="left: 17.5%; top: 59%">{{
+            <div class="label data-box" style="left: 17.5%; top: 57.5%">{{
               lt.下端温度右.value.value + ' ' + lt.下端温度右.value.unit
             }}</div>
             <div class="label data-box" style="left: 17.5%; top: 64%">{{
@@ -300,7 +300,7 @@
               }}</div
             >
             <!-- 给水泵 -->
-            <div class="label device-name" style="left: 60%; top:90%"
+            <div class="label device-name" style="left: 60%; top: 90%"
               >给水泵</div
             >
             <div class="label data-box" style="left: 78%; top: 83%"
@@ -312,7 +312,15 @@
               {{ gs.出口流量.value.value + ' ' + gs.出口流量.value.unit }}</div
             >
             <!-- 左下角给水 -->
-            <div class="label device-name" style="left: 2%; top: 93.5%">给水</div>
+            <div class="label device-name" style="left: 2%; top: 93.5%"
+              >给水</div
+            >
+            <div class="label data-box" style="left: 4%; top: 88%"
+              >进口流量:
+              {{
+                zgs.进口流量.value.value + ' ' + zgs.进口流量.value.unit
+              }}</div
+            >
           </div>
           <!-- 右侧排放数据面板 -->
           <div class="emission-panel">
@@ -438,6 +446,23 @@
             }
           }
         },
+        //主给水
+        zgs: {
+          deviceId: {
+            5: '2048945828386091010',
+            6: '2048945828440616962',
+            7: '2064913192936058881'
+          },
+          进口流量: {
+            5: 'AI0043',
+            6: 'AI0024',
+            7: '0',
+            value: {
+              value: '',
+              unit: ''
+            }
+          }
+        },
         //给水
         gs: {
           deviceId: {
@@ -923,6 +948,7 @@
         this.getYcfj();
         this.getEcfj();
         this.getYfj();
+        this.getZgs()
       },
 
       onFullscreen() {
@@ -1196,6 +1222,21 @@
             });
           });
         });
+      },
+      getZgs() {
+        const keys = ['进口流量'];
+        getRealData(this.zgs.deviceId[this.currentId]).then((res) => {
+          res.forEach((item) => {
+            keys.forEach((key) => {
+              if (item.identifier == this.zgs[key][this.currentId]) {
+                this.zgs[key].value = {
+                  value: item.value,
+                  unit: item.unit
+                };
+              }
+            });
+          });
+        });
       }
     }
   };

src/views/recordComponents/workOrderReport.vue

@@ -744,7 +744,7 @@
         }
       },
       addContactName(row, index) {
-        if (row.paramValue == '运输单位') {
+        if (row.paramValue == '运输单位'||row.paramValue == '收货单位') {
           this.currentIndex = index;
           this.handParent('09');
         }