chenzhen2 преди 2 години
родител
ревизия
2efda45968
променени са 1 файла, в които са добавени 50 реда и са изтрити 35 реда
  1. 50 35
      src/views/envmonitor/index.vue

+ 50 - 35
src/views/envmonitor/index.vue

@@ -409,6 +409,7 @@ export default defineComponent({
     const document: any = window.document;
     const screenHeight: any = document.body.clientHeight;
     const outWeather: any = {};
+    const weatherTimer: any = null;
     let secenaroStatus: any = {};
     // 空间数据(包括空间下的设备的状态)
     const officeData: any = {};
@@ -894,6 +895,13 @@ export default defineComponent({
         // }
         // console.log(targetLocationInfo)
       },
+      weatherTimer: weatherTimer,
+      getWeatherTimer(timer: any = 3600000) {
+        proxyData.weatherTimer = setTimeout(() => {
+          clearTimeout(proxyData.weatherTimer);
+          proxyData.getWeather();
+        }, timer);
+      },
       // 获取天气信息
       getWeather() {
         const params: any = {
@@ -908,6 +916,7 @@ export default defineComponent({
           const text: string = content.text;
           proxyData.getWeatherIcon(text);
           proxyData.getnowTime(text);
+          proxyData.getWeatherTimer();
         });
       },
       // 设置当前背景图
@@ -1604,46 +1613,51 @@ export default defineComponent({
           let item: any = data[i];
           let spaceCustomContentList: any =
             data[i].spaceCustomContentList || [];
-          spaceCustomContentList = spaceCustomContentList.sort(
-            proxyData.compare
-          );
-          item.spaceCustomContentList = spaceCustomContentList;
-          let nowTime: any = getRelNowTime();
-          let nowDate: any = formatDate("YYYY-MM-DD");
-          let date: any = formatDateStr(data[i].date);
-          item.cusStartTime = spaceCustomContentList[0]
-            ? spaceCustomContentList[0].startTime
-            : "";
-          item.cusEndTime = spaceCustomContentList[0]
-            ? spaceCustomContentList[0].endTime
-            : "";
-          if (nowDate == date) {
-            // 当前时间
-            item.cusStartTime = "";
-            item.cusEndTime = "";
-          }
-          for (let j = 0; j < spaceCustomContentList.length; j++) {
-            if (item.cusStartTime && item.cusEndTime) {
-              if (item.cusEndTime + 1 === spaceCustomContentList[j].startTime) {
-                item.cusEndTime = spaceCustomContentList[j].endTime;
-              }
-            } else {
-              if (
-                nowTime >= spaceCustomContentList[j].startTime &&
-                nowTime <= spaceCustomContentList[j].endTime
-              ) {
-                item.cusStartTime = spaceCustomContentList[j].startTime;
-                item.cusEndTime = spaceCustomContentList[j].endTime;
-              }
-            }
-          }
-          if (!item.cusStartTime) {
+          if (spaceCustomContentList && spaceCustomContentList.length) {
+            spaceCustomContentList = spaceCustomContentList.sort(
+              proxyData.compare
+            );
+            item.spaceCustomContentList = spaceCustomContentList;
+            let nowTime: any = getRelNowTime();
+            let nowDate: any = formatDate("YYYY-MM-DD");
+            let date: any = formatDateStr(data[i].date);
             item.cusStartTime = spaceCustomContentList[0]
               ? spaceCustomContentList[0].startTime
               : "";
             item.cusEndTime = spaceCustomContentList[0]
               ? spaceCustomContentList[0].endTime
               : "";
+            if (nowDate == date) {
+              // 当前时间
+              item.cusStartTime = "";
+              item.cusEndTime = "";
+            }
+            for (let j = 0; j < spaceCustomContentList.length; j++) {
+              if (item.cusStartTime && item.cusEndTime) {
+                if (
+                  item.cusEndTime + 1 ===
+                  spaceCustomContentList[j].startTime
+                ) {
+                  item.cusEndTime = spaceCustomContentList[j].endTime;
+                }
+              } else {
+                if (
+                  nowTime >= spaceCustomContentList[j].startTime &&
+                  nowTime <= spaceCustomContentList[j].endTime
+                ) {
+                  item.cusStartTime = spaceCustomContentList[j].startTime;
+                  item.cusEndTime = spaceCustomContentList[j].endTime;
+                }
+              }
+            }
+            if (!item.cusStartTime) {
+              item.cusStartTime = spaceCustomContentList[0]
+                ? spaceCustomContentList[0].startTime
+                : "";
+              item.cusEndTime = spaceCustomContentList[0]
+                ? spaceCustomContentList[0].endTime
+                : "";
+            }
           }
         }
       },
@@ -1839,8 +1853,8 @@ export default defineComponent({
       cusServiceTimer: cusServiceTimer,
       queryCustomerserviceTimer(timer: any = 3600000) {
         proxyData.cusServiceTimer = setTimeout(() => {
-          proxyData.queryCustomerservice();
           clearTimeout(proxyData.cusServiceTimer);
+          proxyData.queryCustomerservice();
         }, timer);
       },
       // 查询联系方式
@@ -1863,6 +1877,7 @@ export default defineComponent({
     onBeforeUnmount(() => {
       proxyData.clearAll();
       clearTimeout(proxyData.cusServiceTimer);
+      clearTimeout(proxyData.weatherTimer);
     });
     onMounted(() => {
       let spaceId: any = route.query.spaceId;