openatc-components 0.2.13 → 0.2.14

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

@@ -47,8 +47,7 @@ export default {
   },
   data () {
     return {
-      overlapDatas: [],
-      max: ''
+      overlapDatas: []
     }
   },
   props: {
@@ -68,10 +67,6 @@ export default {
       type: Boolean,
       default: false
     },
-    cycleChange: {
-      type: Boolean,
-      default: true
-    },
     cycle: {
       type: Number
     },
@@ -87,13 +82,6 @@ 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)
@@ -152,15 +140,6 @@ 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),
@@ -171,8 +150,8 @@ export default {
               ...sta,
               direction: this.getRoad(item),
               // peddirection: this.getPedPhasePos(item.peddirection),
-              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%'
+              greenWidth: find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%',
+              redWidth: !find ? (sta.split / 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 ? this.allPatternList : pattern).map(item => item.stagesList).map(item => {
+      // const globalParamModel = this.$store.getters.globalParamModel
+      // let pattern = globalParamModel.getParamsByType('patternList')
+      let mapAdd = this.allPatternList.map(item => item.stagesList).map(item => {
         return item.map(val => {
           return val.stageSplit ? val.stageSplit : val.split
         })
@@ -921,6 +921,7 @@ export default {
       }
     },
     handleCurrentChange (val) { // 两个ring的数据
+      this.patternInfo = []
       if (val === null || val.length === 0) return
       if (this.controlPhase && this.controlPhase.phase && this.controlPhase.phase[0].split) {
         val.map(i => {
@@ -1051,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 = pattern.map(item => item.cycle)
+          // const globalParamModel = this.$store.getters.globalParamModel
+          // let pattern = globalParamModel.getParamsByType('patternList')
+          const allCycle = this.patternList.map(item => item.cycle)
           let cycle = Math.max(...allCycle)
           this.max = cycle
         } else {
@@ -1062,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 : cycle) * 100) + '%'
+          return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)
       }

package/package/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue

@@ -212,7 +212,7 @@
               @onStageAdvanceendChange="onStageAdvanceendChange"
             >
             </stage-bord>
-            <div v-if="isRing" style="margin-left: 20px">
+            <div v-if="isRing" style="margin-left: 10px">
               <el-button
                 type="primary"
                 @click="
@@ -479,27 +479,9 @@ export default {
         //   this.patternOne = this.allPatternList.filter(item => {
         //   return item.id === Number(this.manualInfo.tempPatternid)
         // })
-        this.setStageList(this.patternOne[0].stagesList, this.patternOne[0].id)
+        // this.setStageList(this.patternOne[0].stagesList, this.patternOne[0].id)
       }
-      // let pattern = this.allPatternList
-      // for (let i = 0; i < pattern.length; i++) {
-      // this.patternOne[0].cycle = this.changeStageCycle(pattern[i])
-      // }
     },
-    // changeStageCycle (pattern) {
-    //   let rings = pattern.stagesList
-    //   let stageCycleList = rings.map(item => {
-    //     if (item.stageSplit) {
-    //       return item.stageSplit
-    //     } else {
-    //       return 0
-    //     }
-    //   })
-    //   let maxCycle = stageCycleList.reduce((a, b) => {
-    //     return a + b
-    //   }, 0)
-    //   return maxCycle
-    // },
     setStageList (stageChange, id) {
       // let patternList = this.globalParamModel.getParamsByType('patternList')
       // let patternList = this.allPatternList
@@ -906,6 +888,7 @@ export default {
       this.handleStageData(this.patternOne[0].rings)
     },
     handleStageData (rings) { // stagesList
+      if (!rings) return
       for (let i = 0; i < rings.length; i++) {
         if (rings[i].length > 0) {
           let phaseList = []