openatc-components 0.0.96-hotfix → 0.0.99

package/package/kisscomps/components/BoardCard/BoardCard.vue

@@ -8,6 +8,7 @@
         :patternStatusList="patternStatusList">
         </StageStatus>
         <PatternStatus
+        :showBarrier="showBarrier"
         :localPatternList="localPatternList"
         :contrloType="contrloType"
         :stagesChange="stagesChange"
@@ -17,7 +18,7 @@
         :phaseList="phaseList"
         :cycle="cycle"
         :syncTime="syncTime"
-        :style="{'margin-top':cycle ? '25px':'0'}"
+        :style="{'margin-top':(cycle || !showBarrier)? '25px':'0'}"
         :patternStatusList="patternStatusList"
         :patternId="patternId"
         :cycles="cycles">
@@ -52,6 +53,10 @@ export default {
     stagesChange: {
       type: Array
     },
+    showBarrier: {
+      type: Boolean,
+      default: false
+    },
     phaseList: {
       type: Array
     },

package/package/kisscomps/components/DrawChannelization/drawsvg/index.draw.vue

@@ -541,8 +541,7 @@ export default {
         detectortype: 1, // 检测器类型： 1 车辆检测器 2 行人检测器
         detectorid: undefined,
         occupancythreshold: 80,
-        minflowsaturationthreshold: 30,
-        maxflowsaturationthreshold: 70,
+        flowsaturationthreshold: 20,
         ...defaultDetectorParam
       }
       this.curChooseIconIndex = detectoritem.index

package/package/kisscomps/components/DrawChannelization/drawsvg/laneEditPanel.vue

@@ -160,45 +160,18 @@
            <el-form-item
                 :label="$t('openatccomponents.channelizationmap.occupancythreshold') + ':'"
                 prop="intersection">
-              <!-- <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
+              <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
                 :value="occupancythreshold" size="mini"
                 @change="handleChangeOccuthreshold" />
-              <span class="detector-threshold-formtext">%</span> -->
-              <el-select :value="occupancythreshold" @change="handleChangeOccuthreshold">
-                <el-option
-                  v-for="item in occupResholdOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value">
-                </el-option>
-              </el-select>
+              <span class="detector-threshold-formtext">%</span>
             </el-form-item>
             <el-form-item
                 :label="$t('openatccomponents.channelizationmap.saturationthreshold') + ':'"
                 prop="count">
-              <!-- <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
+              <el-input-number :min="0" :max="100" :precision="0" :step="1" :controls="false"
                 :value="flowsaturationthreshold" size="mini"
                 @change="handleChangeFlowthreshold" />
-              <span class="detector-threshold-formtext">%</span> -->
-              <el-select :value="minflowsaturationthreshold" @change="handleChangeMinFlowthreshold">
-                <el-option
-                  v-for="item in minflowResholdOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled">
-                </el-option>
-              </el-select>
-              <span class="flow-separator">——</span>
-              <el-select :value="maxflowsaturationthreshold" @change="handleChangeMaxFlowthreshold">
-                <el-option
-                  v-for="item in maxflowResholdOptions"
-                  :key="item.value"
-                  :label="item.label"
-                  :value="item.value"
-                  :disabled="item.disabled">
-                </el-option>
-              </el-select>
+              <span class="detector-threshold-formtext">%</span>
             </el-form-item>
         </el-form>
       </div>
@@ -400,12 +373,8 @@ export default {
         iconclass: 'custom-peddetector',
         name: this.$t('openatccomponents.channelizationmap.pedestriandetector')
       }],
-      occupResholdOptions: [],
-      minflowResholdOptions: [],
-      maxflowResholdOptions: [],
       occupancythreshold: 80,
-      minflowsaturationthreshold: 30,
-      maxflowsaturationthreshold: 70
+      flowsaturationthreshold: 20
     }
   },
   watch: {
@@ -425,11 +394,8 @@ export default {
         if (data.occupancythreshold !== undefined) {
           this.occupancythreshold = data.occupancythreshold
         }
-        if (data.minflowsaturationthreshold !== undefined) {
-          this.minflowsaturationthreshold = data.minflowsaturationthreshold
-        }
-        if (data.maxflowsaturationthreshold !== undefined) {
-          this.maxflowsaturationthreshold = data.maxflowsaturationthreshold
+        if (data.flowsaturationthreshold !== undefined) {
+          this.flowsaturationthreshold = data.flowsaturationthreshold
         }
         if (data.flip !== undefined) {
           this.flip = data.flip
@@ -481,9 +447,8 @@ export default {
       if (value === 2) {
         // 行人检测器没有阈值设置
         this.iconObj.occupancythreshold = undefined
-        this.iconObj.minflowsaturationthreshold = undefined
-        this.iconObj.maxflowsaturationthreshold = undefined
-        this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold', 'minflowsaturationthreshold', 'maxflowsaturationthreshold'])
+        this.iconObj.flowsaturationthreshold = undefined
+        this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold', 'flowsaturationthreshold'])
       }
     },
     selectPedPos (value) {
@@ -541,53 +506,15 @@ export default {
       this.iconObj.occupancythreshold = occupancythreshold
       this.$emit('changeIconDataByType', this.iconObj, ['occupancythreshold'])
     },
-    handleChangeMinFlowthreshold (minflowsaturationthreshold) {
-      if (minflowsaturationthreshold === undefined) {
-        this.$message.error(this.$t('openatccomponents.channelizationmap.checkthreshold'))
-        this.minflowsaturationthreshold = 30
-        return
-      }
-      this.minflowsaturationthreshold = minflowsaturationthreshold
-      this.iconObj.minflowsaturationthreshold = minflowsaturationthreshold
-      this.$emit('changeIconDataByType', this.iconObj, ['minflowsaturationthreshold'])
-      this.handleDisabledMaxflowOption()
-    },
-    handleDisabledMinflowOption () {
-      // 此处需要排他，恢复上次置灰到默认值
-      this.minflowResholdOptions = this.minflowResholdOptions.map(option => ({
-        label: option.label,
-        value: option.value
-      }))
-      // 控制流量饱和度最小阈值的禁用范围
-      for (let i = 0; i < this.minflowResholdOptions.length; i++) {
-        if (this.minflowResholdOptions[i].value >= this.maxflowsaturationthreshold) {
-          this.minflowResholdOptions[i].disabled = true
-        }
-      }
-    },
-    handleChangeMaxFlowthreshold (maxflowsaturationthreshold) {
-      if (maxflowsaturationthreshold === undefined) {
+    handleChangeFlowthreshold (flowsaturationthreshold) {
+      if (flowsaturationthreshold === undefined) {
         this.$message.error(this.$t('openatccomponents.channelizationmap.checkthreshold'))
-        this.maxflowsaturationthreshold = 70
+        this.flowsaturationthreshold = 20
         return
       }
-      this.maxflowsaturationthreshold = maxflowsaturationthreshold
-      this.iconObj.maxflowsaturationthreshold = maxflowsaturationthreshold
-      this.$emit('changeIconDataByType', this.iconObj, ['maxflowsaturationthreshold'])
-      this.handleDisabledMinflowOption()
-    },
-    handleDisabledMaxflowOption () {
-      // 此处需要排他，恢复上次置灰到默认值
-      this.maxflowResholdOptions = this.maxflowResholdOptions.map(option => ({
-        label: option.label,
-        value: option.value
-      }))
-      // 控制流量饱和度最大阈值的禁用范围
-      for (let i = 0; i < this.maxflowResholdOptions.length; i++) {
-        if (this.maxflowResholdOptions[i].value <= this.minflowsaturationthreshold) {
-          this.maxflowResholdOptions[i].disabled = true
-        }
-      }
+      this.flowsaturationthreshold = flowsaturationthreshold
+      this.iconObj.flowsaturationthreshold = flowsaturationthreshold
+      this.$emit('changeIconDataByType', this.iconObj, ['flowsaturationthreshold'])
     },
     getCurPedPosList (iconpedtypeid) {
       // 方位根据行人类型显示
@@ -605,34 +532,8 @@ export default {
     handleChangeFilp (value) {
       this.iconObj.flip = value
       this.$emit('changeIconDataByType', this.iconObj, ['flip'])
-    },
-    createResholdSelectOptions () {
-      for (let i = 5; i < 100; i = i + 5) {
-        let option = {
-          label: i + '%',
-          value: i
-        }
-        this.occupResholdOptions.push(option)
-        if (i <= this.minflowsaturationthreshold) {
-          option.disabled = true
-        }
-        this.maxflowResholdOptions.push(option)
-      }
-      for (let i = 5; i < 100; i = i + 5) {
-        let option = {
-          label: i + '%',
-          value: i
-        }
-        if (i >= this.maxflowsaturationthreshold) {
-          option.disabled = true
-        }
-        this.minflowResholdOptions.push(option)
-      }
     }
   },
-  created () {
-    this.createResholdSelectOptions()
-  },
   mounted () {
     if (JSON.stringify(this.Data) === '{}') return
     this.iconObj = JSON.parse(JSON.stringify(this.Data))
@@ -648,11 +549,8 @@ export default {
     if (this.Data.occupancythreshold !== undefined) {
       this.occupancythreshold = this.Data.occupancythreshold
     }
-    if (this.Data.minflowsaturationthreshold !== undefined) {
-      this.minflowsaturationthreshold = this.Data.minflowsaturationthreshold
-    }
-    if (this.Data.maxflowsaturationthreshold !== undefined) {
-      this.maxflowsaturationthreshold = this.Data.maxflowsaturationthreshold
+    if (this.Data.flowsaturationthreshold !== undefined) {
+      this.flowsaturationthreshold = this.Data.flowsaturationthreshold
     }
     if (this.Data.flip !== undefined) {
       this.flip = this.Data.flip

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

@@ -202,12 +202,12 @@ export default {
       }
       return maxCycle
     },
-    doChange (val) {
-      // if (val.mode === 7) {
-      //   val.value = 0
-      // } else {
-      //   val.value = 30
-      // }
+    doChange (e) {
+      if (e) {
+        let n = this.index
+        this.$emit('handleSplit', n)
+        this.$forceUpdate()
+      }
     }
   }
 }

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

@@ -43,7 +43,7 @@
               <div class="first-1" :style="{'width':item.redWidth,'height':'34px','background':'#f27979'}"></div>
               </div>
           </div>
-        <div v-for="(item, index) in barrierList" :key="index + '1'">
+        <div v-if="showBarrier" v-for="(item, index) in barrierList" :key="index + '1'">
           <div class="divider" :style="{'left':item, 'height':barrierHeight}"></div>
         </div>
         <div v-show="(syncTime && cycle && cycle>0) || (syncTime && newCycle && newCycle>0)">
@@ -123,6 +123,10 @@ export default {
     patternList: {
       type: Array
     },
+    showBarrier: {
+      type: Boolean,
+      default: false
+    },
     localPatternList: {
       type: Array
     },
@@ -162,10 +166,10 @@ export default {
       return res
     },
     timeNumDevide () {
-      if (this.newCycle && this.newCycle > 0) {
-        let res = (this.newCycle - this.syncTime) + '/' + this.newCycle
-        return res
-      }
+      // if (this.newCycle && this.newCycle > 0) {
+      //   let res = (this.newCycle - this.syncTime) + '/' + this.newCycle
+      //   return res
+      // }
       if (this.cycle && this.cycle > 0) {
         let res = (this.cycle - this.syncTime) + '/' + this.cycle
         return res
@@ -191,7 +195,7 @@ export default {
         this.getPedPhasePos()
         this.getBusPos()
         this.getStage()
-        this.handlePatternData()
+        // this.handlePatternData()
       },
       // 深度观察监听
       deep: true
@@ -407,63 +411,174 @@ export default {
       this.newList = []
       if (Object.keys(this.controlData).length === 0 || this.phaseList.length === 0) return
       if (!this.controlData.phase) return
-      let cycle = this.controlData.cycle
+      // 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 list = []
+        let obj = {}
+        for (let key in rings.sequence) {
+          obj[key] = rings.sequence[key]
+        }
+        let newObj = Object.keys(obj).map(val => ({
+          id: obj[val]
+        }))
+        newValue.push(newObj)
         for (let sequ of rings.sequence) {
           let obj = {}
           obj.id = sequ
           let split = phase.filter((item) => {
             return item.id === sequ
           })[0].split
+          newValue.map(d => {
+            d.map(r => {
+              if (r.id === sequ) {
+                r.value = split
+              }
+            })
+          })
+          // let currPhase = this.phaseList.filter((item) => {
+          //   if (item.id === sequ && item.controltype === 99) {
+          //     obj.controltype = item.controltype
+          //   }
+          //   return item.id === sequ
+          // })[0]
+          // if (currPhase) {
+          //   obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
+          //   obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
+          //   obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
+          //   obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
+          //   // obj.peddirection = currPhase.peddirection
+          //   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))
+          //       }
+          //       // }
+          //     }
+          //   }
+          //   obj.peddirection = peddirections
+          //   obj.split = split
+          //   obj.direction = currPhase.direction.map(item => {
+          //     return {
+          //       id: item,
+          //       color: '#454545'
+          //     }
+          //   })
+          //   list.push(obj)
+          // }
+        }
+        // this.newList.push(list)
+        // this.patternInfo = [...this.newList]
+      }
+      this.handleOverViewChange(newValue)
+    },
+    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.split = split
           let currPhase = this.phaseList.filter((item) => {
-            if (item.id === sequ && item.controltype === 99) {
+            if (item.id === ring.id && item.controltype === 99) {
               obj.controltype = item.controltype
             }
-            return item.id === sequ
+            return item.id === ring.id
           })[0]
-          if (currPhase) {
-            obj.redWidth = (currPhase.redclear / cycle * 100).toFixed(3) + '%'
-            obj.yellowWidth = (currPhase.yellow / cycle * 100).toFixed(3) + '%'
-            obj.greenWidth = ((split - currPhase.redclear - currPhase.yellow - currPhase.flashgreen) / cycle * 100).toFixed(3) + '%'
-            obj.flashgreen = (currPhase.flashgreen / cycle * 100).toFixed(3) + '%'
-            // obj.peddirection = currPhase.peddirection
-            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'
               }
-            }
-            obj.peddirection = peddirections
-            obj.split = split
+            })
+          } else {
             obj.direction = currPhase.direction.map(item => {
               return {
                 id: item,
                 color: '#454545'
               }
             })
+          }
+          if (ring.sum) {
+            obj.split = split
+            obj.redWidth = (currPhase.redclear + ring.sum / (this.max ? this.max : cycle) * 100).toFixed(3) + '%'
+          } else {
+            obj.split = split
+            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) + '%'
+          // obj.peddirection = currPhase.peddirection
+          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))
+              }
+            // }
+            }
+          }
+          obj.peddirection = peddirections
+          // 忽略相位不显示
+          let mode = ring.mode
+          if (mode !== 7) { // 忽略相位不显示
             list.push(obj)
           }
         }
-        this.newList.push(list)
-        this.patternInfo = [...this.newList]
+        this.patternInfo.push(list)
       }
     },
-    handleBarrierHeight () { // 屏障高度
-      if (!this.patternInfo) return
-      let patternLength = this.patternInfo.length
-      this.barrierHeight = (patternLength * 35 + 21) + 'px'
-    },
     handleCurrentChange (val) { // 两个ring的数据
       if (val === null || val.length === 0) return
       this.patternInfo = []

package/package/kisscomps/components/SchemeConfig/SchemeConfig.vue

@@ -69,6 +69,12 @@
                  @closePhaseBack="closePhaseBack"
                  @closePhaseControl="closePhaseControl"
                 />
+                <priorityControl
+                v-if="specialPage === 'prioritycontrol'"
+                :phaseList="phaseList"
+                 @closePhaseBack="closePhaseBack"
+                 @closePhaseControl="closePhaseControl"
+                />
             </div>
           </transition>
 
@@ -110,6 +116,7 @@ import ManualControlModal from './manualControlModal'
 import ClosePhaseControlModal from './closePhaselControlModal'
 import LockingPhaseControlModal from './lockingPhaselControlModal'
 import TentativePlanControlModal from './tentativeplancontrolmodal'
+import priorityControl from './priorityControl'
 // import { getFaultMesZh, getFaultMesEn } from '../../utils/faultcode.js'
 import { getMessageByCode } from '../../../utils/responseMessage'
 import { GetAllFaultRange } from '../../../api/fault'
@@ -125,6 +132,7 @@ export default {
     ManualControlModal,
     ClosePhaseControlModal,
     LockingPhaseControlModal,
+    priorityControl,
     TentativePlanControlModal
   },
   props: {
@@ -292,6 +300,9 @@ export default {
       }, {
         id: 100,
         iconClass: 'tentativeplan'
+      }, {
+        id: 24,
+        iconClass: 'tentativeplan'
       }],
       phaseRings: [],
       curFaultList: [],
@@ -620,6 +631,11 @@ export default {
         this.isClosePhase = true
         this.phaseRings = ringDataModel.initRingPhaseData()
         this.specialPage = 'tentativeplan'
+      } else if (id === 24) {
+        this.toPage = 3
+        this.isClosePhase = true
+        this.phaseRings = ringDataModel.initRingPhaseData()
+        this.specialPage = 'prioritycontrol'
       } else {
         this.isClosePhase = false
         this.specialPage = ''