openatc-components 0.1.100 → 0.1.102

package/package.json

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

package/src/api/cross.js

@@ -16,6 +16,11 @@ export const saveChannelizatonChart = (data) => {
   return api.Send({}, data, [])
 }
 
+export const getDuration = (data) => {
+  let api = new Authapi('gettimeplan')
+  return api.Send({}, data, [])
+}
+
 export const getChannelizatonChart = (agentid) => {
   let api = new Authapi('getChannelizatonChart')
   return api.Send({}, {}, [agentid])
@@ -29,5 +34,6 @@ export const getDetectorStatus = (agentid) => {
 export default {
   saveChannelizatonChart,
   getChannelizatonChart,
-  getDetectorStatus
+  getDetectorStatus,
+  getDuration
 }

package/src/i18n/language/en.js

@@ -108,6 +108,11 @@ const en = {
       'divicestate': 'Device Status',
       'protocoltype': 'Protocol',
       'signalID': 'Intersection ID',
+      'flow': 'Average lane flow (h)low',
+      'saturationflow': 'Planned lane saturation Flow (h)',
+      'typeflow-split-opt': 'Flow Split Op',
+      'maxFlow': 'The average lane flow is too large. Is it further optimized?',
+      'typecycle-opt': 'Cycle Opt',
       'signalIP': 'Signal IP',
       'faultinfo': 'Fault Information',
       'platform': 'platform',
@@ -125,7 +130,7 @@ const en = {
       'mode': 'Mode',
       'stage': 'Stage',
       'specialcontrol': 'Special Control',
-      'phaseclosecontrol': 'Phase Close Control',
+      'phaseclosecontrol': 'Phase release Control',
       'phaseclose': 'Close Phase',
       'phaselocking': 'Priority Control',
       'tentativeplan': 'Tentative Plan',
@@ -407,6 +412,11 @@ const en = {
       'parameters': 'Parameters',
       'overLap': 'Over Lap',
       'plan': 'Plan',
+      'patternOptimize': 'Pattern Optimize',
+      'optimizetype': 'Optimize Type',
+      'inoptimize': 'In Optimize',
+      'success': 'Success',
+      'optimizecycle': 'Optimize Cycle',
       'ringConfig': 'Ring Config',
       'stage': 'Stage',
       'phase': 'Phase',
@@ -857,6 +867,7 @@ const en = {
       'alarm': 'Alarm',
       'none': 'none',
       'weak': 'weak',
+      'enter': 'Please enter the content',
       'normal': 'normal',
       'strong': 'strong',
       'name': 'Name',

package/src/i18n/language/zh.js

@@ -104,6 +104,11 @@ const zh = {
     },
     'overview': {
       'crossinfo': '路口信息',
+      'flow': '车道平均流量(h)',
+      'saturationflow': '车道规划饱和流量（h）',
+      'typeflow-split-opt': '饱和绿信比优化',
+      'maxFlow': '车道平均流量过大，是否继续优化？',
+      'typecycle-opt': '周期优化',
       'crossname': '路口名称',
       'divicestate': '设备状态',
       'protocoltype': '协议类型',
@@ -125,7 +130,7 @@ const zh = {
       'mode': '控制方式',
       'stage': '阶段(驻留)',
       'specialcontrol': '特殊控制',
-      'phaseclosecontrol': '相位关断控制',
+      'phaseclosecontrol': '相位放行控制',
       'phaseclose': '相位关断',
       'phaselocking': '相位锁定',
       'tentativeplan': '临时方案',
@@ -405,6 +410,11 @@ const zh = {
       'parameters': '扩展参数配置',
       'overLap': '跟随相位',
       'plan': '方案',
+      'patternOptimize': '方案优化',
+      'optimizecycle': '优化周期',
+      'success': '优化成功',
+      'optimizetype': '优化算法类型',
+      'inoptimize': '优化',
       'ringConfig': '环配置',
       'stage': '阶段',
       'phase': '相位',
@@ -851,6 +861,7 @@ const zh = {
       'clone': '克隆',
       'deleteall': '全部删除',
       'update': '修改',
+      'enter': '请输入',
       'search': '搜索',
       'alarm': '警告',
       'none': '无',

package/src/kisscomps/components/KanBan/kanban.vue

@@ -117,7 +117,7 @@ export default {
     }
   },
   created () {
-    this.addMinSplit()
+    // this.addMinSplit()
     // console.log(this.list, 'list')
   },
   watch: {
@@ -134,7 +134,7 @@ export default {
         // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
         // let pattern = globalParamModel.getParamsByType('patternList')[n]
         // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-        this.addMinSplit()
+        // this.addMinSplit()
         this.$emit('handleSplit', n, newList)
       },
       deep: true

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

@@ -0,0 +1,272 @@
+/**
+ * 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>
+    <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="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
+    </div>
+  <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px'}">
+    <div class="common-board-column-header">
+      {{headerText}}
+    </div>
+    <div class="common-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="40px" Height="40px" :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 '../XRDDirSelector/XRDDirSelector'
+
+export default {
+  name: 'patternOptimize',
+  components: {
+    draggable,
+    xdrdirselector
+  },
+  data () {
+    return {
+      showStyle: {
+        left: '8px',
+        top: '3px'
+      },
+      typeOptions: [{
+        value: 'flow-split-opt'
+      }, {
+        value: 'cycle-opt'
+      }],
+      value: '',
+      optimizecycle: 0
+    }
+  },
+  props: {
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    rings: {
+      type: Object
+    },
+    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()
+  },
+  watch: {
+    list: {
+      handler: function () {
+        this.addMin()
+        // 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: {
+    optimize () {
+      let _that = this
+      let newPha = []
+      for (let i = 0; i < _that.rings.rings.length; i++) {
+        newPha.push(..._that.rings.rings[i])
+      }
+      let phaseData = newPha.map(item => {
+        return {
+          id: item.id,
+          flowperhour: item.flowperhour,
+          saturation: item.saturation
+        }
+      })
+      //   let patternList = _that.$store.state.globalParam.tscParam.patternList
+      //   console.log(patternList, 'patternList')
+      let pattern = _that.rings
+      let reqData = {
+        'type': _that.value,
+        'optcycle': _that.optimizecycle,
+        'phaseList': _that.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('openatccomponents.common.confirm'),
+            cancelButtonText: this.$t('openatccomponents.common.cancel'),
+            type: 'warning'
+          }).then(() => {
+          getDuration(reqData).then(data => {
+            if (data.data.success) {
+              _that.$message({
+                type: 'success',
+                message: _that.$t('openatccomponents.pattern.success')
+              })
+              for (let i = 0; i < _that.rings.rings.length; i++) {
+                for (let j = 0; j < _that.rings.rings[i].length; j++) {
+                  for (let h = 0; h < data.data.data.phase.length; h++) {
+                    if (_that.rings.rings[i][j].id === data.data.data.phase[h].id) {
+                      _that.rings.rings[i][j].value = data.data.data.phase[h].duration
+                      // _that.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) {
+            _that.$message({
+              type: 'success',
+              message: _that.$t('openatccomponents.pattern.success')
+            })
+            for (let i = 0; i < _that.rings.rings.length; i++) {
+              for (let j = 0; j < _that.rings.rings[i].length; j++) {
+                for (let h = 0; h < data.data.data.phase.length; h++) {
+                  if (_that.rings.rings[i][j].id === data.data.data.phase[h].id) {
+                    _that.rings.rings[i][j].value = data.data.data.phase[h].duration
+                    // _that.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.flowperhour = 0
+          i.saturation = 1700
+          i.length = this.list.length
+        }
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.col-content {
+  width: 100%;
+}
+.optimizetype{
+  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/kisscomps/components/PatternOptimize/index.js

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

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

@@ -139,6 +139,21 @@
                 </el-col>
                 </el-row>
             </el-tab-pane>
+            <el-tab-pane :label="$t('openatccomponents.pattern.patternOptimize')" name="patternOptimize">
+                <pattern-optimize
+                v-for="n in optimizes"
+                :key="n" class="expendkanban"
+                :list="patternOne.length===0?planPattern.rings[n-1]:patternOne[0].rings[n-1]"
+                :rings="patternOne.length===0?planPattern:patternOne[0]"
+                :phaseList="phaseList"
+                :options="options"
+                :header-text="$t('openatccomponents.pattern.ring')+n"
+                :index="n"
+                :nowNumber="n"
+                @handleSplit="handleSplit"
+                >
+                </pattern-optimize>
+            </el-tab-pane>
         </el-tabs>
     </el-row>
     <div class="footer" v-if="realtimeStatusModalvisible">
@@ -209,6 +224,8 @@ export default {
       activeList: 'ring',
       ringCount: 1,
       ringCounts: 1,
+      barriers: [],
+      optimizes: 1,
       coordphaseOption: [],
       patternOne: [],
       planPattern: {},
@@ -230,6 +247,188 @@ export default {
     this.initData()
   },
   methods: {
+    tranform (arr) { // 分barrier
+      let newMap = new Map()
+      arr.forEach(({id, current}) => {
+        const find = newMap.get(current.join())
+        if (find) newMap.get(current.join()).push(id)
+        else newMap.set(current.join(), [id])
+      })
+      let ret = []
+      newMap.forEach((value, key) => {
+        ret.push(Array.from(new Set(key.split(',').map(Number).concat(value))))
+      })
+      const result = []
+      for (const a of ret) {
+        let merged = false
+        for (const r of result) {
+          if (this.check([...r], a)) {
+            a.forEach(item => r.add(item))
+            merged = true
+          }
+        }
+        if (!merged) {
+          result.push(new Set(a))
+        }
+        merged = false
+      }
+      return result.map(s => [...s])
+    },
+    check (arr1, arr2) {
+      return arr1.some(a1 => arr2.some(a2 => a1 === a2))
+    },
+    handleCurrentChange (val) { // 两个ring的数据
+      if (val === null || val.length === 0) return
+      // 按环序分组
+      let ringlength = []
+      let ringsequence = val.map(item => {
+        if (item.length === 0) return
+        ringlength.push(item.length)
+        return item.map(k => {
+          return k.id
+        })
+      })
+      let newRings = ringsequence.filter(item => item)
+      let minLength = Math.min(...ringlength)
+      let resultArrs = [] // 环1分组
+      let resultArr = [] // 环2分组
+      for (let j = 0; j < ringsequence[0].length; j += minLength) {
+        resultArrs.push(ringsequence[0].slice(j, j + minLength))
+        if (ringsequence[0].length === minLength) {
+          resultArrs.push([])
+        }
+      }
+      if (newRings.length > 1) {
+        for (let i = 0; i < ringsequence[1].length; i += minLength) {
+          resultArr.push(ringsequence[1].slice(i, i + minLength))
+        }
+      }
+      // this.patternInfo = []
+      // this.barrierList = []
+      let currentArr = []
+      let newPattern = []
+      val.map(i => {
+        newPattern.push(...i)
+      })
+      if (this.phaseList.length === 0) return
+      for (let patternStatus of val[0]) {
+        // if (patternStatus.mode !== 7) {
+        let concurrent = this.phaseList.filter((item) => {
+          return item.id === patternStatus.id // patternStatus.id当前相位id concurrent当前相位的并发相位
+        })[0].concurrent// 当前相位的并发相位
+        if (concurrent) {
+          let obj = {
+            id: patternStatus.id,
+            current: concurrent.sort()
+          }
+          currentArr.push(obj)
+        }
+        // }
+      }
+      if (currentArr.length !== 0) {
+        let newCurrent = this.tranform(currentArr)
+        // 取没个环与环关系的并集
+        let barrierRing1 = []
+        let barrierRing2 = []
+        let ring1 = [] // 环1与关系1的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let adds = [...new Set(resultArrs[0])].filter(item => newCurrent[h].includes(item))
+          ring1.push(adds)
+        }
+        let ring1s = [] // 环1与关系2的并集
+        for (let h = 0; h < newCurrent.length; h++) {
+          let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
+          ring1s.push(addRing1)
+        }
+        barrierRing1.push(...ring1, ...ring1s)
+        let resultList = []
+        if (newRings.length > 1) {
+          let ring2s = [] // 环2与关系1的并集
+          for (let h = 0; h < newCurrent.length; h++) {
+            let addRing2 = [...new Set(resultArr[1])].filter(item => newCurrent[h].includes(item))
+            ring2s.push(addRing2)
+          }
+          let ring2 = [] // 环2与关系1的并集
+          for (let h = 0; h < newCurrent.length; h++) {
+            let add = [...new Set(resultArr[0])].filter(item => newCurrent[h].includes(item))
+            ring2.push(add)
+          }
+          barrierRing2.push(...ring2, ...ring2s)
+          for (let k = 0; k < barrierRing1.length; k++) {
+            resultList.push(barrierRing1[k].concat(barrierRing2[k]))
+          }
+        }
+        let resultLists = resultList.filter(item => item.length !== 0)
+        let ringArr = []
+        for (let l = 0; l < resultLists.length; l++) {
+          for (let d = 0; d < newCurrent.length; d++) {
+            if (newCurrent[d].filter(item => resultLists[l].includes(item)).length > 0) {
+              ringArr.push({
+                data: resultLists[l],
+                id: d + 1,
+                index: l
+              })
+            }
+          }
+        }
+        for (var i = 0; i < ringArr.length; i++) {
+          for (var j = i + 1; j < ringArr.length; j++) {
+            if (ringArr[i].id === ringArr[j].id && ringArr[i].index + 1 === ringArr[j].index) {
+              ringArr[i].data = ringArr[i].data.concat(ringArr[j].data)
+              ringArr.splice(ringArr.indexOf(ringArr[j].id), 1)
+            }
+          }
+        }
+        let resArr = ringArr.map(item => item.data)
+        let ringTeam = this.step1(this.phaseList, resArr)
+        let ringTeams = ringTeam.filter(item => item.length !== 0)
+        return this.setBarrier(ringTeams, val)
+      }
+    },
+    setBarrier (ringTeam, val) {
+      const patternObjs = {}
+      val.forEach(l => {
+        l.map(k => {
+          patternObjs[k.id] = k.value
+        })
+      })
+      let ret = ringTeam.map((y, index) => {
+        if (!y || y.length === 0) return
+        y.map(n => {
+          n.length = n.data.length > 1 ? n.data.reduce((pre, cur) => pre + patternObjs[cur], 0) : patternObjs[n.data[0]]
+        })
+        return {
+          barrier: index + 1,
+          length: y[0].length,
+          items: y.map(j => {
+            return {
+              ring: j.ring,
+              data: j.data
+            }
+          })
+        }
+      })
+      return ret
+    },
+    step1 (list, arr) { // 各个环包含的相位
+      const ret = []
+      const listObj = {}
+      list.forEach(l => {
+        listObj[l.id] = l.ring
+      })
+      arr.forEach(a => {
+        const retItem = []
+        a.forEach(b => {
+          if (listObj[b]) {
+            const find = retItem.find(r => r.ring === listObj[b])
+            if (find) find.data.push(b)
+            else retItem.push({ring: listObj[b], data: [b]})
+          }
+        })
+        ret.push(retItem)
+      })
+      return ret
+    },
     patternPlan () {
       let Pattern = {
         offset: 0,
@@ -257,6 +456,8 @@ export default {
           newPattern.rings[3].push(ring)
         }
       }
+      let barrier = this.handleCurrentChange(newPattern.rings)
+      newPattern.barriers = barrier
       this.planPattern = newPattern
     },
     getCycle () {
@@ -540,6 +741,8 @@ export default {
       this.ringCount = this.ringCount.sort(this.sortNumbers) // 把数组中的值按照从小到大的顺序重新排序
       this.ringCounts = Array.from(new Set(rings)) // 去除数组重复的元素
       this.ringCounts = this.ringCounts.sort(this.sortNumbers) // 把数组中的值按照从小到大的顺序重新排序
+      this.optimizes = Array.from(new Set(rings)) // 去除数组重复的元素
+      this.optimizes = this.optimizes.sort(this.sortNumbers) // 把数组中的值按照从小到大的顺序重新排序
     //   this.increaseId()
     //   this.getCycle()
     //   this.updatePhaseDescription()

package/src/kisscomps/components/StageBord/StageBord.vue

@@ -51,7 +51,7 @@
             <el-input
               v-if="this.contrloType === 'ring' || !this.contrloType"
               size="small"
-              :value="stage.stageKanban.join(',')"
+              :value="stage.stageKanban?stage.stageKanban.join(','):''"
               ref="type"
               :disabled="true">
             </el-input>

package/src/kisscomps/index.js

@@ -14,6 +14,7 @@ import PatternStatus from './components/PatternStatus/index'
 import BoardCard from './components/BoardCard/index'
 import StageStatus from './components/StageStatus/index'
 import OverLap from './components/OverLap/index'
+import PatternOptimize from './components/PatternOptimize/index'
 import Stages from './components/Stages/index'
 import PhaseMarker from './components/PhaseMarker/index'
 import overView from './components/overView/index'
@@ -48,6 +49,7 @@ const components = {
   patternList,
   CommonKanban,
   Stages,
+  PatternOptimize,
   PhaseMarker,
   overView,
   KanBan,

package/static/apiconfig.json

@@ -104,6 +104,11 @@
   "url": "/devs",
   "method": "get"
 },
+{
+  "key": "gettimeplan",
+  "url": "/fixedtimeplan",
+  "method": "post"
+},
 {
   "key": "getTscCurrentVolume",
   "url": "/devs/message",

package/static/styles/schemeconfig.scss

@@ -411,7 +411,7 @@
   .model-label, .stage-label {
     color: $--color-text-secondary;
   }
-  .expendkanban {
+  .expendkanban .common-board-column{
     width: 77% !important;
     margin: 0 auto;
     margin-bottom: 13PX;