openatc-components 0.4.57 → 0.4.59

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

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

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/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -11,33 +11,8 @@
  **/
 <template>
     <div class="main-patternstatus">
-      <!-- rcp模式 -->
-      <div v-if="patternType === 'rcp'">
-        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
-          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
-              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
-              v-for="(item, index2) in list" :key="index2">
-            <div class="first-1" :style="{ width:
-                  (Number(item.greenWidth.replace('%', '')) /
-                    Number((((item.split + (item.sum ? item.sum : 0)) /
-                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
-            </div>
-            <el-tooltip placement="top-start" effect="light">
-                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
-                <div v-if="item.id" style="cursor: pointer">
-                  <div
-                    class="box"
-                    style="position: absolute; width:40px; left: 0; top: 5px"
-                  >
-                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
-                  </div>
-                </div>
-              </el-tooltip>
-          </div>
-      </div>
-      </div>
       <!-- 环模式true -->
-      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
+      <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
             <div style="position: relative;" :style="{'height': '35px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode === 7 ? 'direction' : isBorder ? 'hovercell' : ''">
@@ -159,7 +134,6 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
-      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -196,9 +170,6 @@ export default {
     controlPhase: {
       type: Object
     },
-    patternType: {
-      type: String
-    },
     contrloType: {
       type: String
     },
@@ -371,9 +342,6 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
       },
       // 深度观察监听
       deep: true
@@ -398,9 +366,6 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           // setTimeout(() => {
@@ -433,9 +398,6 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
-    if (this.patternType === 'rcp') {
-      this.handleRcp(this.patternStatusList)
-    }
   },
   methods: {
     move (e) {
@@ -523,48 +485,6 @@ export default {
       }
       return ped
     },
-    handleRcp (val) {
-      this.patternRcp = []
-      let valSplit = val.map(item => {
-        return item.map(val => {
-          return val.splitchain
-        })
-      })
-      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
-        return item.length > 0 ? item.reduce((a, b) => {
-          return a + b
-        }) : 0
-      }) : 0
-      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
-      for (let rings of val) {
-        if (rings.length === 0) continue
-        let list = []
-        for (let ring of rings) {
-          if (ring.splitchain === 0) continue
-          let obj = {}
-          let split = ring.splitchain
-          obj.split = split
-          obj.cycle = cycle
-          obj.id = ring.phases
-          // if (ring.sum) {
-          //   obj.sum = ring.sum
-          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // } else {
-          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // }
-          // obj.mode = ring.mode
-          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
-          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // 忽略相位不显示
-          // let mode = ring.mode
-          // if (mode !== 7) { // 忽略相位不显示
-          list.push(obj)
-          // }
-        }
-        this.patternRcp.push(list)
-      }
-    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)

package/src/kisscomps/components/patternList/patternList.vue

@@ -3,7 +3,6 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
-    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :isBorder="isBorder"
@@ -553,9 +552,6 @@ export default {
     patternStatusList: {
       type: Array
     },
-    patternType: {
-      type: String
-    },
     patternId: {
       type: Number
     },

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"
 }
 ]