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

fix:空调模块的样式修改

chenzhen2 1 рік тому
батько
коміт
2a49b029dd

BIN
public/favicon.ico


+ 1 - 0
public/index.html

@@ -6,6 +6,7 @@
   <meta http-equiv="Content-Security-Policy" content="">
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, minimum-scale=1, user-scalable=no">
   <meta charset="utf-8">
+  <link rel="icon" href="data:,">
   <title><%= htmlWebpackPlugin.options.title %></title>
 </head>
 <body>

Різницю між файлами не показано, бо вона завелика
+ 1043 - 1315
src/views/envmonitor/components/Air/ChildAirControl.vue


+ 6 - 1
src/views/envmonitor/components/Air/manualIndex.vue

@@ -169,6 +169,7 @@
     <div class="air-child" v-if="navType == 'child'">
       <div
         class="child-control-box"
+        @click="showAirColorCtrol(item)"
         :key="'child' + index"
         v-for="(childItem, index) in equipList"
       >
@@ -181,7 +182,7 @@
             </div>
           </div>
           <Switch
-            @click="changeChildItemAir('switch', childItem, 'switch')"
+            @click.stop="changeChildItemAir('switch', childItem, 'switch')"
             :loading="
               childItem.loadingTimer > 0 && childItem.loadingTimer <= 15
                 ? true
@@ -352,6 +353,10 @@ export default defineComponent({
         // isAddTimer==0(需要定时再调) isAddTimer==1(不需要定时调)
         proxyData.getAirInfo(1);
       },
+      // 展示灯的控制
+      showAirColorCtrol(item: any) {
+        contx.emit("showChildAirControl", item);
+      },
       // 点击展示所有的登录
       async showAll() {
         proxyData.showChild = !proxyData.showChild;

+ 11 - 8
src/views/envmonitor/index.vue

@@ -180,6 +180,7 @@
         :seviceEquipmentList="seviceEquipmentList"
         :forceOverTimeFlag="forceOverTimeFlag"
         @updateAirTemp="updateAirTemp"
+        @showChildAirControl="showChildAirControl"
         :airVolumes="officeData.airVolumes"
         :temperature="officeData.temperature"
         :spaceId="spaceInfo.spaceId"
@@ -383,18 +384,15 @@
 
     <!--空调子设备控制功能-->
     <van-popup
-      v-model:show="isCurtainOpening"
+      v-model:show="isChildAirControl"
       position="right"
       :close-on-click-overlay="true"
       @click-overlay="closeCurtainOpening"
       class="popup-content-small"
       teleport="#app"
     >
-      <div v-if="isCurtainOpening">
-        <curtain-opening
-          v-if="isCurtainOpening"
-          :curtainData="curtainData"
-        ></curtain-opening>
+      <div v-if="isChildAirControl">
+        <ChildAirControl v-if="isChildAirControl"></ChildAirControl>
       </div>
     </van-popup>
   </div>
@@ -921,8 +919,13 @@ export default defineComponent({
         proxyData.curtainData = curtainData;
         proxyData.isCurtainOpening = true;
       },
-      // 展开空调弹窗
-      isChildAirControl:false,
+      // 展开子设备控制
+      isChildAirControl: false,
+      showChildAirControl() {
+        proxyData.isChildAirControl = true;
+      },
+      // 关闭空调控制弹窗
+      closeChildAirControl() {},
       closeCurtainOpening() {
         console.log("被点击了");
         proxyData.curtainRef.updateGroupPeing();