openatc-components 0.1.62 → 0.1.64

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) { // 忽略相位不显示
@@ -1111,8 +1112,8 @@ export default {
         newMin.push(minNum)
         let newmaxNum = Math.max.apply(Math, newMax)// 每组最大值
         let newminNum = Math.min.apply(Math, newMin)
+        this.newCycle = newmaxNum + newminNum
         if (newmaxNum === newminNum) {
-          this.newCycle = newmaxNum + newminNum
           this.max = newmaxNum + newminNum
           pattern.map(d => {
             d.map(r => {