Przeglądaj źródła

fix:定时器调整到15s

chenzhen2 1 rok temu
rodzic
commit
4e6a0fb17d

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

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

@@ -319,7 +319,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({
@@ -538,7 +538,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;

+ 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();

+ 8 - 4
src/views/envmonitor/index.vue

@@ -143,7 +143,7 @@
       >
         <!--自动控制的加班 start-->
         <WorkConfig
-          v-if="roomType === '开放' && isWork && controlMode ==0"
+          v-if="roomType === '开放' && isWork && controlMode == 0"
           key="workCkey"
           :workkArr="workkArr"
           @closeWork="closeWork"
@@ -237,7 +237,7 @@
       teleport="#app"
     >
       <work-overtime
-        v-if="isShowWork && controlMode ==0"
+        v-if="isShowWork && controlMode == 0"
         :spaceInfo="spaceInfo"
         @closeWork="closeWork"
         :projectId="projectId"
@@ -1552,7 +1552,7 @@ export default defineComponent({
         proxyData.spaceTimer = null;
       },
       // 定时调空间
-      timerSpaceInfo(timer: any = 5000) {
+      timerSpaceInfo(timer: any = 15000) {
         proxyData.spaceTimer = setTimeout(() => {
           proxyData.getSpaceInfo();
           proxyData.clearTimerSpaceInfo();
@@ -1644,7 +1644,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();