openatc-components 0.3.18 → 0.3.19

package/package.json

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

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

@@ -19,12 +19,15 @@
       :crossStatusData="crossStatusData"
       :agentId="agentId"
       :graphicMode="true"
-      :roadDirection="roadDirection"/>
+      :roadDirection="roadDirection"
+      :isThirdSignal="isThirdSignal"/>
 </div>
 </template>
 
 <script>
 import IntersectionMap from '../IntersectionMap/intersectionmap'
+import { queryDevice } from '../../../api/control.js'
+import { getMessageByCode } from '../../../utils/responseMessage.js'
 
 export default {
   name: 'channel-realtime-intersection',
@@ -77,19 +80,35 @@ export default {
   data () {
     return {
       reset: true,
-      crossStatusData: {}
+      crossStatusData: {},
+      isThirdSignal: false
     }
   },
   methods: {
-
+    getPlatform () {
+      queryDevice(this.agentId).then(res => {
+        if (!res.data.success) {
+          let commomMsg = this.$t('openatc.overview.signalID') + ': ' + this.AgentId
+          this.$message.error(getMessageByCode(res.data.code, this.$i18n.locale) + ' - ' + commomMsg)
+          return
+        }
+        this.platform = res.data.data.platform
+        console.log(this.platform)
+        if (this.platform !== '' && this.platform !== 'OpenATC') {
+          this.isThirdSignal = true
+        } else {
+          this.isThirdSignal = false
+        }
+        if (this.thirdSignal) {
+          this.isThirdSignal = this.thirdSignal
+        }
+      })
+    }
   },
   created () {
   },
   mounted () {
-    // setTimeout(() => {
-    // 模拟
-    //   this.crossStatusData = JSON.parse(JSON.stringify(this.channelRealtimeStatusData))
-    // }, 3000)
+    this.getPlatform()
     this.crossStatusData = JSON.parse(JSON.stringify(this.channelRealtimeStatusData))
   },
   destroyed () {

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

@@ -287,64 +287,15 @@ export default {
         this.statusData = JSON.parse(JSON.stringify(val))
         // 默认显示相位数据（包括黄闪、全红、关灯状态下，或者匝道，均不做比对跟随相位的处理）
         this.drawDefaultPhaseIcon()
-
-        if (this.channelType) {
-          // 通道路口图状态数据
+        if (this.channelType && !this.isThirdSignal) {
+          // 通道路口图状态数据（实时通道展示排除第三方信号机，第三方信号机还是按模版路口一样展示相位状态）
           this.channelStatusList = val.channellamp
           this.createChannelStatusMap()
           this.getChannelPhaseStatus()
           this.getChannelPedStatus()
           return
         }
-
-        // 模版路口图状态数据
-        this.phaseStatusList = val.phase
-        this.overlapStatusList = val.overlap
-        if (val.control === 1 || val.control === 2 || val.control === 3) {
-          // 黄闪、全红、关灯属于特殊控制，优先级最高，直接改变灯色，不用判断phase里的type，也不需要考虑跟随相位的灯色优先级
-          if (val.control === 1) {
-            this.getYellowFlashColor()
-          } else {
-            this.SpecialControl(val)
-          }
-          this.isHasPhase = false
-          return
-        }
-        if (!val.phase && !this.overlapStatusList) {
-          // 非特殊控制，相位和跟随相位不存在的情况下，灯色恢复默认
-          this.handleSpecialControlStatus('默认')
-          this.isHasPhase = false
-          return
-        }
-        if (val.control === 16) {
-          // 方向锁定时，相位状态显示与通道无关，显示接口返回的红灯会有歧义，此处特殊处理显示默认白色
-          this.handleSpecialControlStatus('方向锁定')
-          this.isHasPhase = false
-          return
-        }
-        this.curPhase = val.current_phase
-        this.isHasPhase = true
-        this.createPhaseStatusMap()
-        // 正常情况下，获取车道相位、车道跟随相位、相位倒计时、行人相位、行人跟随相位 的状态
-        this.getPhaseStatus()
-        this.getOverlapPhaseStatus()
-        this.getCurPhaseCountdown()
-        this.getBusPhaseStatus()
-        if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
-          // 城市道路和路段行人过街才显示人行道状态
-          this.getpedStatus()
-          this.getOverlapPedStatus()
-          // 算法对比行人相位与行人跟随相位的状态
-          this.comparePedStatus()
-          // 算法对比车道相位与车道跟随相位的状态
-          this.comparePhaseStatus()
-        }
-        // console.log('this.phaseStatusMap 相位状态映射', this.phaseStatusMap)
-        // console.log('LanePhaseData 车道相位', this.LanePhaseData)
-        // console.log('sidewalkPhaseData 行人相位', this.sidewalkPhaseData)
-        // console.log('overlapPhaseStatusMap 跟随相位状态映射', this.overlapPhaseStatusMap)
-        // console.log('overlapLanePhaseData 车道跟随相位', this.overlapLanePhaseData)
-        // console.log('this.overlapsidewalkPhaseData 行人跟随相位', this.overlapsidewalkPhaseData)
+        this.handleTempCrossStatus(val)
       },
       // 深度观察监听
       deep: true
@@ -414,6 +365,56 @@ export default {
     }
   },
   methods: {
+    handleTempCrossStatus (val) {
+      // 模版路口图状态数据
+      this.phaseStatusList = val.phase
+      this.overlapStatusList = val.overlap
+      if (val.control === 1 || val.control === 2 || val.control === 3) {
+        // 黄闪、全红、关灯属于特殊控制，优先级最高，直接改变灯色，不用判断phase里的type，也不需要考虑跟随相位的灯色优先级
+        if (val.control === 1) {
+          this.getYellowFlashColor()
+        } else {
+          this.SpecialControl(val)
+        }
+        this.isHasPhase = false
+        return
+      }
+      if (!val.phase && !this.overlapStatusList) {
+        // 非特殊控制，相位和跟随相位不存在的情况下，灯色恢复默认
+        this.handleSpecialControlStatus('默认')
+        this.isHasPhase = false
+        return
+      }
+      if (val.control === 16) {
+        // 方向锁定时，相位状态显示与通道无关，显示接口返回的红灯会有歧义，此处特殊处理显示默认白色
+        this.handleSpecialControlStatus('方向锁定')
+        this.isHasPhase = false
+        return
+      }
+      this.curPhase = val.current_phase
+      this.isHasPhase = true
+      this.createPhaseStatusMap()
+      // 正常情况下，获取车道相位、车道跟随相位、相位倒计时、行人相位、行人跟随相位 的状态
+      this.getPhaseStatus()
+      this.getOverlapPhaseStatus()
+      this.getCurPhaseCountdown()
+      this.getBusPhaseStatus()
+      if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
+        // 城市道路和路段行人过街才显示人行道状态
+        this.getpedStatus()
+        this.getOverlapPedStatus()
+        // 算法对比行人相位与行人跟随相位的状态
+        this.comparePedStatus()
+        // 算法对比车道相位与车道跟随相位的状态
+        this.comparePhaseStatus()
+      }
+      // console.log('this.phaseStatusMap 相位状态映射', this.phaseStatusMap)
+      // console.log('LanePhaseData 车道相位', this.LanePhaseData)
+      // console.log('sidewalkPhaseData 行人相位', this.sidewalkPhaseData)
+      // console.log('overlapPhaseStatusMap 跟随相位状态映射', this.overlapPhaseStatusMap)
+      // console.log('overlapLanePhaseData 车道跟随相位', this.overlapLanePhaseData)
+      // console.log('this.overlapsidewalkPhaseData 行人跟随相位', this.overlapsidewalkPhaseData)
+    },
     init () {
       this.CrossDiagramMgr = new CrossDiagramMgr()
       this.getRoadDirection()
@@ -729,40 +730,43 @@ export default {
           this.getChannelInfo()
           return
         }
-        if (this.channelType) {
+        if (this.channelType && !this.isThirdSignal) {
           this.getChannelInfo()
           return
         }
-        this.crossInfo = res.data.data.param
-        this.crossInfo.phaseList.forEach(cross => this.phaseDirMap.set(cross.id, {direction: cross.direction, peddirection: cross.peddirection}))
-        if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
-          // 城市道路加载车道相位坐标和人行道坐标
-          this.getPhasePos()
-          this.getOverlapPhasePos()
-          this.getPedPhasePos()
-          this.getOverlapPedPhasePos()
-          if (!this.isVipRoute) {
-            this.getBusPos()
-          }
-        }
-        if (!this.isVipRoute && this.mainType === '103') {
-          // 获取匝道道路的主路和支路的相位坐标
-          this.getRampPhasePos()
-        }
+        this.getTempCrossInfo(res)
+      })
+    },
+    getTempCrossInfo (res) {
+      this.crossInfo = res.data.data.param
+      this.crossInfo.phaseList.forEach(cross => this.phaseDirMap.set(cross.id, {direction: cross.direction, peddirection: cross.peddirection}))
+      if (this.mainType === '100' || this.mainType === '101' || this.mainType === '104') {
+        // 城市道路加载车道相位坐标和人行道坐标
+        this.getPhasePos()
+        this.getOverlapPhasePos()
+        this.getPedPhasePos()
+        this.getOverlapPedPhasePos()
         if (!this.isVipRoute) {
-          this.drawDefaultPhaseIcon()
+          this.getBusPos()
         }
-        if (this.isVipRoute && this.isThirdSignal) {
-          this.LanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
-          // console.log(this.LanePhaseData)
-          this.sidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
-          let allDir = this.LanePhaseData.map(ele => ele.id)
-          let allPedDir = this.sidewalkPhaseData.map(ele => ele.id)
-          this.inneChoosedDirection = this.choosedDirection.filter(dir => allDir.indexOf(dir) !== -1)
-          this.inneChoosedPedDirection = this.choosedPedDirection.filter(dir => allPedDir.indexOf(dir) !== -1)
-          this.drawPhaseIcon()
-        }
-      })
+      }
+      if (!this.isVipRoute && this.mainType === '103') {
+        // 获取匝道道路的主路和支路的相位坐标
+        this.getRampPhasePos()
+      }
+      if (!this.isVipRoute) {
+        this.drawDefaultPhaseIcon()
+      }
+      if (this.isVipRoute && this.isThirdSignal) {
+        this.LanePhaseData = this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')
+        // console.log(this.LanePhaseData)
+        this.sidewalkPhaseData = this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')
+        let allDir = this.LanePhaseData.map(ele => ele.id)
+        let allPedDir = this.sidewalkPhaseData.map(ele => ele.id)
+        this.inneChoosedDirection = this.choosedDirection.filter(dir => allDir.indexOf(dir) !== -1)
+        this.inneChoosedPedDirection = this.choosedPedDirection.filter(dir => allPedDir.indexOf(dir) !== -1)
+        this.drawPhaseIcon()
+      }
     },
     getBusPos () {
       // 公交相位信息

package/src/views/intersection.vue

@@ -161,12 +161,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '12007_001',
+      agentId: '12008_ticp',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzIxODAwODA0MzQxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTgwNDQwNCwiaWF0IjoxNzIxNzk3MjA0fQ.HrNlQ_mgyoHFwtyCO77W1efPcyAHH6BwgImWRXjGE-8',
+      Token: 'eyJraWQiOiIxNzIxOTcwMTEzMTMwIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk3MzcxMywiaWF0IjoxNzIxOTY2NTEzfQ.aT14xZel09fHji-SrPMDTPAxISEUS8Y6KF30BWjCGKY',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -209,6 +209,72 @@ export default {
         }
       ],
       crossStatusData: {},
+      crossStatusDataMock:
+        {
+          'agentid': '12008_ticp',
+          'operation': 'get-request',
+          'infotype': 'status/pattern',
+          'data': {
+            'phase': [
+              {
+                'id': 1,
+                'type': 1,
+                'pedtype': 1
+              },
+              {
+                'id': 3,
+                'type': 1,
+                'pedtype': 1
+              },
+              {
+                'id': 4,
+                'type': 1,
+                'pedtype': 1
+              },
+              {
+                'id': 6,
+                'type': 3,
+                'pedtype': 3
+              }
+            ],
+            'mode': 0,
+            'control': 5,
+            'patternid': 2,
+            'cycle': 141,
+            'stages': [
+              [
+                1
+              ],
+              [
+                4,
+                3
+              ],
+              [
+                6
+              ]
+            ],
+            'stages_len': [
+              70,
+              25,
+              46
+            ],
+            'stages_seq': [
+              1,
+              2,
+              3
+            ],
+            'current_stage': 3,
+            'current_stagecd': 15,
+            'offset': 0,
+            'current_phase': [
+              6
+            ],
+            'next_phase': [
+              1
+            ],
+            'curTime': 127
+          }
+        },
       channelRealtimeStatusData: {
         'channellamp': [
           {
@@ -402,6 +468,9 @@ export default {
     }
     this.getTscControlData()
     this.getCurPhaseDirection()
+    // setTimeout(() => {
+    //   this.crossStatusData = this.crossStatusDataMock.data
+    // }, 1000)
   },
   destroyed () {
   }