openatc-components 0.2.8 → 0.2.10

package/package.json

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

package/src/i18n/language/en.js

@@ -455,7 +455,10 @@ const en = {
       'phase': 'Phase',
       'agentidError': 'Failed to get agentid!',
       'splitCheckMsg': 'The green letter ratio must be greater than the phase transition time or the pedestrian crossing + pedestrian transition time!',
-      'pattern': 'Pattern'
+      'pattern': 'Pattern',
+      'green': 'Green',
+      'yellow': 'Yellow',
+      'red': 'Red'
     },
     'plan': {
       'tipcontext': 'Please input your plan_name',
@@ -890,6 +893,8 @@ const en = {
     'common': {
       'confirm': 'Confirm',
       'query': 'Query',
+      'stageStyle': 'Stage Style',
+      'ringStyle': 'Ring Style',
       'cancel': 'Cancel',
       'add': 'Add',
       'delete': 'Delete',

package/src/i18n/language/zh.js

@@ -453,7 +453,10 @@ const zh = {
       'phase': '相位',
       'agentidError': '获取设备ID失败!',
       'splitCheckMsg': '绿信比需大于相位过渡时间或绿信比需大于行人过街+行人过渡时间!',
-      'pattern': '方案'
+      'pattern': '方案',
+      'green': '绿灯',
+      'yellow': '黄灯',
+      'red': '红灯清空'
     },
     'plan': {
       'tipcontext': '请输入计划名！',
@@ -888,6 +891,8 @@ const zh = {
     'common': {
       'confirm': '确认',
       'query': '查询',
+      'stageStyle': '阶段配置',
+      'ringStyle': '环配置',
       'cancel': '取消',
       'add': '添加',
       'delete': '删除',

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

@@ -13,6 +13,7 @@
         :localPatternList="localPatternList"
         :showCondition="showCondition"
         :contrloType="contrloType"
+        :allPatternList="allPatternList"
         :stagesChange="stagesChange"
         :cycleChange="cycleChange"
         :patternList="patternList"
@@ -54,6 +55,9 @@ export default {
     controlPhase: {
       type: Object
     },
+    allPatternList: {
+      type: Array
+    },
     localPatternList: {
       type: Array
     },

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

@@ -144,6 +144,9 @@ export default {
       type: Boolean,
       default: false
     },
+    allPatternList: {
+      type: Array
+    },
     localPatternList: {
       type: Array
     },
@@ -429,11 +432,11 @@ export default {
     },
     getStage () {
       if (!this.stagesChange) return
-      const globalParamModel = this.$store.getters.globalParamModel
-      let pattern = globalParamModel.getParamsByType('patternList')
-      let mapAdd = 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
+          return val.stageSplit ? val.stageSplit : val.split
         })
       })
       let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
@@ -441,6 +444,7 @@ export default {
           return a + b
         }) : 0
       }) : 0
+      console.log(maxCycle, 'maxCycle')
       let stageMaxCyle = Math.max(...maxCycle)// 每个环的周期最大值
       if (!this.cycleChange) {
         let stageCycleList = this.stagesChange.map(item => {
@@ -460,6 +464,7 @@ export default {
           redWidth: (item.red / stageMaxCyle * 100).toFixed(3) + '%'
         }
       })
+      console.log(this.stageLists, '011')
     },
     getBusPos () {
       // 公交相位信息
@@ -1046,9 +1051,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 {