openatc-components 0.4.56 → 0.4.58

package/src/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/src/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)
+  }
 }

package/src/views/intersection.vue

@@ -33,17 +33,19 @@
     <!-- <intersection-base-map
             ref="intersectionMap"
             :crossStatusData="crossStatusData"
-            agentId="tjblsxl-ticp6"
+            agentId="1059"
             isVipRoute
             :choosedDirection="[1,2,3]"
             :choosedPedDirection="[3,4]"
             :roadDirection="roadDirection" /> -->
-      <!-- <intersection-direction-selection
-            :agentId="this.agentId"
+      <el-button @click="refresh">刷新特勤路口底图</el-button>
+      <intersection-direction-selection
+            ref="selectMap"
+            :agentId="1059"
             :clickMode="false"
             :choosedDirection="[14,6,13,8]"
             :choosedPedDirection="[1]"
-            :roadDirection="roadDirection" /> -->
+            :roadDirection="roadDirection" />
 
       <!-- <button @click="lockPhase" >相位锁定</button><br/>
       <button @click="unlockPhase" >解锁相位</button><br/>
@@ -167,7 +169,7 @@ export default {
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzQxNjcxODYyMDI2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0MTY3NTQ2MiwiaWF0IjoxNzQxNjY4MjYyfQ.IcB4eEk2j5WFpgIwUYhu0w5sbbR9rYZNxyS9wnmGJZI',
+      Token: 'eyJraWQiOiIxNzQ0MTgzMDYxNjg4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTc0NDE4NjY2MiwiaWF0IjoxNzQ0MTc5NDYyfQ.g8_cn1W12VbwxJyLybxczBULqsOyKyw30s1scdcP8Ro',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',
@@ -450,6 +452,9 @@ export default {
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {
       console.log('handleClickCrossIcon', allChoosedDir, curClickedPhase)
+    },
+    refresh () {
+      this.$refs.selectMap.refresh()
     }
   },
   created () {

package/static/apiconfig.json

@@ -457,5 +457,10 @@
   "key": "getPermission",
   "url": "/auth/role/",
   "method": "get"
+},
+{
+  "key": "getValidDirections",
+  "url": "/devs/validdirections",
+  "method": "get"
 }
 ]