openatc-components 0.1.41 → 0.1.43

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

@@ -166,7 +166,7 @@ export default {
         res = curPercent * 100 + '%'
       }
       if (this.cycle && this.cycle > 0) {
-        let curPercent = (this.cycle - this.syncTime) / this.cycle
+        let curPercent = (this.cycle - this.syncTime) / (this.max ? this.max : this.cycle)
         res = curPercent * 100 + '%'
       }
       return res
@@ -471,18 +471,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)
@@ -555,10 +555,10 @@ export default {
           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)
-          }
+          // let mode = ring.mode
+          // if (mode !== 7) { // 忽略相位不显示
+          list.push(obj)
+          // }
         }
         this.patternInfo.push(list)
       }

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

@@ -275,6 +275,26 @@ export default {
         }
       }
     },
+    getCycles () {
+      if (!this.patternOne[0].stages) return
+      let stages = this.patternOne[0].stages
+      let modeId = stages.filter(item => item.length === 1)[0]
+      for (let rings of this.patternOne[0].rings) {
+        let num = 0
+        for (let i = 0; i < rings.length; i++) {
+          if (rings[i].length !== 0) {
+            if (rings[i].mode === 7 && (modeId && modeId[0] === rings[i].id)) { // 忽略相位不计周期
+              continue
+            }
+            num = num + Number(rings[i].value)
+          }
+        }
+        if (num !== 0) {
+          this.patternOne[0].cycle = num
+          break
+        }
+      }
+    },
     getPhaseDescription (phaseList) {
       if (!phaseList) return
       let list = []
@@ -343,11 +363,15 @@ export default {
         let currPattern = this.patternOne[0].rings
         setTimeout(() => {
           this.handleStageData(currPattern)
+          this.getCycles()
+          this.patternOne[0].stagesList = this.stagesList
         }, 50)
       } else {
         let currPattern = this.planPattern.rings
         setTimeout(() => {
           this.handleStageData(currPattern)
+          this.getCycle()
+          this.allPatternList[0].stagesList = this.stagesList
         }, 50)
       }
     },
@@ -383,11 +407,11 @@ export default {
           // rings = JSON.parse(JSON.stringify(rings))
           let mapAdd = rings.map(item => {
             return item.map(val => {
-              if (val.mode !== 7) {
-                return val.value + (val.sum ? val.sum : 0)
-              } else {
-                return 0
-              }
+              // if (val.mode !== 7) {
+              return val.value + (val.sum ? val.sum : 0)
+              // } else {
+              //   return 0
+              // }
             })
           })
           let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
@@ -405,14 +429,14 @@ export default {
               let ring = rings[i]// 每个环对象
               let sum = 0
               for (let n = 0; n < ring.length; n++) { // 相位累计长度
-                if (ring[n].mode !== 7) {
-                  sum = sum + ring[n].value + (ring[n].sum ? ring[n].sum : 0)
-                  if (j < sum) {
-                    let phaseId = ring[n].id
-                    currentIds = currentIds + '-' + phaseId
-                    break
-                  }
+                // if (ring[n].mode !== 7) {
+                sum = sum + ring[n].value + (ring[n].sum ? ring[n].sum : 0)
+                if (j < sum) {
+                  let phaseId = ring[n].id
+                  currentIds = currentIds + '-' + phaseId
+                  break
                 }
+                // }
               }
             }
             if (lastCurrentIds !== currentIds && lastCurrentIds !== '') { // 当前相位id和上一个相比不同说明相位变化了

package/package/kisscomps/components/StageStatus/StageStatus.vue

@@ -157,18 +157,20 @@ export default {
           let ring = newList[i]// 每个环对象
           let sum = 0
           for (let n = 0; n < ring.length; n++) { // 相位累计长度
-            if (ring[n].mode !== 7) {
-              if (this.controlData) {
-                sum = sum + ring[n].split
-              } else {
-                sum = sum + ring[n].value
-              }
-              if (j < sum) {
-                let phaseId = ring[n].id
-                currentIds = currentIds + '-' + phaseId
-                break
-              }
+            // if (ring[n].mode !== 7) {
+            // if (this.controlData) {
+            // sum = sum + ring[n].split
+            sum = sum + ring[n].value + (ring[n].sum ? ring[n].sum : 0)
+            // } else {
+            // sum = sum + ring[n].value
+            // sum = sum + ring[n].value + (ring[n].sum ? ring[n].sum : 0)
+            // }
+            if (j < sum) {
+              let phaseId = ring[n].id
+              currentIds = currentIds + '-' + phaseId
+              break
             }
+            // }
           }
         }
         if (lastCurrentIds !== currentIds && lastCurrentIds !== '') { // 当前相位id和上一个相比不同说明相位变化了
@@ -189,38 +191,52 @@ export default {
       }
       // this.stageLineStatus = true
       if (this.controlData) {
+        if (this.localPatternList.length === 0) return
+        let ringList = this.localPatternList.filter(item => {
+          return item.id === this.controlData.patternid
+        })[0].rings
         if (!rings.rings) return
-        let mapAdd = rings.phase.map(item => {
-          return {
-            id: item.id,
-            split: item.split
-          }
-        })
-        let newRings = rings.rings.map(j => {
-          return j.sequence
-        })
-        let newList = newRings.map(item => {
-          let ret = []
-          item.map(i => {
-            const find = mapAdd.find(j => j.id === i)
-            if (find) {
-              ret.push(find)
-            }
-          })
-          return ret
-        })
-        let mapAdds = newList.map(item => {
+        // let mapAdd = rings.phase.map(item => {
+        //   return {
+        //     id: item.id,
+        //     split: item.split
+        //   }
+        // })
+        // let newRings = rings.rings.map(j => {
+        //   return j.sequence
+        // })
+        // let newList = newRings.map(item => {
+        //   let ret = []
+        //   item.map(i => {
+        //     const find = mapAdd.find(j => j.id === i)
+        //     if (find) {
+        //       ret.push(find)
+        //     }
+        //   })
+        //   return ret
+        // })
+        // let mapAdds = newList.map(item => {
+        //   return item.map(val => {
+        //     return val.split
+        //   })
+        // })
+        // let maxCycle = mapAdds.length > 0 ? mapAdds.map(item => {
+        //   return item.length > 0 ? item.reduce((a, b) => {
+        //     return a + b
+        //   }) : 0
+        // }) : 0
+        let mapAdd = ringList.map(item => {
           return item.map(val => {
-            return val.split
+            return val.value + (val.sum ? val.sum : 0)
           })
         })
-        let maxCycle = mapAdds.length > 0 ? mapAdds.map(item => {
+        let maxCycle = mapAdd.length > 0 ? mapAdd.map(item => {
           return item.length > 0 ? item.reduce((a, b) => {
             return a + b
           }) : 0
         }) : 0
         this.max = Math.max(...maxCycle)// 每个环的周期最大值
-        this.getControl(newList)
+        this.getControl(ringList)
       } else {
         let mapAdd = rings.map(item => {
           return item.map(val => {