openatc-components 0.4.18 → 0.4.20

package/package.json

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

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

@@ -309,6 +309,7 @@ export default {
     crossStatusData: {
       handler: function (val, oldVal) {
         // 路口状态数据
+        this.compareIsChangedPhase(val, oldVal) // 比较相位状态决定是否更新相位图标（解决虚相位显示问题，虚相位图标不显示）
         this.statusData = JSON.parse(JSON.stringify(val))
         // 默认显示相位数据（包括黄闪、全红、关灯状态下，或者匝道，均不做比对跟随相位的处理）
         this.drawDefaultPhaseIcon()
@@ -389,10 +390,26 @@ export default {
         top: '1px'
       },
       isHasCountdown: false,
-      contrloType: 'ring'
+      contrloType: 'ring',
+      isMphaseStatusDataReturnMap: new Map() // 每个跟随相位的母相位是否返回了相位状态数据
     }
   },
   methods: {
+    compareIsChangedPhase (newCrossStatus, oldCrossStatus) {
+    // 返回的相位状态改变后，按照返回的相位状态更新路口相位显示（下个周期生效）
+      let newPhaseIds = newCrossStatus.phase.map(item => item.id)
+      let oldPhaseIds = oldCrossStatus.phase.map(item => item.id)
+      if (!this.isArraysEqual(newPhaseIds, oldPhaseIds)) { // 通过比较相位id是否完全一致
+        this.getIntersectionInfo()
+      }
+    },
+    isArraysEqual (arr1, arr2) {
+      if (arr1.length !== arr2.length) return false
+      for (let i = 0; i < arr1.length; i++) {
+          if (arr1[i] !== arr2[i]) return false
+      }
+      return true
+    },
     handleTempCrossStatus (val) {
       // 模版路口图状态数据
       this.phaseStatusList = val.phase
@@ -423,6 +440,7 @@ export default {
       this.curStage = val.current_stage
       this.isHasPhase = true
       this.createPhaseStatusMap()
+      this.createOverlapPhaseStatusMap()
       // 正常情况下，获取车道相位、车道跟随相位、相位倒计时、行人相位、行人跟随相位 的状态
       this.getPhaseStatus()
       this.getOverlapPhaseStatus()
@@ -558,6 +576,7 @@ export default {
     },
     createPhaseStatusMap () {
       // 生成相位id和相位状态对应数据结构
+      this.phaseStatusMap = new Map()
       this.phaseStatusList.map(phase => {
         let phaseId = phase.id
         let phaseInfo = {
@@ -638,20 +657,38 @@ export default {
       // 如果有相同direction，处理后会改变原数组长度，导致第二次无法正确比较状态，因此需要中间变量存储
       this.comdirePhaseData = JSON.parse(JSON.stringify(this.CrossDiagramMgr.compareRepeatDirection(this.LanePhaseData, 'type', 'phase')))
     },
+    createOverlapPhaseStatusMap () {
+      // 处理跟随相位的母相位设置为忽略相位后的情况（如果跟随相位的母相位包含忽略相位，过滤掉跟随相位的状态数据，参照相位状态数据处理）
+      let isMphaseStatusDataReturn = false
+      let reset = false
+      this.overlapStatusList = this.overlapStatusList.filter(ele => {
+        let phaseids = this.phaseStatusList.map(item => item.id)
+        let mphase = ele.mphase
+        const phaseidsSet = new Set(phaseids)
+        isMphaseStatusDataReturn = mphase.every(value => phaseidsSet.has(value))
+        console.log(`跟随相位${ele.id}的母相位状态数据是否均返回?`, isMphaseStatusDataReturn)
+        if (isMphaseStatusDataReturn !== this.isMphaseStatusDataReturnMap.get(ele.id) && !reset) {
+          this.getIntersectionInfo()
+          reset = true
+        }
+        this.isMphaseStatusDataReturnMap = this.isMphaseStatusDataReturnMap.set(ele.id, isMphaseStatusDataReturn)
+        return isMphaseStatusDataReturn
+      })
+      // 得到跟随相位状态Map数据
+      this.overlapPhaseStatusMap = new Map()
+      this.overlapStatusList.map(phase => {
+        let phaseId = phase.id
+        let phaseInfo = {
+          type: phase.type,
+          phaseCountdown: phase.countdown,
+          pedtype: phase.pedtype
+        }
+        this.overlapPhaseStatusMap.set(phaseId, phaseInfo)
+      })
+    },
     getOverlapPhaseStatus () {
       // 得到车道跟随相位状态（颜色）
       this.comdireOverlapPhaseData = []
-      if (this.overlapStatusList) {
-        this.overlapStatusList.map(phase => {
-          let phaseId = phase.id
-          let phaseInfo = {
-            type: phase.type,
-            phaseCountdown: phase.countdown,
-            pedtype: phase.pedtype
-          }
-          this.overlapPhaseStatusMap.set(phaseId, phaseInfo)
-        })
-      }
       let curLanePhaseData = []
       for (let i = 0; i < this.overlapLanePhaseData.length; i++) {
         let curPhaseStatus = this.overlapPhaseStatusMap.get(this.overlapLanePhaseData[i].phaseid)
@@ -704,13 +741,23 @@ export default {
             countdownObj.phaseCountdownColor = this.ColorMap.get(phaseInfo.type)
             let curphasedir = this.phaseDirMap.get(phaseInfo.id)
             if (curphasedir !== undefined) {
-              countdownObj.showlist = curphasedir.direction.map(dir => {
+              if (curphasedir.direction && curphasedir.direction.length > 0) {
+                countdownObj.showlist = curphasedir.direction.map(dir => {
                 return {
                   id: dir,
                   peddirection: this.getshowped(curphasedir.peddirection),
                   color: '#fff'
                 }
               })
+              } else {
+                countdownObj.showlist = [
+                  {
+                  id: '',
+                  peddirection: this.getshowped(curphasedir.peddirection),
+                  color: '#fff'
+                  }
+                ]
+              }
             } else {
               countdownObj.showlist = []
             }
@@ -1084,11 +1131,11 @@ export default {
           let curPhaseStatus = this.overlapPhaseStatusMap.get(this.overlapsidewalkPhaseData[i].phaseid)
           if (!curPhaseStatus) {
             // 无状态的行人道,也显示出来
-            const data = {
-              ...this.overlapsidewalkPhaseData[i],
-              pedtype: undefined
-            }
-            curPedStatus.push(data)
+            // const data = {
+            //   ...this.overlapsidewalkPhaseData[i],
+            //   pedtype: undefined
+            // }
+            // curPedStatus.push(data)
             continue
           }
           const data = {

package/src/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -116,7 +116,7 @@ export default {
       //   left: '1px',
       //   top: '0px'
       // },
-      tableHeight: 300,
+      tableHeight: 400,
       typeOptions: [{
         value: 'flow-split-opt'
       }, {

package/src/utils/errorcode.js

@@ -13,6 +13,8 @@ let errorCodeMap = new Map([
   [112, '所有环不能同时配一个相位'],
   [113, '环索引应从1开始配置'],
   [114, '环索引应连续配置'],
+  [115, '绿脉冲时间应该大于绿闪时间'],
+  [116, '行人绿脉冲应该大于行人清空时间'],
   [201, '跟随相位数量超出限值'],
   [202, '跟随相位的母相位为空'],
   [203, '跟随相位配置未知母相位'],
@@ -101,6 +103,8 @@ let errorCodeMapEn = new Map([
   [112, 'All rings cannot be equipped with only one phase'],
   [113, 'The ring index should be configured from 1'],
   [114, 'The ring index shall be configured continuously'],
+  [115, 'The green pulse time should be greater than the green flash time'],
+  [116, 'The pedestrian green pulse should be greater than the pedestrian clearing time'],
   [201, 'The number of following phases exceeds the limit'],
   [202, 'The mother phase following the phase is null'],
   [203, 'Follow the phase configuration with an agnostic phase'],

package/src/views/intersection.vue

@@ -162,12 +162,12 @@ export default {
     return {
       roadDirection: 'right',
       // reqUrl: 'http://192.168.13.103:10003/openatc',
-      agentId: '32050101041121000001',
+      agentId: 'jmlfql',
       // agentId: '13013',
       // agentId: '12007_390',
       // agentId: '12014',
       reqUrl: 'http://192.168.13.103:10003/openatc',
-      Token: 'eyJraWQiOiIxNzMwODU1NTQ1NzA3IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczMDg1OTE0NSwiaWF0IjoxNzMwODUxOTQ1fQ.CBl61S3eRifl4qEtTmgVjOZGo2hqNSGQKPxG1bN-utU',
+      Token: 'eyJraWQiOiIxNzM5NDEyMzIwNjMxIiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJhZG1pbiIsImV4cCI6MTczOTQxNTkyMCwiaWF0IjoxNzM5NDA4NzIwfQ.QkbGd0aKSZOI3K8zDk_UZOCGtdS6lZBlg97H6GnfxCk',
       // agentId: '30003-352',
       // reqUrl: 'https://kints-dev.devdolphin.com/openatc',
       // Token: 'eyJraWQiOiIxNjUwNTA5MDI2ODk2IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.eyJzdWIiOiJ4aWFvbWluZyIsImV4cCI6MTczNjkwOTAyNiwiaWF0IjoxNjUwNTA5MDI2fQ.-s4T-uMRmB2zf9yer87USKQXLY1a12Zq5lCOnqjNmfA',

package/package/kisscomps/components/OptimizeKanban/index.js

@@ -1,2 +0,0 @@
-import OptimizeKanban from './OptimizeKanban.vue'
-export default OptimizeKanban

package/package/kisscomps/components/OptimizeKanban/index.vue

@@ -1,369 +0,0 @@
-/**
- * Copyright (c) 2020 kedacom
- * OpenATC is licensed under Mulan PSL v2.
- * You can use this software according to the terms and conditions of the Mulan PSL v2.
- * You may obtain a copy of Mulan PSL v2 at:
- * http://license.coscl.org.cn/MulanPSL2
- * THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
- * EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
- * MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
- * See the Mulan PSL v2 for more details.
- **/
-<template>
-<div class="kanbanOptimize">
-    <div v-if="this.nowNumber === 1" class="optimizetype">
-        <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
-        <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
-            <el-option
-                v-for="item in typeOptions"
-                :key="item.value"
-                :label="$t('openatccomponents.overview.type' + item.value)"
-                :value="item.value"
-                >
-            </el-option>
-            </el-select>
-            <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
-            <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
-        <!-- <el-button type="primary" @click="onOptimizeClick()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
-    </div>
-  <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px',marginLeft:this.nowNumber === 1 ? 0 : 0}">
-    <div class="common-board-column-header">
-      {{headerText}}
-    </div>
-    <div class="openatccomponents-board-table-header">
-      <el-row :gutter="13">
-        <el-col :span="4">{{this.$t('openatccomponents.overview.phase')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.flow')}}
-        </el-col>
-        <el-col :span="10">{{this.$t('openatccomponents.overview.saturationflow')}}
-        </el-col>
-      </el-row>
-    </div>
-    <draggable
-      class="common-board-column-content"
-      :list="list"
-      :options="options">
-      <div class="common-board-item" v-for="element in list" :key="element.id">
-        <el-row :gutter="13">
-          <el-col :span="4">
-            <el-tooltip class="item" effect="dark" placement="left">
-              <div slot="content">{{element.name}}</div>
-              <div class="common-phase-description">
-                <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
-              </div>
-            </el-tooltip>
-        </el-col>
-        <el-col :span="10">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.flowperhour" ref="type" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        <el-col :span="10">
-            <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="element.saturation" ref="types" :disabled="element.mode === 7"></el-input-number>
-        </el-col>
-        </el-row>
-      </div>
-    </draggable>
-  </div>
-</div>
-</template>
-<script>
-import draggable from 'vuedraggable'
-import { getDuration } from '@/api/cross'
-import xdrdirselector from '@/components/XRDDirSelector'
-
-export default {
-  name: 'patternOptimize',
-  components: {
-    draggable,
-    xdrdirselector
-  },
-  data () {
-    return {
-      showStyle: {
-        left: '7px',
-        top: '0px'
-      },
-      styles: {
-        left: '7px',
-        top: '0px'
-      },
-      typeOptions: [{
-        value: 'flow-split-opt'
-      }, {
-        value: 'cycle-opt'
-      }],
-      value: 'flow-split-opt',
-      optimizecycle: 0
-    }
-  },
-  props: {
-    headerText: {
-      type: String,
-      default: 'Header'
-    },
-    id: {
-      type: Number
-    },
-    rings: {
-      type: Array
-    },
-    nowNumber: {
-      type: Number
-    },
-    phaseList: {
-      type: Array
-    },
-    options: {
-      type: Object,
-      default () {
-        return {}
-      }
-    },
-    list: {
-      type: Array,
-      default () {
-        return []
-      }
-    },
-    // index: {
-    //   type: Number
-    // },
-    ISActiveMask: {
-      type: Boolean,
-      default: true
-    },
-    // 当phase的描述为空时，显示的图形颜色。
-    MaskColor: {
-      type: String,
-      default: '#000000'
-    }
-  },
-  created () {
-    // this.addMinSplit()
-    this.addMin()
-  },
-  computed () {
-
-  },
-  watch: {
-    list: {
-      handler: function () {
-        // let list = this.$refs.type
-        // let flow = this.$refs.types
-        // console.log(this.list, 'list')
-        // let cycle = 0
-        // let n = this.index
-        // for (let i = 0; i < list.length; i++) {
-        //   cycle = cycle + Number(list[i].currentValue)
-        // }
-        // const globalParamModel = this.$store.getters.globalParamModel
-        // // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
-        // let pattern = globalParamModel.getParamsByType('patternList')[n]
-        // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-        // this.addMinSplit()
-        // this.$emit('handleSplit', n)
-      },
-      deep: true
-    }
-  },
-  methods: {
-    onOptimizeClick () {
-      let msg = this.$t('openatccomponents.pattern.algorithmEngineOptimization')
-      const loading = this.$loading({
-        lock: true,
-        text: msg,
-        spinner: 'el-icon-loading',
-        background: 'rgba(0, 0, 0, 0.7)'
-      })
-      setTimeout(() => {
-        loading.close()
-        this.handeleOptimizeClick()
-      }, 1000)
-    },
-    handeleOptimizeClick () {
-      let newPha = []
-      for (let i = 0; i < this.rings.length; i++) {
-        newPha.push(...this.rings[i])
-      }
-      let phaseData = newPha.map(item => {
-        return {
-          id: item.id,
-          flowperhour: item.flowperhour,
-          saturation: item.saturation
-        }
-      })
-      let patternList = this.$store.state.globalParam.tscParam.patternList
-      let pattern = patternList.filter((item) => item.id === this.id)[0]
-      let reqData = {
-        'type': this.value,
-        'optcycle': this.optimizecycle ? this.optimizecycle : 0,
-        'phaseList': this.phaseList,
-        'pattern': pattern,
-        'phases': phaseData
-      }
-      let isValidata = []
-      for (let j = 0; j < newPha.length; j++) {
-        let comNum = (newPha[j].length / 4) * 1700 * 0.8
-        isValidata.push(newPha[j].flowperhour > comNum)
-      }
-      if (isValidata.includes(true)) {
-        this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
-          this.$t('openatccomponents.common.alarm'), {
-            confirmButtonText: this.$t('eopenatccomponentsdge.common.confirm'),
-            cancelButtonText: this.$t('openatccomponents.common.cancel'),
-            type: 'warning'
-          }).then(() => {
-          getDuration(reqData).then(data => {
-            if (data.data.success) {
-              this.$message({
-                type: 'success',
-                message: this.$t('openatccomponents.pattern.success')
-              })
-              for (let i = 0; i < this.rings.length; i++) {
-                for (let j = 0; j < this.rings[i].length; j++) {
-                  for (let h = 0; h < data.data.data.phase.length; h++) {
-                    if (this.rings[i][j].id === data.data.data.phase[h].id) {
-                      this.rings[i][j].value = data.data.data.phase[h].duration
-                      // this.rings[i][j].cycle = data.data.data.phase[h].cycle
-                    }
-                  }
-                }
-              }
-            }
-          }).catch(error => {
-            console.log(error)
-          })
-        }).catch(() => {
-        })
-      } else {
-        getDuration(reqData).then(data => {
-          if (data.data.success) {
-            this.$message({
-              type: 'success',
-              message: this.$t('openatccomponents.pattern.success')
-            })
-            for (let i = 0; i < this.rings.length; i++) {
-              for (let j = 0; j < this.rings[i].length; j++) {
-                for (let h = 0; h < data.data.data.phase.length; h++) {
-                  if (this.rings[i][j].id === data.data.data.phase[h].id) {
-                    this.rings[i][j].value = data.data.data.phase[h].duration
-                    // this.rings[i][j].cycle = data.data.data.phase[h].cycle
-                  }
-                }
-              }
-            }
-          }
-        }).catch(error => {
-          console.log(error)
-        })
-      }
-    },
-    addMin () {
-      for (let i of this.list) {
-        if (!i.flowperhour || !i.saturation) {
-          i.length = this.list.length
-          i.flowperhour = 0
-          i.saturation = 1700
-        }
-      }
-    }
-    // addMinSplit () {
-    //   const globalParamModel = this.$store.getters.globalParamModel
-    //   let phaseList = globalParamModel.getParamsByType('phaseList')
-    //   for (let ls of this.list) {
-    //     let phase = phaseList.filter((item) => {
-    //       return item.id === ls.id
-    //     })[0]
-    //     if (!phase.redyellow) {
-    //       phase.redyellow = 0
-    //     }
-    //     if (!phase.yellow) {
-    //       phase.yellow = 0
-    //     }
-    //     if (!phase.redclear) {
-    //       phase.redclear = 0
-    //     }
-    //     if (!phase.flashgreen) {
-    //       phase.flashgreen = 0
-    //     }
-    //     if (!phase.phasewalk) {
-    //       phase.phasewalk = 0
-    //     }
-    //     if (!phase.pedclear) {
-    //       phase.pedclear = 0
-    //     }
-    //     // let temp1 = phase.redyellow + phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
-    //     // let temp2 = phase.phasewalk + phase.pedclear
-    //     // if (temp1 > temp2) {
-    //     //   ls.minSplit = temp1
-    //     // } else {
-    //     //   ls.minSplit = temp2
-    //     // }
-    //     // if (ls.mode !== 7 && ls.value < ls.minSplit) {
-    //     //   ls.value = ls.minSplit
-    //     // }
-    //     // let temp1 = phase.yellow + phase.redclear + phase.flashgreen // 绿信比的最小值要大于最小绿+黄灯+全红+绿闪
-    //     let temp1 = phase.yellow + phase.redclear + phase.mingreen
-    //     let temp2 = phase.yellow + phase.redclear + phase.phasewalk + phase.pedclear
-    //     ls.minSplit = temp1 > temp2 ? temp1 : temp2
-    //     if (ls.mode !== 7 && ls.value < ls.minSplit) {
-    //       ls.value = ls.minSplit
-    //       this.$message.error(this.$t('openatccomponents.pattern.splitCheckMsg'))
-    //     }
-    //   }
-    // },
-    // getMaxCycle (pattern) {
-    //   let rings = pattern.rings
-    //   let maxCycle = 0
-    //   for (let ring of rings) {
-    //     if (ring.length === 0) continue
-    //     let cycle = 0
-    //     for (let r of ring) {
-    //       if (r.mode === 7) { // 忽略相位不计周期
-    //         continue
-    //       }
-    //       cycle = cycle + r.value
-    //     }
-    //     if (cycle > maxCycle) {
-    //       maxCycle = cycle
-    //     }
-    //   }
-    //   return maxCycle
-    // },
-    // doChange (val) {
-    //   // if (val.mode === 7) {
-    //   //   val.value = 0
-    //   // } else {
-    //   //   val.value = 30
-    //   // }
-    // }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.col-content {
-  width: 100%;
-}
-.kanbanOptimize {
-  .common-board-column {
-    max-width: unset !important;
-  }
-}
-.optimizetype{
-  // float: left;
-  font-size: 14PX;
-  margin:0 0 10PX 0;
-  .el-input {
-    width: 80PX;
-  }
-  .el-select{
-    width: 145PX;
-  }
-  .el-button {
-    margin-left: 10PX;
-  }
-  .optimiNum {
-    padding-left: 10PX;
-  }
-}
-</style>

package/src/node_modules/.package_versions.json

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