Quellcode durchsuchen

fix: 空调配置处理

chenzhen2 vor 2 Jahren
Ursprung
Commit
6baeaa5058

+ 6 - 5
src/styles/index.scss

@@ -182,16 +182,17 @@ div:focus {
 }
 
 
-.van-switch__node {
-  width: 24px !important;
-  height: 24px !important;
-}
-
 .switch-btn {
   width: 48px !important;
   height: 24px !important;
+
+  .van-switch__node {
+    width: 24px !important;
+    height: 24px !important;
+  }
 }
 
+
 .com-search {
   position: relative;
 

+ 1 - 1
src/utils/https.ts

@@ -23,7 +23,7 @@ export const https = (configobj: any = { timeout: '' }) => {
   const https = new HttpClient(config)
   https.httpClient.interceptors.request.use(function (request) {
     let comInfo = getUserInfo()
-    // comInfo.projectId="Pj1101080255"
+    comInfo.projectId="Pj1101080255"
     const comParams: string = setQueryConfig(comInfo)
     let url: any = request.url
     if (url.indexOf("?") != -1) {

+ 41 - 26
src/views/envmonitor/components/Air/manualIndex.vue

@@ -23,6 +23,7 @@
 
         <Switch
           class="switch-btn"
+          v-if="!showChild"
           :loading="loadingAir || firstLoadingAir"
           :disabled="loadingAir || firstLoadingAir"
           inactive-color="rgba(196, 196, 196, 0.4)"
@@ -177,7 +178,7 @@
             :model-value="childItem.isOpen"
             class="child-switch"
             inactive-color="rgba(196, 196, 196, 0.4)"
-            size="25px"
+            size="14px"
           />
         </div>
         <div
@@ -190,18 +191,18 @@
             <van-icon
               name="arrow-up"
               :class="
-                childItem.tempSet <= airData.minTempSet ? 'disable-color' : ''
+                childItem.tempSet >= airData.maxTempSet ? 'disable-color' : ''
               "
-              @click="changeChildItemAir('temp', childItem, 'down')"
+              @click="changeChildItemAir('temp', childItem, 'up')"
               class="adjust-icon"
             />
             <span class="adjust-text">{{ childItem.tempSet }}</span>
             <van-icon
               name="arrow-down"
               :class="
-                childItem.tempSet >= airData.maxTempSet ? 'disable-color' : ''
+                childItem.tempSet <= airData.minTempSet ? 'disable-color' : ''
               "
-              @click="changeChildItemAir('temp', childItem, 'up')"
+              @click="changeChildItemAir('temp', childItem, 'down')"
               class="adjust-icon"
             />
             <span class="adjust-title">温度</span>
@@ -209,12 +210,8 @@
           <div class="adjust-item">
             <van-icon
               name="arrow-up"
-              :class="
-                !childItem.isAutoGear && childItem.gear <= 1
-                  ? 'disable-color'
-                  : ''
-              "
-              @click="changeChildItemAir('gear', childItem, 'down')"
+              :class="childItem.isAutoGear ? 'disable-color' : ''"
+              @click="changeChildItemAir('gear', childItem, 'up')"
               class="adjust-icon"
             />
             <span class="adjust-text">{{
@@ -222,8 +219,12 @@
             }}</span>
             <van-icon
               name="arrow-down"
-              :class="childItem.isAutoGear ? 'disable-color' : ''"
-              @click="changeChildItemAir('gear', childItem, 'up')"
+              :class="
+                !childItem.isAutoGear && childItem.gear <= 1
+                  ? 'disable-color'
+                  : ''
+              "
+              @click="changeChildItemAir('gear', childItem, 'updown')"
               class="adjust-icon"
             />
             <span class="adjust-title">档位</span>
@@ -231,8 +232,8 @@
           <div class="adjust-item">
             <van-icon
               name="arrow-up"
-              :class="childItem.workMode <= 1 ? 'disable-color' : ''"
-              @click="changeChildItemAir('model', childItem, 'down')"
+              :class="childItem.workMode >= 3 ? 'disable-color' : ''"
+              @click="changeChildItemAir('model', childItem, 'up')"
               class="adjust-icon"
             />
             <span class="adjust-text">
@@ -246,8 +247,8 @@
             </span>
             <van-icon
               name="arrow-down"
-              :class="childItem.workMode >= 4 ? 'disable-color' : ''"
-              @click="changeChildItemAir('model', childItem, 'up')"
+              :class="childItem.workMode <= 1 ? 'disable-color' : ''"
+              @click="changeChildItemAir('model', childItem, 'down')"
               class="adjust-icon"
             />
             <span class="adjust-title">模式</span>
@@ -728,8 +729,8 @@ export default defineComponent({
         const paramObj = {
           // // projectId: props.projectId, //'Pj1101080255'
           // projectId: "Pj1101080255",
-          // spaceId: "Sp110108025564f438d7fef64eea8202a6462f1bbcce",
-          spaceId: props.spaceId,
+          spaceId: "Sp110108025564f438d7fef64eea8202a6462f1bbcce",
+          // spaceId: props.spaceId,
           // spaceId: props.spaceId,//'Sp110108025564f438d7fef64eea8202a6462f1bbcce' 空间id
         };
         //wx.showLoading();
@@ -828,11 +829,17 @@ export default defineComponent({
 
 .air-child {
   width: 100%;
+  // padding: 20px;
+  padding-left: 10px;
+  padding-right: 10px;
+  // padding-top: 10px;
   .child-control-box {
     display: inline-block;
     width: 50%;
     justify-content: space-between;
-    padding: 20px 10px 10px 20px;
+    padding: 0px 10px 10px 10px;
+    margin-top: 10px;
+    // padding-right: 10px;
     border-bottom: 1px solid rgba(196, 196, 196, 0.4);
     &:nth-child(2n + 1) {
       border-right: 1px solid rgba(196, 196, 196, 0.4);
@@ -846,6 +853,7 @@ export default defineComponent({
       justify-content: space-between;
       margin-bottom: 10px;
       span {
+        font-size: 16px;
         display: inline-block;
         width: calc(100% - 50px);
         overflow: hidden;
@@ -853,23 +861,28 @@ export default defineComponent({
         white-space: nowrap;
       }
       .child-switch {
-        height: 20px;
-        width: 50px;
+        // height: 20px;
+        // width: 50px;
       }
     }
     .adjust-box {
       box-sizing: border-box;
-      padding-right: 10px;
+      // padding-right: 10px;
+      padding-top: 10px;
       display: flex;
       justify-content: space-between;
       font-size: 19px;
       .adjust-item {
         // flex: 1;
-        width: 40px;
+        // width: 40px;
         display: flex;
         flex-direction: column;
         justify-content: space-between;
         text-align: center;
+        &:nth-child(2) {
+          // width: 60px;
+          flex: 1;
+        }
         .adjust-icon {
           display: inline-block;
           flex: 1;
@@ -1147,9 +1160,11 @@ export default defineComponent({
   }
   .child-control-box {
     .child-switch {
+      // position: relative;
       .van-switch__node {
-        width: 20px !important;
-        height: 20px !important;
+        // margin-top: -6px;
+        // width: 20px !important;
+        // height: 20px !important;
       }
     }
   }

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

@@ -987,8 +987,8 @@ export default defineComponent({
               proxyData.officeData.temperature =
                 proxyData.officeData.temperature.toFixed(1) * 1;
             }
-            // proxyData.controlMode = proxyData.officeData.controlMode || 1;
-            proxyData.controlMode = proxyData.officeData.controlMode;
+            proxyData.controlMode = proxyData.officeData.controlMode || 1;
+            // proxyData.controlMode = proxyData.officeData.controlMode;
             // 环境数据
             proxyData.checkSpaceType(proxyData.officeData.roomFuncType);
             proxyData.formatSpaceInfo(content);