openatc-components 0.5.49 → 0.5.51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.5.49",
+  "version": "0.5.51",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

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

@@ -678,14 +678,14 @@ export default {
           obj.id = ring.phases
           // if (ring.sum) {
           //   obj.sum = ring.sum
-          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          //   obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
           // } else {
-          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          //   obj.redWidth = ((currPhase.redclear || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
           // }
           // obj.mode = ring.mode
           obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
-          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // obj.flashgreen = ((currPhase.flashgreen || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+          // obj.yellowWidth = ((currPhase.yellow || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1148,13 +1148,13 @@ export default {
           obj.cycle = cycle
           if (ring.sum) {
             obj.sum = ring.sum
-            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
+            obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100) + '%'
+            obj.redWidth = ((currPhase.redclear || 0) / (this.max ? this.max : cycle) * 100) + '%'
           }
-          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100) + '%'
-          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100) + '%'
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.flashgreen = (((currPhase.flashgreen || 0) || 0) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.yellowWidth = ((currPhase.yellow || 0) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.greenWidth = ((split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)) / (this.max ? this.max : cycle) * 100) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1452,13 +1452,13 @@ export default {
           obj.cycle = cycle
           if (ring.sum) {
             obj.sum = ring.sum
-            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
+            obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.max ? this.max : cycle) * 100) + '%'
           } else {
-            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100) + '%'
+            obj.redWidth = ((currPhase.redclear || 0) / (this.max ? this.max : cycle) * 100) + '%'
           }
-          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100) + '%'
-          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100) + '%'
-          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.flashgreen = ((currPhase.flashgreen || 0) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.yellowWidth = ((currPhase.yellow || 0) / (this.max ? this.max : cycle) * 100) + '%'
+          obj.greenWidth = ((split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)) / (this.max ? this.max : cycle) * 100) + '%'
           // 忽略相位不显示
           // let mode = ring.mode
           // if (mode !== 7) { // 忽略相位不显示
@@ -1659,6 +1659,9 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -1668,9 +1671,6 @@ export default {
         } else {
           this.max = ''
         }
-        if (newRings.length > 1) {
-          this.fillGap(ringTeams, val)
-        }
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {
@@ -1742,29 +1742,29 @@ export default {
           }
           obj.split = split
           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
+          const isZero = split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)
+          const allAdd = split + (currPhase.redclear || 0) + (currPhase.yellow || 0) + (currPhase.flashgreen || 0)
           if (isZero <= 0) {
             if (ring.sum) {
               obj.sum = ring.sum
-              obj.redWidth = ((((currPhase.redclear + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+              obj.redWidth = (((((currPhase.redclear || 0) + ring.sum) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
             } else {
-              obj.redWidth = (((currPhase.redclear / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+              obj.redWidth = ((((currPhase.redclear || 0) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
             }
-            obj.greenWidth = (((split - (currPhase.redclear / allAdd) - (currPhase.yellow / allAdd) - (currPhase.flashgreen / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.yellowWidth = (((currPhase.yellow / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
-            obj.flashgreen = (((currPhase.flashgreen / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+            obj.greenWidth = (((split - ((currPhase.redclear || 0) / allAdd) - ((currPhase.yellow || 0) / allAdd) - ((currPhase.flashgreen || 0) / allAdd)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+            obj.yellowWidth = ((((currPhase.yellow || 0) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
+            obj.flashgreen = ((((currPhase.flashgreen || 0) / allAdd) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle)) * 100) + '%'
           } else {
             if (ring.sum) {
               obj.sum = ring.sum
-              obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+              obj.redWidth = (((currPhase.redclear || 0) + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
             } else {
-              obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+              obj.redWidth = ((currPhase.redclear || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
             }
             obj.mode = ring.mode
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-            obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+            obj.greenWidth = ((split - (currPhase.redclear || 0) - (currPhase.yellow || 0) - (currPhase.flashgreen || 0)) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+            obj.flashgreen = ((currPhase.flashgreen || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
+            obj.yellowWidth = ((currPhase.yellow || 0) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
           }
           // 忽略相位不显示
           // let mode = ring.mode

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}