Merge remote-tracking branch 'origin/main'

src/views/pad/building/cameraData.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-data data-camera-operation">
 <!--    <div class="title-area">摄像头接入情况</div>-->
-    <div class="content-area">
+    <div class="content-area" v-if="flag >= 2">
       <div class="content-title">
         <span class="title">近一月楼宇能耗信息</span>
       </div>
@@ -197,6 +197,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       energyList:{},
       airOverviewList:{},
       curBodex:0,
@@ -263,6 +264,7 @@ export default {
         powerAndWaterMonth(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.energyList=res.data;
+          this.flag++
         }
       });
     },
@@ -271,6 +273,7 @@ export default {
       airOverview(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.airOverviewList=res.data;
+          this.flag++
         }
       });
     },

src/views/pad/building/cameraDataDialog.vue

@@ -6,7 +6,7 @@
       />
       <div class="title">办公能耗</div>
     </div>
-    <div class="dialog-cont">
+    <div class="dialog-cont" v-if="flag >= 9">
       <div class="dialog-left">
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -587,6 +587,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       energyList:{},
       airOverviewList:{},
       curBodex:0,
@@ -823,6 +824,7 @@ export default {
       powerAndWaterMonth(this.$props.appOrg).then((res) => {
       if (Number(res.code) === 200) {
         this.energyList=res.data; 
+        this.flag++
       }
     });
   },
@@ -832,6 +834,7 @@ export default {
     airOverview(this.$props.appOrg).then((res) => {
       if (Number(res.code) === 200) {
         this.airOverviewList=res.data;
+        this.flag++
       }
     });
   },
@@ -1530,6 +1533,7 @@ export default {
           show: false
         }
         };
+        this.flag++
       } else {
 
       }
@@ -1581,6 +1585,7 @@ export default {
             },
           },
         ];
+        this.flag++
       } else {
         //构造默认数据
 
@@ -1593,6 +1598,7 @@ export default {
           greenElectricity(this.$props.appOrg).then((res) => {
       if (Number(res.code) === 200) {
         this.greenIntionList=res.data; 
+        this.flag++
       }
     });
   },
@@ -1658,6 +1664,7 @@ export default {
         data: res.data[1].monthData,
       },
     ])
+    this.flag++
     }
   });  
 },
@@ -1720,6 +1727,7 @@ energyYear() {
         data: res.data.lastYear,
       },
     ])
+    this.flag++
     }
   });  
 },
@@ -1782,6 +1790,7 @@ powerYear() {
         data: res.data.lastYear,
       },
     ])
+    this.flag++
     }
   });  
 },
@@ -1845,6 +1854,7 @@ waterYear() {
         data: res.data.lastYear,
       },
     ])
+    this.flag++
     }
   });  
 },

src/views/pad/building/energyRate.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-data energy-rate-operation">
 <!--    <div class="title-area">能源占比</div>-->
-    <div class="content-area">
+    <div class="content-area" v-if="flag >= 4">
       <div class="content-title">
         <span class="title">楼宇本周用电量</span>
       </div>
@@ -268,6 +268,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       thisWeekElectricityList:{},
       fllEleList:{},
       //楼宇每月用电量
@@ -315,6 +316,7 @@ export default {
         thisWeekElectricity(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.thisWeekElectricityList=res.data;
+          this.flag++
         }
       });
     },
@@ -324,6 +326,7 @@ export default {
           controlElevator(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.fllEleList=res.data;
+          this.flag++
         }
       });
     },
@@ -410,8 +413,10 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
     });
+   
     },
 
       //楼宇每月用电量
@@ -522,8 +527,10 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
   });
+ 
 },
 
 

src/views/pad/building/energyRateDialog.vue

@@ -4,7 +4,7 @@
       <img src="@/assets/images/main/cont_title_bg.png" />
       <div class="title">楼宇中控</div>
     </div>
-    <div class="dialog-cont">
+    <div class="dialog-cont" v-if="flag >= 8">
       <div class="dialog-left">
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -122,11 +122,11 @@
                 <div class="left-info">
                   <div class="name">
                     <div> <img src="@/assets/images/service_new/quantity.png"></div>
-                    <div @mouseenter="macShow = true">机房总用电量</div>
-                    <div class="arrow" @mouseenter="macShow = true"></div>
+                    <div @click="macShow = !macShow">机房总用电量</div>
+                    <div class="arrow" @click="macShow = !macShow"></div>
                     <!-- 机房总用电量 -->
                     <transition name="fade-grow">
-                      <div class="machine" v-if="macShow" @mouseleave="macShow = false">
+                      <div class="machine" v-if="macShow" @click="macShow = !macShow">
                         <div class="macBox">
                           <div class="content-title">
                             <span class="title">机房总用电量</span>
@@ -626,6 +626,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       thisWeekElectricityList:{},
       fllEleList:{},
       warnDeviceList:{},
@@ -772,6 +773,7 @@ export default {
         thisWeekElectricity(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.thisWeekElectricityList=res.data;
+          this.flag++
         }
       });
     },
@@ -780,6 +782,7 @@ export default {
           controlElevator(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.fllEleList=res.data;
+          this.flag++
         }
       });
     },
@@ -1576,6 +1579,7 @@ export default {
         },
 
       }
+      this.flag++
     }
   });
     },
@@ -1688,6 +1692,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
   });
 },
@@ -1794,6 +1799,7 @@ export default {
         },
         splitArea: false,
       };
+      this.flag++
     }
   });
 },
@@ -1879,6 +1885,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
     });
     },
@@ -2018,6 +2025,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
   });
     },
@@ -2027,6 +2035,7 @@ export default {
         warnDevice(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.warnDeviceList=res.data;
+          this.flag++
         }
       });
     },

src/views/pad/building/main.vue

@@ -465,7 +465,7 @@
       <energy-rate-dialog v-if="dialogType === 1"  @abnormalClick="onAbnormalClick" @closeDialog="closeDialog" :appOrg="appOrg"></energy-rate-dialog>
       <building-save-dialog v-if="dialogType === 2" @closeDialog="closeDialog"></building-save-dialog>
       <camera-data-dialog v-if="dialogType === 5" @closeDialog="closeDialog"></camera-data-dialog >
-      <unit-monitor-dialog v-if="dialogType === 4" @closeDialog="closeDialog" @chooseMonitor="chooseMonitorBack" :monitorName="monitorName"></unit-monitor-dialog>
+      <unit-monitor-dialog v-if="dialogType === 4" @closeDialog="closeDialog"  :monitorName="monitorName"></unit-monitor-dialog>
     </div>
 
     <!-- 监控区域 -->

src/views/screen/building/cameraData.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-data data-camera-operation">
 <!--    <div class="title-area">摄像头接入情况</div>-->
-    <div class="content-area">
+    <div class="content-area" v-if="flag >= 2">
       <div class="content-title">
         <span class="title">近一月楼宇能耗信息</span>
       </div>
@@ -197,6 +197,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       energyList:{},
       airOverviewList:{},
       curBodex:0,
@@ -263,6 +264,7 @@ export default {
         powerAndWaterMonth(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.energyList=res.data;
+          this.flag++
         }
       });
     },
@@ -271,6 +273,7 @@ export default {
       airOverview(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.airOverviewList=res.data;
+          this.flag++
         }
       });
     },

src/views/screen/building/cameraDataDialog.vue

@@ -6,7 +6,7 @@
         />
         <div class="title">办公能耗</div>
       </div>
-      <div class="dialog-cont">
+      <div class="dialog-cont" v-if="flag >= 9">
         <div class="dialog-left">
           <div class="dialog-list">
             <div class="dialog-item wid100">
@@ -587,6 +587,7 @@
     },
     data() {
       return {
+        flag: 0,
         energyList:[{name: "water", value: 0}, {name: "power", value: 0}],
         airOverviewList:{},
         curBodex:0,
@@ -823,6 +824,7 @@
         powerAndWaterMonth(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.energyList=res.data; 
+          this.flag++
         }
       });
     },
@@ -832,6 +834,7 @@
       airOverview(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.airOverviewList=res.data;
+          this.flag++
         }
       });
     },
@@ -1530,6 +1533,7 @@
             show: false
           }
           };
+          this.flag++
         } else {
 
         }
@@ -1581,6 +1585,7 @@
               },
             },
           ];
+          this.flag++
         } else {
           //构造默认数据
 
@@ -1593,6 +1598,7 @@
             greenElectricity(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.greenIntionList=res.data; 
+          this.flag++
         }
       });
     },
@@ -1658,6 +1664,7 @@
           data: res.data[1].monthData,
         },
       ])
+      this.flag++
       }
     });  
   },
@@ -1720,6 +1727,7 @@
           data: res.data.lastYear,
         },
       ])
+      this.flag++
       }
     });  
   },
@@ -1782,6 +1790,7 @@
           data: res.data.lastYear,
         },
       ])
+      this.flag++
       }
     });  
   },
@@ -1845,6 +1854,7 @@
           data: res.data.lastYear,
         },
       ])
+      this.flag++
       }
     });  
   },

src/views/screen/building/energyRate.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="main-data energy-rate-operation">
 <!--    <div class="title-area">能源占比</div>-->
-    <div class="content-area">
+    <div class="content-area" v-if="flag >= 4">
       <div class="content-title">
         <span class="title">楼宇本周用电量</span>
       </div>
@@ -267,6 +267,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       thisWeekElectricityList:{},
       fllEleList:{},
       //楼宇每月用电量
@@ -315,6 +316,7 @@ export default {
         thisWeekElectricity(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.thisWeekElectricityList=res.data;
+          this.flag++
         }
       });
     },
@@ -324,6 +326,7 @@ export default {
           controlElevator(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.fllEleList=res.data;
+          this.flag++
         }
       });
     },
@@ -410,6 +413,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
     });
     },
@@ -522,6 +526,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
   });
 },

src/views/screen/building/energyRateDialog.vue

@@ -4,7 +4,7 @@
       <img src="@/assets/images/main/cont_title_bg.png" />
       <div class="title">楼宇中控</div>
     </div>
-    <div class="dialog-cont">
+    <div class="dialog-cont" v-if="flag >= 8">
       <div class="dialog-left">
         <div class="dialog-list">
           <div class="dialog-item wid100">
@@ -625,6 +625,7 @@ export default {
   },
   data() {
     return {
+      flag: 0,
       thisWeekElectricityList:{},
       fllEleList:{},
       warnDeviceList:{},
@@ -771,6 +772,7 @@ export default {
         thisWeekElectricity(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.thisWeekElectricityList=res.data;
+          this.flag++
         }
       });
     },
@@ -779,6 +781,7 @@ export default {
           controlElevator(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.fllEleList=res.data;
+          this.flag++
         }
       });
     },
@@ -1574,6 +1577,7 @@ export default {
         },
 
       }
+      this.flag++
     }
   });
     },
@@ -1686,6 +1690,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
   });
 },
@@ -1792,6 +1797,7 @@ export default {
         },
         splitArea: false,
       };
+      this.flag++
     }
   });
 },
@@ -1877,6 +1883,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
     });
     },
@@ -2016,6 +2023,7 @@ export default {
         },
         splitArea: false
       }
+      this.flag++
     }
   });
     },
@@ -2025,6 +2033,7 @@ export default {
         warnDevice(this.$props.appOrg).then((res) => {
         if (Number(res.code) === 200) {
           this.warnDeviceList=res.data;
+          this.flag++
         }
       });
     },

src/views/screen/building/main.vue

@@ -465,7 +465,7 @@
       <energy-rate-dialog v-if="dialogType === 1"  @abnormalClick="onAbnormalClick" @closeDialog="closeDialog" :appOrg="appOrg"></energy-rate-dialog>
       <building-save-dialog v-if="dialogType === 2" @closeDialog="closeDialog"></building-save-dialog>
       <camera-data-dialog v-if="dialogType === 5" @closeDialog="closeDialog"></camera-data-dialog >
-      <unit-monitor-dialog v-if="dialogType === 4" @closeDialog="closeDialog" @chooseMonitor="chooseMonitorBack" :monitorName="monitorName"></unit-monitor-dialog>
+      <unit-monitor-dialog v-if="dialogType === 4" @closeDialog="closeDialog"  :monitorName="monitorName"></unit-monitor-dialog>
     </div>
 
     <!-- 监控区域 -->

src/views/screen/service/shareStation.vue

@@ -132,7 +132,7 @@ export default {
       pieTitle: {},
       constructionQuantityNum: {name: '', value: 0},
         // 服务内容
-      serviceContent :{name: '', value: 0},
+      serviceContent :[{name:'', value: 0},{name: '', value: 0}],
       completedNum: {name: '', value: 0},
       participateProportionRate: {
         value:0