openatc-components 0.1.33 → 0.1.35

package/src/kisscomps/components/patternList/patternList.vue

@@ -8,6 +8,7 @@
     :cycles="cycles"
     :cycle="cycle"
     :patternList="patternList"
+    :condition="condition"
     :localPatternList="localPatternList"
     :phaseList="phaseList"
     :showBarrier="showBarrier"
@@ -496,6 +497,9 @@ export default {
     contrloType: {
       type: String
     },
+    condition: {
+      type: Boolean
+    },
     localPatternList: {
       type: Array
     },

package/src/node_modules/.package_versions.json

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

package/src/utils/RingDataModel.js

@@ -53,7 +53,7 @@ export default class RingDataModel {
   addPhaseInfo (phase) {
     let addphse = {}
     addphse.name = i18n.t('openatccomponents.overview.phase') + phase.id
-    addphse.desc = this.getPhaseDescription(phase.direction)
+    addphse.desc = this.getPhaseDescription(phase)
     // 相位锁定选项默认都按照解锁状态显示
     addphse.locktype = 0
     addphse.close = 0
@@ -67,9 +67,25 @@ export default class RingDataModel {
 
   getPhaseDescription (phaseList) {
     let list = []
-    for (let id of phaseList) {
+    let peddirections = []
+    let sidewalkPhaseData = this.getPedPhasePos()
+    for (let walk of sidewalkPhaseData) {
+      for (let ped of phaseList.peddirection) {
+        // if (stg === walk.phaseid) {
+        let obj = {}
+        obj.name = walk.name
+        obj.id = walk.id
+        if (ped === walk.id) {
+          peddirections.push(obj)
+          peddirections = Array.from(new Set(peddirections))
+        }
+        // }
+      }
+    }
+    for (let id of phaseList.direction) {
       let obj = {}
       obj.id = id
+      obj.peddirection = peddirections
       obj.color = '#454545'
       list.push(obj)
     }

package/src/views/schemeconfig.vue

@@ -55,9 +55,9 @@ export default {
       showWalk: [ 1, 2 ],
       sidewalkPhaseData: [{key: 'pedphase1653873194007699', phaseid: 1, id: 1, name: '东人行横道', isshow: false}],
       lockPhaseBtnName: this.$t('openatccomponents.overview.comfirm'),
-      agentId: '13001-460',
-      Token: 'eyJraWQiOiIxNjYwMjgzMzQwMzM4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NjY4MzM0MCwiaWF0IjoxNjYwMjgzMzQwfQ.xmgkrjwcdwT_miC3krjqL27Tv4txJ9FQuDEKlfWdtzU',
-      Token103: 'eyJraWQiOiIxNjQ5MzM4NzA5MTA0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczNTczODcwOSwiaWF0IjoxNjQ5MzM4NzA5fQ.JDSkpT1SbB61dEKvorhVdZJHKJzoQZEY5DPKHs1Imo0',
+      agentId: '12004-950',
+      Token: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
+      Token103: 'eyJraWQiOiIxNjcwMzc0ODA4MTcyIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc1Njc3NDgwOCwiaWF0IjoxNjcwMzc0ODA4fQ.xsRoye_tk_Xf60w5Mpigm8vrPgQJCLN-W_IW4U7dafA',
       boxVisible: false,
       dialogWidth: '80%',
       crossStatusData: {} // 路口状态数据