openatc-components 0.2.19 → 0.2.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.2.19",
+  "version": "0.2.21",
   "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/IntersectionDirectionSelection/IntersectionDirectionSelection.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="intersection-direction-selection">
     <intersection-base-map
-            v-if="!isSpecialIntersection && reset"
+            v-if="!isSpecialIntersection"
             ref="intersectionMap2"
             :crossStatusData="crossStatusData"
             :agentId="agentId"
             isVipRoute
-            :clickMode="clickMode"
+            clickMode
             :isThirdSignal="isThirdSignal"
             :choosedDirection="choosedDirection"
             :choosedPedDirection="choosedPedDirection"
             :roadDirection="roadDirection"
             @handleClickCrossIcon="handleClickCrossIcon" />
     <direction-list-configuration
-      v-if="isSpecialIntersection && clickMode && reset"
+      v-if="isSpecialIntersection"
       :agentId="agentId"
       :isThirdSignal="isThirdSignal"
       :choosedDirection="choosedDirection"
@@ -35,8 +35,7 @@ export default {
     return {
       crossStatusData: {},
       isSpecialIntersection: false,
-      isThirdSignal: false,
-      reset: true
+      isThirdSignal: false
     }
   },
   props: {
@@ -56,23 +55,6 @@ export default {
     },
     thirdSignal: { // 是否是第三方平台（可以直接传，也可以内部接口判断）
       type: Boolean
-    },
-    clickMode: {
-      type: Boolean,
-      default: true
-    }
-  },
-  watch: {
-    agentId: {
-      handler: function (val, oldVal) {
-        if (val) {
-          this.reset = false
-          this.$nextTick(() => {
-            this.reset = true
-            this.initSelection()
-          })
-        }
-      }
     }
   },
   methods: {
@@ -131,22 +113,15 @@ export default {
     },
     handleClickCrossIcon (allChoosedDir, curClickedPhase) {
       this.$emit('handleClickCrossIcon', allChoosedDir, curClickedPhase)
-    },
-    initSelection () {
-      this.getIntersectionInfo()
-      this.getPlatform()
     }
   },
   mounted () {
-    this.initSelection()
+    this.getIntersectionInfo()
+    this.getPlatform()
   },
   destroyed () {
   }
 }
 </script>
 <style lang='scss'>
-  .intersection-direction-selection {
-    width: 100%;
-    height: 100%
-  }
 </style>

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/OverLap/OverLap.vue

@@ -47,7 +47,8 @@ export default {
   },
   data () {
     return {
-      overlapDatas: []
+      overlapDatas: [],
+      max: ''
     }
   },
   props: {
@@ -67,6 +68,10 @@ export default {
       type: Boolean,
       default: false
     },
+    cycleChange: {
+      type: Boolean,
+      default: true
+    },
     cycle: {
       type: Number
     },
@@ -82,6 +87,13 @@ export default {
       // 深度观察监听
       deep: true
     },
+    cycleChange: {
+      handler: function (val, oldVal) {
+        this.doAdd(this.stageList, this.overlap)
+      },
+      // 深度观察监听
+      deep: true
+    },
     stageList: {
       handler: function (val, oldVal) {
         this.doAdd(this.stageList, this.overlap)
@@ -140,6 +152,15 @@ export default {
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
         findIndexs = Array.from(new Set(findIndexs))
+        if (this.cycleChange) {
+          const globalParamModel = this.$store.getters.globalParamModel
+          let pattern = globalParamModel.getParamsByType('patternList')
+          const allCycle = pattern.map(item => item.cycle)
+          let cycle = Math.max(...allCycle)
+          this.max = cycle
+        } else {
+          this.max = ''
+        }
         return {
           ...item,
           peddirection: this.getPedPhasePos(item.peddirection),
@@ -150,8 +171,8 @@ export default {
               ...sta,
               direction: this.getRoad(item),
               // peddirection: this.getPedPhasePos(item.peddirection),
-              greenWidth: find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%',
-              redWidth: !find ? (sta.split / this.cycle * 100).toFixed(3) + '%' : '0%'
+              greenWidth: find ? (sta.split / (this.max ? this.max : this.cycle) * 100).toFixed(3) + '%' : '0%',
+              redWidth: !find ? (sta.split / (this.max ? this.max : this.cycle) * 100).toFixed(3) + '%' : '0%'
             }
           })
         }

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

@@ -53,7 +53,7 @@
           <div class="curTimeLine" :style="{'left':paddingLeft, 'height':barrierHeight}"></div>
         </div>
       </div>
-      <div v-if="this.contrloType === 'stage'">
+      <div v-if="this.contrloType === 'stage'" class="ring-first">
         <div v-for="(list, index1) in stageLists" :key="index1">
           <!-- <div> -->
             <div class="first-1" :style="{'width':list.greenWidth,'height':'34px','position':'relative','background':'#7ccc66'}">
@@ -215,7 +215,7 @@ export default {
       handler: function (val, oldVal) {
         if (val && val.curTime) {
           this.curtime = val.curTime
-          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+          if (val.control === 4 || val.control === 16 || val.control === 22) {
             this.isControl = false
           } else {
             this.isControl = true
@@ -244,7 +244,7 @@ export default {
         }
         if (val && val.curTime) {
           this.curtime = val.curTime
-          if (val.control === '相位锁定' || val.control === '通道锁定' || val.control === '阶段锁定') {
+          if (val.control === 4 || val.control === 16 || val.control === 22) {
             this.isControl = false
           } else {
             this.isControl = true
@@ -432,9 +432,9 @@ export default {
     },
     getStage () {
       if (!this.stagesChange) return
-      // const globalParamModel = this.$store.getters.globalParamModel
-      // let pattern = globalParamModel.getParamsByType('patternList')
-      let mapAdd = this.allPatternList.map(item => item.stagesList).map(item => {
+      const globalParamModel = this.$store.getters.globalParamModel
+      let pattern = globalParamModel.getParamsByType('patternList')
+      let mapAdd = (this.allPatternList ? this.allPatternList : pattern).map(item => item.stagesList).map(item => {
         return item.map(val => {
           return val.stageSplit ? val.stageSplit : val.split
         })
@@ -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 () {
       // 公交相位信息
@@ -1052,9 +1050,9 @@ export default {
           this.fillGap(ringTeams, val)
         }
         if (this.cycleChange) {
-          // const globalParamModel = this.$store.getters.globalParamModel
-          // let pattern = globalParamModel.getParamsByType('patternList')
-          const allCycle = this.patternList.map(item => item.cycle)
+          const globalParamModel = this.$store.getters.globalParamModel
+          let pattern = globalParamModel.getParamsByType('patternList')
+          const allCycle = pattern.map(item => item.cycle)
           let cycle = Math.max(...allCycle)
           this.max = cycle
         } else {
@@ -1063,7 +1061,7 @@ export default {
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {
-          return (j / (this.max ? this.max : this.newCycle) * 100) + '%'
+          return (j / (this.max ? this.max : cycle) * 100) + '%'
         })
         // this.barrierList.unshift(0)
       }

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

@@ -510,9 +510,9 @@ export default {
               data[key] = that.ParamsModeEn.get(0)
             }
           }
-          if (key === 'control') {
-            data[key] = that.ParamsControlEn.get(data[key])
-          }
+          // if (key === 'control') {
+          //   data[key] = that.ParamsControlEn.get(data[key])
+          // }
           if (key === 'phase') {
             for (let val of data[key]) {
               val.type = that.phaseTypeEn.get(val.type)

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

@@ -94,7 +94,6 @@
     </el-row>
     <el-row>
       <el-radio
-        style="margin-left: 30px"
         v-model="isRing"
         :label="false"
         @change="changeRing"
@@ -113,7 +112,7 @@
       <pattern-list
         :key="keyChange"
         :allPatternList="allPatternList"
-        :contrloType="!this.isRing ? 'ring' : 'stage'"
+        :contrloType="contrloType"
         :stagesChange="
           patternOne.length === 0
             ? planPattern.stagesList
@@ -390,6 +389,7 @@ export default {
         group: 'pattern'
       },
       max: '',
+      contrloType: '',
       patternCycleEqual: true,
       activeList: 'ring',
       isRing: false,
@@ -417,6 +417,25 @@ export default {
       this.handleStageData(this.planPattern.rings)
     }
     this.initData()
+    if (!this.allPatternList[0].contrloType && this.allPatternList[0].rings.length > 0) {
+      this.contrloType = 'ring'
+    } else if (!this.allPatternList[0].contrloType && this.allPatternList[0].rings.length === 0) {
+      this.contrloType = 'stage'
+    } else {
+      this.contrloType = this.allPatternList[0].contrloType
+    }
+    for (let i = 0; i < this.allPatternList.length; i++) {
+      if (this.allPatternList[i].contrloType === 'stage' || (this.isRing && !this.allPatternList[i].contrloType)) {
+        this.isRing = true
+        // this.setStageList(this.allPatternList[i].stagesList, this.allPatternList[i].id)
+      } else if (this.allPatternList[i].contrloType === 'ring' || (!this.isRing && !this.allPatternList[i].contrloType && this.allPatternList[i].rings.length > 0)) {
+        this.isRing = false
+        // this.handleStageData(this.allPatternList[i].rings)
+      } else if (this.allPatternList[i].rings.length === 0 && this.allPatternList[i].stagesList.length > 0) {
+        this.isRing = true
+        // this.setStageList(this.allPatternList[i].stagesList, this.allPatternList[i].id)
+      }
+    }
   },
   methods: {
     addStage (row) {
@@ -448,7 +467,7 @@ export default {
       }
     },
     changeRing () {
-      // this.contrloType = 'stage'
+      this.contrloType = 'ring'
       this.isRing = false
       // const globalParamModel = this.$store.getters.globalParamModel
       // let pattern = globalParamModel.getParamsByType('patternList')
@@ -468,7 +487,11 @@ export default {
       // }
     },
     changeStage () {
+      this.contrloType = 'stage'
       this.isRing = true
+      this.patternOne = this.allPatternList.filter(item => {
+        return item.id === Number(this.manualInfo.tempPatternid)
+      })
       this.getStageCycle()
     },
     getStageCycle () {
@@ -849,14 +872,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/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/src/views/intersection.vue

@@ -9,19 +9,13 @@
 
     <!-- 显示按通道获取相位的模版路口图 -->
     <h2 class="text">显示配置的相位路口图</h2>
-    <!-- <intersection-base-map
+    <intersection-base-map
             ref="intersectionMap"
             :crossStatusData="crossStatusData"
-            agentId="tjblsxl-ticp6"
+            agentId="bclgkxl"
             isVipRoute
             :choosedDirection="[1,2,3]"
             :choosedPedDirection="[3,4]"
-            :roadDirection="roadDirection" /> -->
-      <intersection-direction-selection
-            :agentId="this.agentId"
-            :clickMode="false"
-            :choosedDirection="[14,6,13,8]"
-            :choosedPedDirection="[1]"
             :roadDirection="roadDirection" />
 
     <!-- 按通道获取相位的方向选择列表，特殊路口显示列表，普通路口显示模版路口图 -->
@@ -137,14 +131,14 @@ export default {
   name: 'demo',
   data () {
     return {
-      roadDirection: 'right',
+      roadDirection: 'left',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: 'tjblsxl-ticp6',
+      agentId: 'bclgkxl',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzE0MDk1MjUwNTU5IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTcxNDEzODQ1MCwiaWF0IjoxNzE0MDk1MjUwfQ.17SP6vzbImSV2jy_LC10xQaH7z4aXWvg3yc2bUFLYvE',
+      Token: 'eyJraWQiOiIxNzEwNzU4MTU3Njk0IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiIxMjM0NTYiLCJleHAiOjE3MTM4ODgwMDAsImlhdCI6MTcxMDY5MTIwMH0.vicLABPjoZEWmHr12-5FXMbjYmEKv-WSTVRROR1eOME',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

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%;