openatc-components 0.1.64 → 0.1.65

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

@@ -1066,26 +1066,27 @@ export default {
     },
     step2 (newArr, pattern) { // 不同环并发相位做比较
       let ret = []
+      let max = 0
       const patternObj = {}
       pattern.forEach(l => {
         // if (l.mode !== 7) {
         patternObj[l.id] = l.value
         // }
       })
-      newArr.forEach((na, index) => {
-        if (!na || na.length === 0) return
-        let max = 0
-        na.forEach(n => {
-          const total = n.data.reduce((pre, cur) => pre + patternObj[cur], 0)
-          if (total > max) {
-            max = total
+      let barrierCycle = newArr.map(item => {
+        return Math.max.apply(Math, item.map(k => { return k.length }))
+      })
+      barrierCycle.forEach((b, index) => {
+        if (index === 0) {
+          ret.push(barrierCycle[index])
+        } else {
+          if (max) {
+            max = barrierCycle[index] + max
+          } else {
+            max = barrierCycle[index] + barrierCycle[index - 1]
           }
-        })
-        while (index > 0 && max < this.newCycle) { // && max < _this.newCycle
-          index--
-          max += ret[index]
+          ret.push(max)
         }
-        ret.push(max)
       })
       return ret
     },