openatc-components 0.1.53 → 0.1.55

package/package.json

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

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

@@ -190,12 +190,15 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
-        if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
-          this.handleTentivePatternData()
-        } else if (this.controlData) {
-          this.handlePatternData()
+        if (this.localPatternList) {
+          let idPattern = this.localPatternList.filter(item => item.id === this.controlData.patternid)
+          if (idPattern.length === 0 || (this.controlData && this.showCondition)) {
+            this.handleTentivePatternData()
+          } else if (this.controlData) {
+            this.handlePatternData()
+          }
+          this.handleBarrierHeight()
         }
-        this.handleBarrierHeight()
       },
       // 深度观察监听
       deep: true
@@ -265,15 +268,18 @@ export default {
   },
   created () {
     this.globalParamModel = this.$store.getters.globalParamModel
-    if (this.patternStatusList && this.newCycle && !this.controlData) {
-      setTimeout(() => {
-        this.handleCurrentChange(this.patternStatusList)
-        this.handleBarrierHeight()
-      }, 400)
-    } else if ((this.controlData && this.controlData.patternid === 109) || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
-      this.handleTentivePatternData()
-    } else {
-      this.handlePatternData()
+    if (this.localPatternList) {
+      let idPattern = this.localPatternList.filter(item => item.id === this.controlData.patternid)
+      if (this.patternStatusList && this.newCycle && !this.controlData) {
+        setTimeout(() => {
+          this.handleCurrentChange(this.patternStatusList)
+          this.handleBarrierHeight()
+        }, 400)
+      } else if (idPattern.length === 0 || (this.controlData && this.showCondition) || (this.controlData && this.localPatternList.length === 0)) {
+        this.handleTentivePatternData()
+      } else {
+        this.handlePatternData()
+      }
     }
     this.PhaseDataModel = new PhaseDataModel()
     this.CrossDiagramMgr = new CrossDiagramMgr()

package/src/utils/RingDataModel.js

@@ -161,18 +161,22 @@ export default class RingDataModel {
         if (currPhase !== undefined) {
           directionList = [...currPhase.direction, ...directionList]
         }
-        for (let walk of sidewalkPhaseData) {
-          for (let ped of currPhase.peddirection) {
+        if (currPhase.peddirection) {
+          for (let walk of sidewalkPhaseData) {
+            for (let ped of currPhase.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))
-            }
+              let obj = {}
+              obj.name = walk.name
+              obj.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(obj)
+                peddirections = Array.from(new Set(peddirections))
+              }
             // }
+            }
           }
+        } else {
+          peddirections = []
         }
         for (let busPhase of busPhaseData) {
           if (stg === busPhase.phaseid) {