openatc-components 0.4.31 → 0.4.33

package/package.json

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

package/src/kisscomps/components/IntersectionMap/crossDirection/crossDiagram.vue

@@ -441,8 +441,12 @@ export default {
       this.curPhase = val.current_phase
       this.curStage = val.current_stage
       this.isHasPhase = true
-      this.createPhaseStatusMap()
-      this.createOverlapPhaseStatusMap()
+      if (val.phase) {
+        this.createPhaseStatusMap()
+      }
+      if (val.overlap) {
+        this.createOverlapPhaseStatusMap()
+      }
       // 正常情况下，获取车道相位、车道跟随相位、相位倒计时、行人相位、行人跟随相位 的状态
       this.getPhaseStatus()
       this.getOverlapPhaseStatus()

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

@@ -1185,6 +1185,7 @@ export default {
       let minLength = Math.min(...ringlength)
       let resultArrs = [] // 环1分组
       let resultArr = [] // 环2分组
+      let resultArrThree = [] // 环3分组
       for (let j = 0; j < ringsequence[0].length; j += minLength) {
         resultArrs.push(ringsequence[0].slice(j, j + minLength))
         if (ringsequence[0].length === minLength) {
@@ -1195,6 +1196,9 @@ export default {
         for (let i = 0; i < ringsequence[1].length; i += minLength) {
           resultArr.push(ringsequence[1].slice(i, i + minLength))
         }
+        for (let k = 0; k < ringsequence[2].length; k += minLength) {
+          resultArrThree.push(ringsequence[2].slice(k, k + minLength))
+        }
       }
       this.patternInfo = []
       this.barrierList = []
@@ -1220,9 +1224,10 @@ export default {
       }
       if (currentArr.length !== 0) {
         let newCurrent = this.tranform(currentArr)
-        // 取没个环与环关系的并集
+        // 取每个环与环关系的并集
         let barrierRing1 = []
         let barrierRing2 = []
+        let barrierRing3 = []
         let ring1 = [] // 环1与关系1的并集
         for (let h = 0; h < newCurrent.length; h++) {
           let adds = [...new Set(resultArrs[0])].filter(item => newCurrent[h].includes(item))
@@ -1247,8 +1252,20 @@ export default {
             ring2.push(add)
           }
           barrierRing2.push(...ring2, ...ring2s)
+           // 环3
+          let ring3s = [] // 环3与关系1的并集
+          for (let h = 0; h < newCurrent.length; h++) {
+            let addRing2 = [...new Set(resultArrThree[1])].filter(item => newCurrent[h].includes(item))
+            ring3s.push(addRing2)
+          }
+          let ring3 = [] // 环3与关系1的并集
+          for (let h = 0; h < newCurrent.length; h++) {
+            let add = [...new Set(resultArrThree[0])].filter(item => newCurrent[h].includes(item))
+            ring3.push(add)
+          }
+          barrierRing3.push(...ring3, ...ring3s)
           for (let k = 0; k < barrierRing1.length; k++) {
-            resultList.push(barrierRing1[k].concat(barrierRing2[k]))
+            resultList.push(barrierRing1[k].concat(barrierRing2[k]).concat(barrierRing3[k]))
           }
         }
         let resultLists = resultList.filter(item => item.length !== 0)

package/src/node_modules/.package_versions.json

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