瀏覽代碼

fix:地暖模块功能

chenzhen2 1 年之前
父節點
當前提交
defd5d1ee4

+ 2 - 2
src/apis/envmonitor.ts

@@ -296,8 +296,8 @@ export const getSpaceEquipList = (params: any) => {
 
 // 查询地暖列表
 export const querySapceFloorHeating = (params: any) => {
-  return https().request<any>(`${duoduoenvService}ctrl/querySapceFloorHeating?${params}`, Method.GET, undefined, ContentType.json)
-  // return https().request<any>(`${testApi}ctrl/querySapceFloorHeating?${params}`, Method.GET, undefined, ContentType.json)
+  // return https().request<any>(`${duoduoenvService}ctrl/querySapceFloorHeating?${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${testApi}ctrl/querySapceFloorHeating?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 

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

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

+ 2 - 2
src/views/envmonitor/components/Air/manualIndex.vue

@@ -23,7 +23,7 @@
         <Switch
           class="switch-btn"
           v-if="!showChild"
-          size="18px"
+          :size="23"
           :loading="loadingAir || firstLoadingAir"
           :disabled="loadingAir || firstLoadingAir"
           inactive-color="rgba(196, 196, 196, 0.4)"
@@ -545,7 +545,7 @@ export default defineComponent({
           timerLong = 300000;
         }
         console.log("nowTime===", nowTime);
-      
+
         if (proxyData.airTimer) {
           clearTimeout(proxyData.airTimer);
           proxyData.airTimer = null;

+ 10 - 15
src/views/envmonitor/components/FloorHeating/ChildTempSet.vue

@@ -93,7 +93,7 @@ export default defineComponent({
           return 1;
         }
       },
-      sliderPading:0,
+      sliderPading: 0,
       // 滑动
       endBoxSwiper() {
         proxyData.swiperIinit = true;
@@ -109,7 +109,7 @@ export default defineComponent({
         let sliderWidth: any = proxyData.getEleWidth(sliderBox);
         let barWidth: any = proxyData.getEleWidth(barBox);
         if (sliderWidth > 1) {
-          sliderWidth = sliderWidth - sliderPadingR - sliderPadingL - barWidth;
+          sliderWidth = sliderWidth - barWidth;
         }
         let tempPart =
           (proxyData.floorData.maxTempSet - proxyData.floorData.minTempSet) /
@@ -136,10 +136,9 @@ export default defineComponent({
               barLeft = Math.abs(barLeft);
               let moveRealX: any = Math.abs(e.mation.moveX - e.mation.startX);
               let left: any = barLeft - moveRealX;
-              left = left < sliderPadingL ? sliderPadingL : left;
+              left = left < 0 ? 0 : left;
               barBox.style.left = left + "px";
-              proxyData.realTemp =
-                (left - sliderPadingL) * part + proxyData.floorData.minTempSet;
+              proxyData.realTemp = left * part + proxyData.floorData.minTempSet;
               proxyData.realTemp = Math.round(proxyData.realTemp);
             }
           },
@@ -148,13 +147,9 @@ export default defineComponent({
               barLeft = Math.abs(barLeft);
               let moveRealX: any = Math.abs(e.mation.moveX - e.mation.startX);
               let left: any = barLeft + moveRealX;
-              left =
-                left > sliderWidth + sliderPadingR
-                  ? sliderWidth + sliderPadingR
-                  : left;
+              left = left > sliderWidth ? sliderWidth : left;
               barBox.style.left = left + "px";
-              proxyData.realTemp =
-                (left - sliderPadingL) * part + proxyData.floorData.minTempSet;
+              proxyData.realTemp = left * part + proxyData.floorData.minTempSet;
               proxyData.realTemp = Math.round(proxyData.realTemp);
             }
           },
@@ -180,15 +175,15 @@ export default defineComponent({
           let left: any =
             (proxyData.realTemp - proxyData.floorData.minTempSet) /
             proxyData.part;
-          left = Math.floor(left) + proxyData.sliderPading ;
+          left = Math.floor(left) + proxyData.sliderPading;
           if (barBox) {
             barBox.style.left = left + "px";
           }
         } else {
           if (!proxyData.realTemp) {
-            barBox.style.left = proxyData.sliderPading  + "px";
+            barBox.style.left = proxyData.sliderPading + "px";
           } else if (proxyData.realTemp < proxyData.floorData.minTempSet) {
-            barBox.style.left = proxyData.sliderPading  + "px";
+            barBox.style.left = proxyData.sliderPading + "px";
           } else if (proxyData.realTemp > proxyData.floorData.maxTempSet) {
             let sliderWidth: any = sliderBox.offsetWidth;
             let barWidth: any = barBox.offsetWidth;
@@ -264,7 +259,7 @@ export default defineComponent({
         display: flex;
         height: 32px;
         flex: 1;
-        padding: 0 32px;
+        padding: 0 24px;
         background: linear-gradient(
           270deg,
           #ffbab6 0%,

+ 20 - 22
src/views/envmonitor/components/FloorHeating/index.vue

@@ -39,7 +39,7 @@
         <div v-else></div>
         <Switch
           class="switch-btn"
-          size="18px"
+          :size="23"
           :loading="loadingFlag"
           :disabled="loadingFlag"
           :model-value="isOpen"
@@ -49,7 +49,10 @@
       </div>
     </div>
 
-    <div class="floor-control floor-control-padding" v-if="navType == 'all'">
+    <div
+      class="floor-control floor-control-padding"
+      v-if="isOpen && navType == 'all'"
+    >
       <div class="control-box">
         <div class="temp-slider" id="slideFloorId">
           <div class="slider-bar" id="barFloorId">
@@ -253,6 +256,7 @@ export default defineComponent({
         if (type == "main") {
           proxyData.isOpen = !proxyData.isOpen;
           proxyData.loading = true;
+          proxyData.endBoxSwiper();
           proxyData.changeZongAir("switch");
         } else {
           item.loading = true;
@@ -279,7 +283,7 @@ export default defineComponent({
       // 初始化滑动
       sliderInit() {
         nextTick(() => {
-          if (proxyData.navType == "all" && !proxyData.swiperIinit) {
+          if (proxyData.navType == "all" && proxyData.isOpen) {
             proxyData.endBoxSwiper();
           }
           if (proxyData.navType == "all") {
@@ -301,7 +305,7 @@ export default defineComponent({
         let sliderPadingL: any = proxyData.getEleWidth(tempLeftBox);
         let sliderPadingR: any = sliderPadingL;
         if (sliderWidth > 1) {
-          sliderWidth = sliderWidth - sliderPadingR - sliderPadingL - barWidth;
+          sliderWidth = sliderWidth - barWidth;
         }
         let tempPart =
           (proxyData.heatingData.maxTempSet -
@@ -328,11 +332,10 @@ export default defineComponent({
               barLeft = Math.abs(barLeft);
               let moveRealX: any = Math.abs(e.mation.moveX - e.mation.startX);
               let left: any = barLeft - moveRealX;
-              left = left < sliderPadingL ? sliderPadingL : left;
+              left = left < 0 ? 0 : left;
               barBox.style.left = left + "px";
               proxyData.realTemp =
-                (left - sliderPadingL) * part +
-                proxyData.heatingData.minTempSet;
+                left * part + proxyData.heatingData.minTempSet;
               proxyData.realTemp = Math.round(proxyData.realTemp);
             }
           },
@@ -341,14 +344,10 @@ export default defineComponent({
               barLeft = Math.abs(barLeft);
               let moveRealX: any = Math.abs(e.mation.moveX - e.mation.startX);
               let left: any = barLeft + moveRealX;
-              left =
-                left > sliderWidth + sliderPadingR
-                  ? sliderWidth + sliderPadingR
-                  : left;
+              left = left > sliderWidth ? sliderWidth : left;
               barBox.style.left = left + "px";
               proxyData.realTemp =
-                (left - sliderPadingL) * part +
-                proxyData.heatingData.minTempSet;
+                left * part + proxyData.heatingData.minTempSet;
               proxyData.realTemp = Math.round(proxyData.realTemp);
             }
           },
@@ -376,16 +375,16 @@ export default defineComponent({
           let left: any =
             (proxyData.realTemp - proxyData.heatingData.minTempSet) /
             proxyData.part;
-          left = Math.floor(left) + sliderPading;
+          left = left;
 
           if (barBox) {
             barBox.style.left = left + "px";
           }
         } else {
           if (!proxyData.realTemp) {
-            barBox.style.left = sliderPading + "px";
+            barBox.style.left = 0 + "px";
           } else if (proxyData.realTemp < proxyData.heatingData.minTempSet) {
-            barBox.style.left = sliderPading + "px";
+            barBox.style.left = 0 + "px";
           } else if (proxyData.realTemp > proxyData.heatingData.maxTempSet) {
             let sliderWidth: any = sliderBox.offsetWidth;
             let barWidth: any = barBox.offsetWidth;
@@ -416,9 +415,10 @@ export default defineComponent({
               proxyData.floorHeatingList = data.equipList || [];
             }
             proxyData.formateDataStatus();
-            setTimeout(() => {
+            let timeout: any = setTimeout(() => {
+              clearTimeout(timeout);
               proxyData.sliderInit();
-            }, 500);
+            }, 1000);
             proxyData.startfloorHeathingStatus();
           })
           .catch(() => {
@@ -435,7 +435,6 @@ export default defineComponent({
           if (proxyData.loadingTimer >= 15) {
             clearInterval(timer);
             proxyData.loading = false;
-            // proxyData.getAirInfoToTimer(0);
           }
         }, 1000);
       },
@@ -448,7 +447,6 @@ export default defineComponent({
       startfloorHeathingStatus(timerLen: any = 15000) {
         proxyData.clearFloorHeathingTimer();
         proxyData.floorHeathingStatus = setTimeout(() => {
-          proxyData.clearFloorHeathingTimer();
           proxyData.getFloorHeatingList();
         }, timerLen);
       },
@@ -467,6 +465,7 @@ export default defineComponent({
           // 清除原始数据
           proxyData.floorHeatingList = [];
           proxyData.heatingData = {};
+          proxyData.swiperIinit = false;
           proxyData.navType = "all";
           proxyData.spaceId = newProps[1];
           proxyData.clearFloorHeathingTimer();
@@ -660,7 +659,7 @@ export default defineComponent({
     display: flex;
     height: 28px;
     flex: 1;
-    padding: 0 32px;
+    padding: 0 24px;
     background: linear-gradient(
       270deg,
       #ffbab6 0%,
@@ -673,7 +672,6 @@ export default defineComponent({
     .temp-left,
     .temp-right {
       position: absolute;
-      width: 32px;
       top: 50%;
       transform: translateY(-50%);
       font-family: "Persagy";

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

@@ -37,6 +37,7 @@
       <div v-else></div>
       <Switch
         v-if="!showFlag"
+        :size="23"
         :disabled="!userIsControl"
         v-model="lampSw"
         @click="eqChange('allLamp', '', 0)"