瀏覽代碼

fix:解决加班子组件修改父组件数据的bug

chenzhen2 2 年之前
父節點
當前提交
67b51c5055

File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/index.html


二進制
dist/sgipad/static/css/chunk-2957dca2.2278f103.css.gz


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/css/chunk-2957dca2.2278f103.css


二進制
dist/sgipad/static/css/chunk-2b051d87.88ed94b3.css.gz


File diff suppressed because it is too large
+ 2 - 2
dist/sgipad/static/js/app.68574011.js


二進制
dist/sgipad/static/js/app.4fc11d08.js.gz


File diff suppressed because it is too large
+ 1 - 1
dist/sgipad/static/js/app.68574011.js.map


二進制
dist/sgipad/static/js/app.68574011.js.gz


File diff suppressed because it is too large
+ 0 - 2
dist/sgipad/static/js/chunk-2957dca2.ec3188ff.js


二進制
dist/sgipad/static/js/chunk-2957dca2.ec3188ff.js.gz


File diff suppressed because it is too large
+ 0 - 1
dist/sgipad/static/js/chunk-2957dca2.ec3188ff.js.map


File diff suppressed because it is too large
+ 2 - 0
dist/sgipad/static/js/chunk-2b051d87.40902f0f.js


二進制
dist/sgipad/static/js/chunk-2b051d87.40902f0f.js.gz


File diff suppressed because it is too large
+ 1 - 0
dist/sgipad/static/js/chunk-2b051d87.40902f0f.js.map


+ 1 - 64
src/views/envmonitor/components/ManualWork/WorkConfig.vue

@@ -528,76 +528,12 @@ export default defineComponent({
       closeLeavDailog() {
         proxyData.isShowLeaveDailog = false;
       },
-      // 数组排序
-      compare(obj1: any, obj2: any) {
-        var val1 = obj1.startTime;
-        var val2 = obj2.startTime;
-        if (val1 < val2) {
-          return -1;
-        } else if (val1 > val2) {
-          return 1;
-        } else {
-          return 0;
-        }
-      },
-      // 手动控制加班处理时间段拼接的逻辑
-      formateManualWorkTime() {
-        // debugger
-        let data: any = proxyData.workkArr;
-        for (let i = 0; i < data.length; i++) {
-          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) {
-            item.cusStartTime = spaceCustomContentList[0]
-              ? spaceCustomContentList[0].startTime
-              : "";
-            item.cusEndTime = spaceCustomContentList[0]
-              ? spaceCustomContentList[0].endTime
-              : "";
-          }
-        }
-      },
     });
     watch(
       props,
       (newProps: any) => {
         proxyData.workkArr = newProps.workkArr;
         if (proxyData.workkArr && proxyData.workkArr.length) {
-          proxyData.formateManualWorkTime();
           proxyData.formateWorkTime();
         }
       },
@@ -607,6 +543,7 @@ export default defineComponent({
       }
     );
     onMounted(() => {
+      // proxyData.formateManualWorkTime();
       // proxyData.formateWorkTime();
     });
     return {

+ 2 - 65
src/views/envmonitor/components/ManualWork/index.vue

@@ -1565,69 +1565,6 @@ export default defineComponent({
             });
         }
       },
-      // 数组排序
-      compare(obj1: any, obj2: any) {
-        var val1 = obj1.startTime;
-        var val2 = obj2.startTime;
-        if (val1 < val2) {
-          return -1;
-        } else if (val1 > val2) {
-          return 1;
-        } else {
-          return 0;
-        }
-      },
-      // 手动控制加班处理时间段拼接的逻辑
-      formateManualWorkTime() {
-        // debugger
-        let data: any = proxyData.workkArr;
-        for (let i = 0; i < data.length; i++) {
-          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) {
-            item.cusStartTime = spaceCustomContentList[0]
-              ? spaceCustomContentList[0].startTime
-              : "";
-            item.cusEndTime = spaceCustomContentList[0]
-              ? spaceCustomContentList[0].endTime
-              : "";
-          }
-        }
-      },
     });
     watch(props, (newProps: any) => {
       proxyData.workkArr = newProps.workkArr;
@@ -1641,8 +1578,8 @@ export default defineComponent({
     });
     onMounted(() => {
       // 设置dom最外层的宽
-      console.log("弹窗变化了-----==");
-      proxyData.formateManualWorkTime();
+      // console.log("弹窗变化了-----==");
+      // proxyData.formateManualWorkTime();
       proxyData.setWorkTimeList();
     });
     return {

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

@@ -1563,10 +1563,14 @@ export default defineComponent({
             let resData: any = res?.data ?? [];
             // 手动控制的情况下走新的服务定制
             proxyData.workkArr = resData;
-            for (let i = 0; i < resData.length; i++) {
-              let customSceneList: any = resData[i]?.customSceneList ?? [];
+            for (let i = 0; i < proxyData.workkArr.length; i++) {
+              let customSceneList: any =
+                proxyData.workkArr[i]?.customSceneList ?? [];
               customSceneList = customSceneList.sort(proxyData.compare);
             }
+            if (proxyData.controlMode == 1) {
+              proxyData.formateManualWorkTime();
+            }
             proxyData.queryCustomAndScenceTimer();
           })
           .catch(() => {
@@ -1586,7 +1590,57 @@ export default defineComponent({
         }
       },
       // 格式化当前页面展示的时间
-      formateWorkTime() {},
+      // 手动控制加班处理时间段拼接的逻辑
+      formateManualWorkTime() {
+        // debugger
+        let data: any = proxyData.workkArr || [];
+        for (let i = 0; i < data.length; i++) {
+          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) {
+            item.cusStartTime = spaceCustomContentList[0]
+              ? spaceCustomContentList[0].startTime
+              : "";
+            item.cusEndTime = spaceCustomContentList[0]
+              ? spaceCustomContentList[0].endTime
+              : "";
+          }
+        }
+      },
       /**
        * 空间相关的接口
        */
@@ -1600,7 +1654,7 @@ export default defineComponent({
         // 获取空间下受控设备
         proxyData.getSpaceEquipList();
         // 查询加班记录
-        proxyData.queryCustomAndScence();
+        proxyData.queryCustomAndScenceTimer(0);
         // 获取空间下的设备信息
         proxyData.getEquipments();
       },