Преглед на файлове

Merge branch 'master' of http://39.106.8.246:3003/sagacloud/sagacloud-sagacare-ipad into test

chenzhen2 преди 1 година
родител
ревизия
1098c8ac5c
променени са 35 файла, в които са добавени 53 реда и са изтрити 39 реда
  1. 1 1
      dist/sgipad/index.html
  2. BIN
      dist/sgipad/static/css/chunk-37ea99b4.5d18f2c8.css.gz
  3. 1 1
      dist/sgipad/static/css/chunk-37ea99b4.5d18f2c8.css
  4. BIN
      dist/sgipad/static/css/chunk-7d029866.49e73d2d.css.gz
  5. BIN
      dist/sgipad/static/js/app.7bbe4641.js.gz
  6. 1 1
      dist/sgipad/static/js/app.7bbe4641.js
  7. BIN
      dist/sgipad/static/js/app.a36801a6.js.gz
  8. 1 1
      dist/sgipad/static/js/chunk-09f4d4ca.c83881b7.js
  9. BIN
      dist/sgipad/static/js/chunk-09f4d4ca.c83881b7.js.gz
  10. 0 1
      dist/sgipad/static/js/chunk-37ea99b4.d820b2a1.js
  11. BIN
      dist/sgipad/static/js/chunk-37ea99b4.d820b2a1.js.gz
  12. 0 0
      dist/sgipad/static/js/chunk-41ab0954.ce743438.js
  13. 0 1
      dist/sgipad/static/js/chunk-6637d5f0.1911c16d.js
  14. BIN
      dist/sgipad/static/js/chunk-6637d5f0.1911c16d.js.gz
  15. 1 0
      dist/sgipad/static/js/chunk-6637d5f0.a7334d26.js
  16. BIN
      dist/sgipad/static/js/chunk-6637d5f0.a7334d26.js.gz
  17. 0 1
      dist/sgipad/static/js/chunk-675be840.2ff6eb81.js
  18. BIN
      dist/sgipad/static/js/chunk-675be840.2ff6eb81.js.gz
  19. 1 0
      dist/sgipad/static/js/chunk-675be840.36bdb495.js
  20. BIN
      dist/sgipad/static/js/chunk-675be840.36bdb495.js.gz
  21. 0 1
      dist/sgipad/static/js/chunk-6c149b5a.1d1cf806.js
  22. 1 0
      dist/sgipad/static/js/chunk-6c149b5a.7290b101.js
  23. 1 0
      dist/sgipad/static/js/chunk-7d029866.3f7b33eb.js
  24. BIN
      dist/sgipad/static/js/chunk-7d029866.3f7b33eb.js.gz
  25. 1 1
      dist/sgipad/static/js/chunk-a2e83f40.01a744ff.js
  26. BIN
      dist/sgipad/static/js/chunk-a2e83f40.019b51bd.js.gz
  27. BIN
      dist/sgipad/static/js/chunk-a2e83f40.01a744ff.js.gz
  28. 0 22
      dist/sgipad/static/js/chunk-a34d880c.8f6d4e53.js
  29. BIN
      dist/sgipad/static/js/chunk-a34d880c.8f6d4e53.js.gz
  30. 22 0
      dist/sgipad/static/js/chunk-a34d880c.abb7aba9.js
  31. BIN
      dist/sgipad/static/js/chunk-a34d880c.abb7aba9.js.gz
  32. 2 1
      src/apis/envmonitor.ts
  33. 8 3
      src/views/envmonitor/components/Air/manualIndex.vue
  34. 6 2
      src/views/envmonitor/components/Light/index.vue
  35. 6 2
      src/views/envmonitor/index.vue

Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/sgipad/index.html


BIN
dist/sgipad/static/css/chunk-37ea99b4.5d18f2c8.css.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/sgipad/static/css/chunk-37ea99b4.5d18f2c8.css


BIN
dist/sgipad/static/css/chunk-7d029866.49e73d2d.css.gz


BIN
dist/sgipad/static/js/app.7bbe4641.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/sgipad/static/js/app.7bbe4641.js


BIN
dist/sgipad/static/js/app.a36801a6.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/sgipad/static/js/chunk-09f4d4ca.c83881b7.js


BIN
dist/sgipad/static/js/chunk-09f4d4ca.c83881b7.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
dist/sgipad/static/js/chunk-37ea99b4.d820b2a1.js


BIN
dist/sgipad/static/js/chunk-37ea99b4.d820b2a1.js.gz


dist/sgipad/static/js/chunk-41ab0954.612dc379.js → dist/sgipad/static/js/chunk-41ab0954.ce743438.js


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
dist/sgipad/static/js/chunk-6637d5f0.1911c16d.js


BIN
dist/sgipad/static/js/chunk-6637d5f0.1911c16d.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/sgipad/static/js/chunk-6637d5f0.a7334d26.js


BIN
dist/sgipad/static/js/chunk-6637d5f0.a7334d26.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
dist/sgipad/static/js/chunk-675be840.2ff6eb81.js


BIN
dist/sgipad/static/js/chunk-675be840.2ff6eb81.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/sgipad/static/js/chunk-675be840.36bdb495.js


BIN
dist/sgipad/static/js/chunk-675be840.36bdb495.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 0 - 1
dist/sgipad/static/js/chunk-6c149b5a.1d1cf806.js


Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/sgipad/static/js/chunk-6c149b5a.7290b101.js


Файловите разлики са ограничени, защото са твърде много
+ 1 - 0
dist/sgipad/static/js/chunk-7d029866.3f7b33eb.js


BIN
dist/sgipad/static/js/chunk-7d029866.3f7b33eb.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 1 - 1
dist/sgipad/static/js/chunk-a2e83f40.01a744ff.js


BIN
dist/sgipad/static/js/chunk-a2e83f40.019b51bd.js.gz


BIN
dist/sgipad/static/js/chunk-a2e83f40.01a744ff.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 0 - 22
dist/sgipad/static/js/chunk-a34d880c.8f6d4e53.js


BIN
dist/sgipad/static/js/chunk-a34d880c.8f6d4e53.js.gz


Файловите разлики са ограничени, защото са твърде много
+ 22 - 0
dist/sgipad/static/js/chunk-a34d880c.abb7aba9.js


BIN
dist/sgipad/static/js/chunk-a34d880c.abb7aba9.js.gz


+ 2 - 1
src/apis/envmonitor.ts

@@ -42,7 +42,8 @@ export const changeTempHttp = (params: any) => {
 }
 // 查询灯的状态(优先查采集的状态)
 export const getLampHttp = (params: any) => {
-  return https({ timeout: 2000 }).request<RootObject<any>>(`${duoduoenvService}light/status/query?spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
+  // { timeout: 2000 }
+  return https().request<RootObject<any>>(`${duoduoenvService}light/status/query?spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
   // return https({ timeout: 20000 }).request<RootObject<any>>(`${testApi}light/status/query?spaceId=${params.spaceId}`, Method.GET, undefined, ContentType.json)
 }
 

+ 8 - 3
src/views/envmonitor/components/Air/manualIndex.vue

@@ -320,7 +320,7 @@ import {
 import { Switch, Dialog, Toast } from "vant";
 import { swiper } from "@/utils/swiper";
 import { querySpaceConditioners, setSpaceCondtioners } from "@/apis/envmonitor";
-import { parseImgUrl, setQueryConfig } from "@/utils";
+import { getRelNowTime, parseImgUrl, setQueryConfig } from "@/utils";
 import any = jasmine.any;
 
 export default defineComponent({
@@ -539,7 +539,12 @@ export default defineComponent({
         });
       },
       // 定时获取空调状态
-      getAirInfoToTimer(timerLong: any = 10000) {
+      getAirInfoToTimer(timerLong: any = 15000) {
+        let nowTime: any = getRelNowTime();
+        if (timerLong == 15000 && nowTime < "070000" && nowTime > "200000") {
+          timerLong = 300000;
+        }
+        console.log("nowTime===", nowTime);
         if (proxyData.airTimer) {
           clearTimeout(proxyData.airTimer);
           proxyData.airTimer = null;
@@ -914,7 +919,7 @@ export default defineComponent({
           item.gIndex = gIndex == -1 ? 0 : gIndex;
         });
       },
-      // 空调信息airTemp
+      // 空调信息airTemp的修改
       getAirInfo() {
         const paramObj = {
           spaceId: proxyData.spaceId,

+ 6 - 2
src/views/envmonitor/components/Light/index.vue

@@ -106,7 +106,7 @@ import {
 } from "vue";
 import { Switch, Toast } from "vant";
 import { getLampHttp, getStatusHttp, setallLampHttp } from "@/apis/envmonitor";
-import { parseImgUrl } from "@/utils";
+import { getRelNowTime, parseImgUrl } from "@/utils";
 import { type } from "os";
 import { onDeactivated } from "vue";
 import { AnyMxRecord } from "dns";
@@ -539,7 +539,11 @@ export default defineComponent({
         proxyData.lightsStatusTimer = null;
       },
       // 定时刷新接口
-      startLightsStatusTimer(timerLen: any = 2000) {
+      startLightsStatusTimer(timerLen: any = 15000) {
+        let nowTime: any = getRelNowTime();
+        if (timerLen == 15000 && nowTime < "070000" && nowTime > "200000") {
+          timerLen = 300000;
+        }
         proxyData.clearLightStatusTimer();
         proxyData.lightsStatusTimer = setTimeout(() => {
           proxyData.clearLightStatusTimer();

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

@@ -1597,7 +1597,7 @@ export default defineComponent({
         proxyData.spaceTimer = null;
       },
       // 定时调空间
-      timerSpaceInfo(timer: any = 5000) {
+      timerSpaceInfo(timer: any = 15000) {
         proxyData.spaceTimer = setTimeout(() => {
           proxyData.getSpaceInfo();
           proxyData.clearTimerSpaceInfo();
@@ -1689,7 +1689,11 @@ export default defineComponent({
           });
       },
       // 定时查空间的加班记录
-      queryCustomAndScenceTimer(timer: any = 3000) {
+      queryCustomAndScenceTimer(timer: any = 15000) {
+        let nowTime: any = getRelNowTime();
+        if (timer == 15000 && nowTime < "070000" && nowTime > "200000") {
+          timer = 300000;
+        }
         proxyData.clearSecenTimer();
         proxyData.secenTimer = setTimeout(() => {
           proxyData.queryCustomAndScence();