openatc-components 0.4.15 → 0.4.17

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"