openatc-components 0.2.15 → 0.2.16

package/package.json

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

package/src/EdgeMgr/controller/crossDiagramMgr.js

@@ -41,6 +41,7 @@ export default class crossDiagramMgr extends EdgeModelBase {
         if (n === num) {
           // 相同方向，进行相位和跟随相位的比对算法
           if (iscomparestatus === 'nostatus') {
+            // nostatus没有状态数据，则返回相位、跟随相位按方向去重后合集
             concatarr.push(obj)
             continue
           }

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

@@ -276,9 +276,7 @@ export default {
         this.phaseStatusList = val.phase
         this.overlapStatusList = val.overlap
         // 默认显示相位数据（包括黄闪、全红、关灯状态下，或者匝道，均不做比对跟随相位的处理）
-        this.compLanePhaseData = JSON.parse(JSON.stringify(this.LanePhaseData))
-        this.compSidewalkPhaseData = JSON.parse(JSON.stringify(this.sidewalkPhaseData))
-        this.comdireBusPhaseData = JSON.parse(JSON.stringify(this.busPhaseData))
+        this.drawDefaultPhaseIcon()
         if (val.control === 1 || val.control === 2 || val.control === 3) {
           // 黄闪、全红、关灯属于特殊控制，优先级最高，直接改变灯色，不用判断phase里的type，也不需要考虑跟随相位的灯色优先级
           if (val.control === 1) {
@@ -387,6 +385,14 @@ export default {
       this.PhaseDataModel = new PhaseDataModel(this.roadDirection)
       this.getIntersectionInfo() // 获取路口信息
     },
+    drawDefaultPhaseIcon () {
+      this.compLanePhaseData = JSON.parse(JSON.stringify(this.CrossDiagramMgr.compare(this.LanePhaseData, this.overlapLanePhaseData, 'type', 'nostatus')))
+      this.compSidewalkPhaseData = JSON.parse(JSON.stringify(this.CrossDiagramMgr.compare(this.sidewalkPhaseData, this.overlapsidewalkPhaseData, 'pedtype', 'nostatus')))
+      this.comdireBusPhaseData = JSON.parse(JSON.stringify(this.busPhaseData))
+      console.log(this.LanePhaseData)
+      console.log(this.overlapLanePhaseData)
+      console.log('###################', this.compLanePhaseData)
+    },
     comparePhaseStatus () {
       // 对比车道： 跟随相位和相位的状态数据（此处判断是为了保证被比较的数据direction都是唯一的）
       if (!this.comdirePhaseData && !this.comdireOverlapPhaseData) {
@@ -498,39 +504,51 @@ export default {
     getYellowFlashColor () {
       // 车道相位（左行右行）
       let curLanePhaseData = []
-      for (let i = 0; i < this.LanePhaseData.length; i++) {
+      for (let i = 0; i < this.compLanePhaseData.length; i++) {
         const data = {
-          ...this.LanePhaseData[i],
+          ...this.compLanePhaseData[i],
           type: '黄闪',
           control: 1
         }
         curLanePhaseData.push(data)
       }
-      this.LanePhaseData = JSON.parse(JSON.stringify(curLanePhaseData))
+      this.compLanePhaseData = JSON.parse(JSON.stringify(curLanePhaseData))
 
       // 行人相位
       let curPedStatus = []
-      for (let i = 0; i < this.sidewalkPhaseData.length; i++) {
+      for (let i = 0; i < this.compSidewalkPhaseData.length; i++) {
         const data = {
-          ...this.sidewalkPhaseData[i],
+          ...this.compSidewalkPhaseData[i],
           pedtype: '黄闪',
           control: 1
         }
         curPedStatus.push(data)
       }
-      this.sidewalkPhaseData = JSON.parse(JSON.stringify(curPedStatus))
+      this.compSidewalkPhaseData = JSON.parse(JSON.stringify(curPedStatus))
 
       // 公交相位
       let curBusLanePhaseData = []
-      for (let i = 0; i < this.busPhaseData.length; i++) {
+      for (let i = 0; i < this.comdireBusPhaseData.length; i++) {
         const data = {
-          ...this.busPhaseData[i],
+          ...this.comdireBusPhaseData[i],
           type: '黄闪',
           control: 1
         }
         curBusLanePhaseData.push(data)
       }
-      this.busPhaseData = JSON.parse(JSON.stringify(curBusLanePhaseData))
+      this.comdireBusPhaseData = JSON.parse(JSON.stringify(curBusLanePhaseData))
+
+      if (this.mainType === '103') {
+        // 匝道相位
+        if (this.LanePhaseData.length) {
+          const LanePhaseData = this.LanePhaseData.map(data => ({
+            ...data,
+            type: '黄闪',
+            control: 1
+          }))
+          this.LanePhaseData = JSON.parse(JSON.stringify(LanePhaseData))
+        }
+      }
     },
     getPhaseStatus () {
       // 得到车道相位状态（颜色）
@@ -666,6 +684,9 @@ export default {
           // 获取匝道道路的主路和支路的相位坐标
           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)
@@ -793,8 +814,6 @@ export default {
           })
         }
       })
-      // 行人相位无，也要显示人行横道，与车道相位显示与否逻辑不同
-      // this.handleCompleteSidewalkPhase()
     },
     getOverlapPedPhasePos () {
       // 行人跟随相位信息
@@ -817,25 +836,6 @@ export default {
         }
       })
     },
-    // handleCompleteSidewalkPhase () {
-    //   // 没有相位状态的车道也要显示，默认白色
-    //   let hasDirIds = this.sidewalkPhaseData.map(data => data.id)
-    //   let allIds = []
-    //   for (let key of this.PhaseDataModel.SidePosMap.keys()) {
-    //     allIds.push(key)
-    //   }
-    //   let diffIds = allIds.filter(function (val) { return hasDirIds.indexOf(val) === -1 })
-    //   diffIds.forEach(id => {
-    //     this.sidewalkPhaseData.push({
-    //       key: `${this.sidewalkPhaseData.length + 1}`,
-    //       phaseid: undefined, // 相位id，用于对应相位状态
-    //       id,
-    //       name: this.PhaseDataModel.getSidePos(id).name,
-    //       left: this.PhaseDataModel.getSidePos(id).x,
-    //       top: this.PhaseDataModel.getSidePos(id).y
-    //     })
-    //   })
-    // },
     getCrossType () {
       // 路口类型对应底图决策
       if (this.mainType === '101') {

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -444,7 +444,6 @@ export default {
           return a + b
         }) : 0
       }) : 0
-      console.log(maxCycle, 'maxCycle')
       let stageMaxCyle = Math.max(...maxCycle)// 每个环的周期最大值
       if (!this.cycleChange) {
         let stageCycleList = this.stagesChange.map(item => {
@@ -464,7 +463,6 @@ export default {
           redWidth: (item.red / stageMaxCyle * 100).toFixed(3) + '%'
         }
       })
-      console.log(this.stageLists, '011')
     },
     getBusPos () {
       // 公交相位信息

package/src/kisscomps/components/SchemeConfig/tentativeplancontrolmodal/index.vue

@@ -469,6 +469,9 @@ export default {
     },
     changeStage () {
       this.isRing = true
+      this.patternOne = this.allPatternList.filter(item => {
+        return item.id === Number(this.manualInfo.tempPatternid)
+      })
       this.getStageCycle()
     },
     getStageCycle () {
@@ -849,14 +852,14 @@ export default {
         setTimeout(() => {
           this.handleStageData(currPattern)
           this.getCycles()
-          this.patternOne[0].stagesList = this.stagesList
+          // this.patternOne[0].stagesList = this.stagesList
         }, 50)
       } else {
         let currPattern = this.planPattern.rings
         setTimeout(() => {
           this.handleStageData(currPattern)
           this.getCycle()
-          this.allPatternList[0].stagesList = this.stagesList
+          // this.allPatternList[0].stagesList = this.stagesList
         }, 50)
       }
     },

package/static/styles/schemeconfig.scss

@@ -342,12 +342,17 @@
     margin: 10px auto;
     color: $--color-text-primary;
   }
+  .stage-panel-contener {
+    display: flex;
+    align-items: center;
+    flex-wrap: wrap;
+  }
   .optimizetype {
     color: $--color-text-primary;
   }
-  .todo {
-    float: left;
-  }
+  // .todo {
+  //   float: left;
+  // }
   .stage-item {
     cursor: pointer;
     width: 100%;