openatc-components 0.4.19 → 0.4.20

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

@@ -309,6 +309,7 @@ export default {
     crossStatusData: {
       handler: function (val, oldVal) {
         // 路口状态数据
+        this.compareIsChangedPhase(val, oldVal) // 比较相位状态决定是否更新相位图标（解决虚相位显示问题，虚相位图标不显示）
         this.statusData = JSON.parse(JSON.stringify(val))
         // 默认显示相位数据（包括黄闪、全红、关灯状态下，或者匝道，均不做比对跟随相位的处理）
         this.drawDefaultPhaseIcon()
@@ -389,10 +390,26 @@ export default {
         top: '1px'
       },
       isHasCountdown: false,
-      contrloType: 'ring'
+      contrloType: 'ring',
+      isMphaseStatusDataReturnMap: new Map() // 每个跟随相位的母相位是否返回了相位状态数据
     }
   },
   methods: {
+    compareIsChangedPhase (newCrossStatus, oldCrossStatus) {
+    // 返回的相位状态改变后，按照返回的相位状态更新路口相位显示（下个周期生效）
+      let newPhaseIds = newCrossStatus.phase.map(item => item.id)
+      let oldPhaseIds = oldCrossStatus.phase.map(item => item.id)
+      if (!this.isArraysEqual(newPhaseIds, oldPhaseIds)) { // 通过比较相位id是否完全一致
+        this.getIntersectionInfo()
+      }
+    },
+    isArraysEqual (arr1, arr2) {
+      if (arr1.length !== arr2.length) return false
+      for (let i = 0; i < arr1.length; i++) {
+          if (arr1[i] !== arr2[i]) return false
+      }
+      return true
+    },
     handleTempCrossStatus (val) {
       // 模版路口图状态数据
       this.phaseStatusList = val.phase
@@ -423,6 +440,7 @@ export default {
       this.curStage = val.current_stage
       this.isHasPhase = true
       this.createPhaseStatusMap()
+      this.createOverlapPhaseStatusMap()
       // 正常情况下，获取车道相位、车道跟随相位、相位倒计时、行人相位、行人跟随相位 的状态
       this.getPhaseStatus()
       this.getOverlapPhaseStatus()
@@ -558,6 +576,7 @@ export default {
     },
     createPhaseStatusMap () {
       // 生成相位id和相位状态对应数据结构
+      this.phaseStatusMap = new Map()
       this.phaseStatusList.map(phase => {
         let phaseId = phase.id
         let phaseInfo = {
@@ -638,20 +657,38 @@ export default {
       // 如果有相同direction，处理后会改变原数组长度，导致第二次无法正确比较状态，因此需要中间变量存储
       this.comdirePhaseData = JSON.parse(JSON.stringify(this.CrossDiagramMgr.compareRepeatDirection(this.LanePhaseData, 'type', 'phase')))
     },
+    createOverlapPhaseStatusMap () {
+      // 处理跟随相位的母相位设置为忽略相位后的情况（如果跟随相位的母相位包含忽略相位，过滤掉跟随相位的状态数据，参照相位状态数据处理）
+      let isMphaseStatusDataReturn = false
+      let reset = false
+      this.overlapStatusList = this.overlapStatusList.filter(ele => {
+        let phaseids = this.phaseStatusList.map(item => item.id)
+        let mphase = ele.mphase
+        const phaseidsSet = new Set(phaseids)
+        isMphaseStatusDataReturn = mphase.every(value => phaseidsSet.has(value))
+        console.log(`跟随相位${ele.id}的母相位状态数据是否均返回?`, isMphaseStatusDataReturn)
+        if (isMphaseStatusDataReturn !== this.isMphaseStatusDataReturnMap.get(ele.id) && !reset) {
+          this.getIntersectionInfo()
+          reset = true
+        }
+        this.isMphaseStatusDataReturnMap = this.isMphaseStatusDataReturnMap.set(ele.id, isMphaseStatusDataReturn)
+        return isMphaseStatusDataReturn
+      })
+      // 得到跟随相位状态Map数据
+      this.overlapPhaseStatusMap = new Map()
+      this.overlapStatusList.map(phase => {
+        let phaseId = phase.id
+        let phaseInfo = {
+          type: phase.type,
+          phaseCountdown: phase.countdown,
+          pedtype: phase.pedtype
+        }
+        this.overlapPhaseStatusMap.set(phaseId, phaseInfo)
+      })
+    },
     getOverlapPhaseStatus () {
       // 得到车道跟随相位状态（颜色）
       this.comdireOverlapPhaseData = []
-      if (this.overlapStatusList) {
-        this.overlapStatusList.map(phase => {
-          let phaseId = phase.id
-          let phaseInfo = {
-            type: phase.type,
-            phaseCountdown: phase.countdown,
-            pedtype: phase.pedtype
-          }
-          this.overlapPhaseStatusMap.set(phaseId, phaseInfo)
-        })
-      }
       let curLanePhaseData = []
       for (let i = 0; i < this.overlapLanePhaseData.length; i++) {
         let curPhaseStatus = this.overlapPhaseStatusMap.get(this.overlapLanePhaseData[i].phaseid)
@@ -704,13 +741,23 @@ export default {
             countdownObj.phaseCountdownColor = this.ColorMap.get(phaseInfo.type)
             let curphasedir = this.phaseDirMap.get(phaseInfo.id)
             if (curphasedir !== undefined) {
-              countdownObj.showlist = curphasedir.direction.map(dir => {
+              if (curphasedir.direction && curphasedir.direction.length > 0) {
+                countdownObj.showlist = curphasedir.direction.map(dir => {
                 return {
                   id: dir,
                   peddirection: this.getshowped(curphasedir.peddirection),
                   color: '#fff'
                 }
               })
+              } else {
+                countdownObj.showlist = [
+                  {
+                  id: '',
+                  peddirection: this.getshowped(curphasedir.peddirection),
+                  color: '#fff'
+                  }
+                ]
+              }
             } else {
               countdownObj.showlist = []
             }
@@ -1084,11 +1131,11 @@ export default {
           let curPhaseStatus = this.overlapPhaseStatusMap.get(this.overlapsidewalkPhaseData[i].phaseid)
           if (!curPhaseStatus) {
             // 无状态的行人道,也显示出来
-            const data = {
-              ...this.overlapsidewalkPhaseData[i],
-              pedtype: undefined
-            }
-            curPedStatus.push(data)
+            // const data = {
+            //   ...this.overlapsidewalkPhaseData[i],
+            //   pedtype: undefined
+            // }
+            // curPedStatus.push(data)
             continue
           }
           const data = {