openatc-components 0.3.113 → 0.3.115

package/package/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -1037,7 +1037,7 @@ export default {
             }
           }
           obj.split = split
-          obj.cycle = this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle
+          obj.cycle = cycle
           if (ring.sum) {
             obj.sum = ring.sum
             obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
@@ -1065,6 +1065,17 @@ export default {
             j.value = this.controlPhase.phase.filter(item => item.id === j.id)[0].split
           })
         })
+        let valSplit = val.map(item => {
+          return item.map(val => {
+            return val.value + (val.sum ? val.sum : 0)
+          })
+        })
+        let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
+          return item.length > 0 ? item.reduce((a, b) => {
+            return a + b
+          }) : 0
+        }) : 0
+        this.fixCycle = Math.max(...splitCycle)// 每个环的周期最大值
       }
       // 按环序分组
       let ringlength = []
@@ -1086,7 +1097,6 @@ export default {
         }) : 0
       }) : 0
       let cycle = Math.max(...splitCycle)// 每个环的周期最大值
-      this.fixCycle = cycle// 每个环的周期最大值
       let newRings = ringsequence.filter(item => item)
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
@@ -1266,7 +1276,7 @@ export default {
             }
           }
           obj.split = split
-          obj.cycle = cycle
+          obj.cycle = this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle
           const isZero = split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen
           const allAdd = split + currPhase.redclear + currPhase.yellow + currPhase.flashgreen
           if (isZero <= 0) {