openatc-components 0.5.44 → 0.5.46

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

@@ -433,6 +433,9 @@ export default {
   },
   methods: {
     compareIsChangedPhase (newCrossStatus, oldCrossStatus) {
+      if (!oldCrossStatus || !newCrossStatus) return
+      if (!newCrossStatus.phase) return
+      if (!oldCrossStatus.phase) return
       if (newCrossStatus.control === 1 || newCrossStatus.control === 2 || newCrossStatus.control === 3) return
     // 返回的相位状态改变后，按照返回的相位状态更新路口相位显示（下个周期生效）
       let newPhaseIds = newCrossStatus.phase.map(item => item.id)
@@ -492,7 +495,9 @@ export default {
       this.getOverlapPhaseStatus()
       this.getRoadwayLightStatus()
       this.getCurPhaseCountdown()
-      this.getCurStageCountdown()
+      if (this.isHasStageCountdown) {
+        this.getCurStageCountdown()
+      }
       this.getBusPhaseStatus()
       if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
         // 城市道路和路段行人过街才显示人行道状态
@@ -852,7 +857,7 @@ export default {
     stagesList () {
       let list = []
       this.isHasStageCountdown = false
-      if (this.crossStatusData && this.crossStatusData.stages && this.crossInfo.phaseList && this.crossInfo.phaseList.length > 0) {
+      if (this.crossStatusData && this.crossStatusData.stages && this.crossInfo && this.crossInfo.phaseList && this.crossInfo.phaseList.length > 0) {
         this.isHasStageCountdown = true
         let ringDataModel = new RingDataModel(this.crossStatusData, this.crossInfo.phaseList)
         list = ringDataModel.getStageData()
@@ -890,11 +895,14 @@ export default {
       // console.log(this.stageCountdownList)
     },
     getshowped (peddirection) {
-      let peddirarr = peddirection.map(peddir => ({
-        id: peddir,
-        name: this.PhaseDataModel.getSidePos(peddir).name,
-        color: 'rgba(255, 255, 255, 0.4)'
-      }))
+      let peddirarr = []
+      if (peddirection) {
+        peddirection.map(peddir => ({
+          id: peddir,
+          name: this.PhaseDataModel.getSidePos(peddir).name,
+          color: 'rgba(255, 255, 255, 0.4)'
+        }))
+      }
       return peddirarr
     },
     getIntersectionInfo () {
@@ -1025,20 +1033,22 @@ export default {
       this.busPhaseData = []
       this.crossInfo.phaseList.forEach((ele, i) => {
         if (ele.controltype >= 3 && ele.controltype <= 6) {
-          ele.direction.forEach((dir, index) => {
-          // 车道相位
-            this.busPhaseData.push({
-              key: this.CrossDiagramMgr.getUniqueKey('busphase'),
-              phaseid: ele.id, // 相位id，用于对应相位状态
-              id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-              name: this.PhaseDataModel.getBusPhasePos(dir).name,
-              left: this.PhaseDataModel.getBusPhasePos(dir).x,
-              top: this.PhaseDataModel.getBusPhasePos(dir).y,
-              busleft: this.PhaseDataModel.getBusMapPos(dir).x,
-              bustop: this.PhaseDataModel.getBusMapPos(dir).y,
-              controltype: ele.controltype
+          if (ele.direction) {
+            ele.direction.forEach((dir, index) => {
+            // 车道相位
+              this.busPhaseData.push({
+                key: this.CrossDiagramMgr.getUniqueKey('busphase'),
+                phaseid: ele.id, // 相位id，用于对应相位状态
+                id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
+                name: this.PhaseDataModel.getBusPhasePos(dir).name,
+                left: this.PhaseDataModel.getBusPhasePos(dir).x,
+                top: this.PhaseDataModel.getBusPhasePos(dir).y,
+                busleft: this.PhaseDataModel.getBusMapPos(dir).x,
+                bustop: this.PhaseDataModel.getBusMapPos(dir).y,
+                controltype: ele.controltype
+              })
             })
-          })
+          }
         }
       })
       // 去掉重复方向的数据
@@ -1055,17 +1065,19 @@ export default {
       this.LanePhaseData = []
       this.crossInfo.phaseList.forEach((ele, i) => {
         if (ele.controltype === undefined || ele.controltype <= 2) {
-          ele.direction.forEach((dir, index) => {
-          // 车道相位
-            this.LanePhaseData.push({
-              key: this.CrossDiagramMgr.getUniqueKey('phase'),
-              phaseid: ele.id, // 相位id，用于对应相位状态
-              id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
-              name: this.PhaseDataModel.getPhase(dir).name,
-              left: this.PhaseDataModel.getPhase(dir).x,
-              top: this.PhaseDataModel.getPhase(dir).y
+          if (ele.direction) {
+            ele.direction.forEach((dir, index) => {
+            // 车道相位
+              this.LanePhaseData.push({
+                key: this.CrossDiagramMgr.getUniqueKey('phase'),
+                phaseid: ele.id, // 相位id，用于对应相位状态
+                id: dir, // 接口返回的dir字段，对应前端定义的相位方向id，唯一标识
+                name: this.PhaseDataModel.getPhase(dir).name,
+                left: this.PhaseDataModel.getPhase(dir).x,
+                top: this.PhaseDataModel.getPhase(dir).y
+              })
             })
-          })
+          }
         }
       })
       // 去掉重复方向的数据
@@ -1098,14 +1110,16 @@ export default {
       // 匝道车道相位信息
       this.LanePhaseData = []
       this.crossInfo.phaseList.forEach((ele, i) => {
-        ele.direction.forEach((dir, index) => {
-          if (ele.controltype === 0) {
-            this.handleRampPhasePosData(`${i}-${index}`, ele, dir, this.PhaseDataModel.getMainPhasePos)
-          }
-          if (ele.controltype === 1) {
-            this.handleRampPhasePosData(`${i}-${index}`, ele, dir, this.PhaseDataModel.getSidePhasePos)
-          }
-        })
+        if (ele.direction) {
+          ele.direction.forEach((dir, index) => {
+            if (ele.controltype === 0) {
+              this.handleRampPhasePosData(`${i}-${index}`, ele, dir, this.PhaseDataModel.getMainPhasePos)
+            }
+            if (ele.controltype === 1) {
+              this.handleRampPhasePosData(`${i}-${index}`, ele, dir, this.PhaseDataModel.getSidePhasePos)
+            }
+          })
+        }
       })
       // 去掉重复方向的数据
       this.LanePhaseData = Array.from(new Set(this.LanePhaseData.map(item => item.id)))

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

@@ -698,7 +698,7 @@ export default {
         let currPhase = this.phaseList.filter((item) => {
           return item.id === stg
         })[0]
-        if (currPhase !== undefined && currPhase.direction) {
+        if (currPhase !== undefined) {
           directionList.push(...currPhase.direction)
           directionList = Array.from(new Set(directionList))
         }