openatc-components 0.4.85 → 0.4.86

package/package.json

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

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

@@ -15,6 +15,7 @@
         :isMove="isMove"
         :localPatternList="localPatternList"
         :showCondition="showCondition"
+        :patternType="patternType"
         :contrloType="contrloType"
         :allPatternList="allPatternList"
         :stagesChange="stagesChange"
@@ -103,6 +104,9 @@ export default {
     patternId: {
       type: Number
     },
+    patternType: {
+      type: String
+    },
     agentId: {
       type: String
     },

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

@@ -11,8 +11,33 @@
  **/
 <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">
+      <div v-if="(this.contrloType === 'ring' || !this.contrloType) && patternType !== 'rcp'">
         <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' : ''">
@@ -134,6 +159,7 @@ export default {
       newCycle: this.cycles,
       patternIds: this.patternId,
       newPatterns: [],
+      patternRcp: [],
       newList: [],
       isControl: true,
       contrloCycle: 0,
@@ -170,6 +196,9 @@ export default {
     controlPhase: {
       type: Object
     },
+    patternType: {
+      type: String
+    },
     contrloType: {
       type: String
     },
@@ -342,6 +371,9 @@ export default {
     cycles: {
       handler: function (val, oldVal) {
         this.newCycle = this.cycles
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
       },
       // 深度观察监听
       deep: true
@@ -366,6 +398,9 @@ export default {
     },
     patternStatusList: {
       handler: function (val, oldVal) {
+        if (this.patternType === 'rcp') {
+          this.handleRcp(this.patternStatusList)
+        }
         this.handleBarrierHeight() // 计算屏障高度
         if (this.patternStatusList && this.newCycle) {
           // setTimeout(() => {
@@ -398,6 +433,9 @@ export default {
     if (this.contrloType === 'stage') {
       this.getStage()
     }
+    if (this.patternType === 'rcp') {
+      this.handleRcp(this.patternStatusList)
+    }
   },
   methods: {
     move (e) {
@@ -485,6 +523,48 @@ 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)

package/src/kisscomps/components/patternList/patternList.vue

@@ -3,6 +3,7 @@
     <BoardCard
     :patternId="patternId"
     :contrloType="contrloType"
+    :patternType="patternType"
     :stagesChange="stagesChange"
     :isShowTip="isShowTip"
     :isBorder="isBorder"
@@ -552,6 +553,9 @@ export default {
     patternStatusList: {
       type: Array
     },
+    patternType: {
+      type: String
+    },
     patternId: {
       type: Number
     },