openatc-components 0.2.79 → 0.2.81

package/package/kisscomps/components/ChannelRealtimeIntersection/ChannelRealtimeIntersection.vue

@@ -87,8 +87,9 @@ export default {
   },
   mounted () {
     // setTimeout(() => {
+    // 模拟
     //   this.crossStatusData = JSON.parse(JSON.stringify(this.channelRealtimeStatusData))
-    // }, 1500)
+    // }, 3000)
     this.crossStatusData = JSON.parse(JSON.stringify(this.channelRealtimeStatusData))
   },
   destroyed () {

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

@@ -281,16 +281,17 @@ export default {
         this.statusData = JSON.parse(JSON.stringify(val))
         // 默认显示相位数据（包括黄闪、全红、关灯状态下，或者匝道，均不做比对跟随相位的处理）
         this.drawDefaultPhaseIcon()
+
         if (this.channelType) {
+          // 通道路口图状态数据
           this.channelStatusList = val.channellamp
-          // 显示实时通道状态
           this.createChannelStatusMap()
           this.getChannelPhaseStatus()
-          // this.getChannelPedStatus()
-          // this.getChannelCountdown()
+          this.getChannelPedStatus()
           return
         }
 
+        // 模版路口图状态数据
         this.phaseStatusList = val.phase
         this.overlapStatusList = val.overlap
         if (val.control === 1 || val.control === 2 || val.control === 3) {
@@ -1046,12 +1047,17 @@ export default {
             ele.realdir.forEach((dir, index) => {
               // 行人相位
               if (this.sidewalkDir.indexOf(dir) === -1 && this.PhaseDataModel.getSidePos(dir)) {
-                this.sidewalkPhaseData.push({
+                let obj = {
                   key: this.CrossDiagramMgr.getUniqueKey('pedphase') + `-${this.agentId}`,
                   channelid: ele.id, // 通道id
                   id: dir,
                   name: this.PhaseDataModel.getSidePos(dir).name
-                })
+                }
+                if (this.channelType) {
+                  obj.left = this.PhaseDataModel.getSidePos(dir).x
+                  obj.top = this.PhaseDataModel.getSidePos(dir).y
+                }
+                this.sidewalkPhaseData.push(obj)
               }
             })
             realpeddirarr = Array.from(new Set(realpeddirarr.concat(ele.realdir)))
@@ -1182,12 +1188,13 @@ export default {
       this.channelStatusList.map(channel => {
         let channelId = channel.id
         let channelInfo = {
-          type: channel.light
+          light: channel.light
         }
         this.channelStatusMap.set(channelId, channelInfo)
       })
     },
     getChannelPhaseStatus () {
+      // 通道相位机动车状态
       this.comdirePhaseData = []
       let curLanePhaseData = []
       for (let i = 0; i < this.LanePhaseData.length; i++) {
@@ -1195,15 +1202,40 @@ export default {
         if (!curPhaseStatus) continue
         const data = {
           ...this.LanePhaseData[i],
-          type: curPhaseStatus.type,
-          color: this.ColorMap.get(curPhaseStatus.type),
-          // phaseCountdown: curPhaseStatus.phaseCountdown,
-          flag: 'channel' // 车道相位数据标识
+          type: curPhaseStatus.light,
+          color: this.ColorMap.get(curPhaseStatus.light),
+          flag: 'phasechannel' // 车道相位数据标识
         }
         curLanePhaseData.push(data)
       }
       this.LanePhaseData = JSON.parse(JSON.stringify(curLanePhaseData))
       this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
+    },
+    getChannelPedStatus () {
+      // 通道行人相位状态
+      let curPedStatus = []
+      for (let i = 0; i < this.sidewalkPhaseData.length; i++) {
+        console.log(this.sidewalkPhaseData[i])
+        if (this.sidewalkPhaseData[i].channelid) {
+          let curPhaseStatus = this.channelStatusMap.get(this.sidewalkPhaseData[i].channelid)
+          if (!curPhaseStatus) continue
+          const data = {
+            ...this.sidewalkPhaseData[i],
+            pedtype: curPhaseStatus.light,
+            color: this.ColorMap.get(curPhaseStatus.light),
+            flag: 'pedchannel' // 行人相位数据标识
+          }
+          curPedStatus.push(data)
+        } else {
+          // 无状态的行人道
+          const data = {
+            ...this.sidewalkPhaseData[i],
+            pedtype: undefined
+          }
+          curPedStatus.push(data)
+        }
+      }
+      this.compSidewalkPhaseData = JSON.parse(JSON.stringify(curPedStatus))
     }
   },
   mounted () {