openatc-components 0.1.152 → 0.1.154

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -13,6 +13,7 @@
         :showCondition="showCondition"
         :contrloType="contrloType"
         :stagesChange="stagesChange"
+        :cycleChange="cycleChange"
         :patternList="patternList"
         :agentId="agentId"
         :controlData="controlData"
@@ -45,6 +46,10 @@ export default {
     contrloType: {
       type: String
     },
+    cycleChange: {
+      type: Boolean,
+      default: false
+    },
     localPatternList: {
       type: Array
     },

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

@@ -118,6 +118,10 @@ export default {
     }
   },
   props: {
+    cycleChange: {
+      type: Boolean,
+      default: false
+    },
     stagesChange: {
       type: Array
     },
@@ -201,6 +205,14 @@ export default {
       // 深度观察监听
       deep: true
     },
+    cycleChange: {
+      handler: function (val, oldVal) {
+        this.handleCurrentChange(this.patternStatusList)
+        this.handleBarrierHeight()
+      },
+      // 深度观察监听
+      deep: true
+    },
     phaseList: {
       handler: function (val, oldVal) {
         this.getPedPhasePos()
@@ -292,6 +304,7 @@ export default {
         let currPhase = this.phaseList.filter((item) => {
           return item.id === stg
         })[0]
+        if (!currPhase) return
         if (!currPhase.peddirection) return
         for (let walk of this.sidewalkPhaseData) {
           for (let ped of currPhase.peddirection) {
@@ -374,12 +387,15 @@ export default {
       let stageMaxCyle = stageCycleList.reduce((a, b) => {
         return a + b
       }, 0)
+      if (this.cycleChange) {
+        stageMaxCyle = this.max
+      }
       this.stageLists = this.stagesChange.map(item => {
         return {
           ...item,
           // peddirection: this.getPed(item.phases ? item.phases : item.stages),
           direction: this.handleStageData(item.phases ? item.phases : item.stages),
-          greenWidth: (item.green / stageMaxCyle * 100).toFixed(3) + '%',
+          greenWidth: ((item.stageSplit - item.yellow - item.red) / stageMaxCyle * 100).toFixed(3) + '%',
           yellowWidth: (item.yellow / stageMaxCyle * 100).toFixed(3) + '%',
           redWidth: (item.red / stageMaxCyle * 100).toFixed(3) + '%'
         }
@@ -951,6 +967,13 @@ export default {
         if (newRings.length > 1) {
           this.fillGap(ringTeams, val)
         }
+        if (this.cycleChange) {
+          const globalParamModel = this.$store.getters.globalParamModel
+          let pattern = globalParamModel.getParamsByType('patternList')
+          const allCycle = pattern.map(item => item.cycle)
+          let cycle = Math.max(...allCycle)
+          this.max = cycle
+        }
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item - 0.3)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {