Browse Source

fix: 平板bug修改

chenzhen2 2 years ago
parent
commit
0f57d9cdc6
3 changed files with 6 additions and 6 deletions
  1. 4 4
      src/apis/envmonitor.ts
  2. 1 1
      src/views/envmonitor/index.vue
  3. 1 1
      src/views/home/index.vue

+ 4 - 4
src/apis/envmonitor.ts

@@ -265,16 +265,16 @@ export const getPadImg = (params: any) => {
  * 设备手动控制
  */
 export const querySpaceConditioners = (params: any) => {
-  // return https().request<any>(`${duoduoenvService}ctrl/querySpaceConditioners?${params}`, Method.GET, undefined, ContentType.json)
-  return https().request<any>(`${testApi}ctrl/querySpaceConditioners?${params}`, Method.GET, undefined, ContentType.json)
+  return https().request<any>(`${duoduoenvService}ctrl/querySpaceConditioners?${params}`, Method.GET, undefined, ContentType.json)
+  // return https().request<any>(`${testApi}ctrl/querySpaceConditioners?${params}`, Method.GET, undefined, ContentType.json)
 }
 
 /**
  * 设备手动控制
  */
 export const setSpaceCondtioners = (data: any) => {
-  // return post(`${duoduoenvService}ctrl/set`, data)
-  return post(`${testApi}ctrl/set`, data)
+  return post(`${duoduoenvService}ctrl/set`, data)
+  // return post(`${testApi}ctrl/set`, data)
 }
 
 

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

@@ -1834,7 +1834,7 @@ export default defineComponent({
             proxyData.touchInterval = null;
             router.push({
               name: "home",
-              query: { mac: proxyData.userInfo.mac },
+              query: { mac: proxyData.userInfo.mac,type:'logoOut' },
             });
           }
         }, 1000);

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

@@ -107,7 +107,7 @@ export default defineComponent({
     console.log(to);
     console.log(from);
     // next()
-    if (from.name !== "envmonitor" || to.query.type !== "logoOut") {
+    if (to.query.type !== "logoOut") {
       next((e: any) => {
         console.log(e);
         e.queryWorkSpace();