openatc-components 0.1.63 → 0.1.65

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

@@ -161,10 +161,10 @@ export default {
   computed: {
     paddingLeft () {
       let res = '0%'
-      if (this.newCycle && this.newCycle > 0) {
-        let curPercent = (this.newCycle - this.syncTime) / this.newCycle
-        res = curPercent * 100 + '%'
-      }
+      // if (this.newCycle && this.newCycle > 0) {
+      //   let curPercent = (this.newCycle - this.syncTime) / this.newCycle
+      //   res = curPercent * 100 + '%'
+      // }
       if (this.cycle && this.cycle > 0) {
         let curPercent = (this.cycle - this.syncTime) / (this.max ? this.max : this.cycle)
         res = curPercent * 100 + '%'
@@ -191,6 +191,7 @@ export default {
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
         if (this.localPatternList) {
+          this.max = ''
           let idPattern = this.localPatternList.filter(item => item.id === this.controlData.patternid)
           if (idPattern.length === 0 || (this.controlData && this.showCondition)) {
             this.handleTentivePatternData()
@@ -558,13 +559,13 @@ export default {
           }
           obj.split = split
           if (ring.sum) {
-            obj.redWidth = ((currPhase.redclear + ring.sum) / cycle * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           }
-          obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
-          obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -774,13 +775,13 @@ export default {
           }
           obj.split = split
           if (ring.sum) {
-            obj.redWidth = ((currPhase.redclear + ring.sum) / cycle * 100).toFixed(3) + '%'
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           }
-          obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
-          obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1065,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
     },