Browse Source

fix: 手动控制子设备的档位设置

chenzhen2 2 years ago
parent
commit
4e64313d4e

+ 0 - 8
src/App.vue

@@ -23,14 +23,6 @@ export default defineComponent({
   components: {
     Header,
   },
-  beforeRouteLeave(to, from, next) {
-    debugger;
-    if (to.name === "home") {
-      let mac: any = getCookieMac();
-      from.query.mac = mac;
-    }
-    next();
-  },
   setup() {
     const route: any = useRoute();
     const data = reactive({

+ 1 - 1
src/components/header/Comheader.vue

@@ -50,7 +50,7 @@ export default defineComponent({
         if (route.meta.toName) {
           router.push({ name: route.meta.toName });
         } else {
-          router.back();
+          router.go(-1);
         }
       },
       goLogin() {

+ 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) {

+ 13 - 0
src/views/choiceSpace/choiceProject.vue

@@ -27,11 +27,24 @@ import router from "@/router";
 import { getUsersInfo } from "@/apis/user";
 import { store } from "@/store";
 import { UserMutationTypes } from "@/store/modules/user/mutation-types";
+import { getCookieMac } from "@/utils/cookies";
 
 export default defineComponent({
   components: {
     vanSearch: Search,
   },
+  beforeRouteLeave(to, from, next) {
+    console.log('导航')
+    console.log(to)
+    console.log(from)
+    console.log("=====")
+    if (to.name === "home") {
+      let mac: any = getCookieMac();
+      to.fullPath=to.fullPath+`?mac=${mac}`
+      to.query.mac = mac;
+    }
+    next();
+  },
   setup() {
     const route: any = useRoute();
     const projects: any = [];

+ 39 - 24
src/views/envmonitor/components/Air/manualIndex.vue

@@ -207,14 +207,20 @@
           <div class="adjust-item">
             <van-icon
               name="arrow-up"
-              :class="childItem.gear <= 1 ? 'disable-color' : ''"
+              :class="
+                !childItem.isAutoGear && childItem.gear <= 1
+                  ? 'disable-color'
+                  : ''
+              "
               @click="changeChildItemAir('gear', childItem, 'down')"
               class="adjust-icon"
             />
-            <span class="adjust-text">{{ childItem.gear }}</span>
+            <span class="adjust-text">{{
+              childItem.isAutoGear ? "AUTO" : childItem.gear
+            }}</span>
             <van-icon
               name="arrow-down"
-              :class="childItem.gear >= 3 ? 'disable-color' : ''"
+              :class="childItem.isAutoGear ? 'disable-color' : ''"
               @click="changeChildItemAir('gear', childItem, 'up')"
               class="adjust-icon"
             />
@@ -238,7 +244,7 @@
             </span>
             <van-icon
               name="arrow-down"
-              :class="childItem.workMode >= 3 ? 'disable-color' : ''"
+              :class="childItem.workMode >= 4 ? 'disable-color' : ''"
               @click="changeChildItemAir('model', childItem, 'up')"
               class="adjust-icon"
             />
@@ -433,21 +439,19 @@ export default defineComponent({
         });
       },
       // 格式化模式
-      formateModel(model: any) {
-        if (model) {
-          if (model === 1) {
-            proxyData.modeName = "制冷";
-          } else if (model === 2) {
-            proxyData.modeName = "制热";
-          } else if (model === 3) {
-            proxyData.modeName = "通风";
-          } else if (model === 4) {
-            proxyData.modeName = "除湿";
-          } else {
-            proxyData.modeName = "";
+      formateModel(childItem: any) {
+        if (childItem.workMode) {
+          if (childItem.workMode == 1) {
+            childItem.modeName = "制冷";
+          } else if (childItem.workMode == 2) {
+            childItem.modeName = "制热";
+          } else if (childItem.workMode == 3) {
+            childItem.modeName = "通风";
+          } else if (childItem.workMode == 4) {
+            childItem.modeName = "AUTO";
           }
         } else {
-          proxyData.modeName = "";
+          childItem.modeName = "";
         }
       },
       // 定时获取空调状态
@@ -590,20 +594,30 @@ export default defineComponent({
           proxyData.childDisabled(childItem, arr);
         } else if (btnType === "gear") {
           if (symbol === "up") {
-            if (childItem.gear >= 3) {
+            if (childItem.isAutoGear) {
               return;
             }
-            childItem.gear++;
+            if (childItem.gear >= 3) {
+              childItem.isAutoGear = 1;
+            } else {
+              childItem.gear++;
+              childItem.isAutoGear = 0;
+            }
           } else if (symbol === "down") {
-            if (childItem.gear <= 1) {
+            if (!childItem.isAutoGear && childItem.gear <= 1) {
               return;
             }
-            childItem.gear--;
+            if (childItem.isAutoGear) {
+              childItem.isAutoGear = 0;
+              childItem.gear = 3;
+            } else {
+              childItem.gear--;
+            }
           }
           let obj: any = {
             id: childItem.id, //类型:String  必有字段  备注:设备id
             code: childItem.gearCode, //类型:String  必有字段  备注:编码 EquipSwtichSet
-            value: childItem.gear, //类型:String  必有字段  备注:值 0
+            value: childItem.isAutoGear ? 4 : childItem.gear, //类型:String  必有字段  备注:值 0
           };
           arr.push(obj);
         } else if (btnType === "model") {
@@ -698,8 +712,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();
@@ -751,6 +765,7 @@ export default defineComponent({
     });
     watch(props, (newProps: any) => {
       if (newProps.spaceId) {
+        // proxyData.getAirInfo();
       }
       proxyData.temperature = props.temperature;
       proxyData.userIsControl = newProps.userIsControl;

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

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

+ 1 - 1
src/views/home/index.vue

@@ -116,7 +116,7 @@ export default defineComponent({
       next((e: any) => {
         e.showLogin = true;
         let mac: any = getCookieMac();
-        console.log(mac)
+        console.log(mac);
         // to.query = { mac: mac};
         console.log(to);
         // console.log( e.showLogin )