Browse Source

fix:地暖模块增加

chenzhen2 1 year ago
parent
commit
9e9d7b4fe1

File diff suppressed because it is too large
+ 401 - 0
public/images/page-officehome/heating-active.svg


File diff suppressed because it is too large
+ 404 - 0
public/images/page-officehome/heating.svg


+ 2 - 1
src/styles/index.scss

@@ -185,13 +185,14 @@ div:focus {
 
 
 .switch-btn {
-  width: 54px !important;
+  width: 48px !important;
   height: 24px !important;
 
   .van-switch__node {
     width: 24px !important;
     height: 24px !important;
   }
+  
 }
 
 

+ 1 - 0
src/views/envmonitor/components/Air/index.vue

@@ -31,6 +31,7 @@
 
         <Switch
           class="switch-btn"
+          size="18px"
           :loading="loadingAir || firstLoadingAir"
           :disabled="!userIsControl || loadingAir || firstLoadingAir"
           inactive-color="rgba(196, 196, 196, 0.4)"

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

@@ -23,6 +23,7 @@
         <Switch
           class="switch-btn"
           v-if="!showChild"
+          size="18px"
           :loading="loadingAir || firstLoadingAir"
           :disabled="loadingAir || firstLoadingAir"
           inactive-color="rgba(196, 196, 196, 0.4)"

File diff suppressed because it is too large
+ 1209 - 0
src/views/envmonitor/components/FloorHeating/index.vue


+ 22 - 2
src/views/envmonitor/index.vue

@@ -143,7 +143,7 @@
       >
         <!--自动控制的加班 start-->
         <WorkConfig
-          v-if="roomType === '开放' && isWork && controlMode ==0"
+          v-if="roomType === '开放' && isWork && controlMode == 0"
           key="workCkey"
           :workkArr="workkArr"
           @closeWork="closeWork"
@@ -205,6 +205,24 @@
         :userIsControl="userIsControl"
       />
       <!--空调自动控制 end-->
+
+      <!--地暖 start-->
+      <floor-heating
+        v-if="spaceInfo.spaceId"
+        :showLight="spaceExistenceDevice.light"
+        :forceOverTimeFlag="forceOverTimeFlag"
+        :controlMode="controlMode"
+        :seviceEquipmentList="seviceEquipmentList"
+        @triggerWork="triggerWork"
+        @showLightColorCtrol="showLightColorCtrol"
+        id="floorHeatingId"
+        key="floorHeatingKey"
+        :userIsControl="userIsControl"
+        :spaceId="spaceInfo.spaceId"
+        :projectId="projectId"
+      ></floor-heating>
+      <!--地暖 end-->
+
       <!--出于性能的灯的显示和隐藏最好放在子组件里面判断,减少组件频繁重新加载的问题-->
       <Light
         v-if="spaceInfo.spaceId"
@@ -237,7 +255,7 @@
       teleport="#app"
     >
       <work-overtime
-        v-if="isShowWork && controlMode ==0"
+        v-if="isShowWork && controlMode == 0"
         :spaceInfo="spaceInfo"
         @closeWork="closeWork"
         :projectId="projectId"
@@ -345,6 +363,7 @@ import MapBox from "@/views/envmonitor/components/Map/MapBox.vue";
 import Header from "@/components/header/Index.vue";
 import Comheader from "@/components/header/Comheader.vue";
 import Air from "@/views/envmonitor/components/Air/index.vue";
+import FloorHeating from "@/views/envmonitor/components/FloorHeating/index.vue";
 import ManualIndex from "@/views/envmonitor/components/Air/manualIndex.vue";
 import Light from "@/views/envmonitor/components/Light/index.vue";
 import Curtain from "@/views/envmonitor/components/Curtain/index.vue";
@@ -402,6 +421,7 @@ export default defineComponent({
     Comheader,
     NavBar,
     Air,
+    FloorHeating,
     ManualIndex,
     ManualOvertime,
     Light,