openatc-components 0.4.56 → 0.4.58

package/package/kisscomps/components/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -141,6 +141,10 @@ export default {
     initSelection () {
       this.getIntersectionInfo()
       this.getPlatform()
+    },
+    refresh () {
+      // 刷新底图
+      this.$refs.intersectionMap2.resetCrossDiagram()
     }
   },
   mounted () {

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

@@ -94,6 +94,10 @@
           <BusMapSvg v-for="(item, index) in comdireBusPhaseData" :key="'Busmap-' + item.key + '-' + index" :Data="item" />
           <PhaseIconSvg v-for="(item, index) in comdireBusPhaseData" :key="item.key + '-' + index" :Data="item"/>
         </div>
+        <!-- 有效方向 -->
+        <div  v-if="isVipRoute" class="effectDir">
+          <PhaseIconSvg v-for="(item, index) in effectDirData" :key="item.key + '-' + index" :Data="item" />
+        </div>
       </div>
       <!-- 匝道状态 -->
         <!-- 车道相位 -->
@@ -200,6 +204,7 @@ import { getMessageByCode } from '../../../../utils/responseMessage.js'
 
 import CrossDirectionConflictList from '../../../../utils/conflictList.js'
 import RingDataModel from '../../../../utils/RingDataModel.js'
+import { getValidDirections } from '../../../../api/cross.js'
 
 export default {
   name: 'crossDiagram',
@@ -395,7 +400,8 @@ export default {
       isHasStageCountdown: false,
       contrloType: 'ring',
       isMphaseStatusDataReturnMap: new Map(), // 每个跟随相位的母相位是否返回了相位状态数据
-      overlapStatusCompareSum: 0 // 首次加载跳过比较母相位状态数据是否返回
+      overlapStatusCompareSum: 0, // 首次加载跳过比较母相位状态数据是否返回
+      effectDirData: [] // 路口有效方向
     }
   },
   methods: {
@@ -859,6 +865,9 @@ export default {
         // 获取车道相位、行人相位信息（坐标、名称）
         this.mainType = this.tempType.split('-')[0]
         this.mainDirection = this.tempType.split('-')[1]
+        if (this.isVipRoute) {
+          this.getValidDirections()
+        }
         if (this.isVipRoute && !this.isThirdSignal) {
           // 特勤、分组管控下，非第三方设备，按通道显示相位方向；第三方设备还是按路口相位配置显示相位方向
           this.getChannelInfo()
@@ -1066,6 +1075,21 @@ export default {
       this.overlapsidewalkPhaseData = Array.from(new Set(this.overlapsidewalkPhaseData.map(item => item.id)))
         .map(id => this.overlapsidewalkPhaseData.find(item => item.id === id))
     },
+    getEffectDirectionPos () {
+      this.effectDirData = []
+      // this.effectiveDirection = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16]
+      this.effectiveDirection.forEach((dir, i) => {
+        this.effectDirData.push({
+          key: this.CrossDiagramMgr.getUniqueKey('effectiveDir'),
+          id: dir,
+          name: this.PhaseDataModel.getEffectPos(dir).name,
+          left: this.PhaseDataModel.getEffectPos(dir).x,
+          top: this.PhaseDataModel.getEffectPos(dir).y,
+          color: 'rgba(9, 31, 64, 0.5)'
+        })
+      })
+      console.log(this.effectDirData)
+    },
     getCrossType () {
       // 路口类型对应底图决策
       if (this.mainType === '101') {
@@ -1459,6 +1483,16 @@ export default {
         }
       }
       this.compSidewalkPhaseData = JSON.parse(JSON.stringify(curPedStatus))
+    },
+    getValidDirections () {
+      getValidDirections(this.agentId).then((data) => {
+        if (!data.data.success) {
+          this.$message.error(getMessageByCode(data.data.code, this.$i18n.locale))
+          return
+        }
+        this.effectiveDirection = data.data.data.validDirections || []
+        this.getEffectDirectionPos()
+      })
     }
   },
   mounted () {

package/package/kisscomps/components/IntersectionMap/crossDirection/posJson/effectPos.json

@@ -0,0 +1,115 @@
+{
+  "effectDirectionList": [{
+      "id": 1,
+      "name": "东直行",
+      "ename": "East-Straight",
+      "x": "530px",
+      "y": "267px"
+    },
+    {
+      "id": 2,
+      "name": "东左转",
+      "ename": "East-Left",
+      "x": "530px",
+      "y": "297px"
+    },
+    {
+      "id": 3,
+      "name": "东右转",
+      "ename": "East-Right",
+      "x": "530px",
+      "y": "238px"
+    },
+    {
+      "id": 4,
+      "name": "东掉头",
+      "ename": "East-Back",
+      "x": "530px",
+      "y": "325px"
+    },
+    {
+      "id": 5,
+      "name": "西直行",
+      "ename": "West-Straight",
+      "x": "306px",
+      "y": "359px"
+    },
+    {
+      "id": 6,
+      "name": "西左转",
+      "ename": "West-Left",
+      "x": "306px",
+      "y": "329px"
+    },
+    {
+      "id": 7,
+      "name": "西右转",
+      "ename": "West-Right",
+      "x": "306px",
+      "y": "388px"
+    },
+    {
+      "id": 8,
+      "name": "西掉头",
+      "ename": "West-Back",
+      "x": "306px",
+      "y": "300px"
+    },
+    {
+      "id": 9,
+      "name": "北直行",
+      "ename": "North-Straight",
+      "x": "379px",
+      "y": "196px"
+    },
+    {
+      "id": 10,
+      "name": "北左转",
+      "ename": "North-Left",
+      "x": "408px",
+      "y": "196px"
+    },
+    {
+      "id": 11,
+      "name": "北右转",
+      "ename": "North-Right",
+      "x": "348px",
+      "y": "196px"
+    },
+    {
+      "id": 12,
+      "name": "北掉头",
+      "ename": "North-Back",
+      "x": "436px",
+      "y": "196px"
+    },
+    {
+      "id": 13,
+      "name": "南直行",
+      "ename": "South-Straight",
+      "x": "470px",
+      "y": "421px"
+    },
+    {
+      "id": 14,
+      "name": "南左转",
+      "ename": "South-Left",
+      "x": "440px",
+      "y": "421px"
+    },
+    {
+      "id": 15,
+      "name": "南右转",
+      "ename": "South-Right",
+      "x": "500px",
+      "y": "421px"
+    },
+    {
+      "id": 16,
+      "name": "南掉头",
+      "ename": "South-Back",
+      "x": "412px",
+      "y": "421px"
+    }
+  ]
+}

package/package/kisscomps/components/IntersectionMap/crossDirection/utils.js

@@ -19,6 +19,7 @@ export default class PhaseDataModel {
     this.RampSidePosMap = new Map() // 匝道支路坐标
     this.BusMapMap = new Map() // 公交相位底图坐标
     this.BusPhaseMap = new Map() // 公交相位坐标
+    this.EffectPosMap = new Map() // 有效方向坐标
     this.roadDirection = roadDirection
     this.Init()
   }
@@ -28,6 +29,7 @@ export default class PhaseDataModel {
     let rampJson = require('./posJson/rampPos.json')
     let busMapJson = require('./posJson/busPos.json').busMap
     let busPhaseJson = require('./posJson/busPos.json').busphases
+    let effectJson = require('./posJson/effectPos.json').effectDirectionList
     if (this.roadDirection === 'left') {
       phaseJson = require('./posJson/phasePos.left.json').phaseList
       busMapJson = require('./posJson/busPos.left.json').busMap
@@ -39,6 +41,7 @@ export default class PhaseDataModel {
     this.handlePos(rampJson.rampSidePhaseList, this.RampSidePosMap)
     this.handlePos(busMapJson, this.BusMapMap)
     this.handlePos(busPhaseJson, this.BusPhaseMap)
+    this.handlePos(effectJson, this.EffectPosMap)
   }
 
   handlePos (phaseJson, phaseMap) {
@@ -81,4 +84,8 @@ export default class PhaseDataModel {
   getBusPhasePos (id) {
     return this.BusPhaseMap.get(id)
   }
+
+  getEffectPos (id) {
+    return this.EffectPosMap.get(id)
+  }
 }