openatc-components 0.4.81 → 0.4.83

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

@@ -11,33 +11,8 @@
  **/
 <template>
     <div class="main-patternstatus">
-      <!-- rcp模式 -->
-      <div v-if="patternType === 'rcp'">
-        <div class="ring-first" v-for="(list, index1) in patternRcp" :key="index1">
-          <div style="position: relative" :style="{height: '34px',paddingRight: '1px',float: 'left',width:
-              ((item.split + (item.sum ? item.sum : 0)) /(item.cycle > cycles ? item.cycle : cycles)) *100 +'%',}"
-              v-for="(item, index2) in list" :key="index2">
-            <div class="first-1" :style="{ width:
-                  (Number(item.greenWidth.replace('%', '')) /
-                    Number((((item.split + (item.sum ? item.sum : 0)) /
-                  (item.cycle > cycles ? item.cycle : cycles)) * 100 + '%').replace('%', ''))) * 100 + '%', height: '34px',background: '#7ccc66'}">
-            </div>
-            <el-tooltip placement="top-start" effect="light">
-                <div v-if="item.id" slot="content">P{{ item.id }}:{{ item.split }}</div>
-                <div v-if="item.id" style="cursor: pointer">
-                  <div
-                    class="box"
-                    style="position: absolute; width:40px; left: 0; top: 5px"
-                  >
-                    <div class="ring-nums">P{{ item.id }}:{{ item.split }}</div>
-                  </div>
-                </div>
-              </el-tooltip>
-          </div>
-      </div>
-      </div>
       <!-- 环模式true -->
-      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
+      <div v-if="this.contrloType === 'ring' || !this.contrloType">
         <div class="ring-first" v-for="(list, index1) in patternInfo" :key="index1">
           <draggable :move="move" @end="endDrag(index1)" :disabled="isMove" :list="list">
             <div style="position: relative;" :style="{'height': '35px','float':'left','width':((item.split+(item.sum?item.sum:0)) / (max?max:item.cycle) * 100) + '%'}"  v-for="(item,index2) in list" :key="index2" :class="item.mode === 7 ? 'direction' : isBorder ? 'hovercell' : ''">
@@ -159,7 +134,6 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
-      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -196,9 +170,6 @@ export default {
     controlPhase: {
       type: Object
     },
-    patternType: {
-      type: String
-    },
     contrloType: {
       type: String
     },
@@ -371,9 +342,6 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
       },
       // 深度观察监听
       deep: true
@@ -398,9 +366,6 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
-        if (this.patternType === 'rcp') {
-          this.handleRcp(this.patternStatusList)
-        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           // setTimeout(() => {
@@ -433,9 +398,6 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
-    if (this.patternType === 'rcp') {
-      this.handleRcp(this.patternStatusList)
-    }
   },
   methods: {
     move (e) {
@@ -523,48 +485,6 @@ export default {
       }
       return ped
     },
-    handleRcp (val) {
-      this.patternRcp = []
-      let valSplit = val.map(item => {
-        return item.map(val => {
-          return val.splitchain
-        })
-      })
-      let splitCycle = valSplit.length > 0 ? valSplit.map(item => {
-        return item.length > 0 ? item.reduce((a, b) => {
-          return a + b
-        }) : 0
-      }) : 0
-      let cycle = Math.max(...splitCycle)// 每个环的周期最大值
-      for (let rings of val) {
-        if (rings.length === 0) continue
-        let list = []
-        for (let ring of rings) {
-          if (ring.splitchain === 0) continue
-          let obj = {}
-          let split = ring.splitchain
-          obj.split = split
-          obj.cycle = cycle
-          obj.id = ring.phases
-          // if (ring.sum) {
-          //   obj.sum = ring.sum
-          //   obj.redWidth = ((currPhase.redclear + ring.sum) / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // } else {
-          //   obj.redWidth = (currPhase.redclear / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // }
-          // obj.mode = ring.mode
-          obj.greenWidth = (split / (cycle > this.cycles ? cycle : this.cycles)) * 100 + '%'
-          // obj.flashgreen = (currPhase.flashgreen / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // obj.yellowWidth = (currPhase.yellow / (this.fixCycle ? this.fixCycle : this.max ? this.max : this.newCycle) * 100) + '%'
-          // 忽略相位不显示
-          // let mode = ring.mode
-          // if (mode !== 7) { // 忽略相位不显示
-          list.push(obj)
-          // }
-        }
-        this.patternRcp.push(list)
-      }
-    },
     handleStageData (data) {
       if (!data) return
       let peddirections = this.getPed(data)
@@ -837,6 +757,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
+              ring1.push(adds)
+            }
+            let ring1s = [] // 环1与关系2的并集
+            for (let h = 0; h < newCurrent.length; h++) {
+              let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1123,6 +1057,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
+              ring1.push(adds)
+            }
+            let ring1s = [] // 环1与关系2的并集
+            for (let h = 0; h < newCurrent.length; h++) {
+              let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length > 1) {
@@ -1372,6 +1320,20 @@ export default {
           let addRing1 = [...new Set(resultArrs[1])].filter(item => newCurrent[h].includes(item))
           ring1s.push(addRing1)
         }
+        // 双环相位数不等的时候
+        if (newRings.length > 1) {
+          if (newRings[0].length !== newRings[1].length) {
+            for (let h = 0; h < newCurrent.length; h++) {
+              let adds = [...new Set(ringsequence[0])].filter(item => newCurrent[h].includes(item))
+              ring1.push(adds)
+            }
+            let ring1s = [] // 环1与关系2的并集
+            for (let h = 0; h < newCurrent.length; h++) {
+              let addRing1 = [...new Set(ringsequence[1])].filter(item => newCurrent[h].includes(item))
+              ring1s.push(addRing1)
+            }
+          }
+        }
         barrierRing1.push(...ring1, ...ring1s)
         let resultList = []
         if (newRings.length >= 1) {
@@ -1430,9 +1392,6 @@ export default {
         if (this.patternList) {
           this.setBarrier(ringTeams, val)
         }
-        if (newRings.length > 1) {
-          this.fillGap(ringTeams, val)
-        }
         if (this.cycleChange) {
           const globalParamModel = this.$store.getters.globalParamModel
           let pattern = globalParamModel.getParamsByType('patternList')
@@ -1442,6 +1401,9 @@ export default {
         } else {
           this.max = ''
         }
+        if (newRings.length > 1) {
+          this.fillGap(ringTeams, val)
+        }
         let barrier = this.step2(ringTeams, newPattern)
         let barrierLeft = barrier.map(item => item)// 屏障左移显示出人行横道
         this.barrierList = barrierLeft.map(j => {