openatc-components 0.1.32 → 0.1.34

package/package.json

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

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

@@ -28,7 +28,7 @@
             </el-tooltip>
         </el-col>
         <el-col :span="9">
-          <el-input-number :controls="false" class="col-content" size="small" :min="element.minSplit" :max="255" :step="1" v-model.number="element.value" ref="type" :disabled="element.mode === 7"></el-input-number>
+          <el-input-number :controls="false" class="col-content" size="small" :min="element.minSplit" :max="255" :step="1" v-model.number="element.value" ref="type"></el-input-number>
         </el-col>
         <el-col :span="9">
           <el-select v-model="element.mode" class="col-content"  size="small" @change="doChange(element)" :placeholder="$t('openatccomponents.common.select')">

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

@@ -14,7 +14,7 @@
       <!-- 环模式true -->
       <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
-          <div v-for="(item,index2) in list" :key="index2" :class="item.controltype===99?'direction': ''">
+          <div v-for="(item,index2) in list" :key="index2" :class="item.mode===7?'direction': ''">
             <div class="first-1" :style="{'width':item.greenWidth,'height':'34px','background':'#7ccc66'}">
                 <el-tooltip placement="top-start" effect="light">
                   <div slot="content">P{{item.id}}:{{item.split}}</div>
@@ -186,7 +186,11 @@ export default {
         }
         // this.controlDatas = this.controlData
         this.getPedPhasePos()
-        this.handlePatternData()
+        if (this.controlData.patternid === 109) {
+          this.handleTentivePatternData()
+        } else {
+          this.handlePatternData()
+        }
         this.handleBarrierHeight()
       },
       // 深度观察监听
@@ -417,15 +421,17 @@ export default {
         }
       })
     },
-    handlePatternData () {
+    handleTentivePatternData () {
       if (!this.controlData) return
       this.newList = []
       if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
       if (!this.controlData.phase) return
+      // let cycle = this.controlData.cycle
       if (!this.controlData.rings) return
       let newValue = []
       for (let rings of this.controlData.rings) {
         let phase = this.controlData.phase
+        // let list = []
         let obj = {}
         for (let key in rings.sequence) {
           obj[key] = rings.sequence[key]
@@ -449,14 +455,9 @@ export default {
           })
         }
       }
-      this.handleOverViewChange(newValue)
+      this.handleTentative(newValue)
     },
-    handleBarrierHeight () { // 屏障高度
-      if (!this.patternInfo) return
-      let patternLength = this.patternInfo.length
-      this.barrierHeight = (patternLength * 35 + 21) + 'px'
-    },
-    handleOverViewChange (val) {
+    handleTentative (val) {
       if (val === null || val.length === 0) return
       this.patternInfo = []
       let currentArr = []
@@ -558,6 +559,125 @@ export default {
         this.patternInfo.push(list)
       }
     },
+    handlePatternData () {
+      if (!this.controlData) return
+      // this.newList = []
+      if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
+      if (!this.controlData.phase) return
+      if (!this.controlData.rings) return
+      let nowPattern = this.localPatternList.filter(item => {
+        return item.id === this.controlData.patternid
+      })[0].rings
+      this.handleOverViewChange(nowPattern)
+    },
+    handleBarrierHeight () { // 屏障高度
+      if (!this.patternInfo) return
+      let patternLength = this.patternInfo.length
+      this.barrierHeight = (patternLength * 35 + 21) + 'px'
+    },
+    handleOverViewChange (val) {
+      if (val === null || val.length === 0) return
+      this.patternInfo = []
+      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 ringTeam = this.step1(this.phaseList, newCurrent)
+        this.fillGap(ringTeam, val)
+      }
+      let cycle = this.controlData.cycle
+      for (let rings of val) {
+        if (rings.length === 0) continue
+        let list = []
+        for (let ring of rings) {
+          if (ring.value === 0) continue
+          let obj = {}
+          let split = ring.value
+          obj.id = ring.id
+          obj.mode = ring.mode
+          // obj.split = split
+          let currPhase = this.phaseList.filter((item) => {
+            if (item.id === ring.id && item.controltype === 99) {
+              obj.controltype = item.controltype
+            }
+            return item.id === ring.id
+          })[0]
+          let peddirections = []
+          for (let walk of this.sidewalkPhaseData) {
+            for (let ped of currPhase.peddirection) {
+            // if (stg === walk.phaseid) {
+              let objs = {}
+              objs.name = walk.name
+              objs.id = walk.id
+              if (ped === walk.id) {
+                peddirections.push(objs)
+                peddirections = Array.from(new Set(peddirections))
+              }
+            // }
+            }
+          }
+          if (ring.desc) {
+            obj.direction = ring.desc.map(item => { // 虚相位desc为空
+              return {
+                id: item.id,
+                color: '#454545'
+              }
+            })
+          } else {
+            if (currPhase.direction.length > 0) {
+              obj.direction = currPhase.direction.map(item => {
+                return {
+                  id: item,
+                  peddirection: peddirections,
+                  color: '#454545'
+                }
+              })
+            } else {
+              obj.direction = [
+                {
+                  id: '',
+                  color: '#454545',
+                  peddirection: peddirections
+                }
+              ]
+            }
+          }
+          obj.split = split
+          if (ring.sum) {
+            obj.redWidth = ((currPhase.redclear + ring.sum) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          } else {
+            obj.redWidth = (currPhase.redclear / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          }
+          obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          // 忽略相位不显示
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
+        }
+        this.patternInfo.push(list)
+      }
+    },
     handleCurrentChange (val) { // 两个ring的数据
       if (val === null || val.length === 0) return
       this.patternInfo = []
@@ -569,18 +689,18 @@ export default {
       })
       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 (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)
@@ -658,6 +778,7 @@ export default {
             obj.split = split
             obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           }
+          obj.mode = ring.mode
           obj.flashgreen = (currPhase.flashgreen / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.redWidth = (currPhase.redclear / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
           obj.yellowWidth = (currPhase.yellow / (this.max ? this.max : this.newCycle) * 100).toFixed(3) + '%'
@@ -678,10 +799,10 @@ export default {
           // }
           // obj.peddirection = peddirections
           // 忽略相位不显示
-          let mode = ring.mode
-          if (mode !== 7) { // 忽略相位不显示
-            list.push(obj)
-          }
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
         }
         this.patternInfo.push(list)
       }
@@ -767,9 +888,9 @@ export default {
       let ret = []
       const patternObj = {}
       pattern.forEach(l => {
-        if (l.mode !== 7) {
-          patternObj[l.id] = l.value
-        }
+        // if (l.mode !== 7) {
+        patternObj[l.id] = l.value
+        // }
       })
       newArr.forEach((na, index) => {
         let max = 0
@@ -779,7 +900,7 @@ export default {
             max = total
           }
         })
-        while (index > 0 && max < this.newCycle) { // && max < _this.newCycle
+        while (index > 0) { // && max < _this.newCycle
           index--
           max += ret[index]
         }
@@ -792,9 +913,9 @@ export default {
       const patternObj = {}
       pattern.forEach(l => {
         l.map(k => {
-          if (k.mode !== 7) {
-            patternObj[k.id] = k.value
-          }
+          // if (k.mode !== 7) {
+          patternObj[k.id] = k.value
+          // }
         })
       })
       let newMax = []
@@ -814,7 +935,7 @@ export default {
           this.max = newmaxNum + newminNum
           pattern.map(d => {
             d.map(r => {
-              if (r.sum && r.mode !== 7) {
+              if (r.sum) {
                 delete r.sum
               }
             })
@@ -824,7 +945,7 @@ export default {
           na.map(n => {
             pattern.map(h => {
               h.map(d => {
-                if (d.id === n.data[1] && d.sum && d.mode !== 7) {
+                if (d.id === n.data[1] && d.sum) {
                   delete d.sum
                 }
               })
@@ -836,11 +957,11 @@ export default {
               pattern.map(h => {
                 h.map(d => {
                   if (n.data.length > 1) {
-                    if (d.id === n.data[1] && d.mode !== 7) {
+                    if (d.id === n.data[1]) {
                       delete d.sum
                     }
                   } else {
-                    if (d.id === n.data[0] && d.mode !== 7) {
+                    if (d.id === n.data[0]) {
                       delete d.sum
                     }
                   }
@@ -858,11 +979,11 @@ export default {
               pattern.filter((i) => {
                 i.map(j => {
                   if (m.data.length > 1) {
-                    if (j.id === m.data[1] && j.mode !== 7) {
+                    if (j.id === m.data[1]) {
                       j.sum = sum
                     }
                   } else {
-                    if (j.id === m.data[0] && j.mode !== 7) {
+                    if (j.id === m.data[0]) {
                       j.sum = sum
                     }
                   }
@@ -872,7 +993,7 @@ export default {
           }
           let mapAdd = pattern.map(item => {
             return item.map(val => {
-              return val.mode === 7 ? 0 : val.value + (val.sum ? val.sum : 0)
+              return val.value + (val.sum ? val.sum : 0)
             })
           })
           let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {

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

@@ -534,6 +534,24 @@ export default {
       }
       return isequal
     },
+    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
+    },
     checkPatternRules (rings) {
       if (!this.isRingCycleEqual(rings)) {
         this.patternCycleEqual = false
@@ -561,8 +579,12 @@ export default {
         // duration: this.manualInfo.tempDuration !== undefined ? Number(this.manualInfo.tempDuration) : 0,
         data: {}
       }
+      if (this.patternOne.length === 0) {
+        submitdata.data.cycle = this.getMaxCycle(this.planPattern)
+      } else {
+        submitdata.data.cycle = this.getMaxCycle(this.patternOne[0])
+      }
       submitdata.data.offset = this.offset
-      submitdata.data.cycle = this.cycle
       submitdata.data.rings = this.rings
       this.checkPatternRules(submitdata.data.rings)
       if (this.patternCycleEqual) {