openatc-components 0.1.42 → 0.1.44

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

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

@@ -133,7 +133,7 @@
                     :overlap="overlap"
                     :checked="true"
                     :tentative="true"
-                    :cycle="patternOne.length===0?planPattern.cycle:patternOne[0].cycle"
+                    :cycle="overLapCycle"
                     >
                     </over-lap>
                 </el-col>
@@ -200,6 +200,7 @@ export default {
     return {
       stagesList: [],
       phaseRings: [],
+      overLapCycle: 0,
       options: {
         group: 'pattern'
       },
@@ -470,6 +471,7 @@ export default {
             let stageItem = this.getStageItem(stage, rings, i)
             stagesList.push(JSON.parse(JSON.stringify(stageItem)))
           }
+          this.overLapCycle = stagesList.reduce((prev, curr) => prev + parseInt(curr.split), 0)
           this.stagesList = JSON.parse(JSON.stringify(stagesList))
         }
       }

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 => {