openatc-components 0.4.16 → 0.4.17

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

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

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

@@ -0,0 +1,369 @@
+/**
+ * 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/package/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -40,11 +40,13 @@
       <el-table-column class="table-column" :label="$t('openatccomponents.overview.flow')" align="center">
         <template slot-scope="scope">
           <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="scope.row.flowperhour" ref="type"></el-input-number>
+          <!-- <span>{{scope.row.flowperhour}}</span> -->
         </template>
       </el-table-column>
       <el-table-column align="center" :label="$t('openatccomponents.overview.saturationflow')">
         <template slot-scope="scope">
           <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="scope.row.saturation" ref="types"></el-input-number>
+          <!-- <span>{{scope.row.saturation}}</span> -->
         </template>
       </el-table-column>
     </el-table>
@@ -96,7 +98,7 @@
 <script>
 import draggable from 'vuedraggable'
 import { getDuration } from '../../../api/cross'
-import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
+import xdrdirselector from '../XRDDirSelector/XRDDirSelector.vue'
 
 export default {
   name: 'patternOptimize',

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

@@ -294,23 +294,19 @@
           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"
+            :tableRing="tableRing"
+            :showStyle="showStyle"
+            :styles="styles"
             @handleSplit="handleSplit"
           >
           </pattern-optimize>
+          <!-- ref="patternOptimize"
+                :tableRing="tableRing"
+                :id="selectedRow.id"
+                @optimizesucess="optimizesucess" -->
         </el-tab-pane>
       </el-tabs>
     </el-row>
@@ -325,7 +321,8 @@
 
 <script>
 import { hasPermission } from '../../../../utils/auth'
-
+import PhaseDataModel from '../../IntersectionMap/crossDirection/utils.js'
+import CrossDiagramMgr from '../../../../EdgeMgr/controller/crossDiagramMgr.js'
 export default {
   name: 'tentativeplancontrol',
   props: {
@@ -398,7 +395,16 @@ export default {
       options: {
         group: 'pattern'
       },
+      styles: {
+        left: '2px',
+        top: 0
+      },
+      showStyle: {
+        left: '2px',
+        top: 0
+      },
       max: '',
+      tableRing: [],
       contrloType: '',
       patternCycleEqual: true,
       // activeList: 'ring',
@@ -422,6 +428,8 @@ export default {
     }
   },
   created () {
+    this.PhaseDataModel = new PhaseDataModel()
+    this.CrossDiagramMgr = new CrossDiagramMgr()
     this.patternPlan()
     this.getCycle()
     if (this.patternOne.length === 0) {
@@ -759,7 +767,7 @@ export default {
       for (let phase of this.phaseList) {
         let ring = {}
         ring.name = 'Phase ' + phase.id
-        ring.desc = this.getPhaseDescription(phase.direction)
+        ring.desc = this.getPhaseDescription(phase)
         ring.id = phase.id
         ring.value = 30
         ring.mode = 2
@@ -779,6 +787,15 @@ export default {
       let barrier = this.handleCurrentChange(newPattern.rings)
       newPattern.barriers = barrier
       this.planPattern = newPattern
+      const flatArray = this.planPattern.rings.flat().filter(item => item !== null)
+      this.tableRing = flatArray.map(item => {
+        return {
+          id: item.id,
+          desc: item.desc,
+          flowperhour: item.flowperhour ? item.flowperhour : 0,
+          saturation: item.saturation ? item.saturation : 0
+        }
+      })
     },
     getCycle () {
       for (let rings of this.planPattern.rings) {
@@ -817,12 +834,71 @@ export default {
         }
       }
     },
+    // getPhaseDescription (phaseList) {
+    //   if (!phaseList) return
+    //   let list = []
+    //   for (let id of phaseList) {
+    //     let obj = {}
+    //     obj.id = id
+    //     obj.color = '#454545'
+    //     list.push(obj)
+    //   }
+    //   return list
+    // },
+    getPedPhasePos () {
+      // 行人相位信息
+      this.sidewalkPhaseData = []
+      // let phaseList = this.globalParamModel.getParamsByType('phaseList')
+      this.phaseList.forEach((ele, i) => {
+        if (ele.peddirection) {
+          ele.peddirection.forEach((dir, index) => {
+            // 行人相位
+            if (this.PhaseDataModel.getSidePos(dir)) {
+              this.sidewalkPhaseData.push({
+                key: this.CrossDiagramMgr.getUniqueKey('pedphase'),
+                phaseid: ele.id, // 相位id，用于对应相位状态
+                id: dir,
+                name: this.PhaseDataModel.getSidePos(dir).name
+              })
+            }
+          })
+        }
+      })
+      return this.sidewalkPhaseData
+    },
     getPhaseDescription (phaseList) {
-      if (!phaseList) return
       let list = []
-      for (let id of phaseList) {
+      let peddirections = []
+      let sidewalkPhaseData = this.getPedPhasePos()
+      for (let walk of sidewalkPhaseData) {
+        if (phaseList.peddirection) {
+          for (let ped of phaseList.peddirection) {
+            // if (stg === walk.phaseid) {
+            let obj = {}
+            obj.name = walk.name
+            obj.id = walk.id
+            if (ped === walk.id) {
+              peddirections.push(obj)
+              peddirections = Array.from(new Set(peddirections))
+            }
+            // }
+          }
+        } else {
+          peddirections = []
+        }
+      }
+      if (phaseList.direction.length > 0) {
+        for (let id of phaseList.direction) {
+          let obj = {}
+          obj.id = id
+          obj.peddirection = peddirections
+          obj.color = '#454545'
+          list.push(obj)
+        }
+      } else {
         let obj = {}
-        obj.id = id
+        obj.id = ''
+        obj.peddirection = peddirections
         obj.color = '#454545'
         list.push(obj)
       }
@@ -906,6 +982,15 @@ export default {
       // if (this.patternOne[0].contrloType === 'stage') {
       //   this.changeStage()
       // }
+      const flatArray = this.patternOne[0].rings.flat().filter(item => item !== null)
+      this.tableRing = flatArray.map(item => {
+        return {
+          id: item.id,
+          desc: item.desc,
+          flowperhour: item.flowperhour ? item.flowperhour : 0,
+          saturation: item.saturation ? item.saturation : 0
+        }
+      })
       this.manualInfo.offset = this.offset
       for (let rings of this.patternOne[0].rings) {
         if (rings.length === 0) continue

package/package/kisscomps/components/XRDDirSelector/XRDDirSelector.vue

@@ -10,7 +10,7 @@
  * See the Mulan PSL v2 for more details.
  **/
 <template>
-<div :style="{position: 'relative'}">
+<div :style="{position: 'relative',height: '40px'}">
   <div :style="{position: 'absolute', left: Data?Data.left:0, top: Data?Data.top:0}">
     <svg
     version="1.1"