openatc-components 0.2.14 → 0.2.15

package/package/kisscomps/components/OverLap/OverLap.vue

@@ -47,7 +47,8 @@ export default {
   },
   data () {
     return {
-      overlapDatas: []
+      overlapDatas: [],
+      max: ''
     }
   },
   props: {
@@ -67,6 +68,10 @@ export default {
       type: Boolean,
       default: false
     },
+    cycleChange: {
+      type: Boolean,
+      default: true
+    },
     cycle: {
       type: Number
     },
@@ -82,6 +87,13 @@ export default {
       // 深度观察监听
       deep: true
     },
+    cycleChange: {
+      handler: function (val, oldVal) {
+        this.doAdd(this.stageList, this.overlap)
+      },
+      // 深度观察监听
+      deep: true
+    },
     stageList: {
       handler: function (val, oldVal) {
         this.doAdd(this.stageList, this.overlap)
@@ -140,6 +152,15 @@ export default {
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
         findIndexs = Array.from(new Set(findIndexs))
+        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
+        } else {
+          this.max = ''
+        }
         return {
           ...item,
           peddirection: this.getPedPhasePos(item.peddirection),
@@ -150,8 +171,8 @@ export default {
               ...sta,
               direction: this.getRoad(item),
               // peddirection: this.getPedPhasePos(item.peddirection),
-              greenWidth: find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%',
-              redWidth: !find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%'
+              greenWidth: find ? (sta.split / (this.max ? this.max : this.cycle) * 100).toFixed(3) + '%' : '0%',
+              redWidth: !find ? (sta.split / (this.max ? this.max : this.cycle) * 100).toFixed(3) + '%' : '0%'
             }
           })
         }

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

@@ -432,9 +432,9 @@ export default {
     },
     getStage () {
       if (!this.stagesChange) return
-      // const globalParamModel = this.$store.getters.globalParamModel
-      // let pattern = globalParamModel.getParamsByType('patternList')
-      let mapAdd = this.allPatternList.map(item => item.stagesList).map(item => {
+      const globalParamModel = this.$store.getters.globalParamModel
+      let pattern = globalParamModel.getParamsByType('patternList')
+      let mapAdd = (this.allPatternList ? this.allPatternList : pattern).map(item => item.stagesList).map(item => {
         return item.map(val => {
           return val.stageSplit ? val.stageSplit : val.split
         })
@@ -1052,9 +1052,9 @@ export default {
           this.fillGap(ringTeams, val)
         }
         if (this.cycleChange) {
-          // const globalParamModel = this.$store.getters.globalParamModel
-          // let pattern = globalParamModel.getParamsByType('patternList')
-          const allCycle = this.patternList.map(item => item.cycle)
+          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
         } else {
@@ -1063,7 +1063,7 @@ export default {
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {
-          return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
+          return (j / (this.max ? this.max : cycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)
       }