openatc-components 0.4.71 → 0.4.73

package/package/kisscomps/components/OverLap/OverLap.vue

@@ -10,6 +10,12 @@
                     <span v-for="(ids,index3) in list.includedphases" :key="index3">
                         {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                     </span>
+                     <span v-if="list.modifyphase && list.modifyphase.length>0">(<span v-for="(ids, index4) in list.modifyphase" :key="index4">
+                      *P{{ ids
+                      }}<span v-if="index4 + 1 !== list.modifyphase.length"
+                        >,</span
+                      >
+                    </span>)</span>
                 </div>
                 <div style="cursor:pointer;">
                     <div class="ring-phase">
@@ -22,6 +28,12 @@
                             <span v-for="(ids,index3) in list.includedphases" :key="index3">
                                 {{$t('openatccomponents.phase.phase')}}{{ids}}<span v-if="index3+1!==list.includedphases.length">,</span>
                             </span>
+                            <span v-if="list.modifyphase && list.modifyphase.length>0">(<span v-for="(ids, index4) in list.modifyphase" :key="index4">
+                              *P{{ ids
+                                }}<span v-if="index4 + 1 !== list.modifyphase.length"
+                                >,</span
+                              >
+                            </span>)</span>
                         </div>
                     </div>
                 </div>
@@ -153,7 +165,16 @@ export default {
           const findItems = stageList.filter(j => (j.phases ? j.phases : j.stages).includes(i))
           if (findItems.length) findIndexs.push(...findItems.map(m => m.key))
         })
+        // 收集所有包含 modifyphase 中相位的阶段 key
+        let modifyIndexs = []
+        if (item.modifyphase !== undefined) {
+          item.modifyphase.forEach(i => {
+            const findItems = stageList.filter(j => j.phases.includes(i))
+            if (findItems.length) modifyIndexs.push(...findItems.map(m => m.key))
+          })
+        }
         findIndexs = Array.from(new Set(findIndexs))
+        modifyIndexs = Array.from(new Set(modifyIndexs))
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -168,7 +189,7 @@ export default {
           peddirection: this.getPedPhasePos(item.peddirection),
           sidewalkPhaseData: this.getPedPhasePos(item.peddirection),
           stageLists: stageList.map(sta => {
-            const find = findIndexs.includes(sta.key)
+            const find = findIndexs.includes(sta.key) && !modifyIndexs.includes(sta.key)
             return {
               ...sta,
               direction: this.getRoad(item),

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

@@ -757,6 +757,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[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(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1043,6 +1057,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[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(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1292,6 +1320,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[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(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length >= 1) {
@@ -1350,9 +1392,6 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        if (newRings.length > 1) {
-          this.fillGap(ringTeams, val)
-        }
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -1362,6 +1401,9 @@ export default {
         } else {
           this.max = ''
         }
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {

package/package/kisscomps/components/StageOptimize/index.vue

@@ -0,0 +1,310 @@
+/**
+ * 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="margin-top: 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="stageData"
+        :options="options">
+        <div class="common-board-item" v-for="element in stageData" :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 v-if="element.desc.length > 0" 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 '../XRDDirSelector/XRDDirSelector'
+
+export default {
+  name: 'StageOptimize',
+  components: {
+    draggable,
+    xdrdirselector
+  },
+  data () {
+    return {
+      showStyle: {
+        left: '2px',
+        top: '0px'
+      },
+      styles: {
+        left: '1px',
+        top: '0px'
+      },
+      typeOptions: [{
+        value: 'flow-split-opt'
+      }, {
+        value: 'cycle-opt'
+      }],
+      value: '',
+      optimizecycle: 0
+    }
+  },
+  props: {
+    headerText: {
+      type: String,
+      default: 'Header'
+    },
+    contrloType: {
+      type: String
+    },
+    stageData: {
+      type: Array
+    },
+    stagesChange: {
+      type: Array
+    },
+    id: {
+      type: Number
+    },
+    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
+    },
+    stageData: {
+      handler: function () {
+        this.addMins()
+        // 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.stagesChange.length; i++) {
+                if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
+                  _that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
+                }
+              }
+              this.$emit('optimizestage', this.id)
+            }
+          }).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.stagesChange.length; i++) {
+              if (_that.stagesChange[i].key === data.data.data.phase[i].id - 1) {
+                _that.stagesChange[i].stageSplit = data.data.data.phase[i].duration
+              }
+            }
+            this.$emit('optimizestage', this.id)
+          }
+        }).catch(error => {
+          console.log(error)
+        })
+      }
+    },
+    addMins () {
+      for (let i of this.stageData) {
+          if (!i.flowperhour || !i.saturation) {
+            i.flowperhour = 0
+            i.saturation = 1700
+            i.length = this.list.length
+          }
+      }
+    },
+    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{
+  position: absolute;
+  margin:0 0 10PX 0;
+  .el-input {
+    width: 80PX;
+  }
+  .el-select{
+    width: 145PX;
+  }
+  .el-button {
+    margin-left: 10PX;
+  }
+  .optimiNum {
+    padding-left: 10PX;
+  }
+}
+</style>