openatc-components 0.3.20 → 0.3.21

package/package.json

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

package/src/kisscomps/components/PhaseLegend/PhaseLegend.vue

@@ -148,11 +148,7 @@ export default {
       let list = []
       if (this.crossStatusData && this.crossStatusData.stages && this.phaseList && this.phaseList.length > 0) {
         let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
-        if (this.showDataType === 'phase') {
-          list = ringDataModel.getStageData('phase')
-        } else {
-          list = ringDataModel.getStageData()
-        }
+        list = ringDataModel.getPhaseLegendData()
         if (this.isShowCurrentStage) {
           this.currentStage = this.crossStatusData.current_stage
         }

package/src/utils/RingDataModel.js

@@ -187,13 +187,8 @@ export default class RingDataModel {
     let busPhaseData = this.getBusPos()
     let sidewalkPhaseData = this.getPedPhasePos()
     let stages
-    if (datatype === 'phase') {
-      // 如果需要按相位展示，datatype传'phase'
-      stages = data.phase.map(ele => [ele.id])
-    } else {
-      // 默认按阶段数据处理
-      stages = data.stages
-    }
+    // 按阶段数据处理
+    stages = data.stages
     for (let stage of stages) {
       let tempList = []
       let directionList = []
@@ -208,9 +203,6 @@ export default class RingDataModel {
         if (!currPhase) return
         if (currPhase !== undefined && phaseMode[0].mode !== 1) {
           directionList = [...currPhase.direction, ...directionList]
-          if (datatype === 'phase') {
-            currPhaseid = stg
-          }
         }
         if (currPhase.peddirection) {
           for (let walk of sidewalkPhaseData) {
@@ -245,9 +237,6 @@ export default class RingDataModel {
           peddirection: peddirections,
           sidewalkPhaseData: sidewalkPhaseData
         }
-        if (datatype === 'phase') {
-          temp.phaseid = currPhaseid
-        }
         return temp
       })
       if (directionList.length === 0) {
@@ -266,4 +255,77 @@ export default class RingDataModel {
     this.stagesList = JSON.parse(JSON.stringify(stagesTemp))
     return this.stagesList
   }
+  getPhaseLegendData () {
+    let data = this.crossStatusData
+    let stagesTemp = []
+    let busPhaseData = this.getBusPos()
+    let sidewalkPhaseData = this.getPedPhasePos()
+    let phaseIdList
+    phaseIdList = data.phase.map(ele => [ele.id])
+    for (let phase of phaseIdList) {
+      let tempList = []
+      let directionList = []
+      let currPhaseid = ''
+      let stageControType = 0
+      let peddirections = []
+      for (let id of phase) {
+        let phaseMode = data.phase.filter(item => item.id === id)
+        let currPhase = this.phaseList.filter((item) => {
+          return item.id === id
+        })[0]
+        if (!currPhase) return
+        if (currPhase !== undefined && phaseMode[0].mode !== 1) {
+          directionList = [...currPhase.direction, ...directionList]
+          currPhaseid = id
+        }
+        if (currPhase.peddirection) {
+          for (let walk of sidewalkPhaseData) {
+            for (let ped of currPhase.peddirection) {
+              let obj = {}
+              obj.name = walk.name
+              obj.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(obj)
+                peddirections = Array.from(new Set(peddirections))
+              }
+            }
+          }
+        } else {
+          peddirections = []
+        }
+        for (let busPhase of busPhaseData) {
+          if (id === busPhase.phaseid) {
+            stageControType = busPhase.controltype
+          }
+        }
+      }
+      directionList = [...new Set(directionList)]
+      tempList = directionList.map(dir => {
+        let temp = {
+          id: dir,
+          phaseid: currPhaseid,
+          color: '#606266',
+          controltype: stageControType,
+          peddirection: peddirections,
+          sidewalkPhaseData: sidewalkPhaseData
+        }
+        return temp
+      })
+      if (directionList.length === 0) {
+        tempList = [
+          {
+            id: -1,
+            phaseid: currPhaseid,
+            color: '#606266',
+            controltype: stageControType,
+            peddirection: peddirections,
+            sidewalkPhaseData: sidewalkPhaseData
+          }
+        ]
+      }
+      stagesTemp.push(tempList)
+    }
+    this.List = JSON.parse(JSON.stringify(stagesTemp))
+    return this.List
+  }
 }

package/src/utils/conflct.js

@@ -61,15 +61,24 @@ export async function computedRelation (id) {
     })
     delete item.conflictchannel
   })
-  const uniqueDirections = new Set()
-  const doChange = results.filter(obj => {
-    if (uniqueDirections.has(obj.direction)) {
+  // const uniqueDirections = new Set()
+  // const doChange = results.filter(obj => {
+  //   if (uniqueDirections.has(obj.direction)) {
+  //     return false
+  //   }
+  //   uniqueDirections.add(obj.direction)
+  //   return true
+  // })
+  const uniqueDirectionsAndTypes = new Set()
+  const filteredResults = results.filter(obj => {
+    const key = `${obj.direction}_${obj.type}`
+    if (uniqueDirectionsAndTypes.has(key)) {
       return false
     }
-    uniqueDirections.add(obj.direction)
+    uniqueDirectionsAndTypes.add(key)
     return true
   })
-  let result = doChange.map(item => {
+  let result = filteredResults.map(item => {
     let uniqueLaneConflictList = [...new Set(item.laneConflictList)]
     let uniquePedConflictList = [...new Set(item.pedConflictList)]
     return {

package/src/views/intersection.vue

@@ -1,30 +1,30 @@
 <template>
   <div>
     <h2 class="text">实时通道路口图</h2>
-    <!-- <channel-realtime-intersection
+    <channel-realtime-intersection
       :agentId="this.agentId"
       :roadDirection="roadDirection"
       :channelRealtimeStatusData="channelRealtimeStatusData"
-    /> -->
+    />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
     <h2 class="text">非第三方配置路口图(按通道显示相位方向)</h2>
     <intersection-direction-selection
       :agentId="this.agentId"
-      :choosedDirection="[]"
-      :choosedPedDirection="[]"
+      :choosedDirection="[14,6,13,8]"
+      :choosedPedDirection="[1]"
       :roadDirection="roadDirection"
       @handleClickCrossIcon="handleClickCrossIcon" />
 
       <h2 class="text">第三方配置路口图(按路口相位配置显示相位方向)</h2>
       <div>
-        <!-- <intersection-direction-selection
+        <intersection-direction-selection
         :agentId="this.agentId"
         thirdSignal
         :choosedDirection="[5,6,7,8,13]"
         :choosedPedDirection="[1,2]"
         :roadDirection="roadDirection"
-        @handleClickCrossIcon="handleClickCrossIcon" /> -->
+        @handleClickCrossIcon="handleClickCrossIcon" />
       </div>
 
       <!-- 显示按通道获取相位的模版路口图 -->
@@ -161,12 +161,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'cslytl',
+      agentId: 'tjblfql',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzIyMzAyMTc1NjY5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMjMwNTc3NywiaWF0IjoxNzIyMjk4NTc3fQ.sge4-AVz9QA1VJs6ZLMLm7knPLjc2kF84ahHU_cMgro',
+      Token: 'eyJraWQiOiIxNzIxOTc3OTkzMTY4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcyMTk4MTU5MywiaWF0IjoxNzIxOTc0MzkzfQ.vjgAFMJlM4FEHxT9K9lJQ_VsUx1fDubr4tYgMaVffS0',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',