openatc-components 0.4.16 → 0.4.18

package/package.json

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

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

@@ -24,7 +24,7 @@
             </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> -->
+        <el-button v-if="isTentative" type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
     </div>
     <el-table class="tb-edit" ref="singleTables" row-key="id" :data="tableRing" element-loading-text="Loading" :max-height="tableHeight" fit highlight-current-row id="footerBtn">
       <el-table-column prop="id" sortable align="center" :label="$t('openatccomponents.overview.id')">
@@ -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',
@@ -129,6 +131,10 @@ export default {
       type: String,
       default: 'Header'
     },
+    isTentative: {
+      type: Boolean,
+      default: false
+    },
     tableRing: {
       type: Array
     },
@@ -177,7 +183,7 @@ export default {
   },
   created () {
     // this.addMinSplit()
-    this.addMin()
+    // this.addMin()
   },
   watch: {
     list: {

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

@@ -294,23 +294,20 @@
           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"
+            :isTentative="true"
             @handleSplit="handleSplit"
           >
           </pattern-optimize>
+          <!-- ref="patternOptimize"
+                :tableRing="tableRing"
+                :id="selectedRow.id"
+                @optimizesucess="optimizesucess" -->
         </el-tab-pane>
       </el-tabs>
     </el-row>
@@ -325,7 +322,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 +396,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 +429,8 @@ export default {
     }
   },
   created () {
+    this.PhaseDataModel = new PhaseDataModel()
+    this.CrossDiagramMgr = new CrossDiagramMgr()
     this.patternPlan()
     this.getCycle()
     if (this.patternOne.length === 0) {
@@ -759,7 +768,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 +788,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 +835,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 +983,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/src/kisscomps/components/StageOptimize/StageOptimize.vue

@@ -11,7 +11,46 @@
  **/
 <template>
 <div>
-  <div v-if="this.nowNumber === 1" class="optimizetype">
+  <div 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>
+    <el-table class="tb-edit" ref="singleTables" row-key="id" :data="tableRing" element-loading-text="Loading" :max-height="tableHeight" fit highlight-current-row id="footerBtn">
+      <el-table-column prop="id" sortable align="center" :label="$t('openatccomponents.overview.id')">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table-column" :label="$t('openatccomponents.overview.phase')" align="center">
+        <template slot-scope="scope">
+          <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="scope.row.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+        </template>
+      </el-table-column>
+      <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>
+  <!-- <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
@@ -68,7 +107,7 @@
           </el-row>
         </div>
       </draggable>
-  </div>
+  </div> -->
 </div>
 </template>
 <script>
@@ -84,14 +123,15 @@ export default {
   },
   data () {
     return {
-      showStyle: {
-        left: '2px',
-        top: '0px'
-      },
-      styles: {
-        left: '1px',
-        top: '0px'
-      },
+      // showStyle: {
+      //   left: '2px',
+      //   top: '0px'
+      // },
+      // styles: {
+      //   left: '1px',
+      //   top: '0px'
+      // },
+      tableHeight: 400,
       typeOptions: [{
         value: 'flow-split-opt'
       }, {
@@ -106,6 +146,15 @@ export default {
       type: String,
       default: 'Header'
     },
+    tableRing: {
+      type: Array
+    },
+    showStyle: {
+      type: Object
+    },
+    styles: {
+      type: Object
+    },
     contrloType: {
       type: String
     },
@@ -154,12 +203,12 @@ export default {
   },
   created () {
     // this.addMinSplit()
-    this.addMin()
+    // this.addMin()
   },
   watch: {
     list: {
       handler: function () {
-        this.addMin()
+        // this.addMin()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -179,7 +228,7 @@ export default {
     },
     stageData: {
       handler: function () {
-        this.addMins()
+        // this.addMins()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -201,16 +250,19 @@ export default {
   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 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
+      //   }
+      // })
+      this.tableRing.map(item => {
+        delete item.desc
       })
       //   let patternList = _that.$store.state.globalParam.tscParam.patternList
       //   console.log(patternList, 'patternList')
@@ -220,12 +272,12 @@ export default {
         'optcycle': _that.optimizecycle,
         'phaseList': _that.phaseList,
         'pattern': pattern,
-        'phases': phaseData
+        'phases': this.tableRing
       }
       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)
+      for (let j = 0; j < this.tableRing.length; j++) {
+        let comNum = (this.tableRing[j].length / 4) * 1700 * 0.8
+        isValidata.push(this.tableRing[j].flowperhour > comNum)
       }
       if (isValidata.includes(true)) {
         this.$confirm(this.$t('openatccomponents.overview.maxFlow'),
@@ -270,25 +322,25 @@ export default {
           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
-        }
-      }
     }
+    // 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>
@@ -297,7 +349,7 @@ export default {
   width: 100%;
 }
 .optimizetype{
-  position: absolute;
+  // position: absolute;
   margin:0 0 10PX 0;
   .el-input {
     width: 80PX;

package/src/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"

package/src/node_modules/.package_versions.json

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