Jelajahi Sumber

fix(power): unable to display task list without enabled timing tasks

Casper Dai 2 tahun lalu
induk
melakukan
971724059a

+ 17 - 19
src/views/device/detail/components/DeviceInfo/components/Power.vue

@@ -248,28 +248,26 @@ export default {
       console.log('GET_MULTI_POWER_TIMING', data)
       const tasks = []
       const map = {}
-      data.forEach(({ enable, conditions }) => {
-        if (enable) {
-          conditions.forEach(task => {
-            if (task.flag) {
-              const flagArr = `${task.flag}`.split('_')
-              const flag = flagArr.length > 2 ? `${flagArr[0]}_${flagArr[1]}` : task.flag
-              if (!map[flag]) {
-                tasks.push(map[flag] = this.transfromDataToTask(task, flagArr.length > 2 ? flagArr : []))
-              }
-              if (flagArr.length > 2) {
-                map[flag].executeTime[flagArr[2]] = {
-                  ...map[flag].executeTime[flagArr[2]],
-                  ...this.transformDataToExecuteTime(task)
-                }
-              } else {
-                map[flag].executeTime.push(this.transformDataToExecuteTime(task))
+      data.forEach(({ conditions }) => {
+        conditions.forEach(task => {
+          if (task.flag) {
+            const flagArr = `${task.flag}`.split('_')
+            const flag = flagArr.length > 2 ? `${flagArr[0]}_${flagArr[1]}` : task.flag
+            if (!map[flag]) {
+              tasks.push(map[flag] = this.transfromDataToTask(task, flagArr.length > 2 ? flagArr : []))
+            }
+            if (flagArr.length > 2) {
+              map[flag].executeTime[flagArr[2]] = {
+                ...map[flag].executeTime[flagArr[2]],
+                ...this.transformDataToExecuteTime(task)
               }
             } else {
-              tasks.push(this.transfromDataToTask(task))
+              map[flag].executeTime.push(this.transformDataToExecuteTime(task))
             }
-          })
-        }
+          } else {
+            tasks.push(this.transfromDataToTask(task))
+          }
+        })
       })
       this.$tasks = tasks.map(task => {
         task.info = transformCronTaskInfo(task)

+ 23 - 25
src/views/device/detail/components/DeviceInvoke/MultifunctionCardPowerSwitch.vue

@@ -577,35 +577,33 @@ export default {
       const tasks = []
       const ports = []
       const map = {}
-      data.forEach(({ connectIndex, portIndex, enable, conditions }) => {
+      data.forEach(({ connectIndex, portIndex, conditions }) => {
         ports.push({ connectIndex, portIndex })
-        if (enable) {
-          conditions.forEach(task => {
-            if (task.flag) {
-              const flagArr = `${task.flag}`.split('_')
-              const flag = flagArr.length > 2 ? `${flagArr[0]}_${flagArr[1]}` : task.flag
-              if (!map[flag]) {
-                tasks.push(map[flag] = {
-                  connectIndex, portIndex, flag,
-                  ...this.transfromDataToTask(task)
-                })
-              }
-              if (flagArr.length > 2) {
-                map[flag].executeTime[flagArr[2]] = {
-                  ...map[flag].executeTime[flagArr[2]],
-                  ...this.transformDataToExecuteTime(task)
-                }
-              } else {
-                map[flag].executeTime.push(this.transformDataToExecuteTime(task))
-              }
-            } else {
-              tasks.push({
-                connectIndex, portIndex,
+        conditions.forEach(task => {
+          if (task.flag) {
+            const flagArr = `${task.flag}`.split('_')
+            const flag = flagArr.length > 2 ? `${flagArr[0]}_${flagArr[1]}` : task.flag
+            if (!map[flag]) {
+              tasks.push(map[flag] = {
+                connectIndex, portIndex, flag,
                 ...this.transfromDataToTask(task)
               })
             }
-          })
-        }
+            if (flagArr.length > 2) {
+              map[flag].executeTime[flagArr[2]] = {
+                ...map[flag].executeTime[flagArr[2]],
+                ...this.transformDataToExecuteTime(task)
+              }
+            } else {
+              map[flag].executeTime.push(this.transformDataToExecuteTime(task))
+            }
+          } else {
+            tasks.push({
+              connectIndex, portIndex,
+              ...this.transfromDataToTask(task)
+            })
+          }
+        })
       })
       this.$tasks = tasks.map(task => {
         task.info = transformCronTaskInfo(task)