烟雾 ywj和液位 错误修改

src/views/pad/building/energyRateDialog.vue

@@ -11,7 +11,7 @@
             <div class="content-title">
               <span class="title">楼宇本周用电量</span>
             </div>
-            <div class="leftNavList">           
+            <div class="leftNavList">
               <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
@@ -323,7 +323,7 @@
                       <div><img src="@/assets/images/service_new/cicleFox.png"></div>
                       <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">电梯能量回收</div>
                     </div>
-                 
+
 
                   </div>
                 </div>
@@ -444,7 +444,7 @@
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/building_guarantee/smoke.png"></div>
-                    <div class="num">{{ warnDeviceList.ywj.total}}<span class="unit">个</span></div>
+                    <div class="num">{{ warnDeviceList.yw.total}}<span class="unit">个</span></div>
                   </div>
 
                 </div>
@@ -455,7 +455,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="nor">{{ warnDeviceList.ywj.zcdw}}</div>
+                      <div class="nor">{{ warnDeviceList.yw.zcdw}}</div>
                     </div>
 
                   </div>
@@ -464,7 +464,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="dor">{{ warnDeviceList.ywj.ycdw}}</div>
+                      <div class="dor">{{ warnDeviceList.yw.ycdw}}</div>
                     </div>
 
                   </div>
@@ -516,7 +516,7 @@
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/building_guarantee/liquidLevel.png"></div>
-                    <div class="num">{{ warnDeviceList.yw.total}}<span class="unit">个</span></div>
+                    <div class="num">{{ warnDeviceList.ywj.total}}<span class="unit">个</span></div>
                   </div>
 
                 </div>
@@ -527,7 +527,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="nor">{{ warnDeviceList.yw.zcdw}}</div>
+                      <div class="nor">{{ warnDeviceList.ywj.zcdw}}</div>
                     </div>
 
                   </div>
@@ -536,7 +536,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="dor">{{ warnDeviceList.yw.ycdw}}</div>
+                      <div class="dor">{{ warnDeviceList.ywj.ycdw}}</div>
                     </div>
 
                   </div>
@@ -589,7 +589,7 @@
               </div>
             </div>
 
-           
+
           </div>
         </div>
 
@@ -763,8 +763,8 @@ export default {
     // this.handleWaterData()
      //负二层生活水箱
      //this.handleFireData()
-  
-   
+
+
   },
   destroyed() { },
   beforeDestroy() { },
@@ -772,12 +772,12 @@ export default {
 
   },
   methods: {
-    
+
     onBarChartClick(params) {
     const xAxisIndex = params.dataIndex;
-    const seriesIndex = params.seriesIndex; 
-    const customXParams = [1, 2, 3, 4, 5][xAxisIndex]; 
-    const customYParams = (seriesIndex + 1); 
+    const seriesIndex = params.seriesIndex;
+    const customXParams = [1, 2, 3, 4, 5][xAxisIndex];
+    const customYParams = (seriesIndex + 1);
      this.abnormalClick(2,customXParams,customYParams);
   },
       //资产存量
@@ -798,7 +798,7 @@ export default {
         }
       });
     },
-    
+
       //电梯能量回收
       controlElevator() {
           controlElevator(this.$props.appOrg).then((res) => {
@@ -809,7 +809,7 @@ export default {
       });
     },
 
-   
+
       //水箱
     // 二十三层生活水箱丶消防水箱
     waterState() {
@@ -820,7 +820,7 @@ export default {
           this.waterTankFirst.shsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
@@ -829,17 +829,17 @@ export default {
           this.waterTankFirst.xfsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
-         
+
            this.waterTankSecond=res.data.minusTwo;
             // 处理 gqsx 数组
           this.waterTankSecond.gqsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
@@ -848,15 +848,15 @@ export default {
           this.waterTankSecond.dqsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
-        
+
           console.log('======================',this.waterTankSecond.dqsx);
-          
+
       this.waterData = [
-        
+
         //三个最底下的圆片
         {
           name: '',
@@ -999,7 +999,7 @@ export default {
           },
           data: [this.waterTankFirst.shsx[2].zgsw, this.waterTankFirst.xfsx[2].zgsw]
         },
-        
+
            //中间最低刻度的圆形
            {
           name: '', //头部
@@ -1030,7 +1030,7 @@ export default {
           },
           data: [this.waterTankFirst.shsx[1].zdsw, this.waterTankFirst.xfsx[1].zdsw]
         },
-       
+
 
         //底部外面刻度的圆形
         {
@@ -1374,7 +1374,7 @@ export default {
           },
           data: [this.waterTankSecond.gqsx[2].zgsw, this.waterTankSecond.dqsx[2].zgsw]
         },
-    
+
            //中间最低刻度的圆形
            {
           name: '', //头部
@@ -1405,7 +1405,7 @@ export default {
           },
           data: [this.waterTankSecond.gqsx[1].zdsw, this.waterTankSecond.dqsx[1].zdsw]
         },
-        
+
 
         //底部外面刻度的圆形
         {
@@ -1605,8 +1605,8 @@ export default {
     }
   });
     },
-   
-   
+
+
     //楼宇每月用电量
     monthElectricity() {
       monthElectricity(this.$props.appOrg).then((res) => {
@@ -1911,7 +1911,7 @@ export default {
     }
     });
     },
-   
+
     //点击楼宇中当前告警设备列表
     abnormalClick(e,f,g) {
       this.$emit("abnormalClick", e,f,g);

src/views/screen/building/energyRateDialog.vue

@@ -11,7 +11,7 @@
             <div class="content-title">
               <span class="title">楼宇本周用电量</span>
             </div>
-            <div class="leftNavList">           
+            <div class="leftNavList">
               <div class="left-list" >
                 <div class="left-info">
                   <div class="name">
@@ -127,7 +127,7 @@
                     <!-- 机房总用电量 -->
                     <transition name="fade-grow">
                       <div class="machine" v-if="macShow">
-                        
+
                         <div class="macBox">
                           <div @click="macShow = !macShow" style="position: absolute;right: 25px;top: 25px;"> <img src="@/assets/images/service_new/maeX.png"></div>
                           <div class="content-title">
@@ -324,7 +324,7 @@
                       <div><img src="@/assets/images/service_new/cicleFox.png"></div>
                       <div style="color: #fff;display: flex;justify-content: center;margin-top: 5px;">电梯能量回收</div>
                     </div>
-                 
+
 
                   </div>
                 </div>
@@ -445,7 +445,7 @@
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/building_guarantee/smoke.png"></div>
-                    <div class="num">{{ warnDeviceList.ywj.total}}<span class="unit">个</span></div>
+                    <div class="num">{{ warnDeviceList.yw.total}}<span class="unit">个</span></div>
                   </div>
 
                 </div>
@@ -456,7 +456,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="nor">{{ warnDeviceList.ywj.zcdw}}</div>
+                      <div class="nor">{{ warnDeviceList.yw.zcdw}}</div>
                     </div>
 
                   </div>
@@ -465,7 +465,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="dor">{{ warnDeviceList.ywj.ycdw}}</div>
+                      <div class="dor">{{ warnDeviceList.yw.ycdw}}</div>
                     </div>
 
                   </div>
@@ -517,7 +517,7 @@
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/building_guarantee/liquidLevel.png"></div>
-                    <div class="num">{{ warnDeviceList.yw.total}}<span class="unit">个</span></div>
+                    <div class="num">{{ warnDeviceList.ywj.total}}<span class="unit">个</span></div>
                   </div>
 
                 </div>
@@ -528,7 +528,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="nor">{{ warnDeviceList.yw.zcdw}}</div>
+                      <div class="nor">{{ warnDeviceList.ywj.zcdw}}</div>
                     </div>
 
                   </div>
@@ -537,7 +537,7 @@
                   <div class="left-info">
                     <div class="name">
                       <!-- <div> <img src="@/assets/images/building_guarantee/waterImmersion.png"></div>    -->
-                      <div class="dor">{{ warnDeviceList.yw.ycdw}}</div>
+                      <div class="dor">{{ warnDeviceList.ywj.ycdw}}</div>
                     </div>
 
                   </div>
@@ -590,7 +590,7 @@
               </div>
             </div>
 
-           
+
           </div>
         </div>
 
@@ -763,8 +763,8 @@ export default {
     // this.handleWaterData()
      //负二层生活水箱
      //this.handleFireData()
-  
-   
+
+
   },
   destroyed() { },
   beforeDestroy() { },
@@ -774,9 +774,9 @@ export default {
   methods: {
     onBarChartClick(params) {
     const xAxisIndex = params.dataIndex;
-    const seriesIndex = params.seriesIndex; 
-    const customXParams = [1, 2, 3, 4, 5][xAxisIndex]; 
-    const customYParams = (seriesIndex + 1); 
+    const seriesIndex = params.seriesIndex;
+    const customXParams = [1, 2, 3, 4, 5][xAxisIndex];
+    const customYParams = (seriesIndex + 1);
      this.abnormalClick(2,customXParams,customYParams);
   },
       //资产存量
@@ -797,7 +797,7 @@ export default {
         }
       });
     },
-    
+
        //电梯能量回收
        controlElevator() {
           controlElevator(this.$props.appOrg).then((res) => {
@@ -807,7 +807,7 @@ export default {
         }
       });
     },
-   
+
       //水箱
     // 二十三层生活水箱丶消防水箱
     waterState() {
@@ -818,7 +818,7 @@ export default {
           this.waterTankFirst.shsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
@@ -827,17 +827,17 @@ export default {
           this.waterTankFirst.xfsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
-         
+
            this.waterTankSecond=res.data.minusTwo;
             // 处理 gqsx 数组
           this.waterTankSecond.gqsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
@@ -846,14 +846,14 @@ export default {
           this.waterTankSecond.dqsx.forEach(item => {
             for (let key in item) {
               if (item.hasOwnProperty(key) && typeof item[key] === "string") {
-                item[key] = item[key].replace(/m$/, ""); 
+                item[key] = item[key].replace(/m$/, "");
               }
             }
           });
-        
-          
+
+
       this.waterData = [
-        
+
         //三个最底下的圆片
         {
           name: '',
@@ -996,7 +996,7 @@ export default {
           },
           data: [this.waterTankFirst.shsx[2].zgsw, this.waterTankFirst.xfsx[2].zgsw]
         },
-        
+
            //中间最低刻度的圆形
            {
           name: '', //头部
@@ -1027,7 +1027,7 @@ export default {
           },
           data: [this.waterTankFirst.shsx[1].zdsw, this.waterTankFirst.xfsx[1].zdsw]
         },
-       
+
 
         //底部外面刻度的圆形
         {
@@ -1371,7 +1371,7 @@ export default {
           },
           data: [this.waterTankSecond.gqsx[2].zgsw, this.waterTankSecond.dqsx[2].zgsw]
         },
-    
+
            //中间最低刻度的圆形
            {
           name: '', //头部
@@ -1402,7 +1402,7 @@ export default {
           },
           data: [this.waterTankSecond.gqsx[1].zdsw, this.waterTankSecond.dqsx[1].zdsw]
         },
-        
+
 
         //底部外面刻度的圆形
         {
@@ -1602,8 +1602,8 @@ export default {
     }
   });
     },
-   
-   
+
+
     //楼宇每月用电量
     monthElectricity() {
       monthElectricity(this.$props.appOrg).then((res) => {
@@ -1908,7 +1908,7 @@ export default {
     }
     });
     },
-   
+
     //点击楼宇中当前告警设备列表
     abnormalClick(e,f,g) {
       this.$emit("abnormalClick", e,f,g);