openatc-components 0.0.49 → 0.0.52

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

@@ -162,9 +162,9 @@ export default {
     controlData: {
       type: Object
     },
-    patternStatus: {
-      type: Object
-    },
+    // patternStatus: {
+    //   type: Object
+    // },
     phaseList: {
       type: Array
     },
@@ -215,9 +215,9 @@ export default {
       // }, {
       //   value: 3
       // }],
-      // options: {
-      //   group: 'pattern'
-      // },
+      options: {
+        group: 'pattern'
+      },
       // overlap: [
       //   {
       //     'id': 1,
@@ -1187,7 +1187,7 @@ export default {
     }
   },
   created () {
-    if (this.patternOne.length === 0 && this.planPattern.rings.length > 0) {
+    if (this.patternOne.length === 0) {
       this.handleStageData(this.planPattern.rings)
     }
     this.initData()
@@ -1275,72 +1275,75 @@ export default {
       this.handleStageData(this.patternOne[0].rings)
     },
     handleStageData (rings) { // stagesList
-      let phaseList = []
-      let stagesList = []
-      // rings = JSON.parse(JSON.stringify(rings))
-      if (rings.length === 0) return
-      let mapAdd = rings.map(item => {
-        return item.map(val => {
-          return val.value + (val.sum ? val.sum : 0)
-        })
-      })
-      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.stateList = [0]
-      this.narr = []
-      let currentIds = ''
-      let lastCurrentIds = ''
-      for (let j = 0; j <= this.max; j++) { // 指针长度
-        for (let i = 0; i < rings.length; i++) { // 环列表
-          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
+      for (let i = 0; i < rings.length; i++) {
+        if (rings[i].length > 0) {
+          let phaseList = []
+          let stagesList = []
+          // rings = JSON.parse(JSON.stringify(rings))
+          let mapAdd = rings.map(item => {
+            return item.map(val => {
+              return val.value + (val.sum ? val.sum : 0)
+            })
+          })
+          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.stateList = [0]
+          this.narr = []
+          let currentIds = ''
+          let lastCurrentIds = ''
+          for (let j = 0; j <= this.max; j++) { // 指针长度
+            for (let i = 0; i < rings.length; i++) { // 环列表
+              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 (lastCurrentIds !== currentIds && lastCurrentIds !== '') { // 当前相位id和上一个相比不同说明相位变化了
+              phaseList.push(lastCurrentIds)
+              this.stateList.push(j)// 阶段累计长度的集合
+            }
+            lastCurrentIds = currentIds
+            currentIds = ''
           }
+          let newPhaselist = []
+          phaseList.forEach(i => {
+            let rangeArr = i.split('-').map(Number)
+            if (rangeArr.length > 2) {
+              newPhaselist.push([
+                JSON.parse(JSON.stringify(rangeArr[1])),
+                JSON.parse(JSON.stringify(rangeArr[2]))
+              ])
+            } else {
+              newPhaselist.push([
+                JSON.parse(JSON.stringify(rangeArr[1]))
+              ])
+            }
+          })
+          for (let i = this.stateList.length - 1; i >= 1; i--) {
+            this.narr.push(this.stateList[i] - this.stateList[i - 1])
+          }
+          // newPhaselist
+          this.narr.reverse()// 阶段差
+          for (let i = 0; i < newPhaselist.length; i++) {
+            let stage = JSON.parse(JSON.stringify(newPhaselist[i]))
+            let stageItem = this.getStageItem(stage, rings, i)
+            stagesList.push(JSON.parse(JSON.stringify(stageItem)))
+          }
+          this.stagesList = JSON.parse(JSON.stringify(stagesList))
         }
-        if (lastCurrentIds !== currentIds && lastCurrentIds !== '') { // 当前相位id和上一个相比不同说明相位变化了
-          phaseList.push(lastCurrentIds)
-          this.stateList.push(j)// 阶段累计长度的集合
-        }
-        lastCurrentIds = currentIds
-        currentIds = ''
-      }
-      let newPhaselist = []
-      phaseList.forEach(i => {
-        let rangeArr = i.split('-').map(Number)
-        if (rangeArr.length > 2) {
-          newPhaselist.push([
-            JSON.parse(JSON.stringify(rangeArr[1])),
-            JSON.parse(JSON.stringify(rangeArr[2]))
-          ])
-        } else {
-          newPhaselist.push([
-            JSON.parse(JSON.stringify(rangeArr[1]))
-          ])
-        }
-      })
-      for (let i = this.stateList.length - 1; i >= 1; i--) {
-        this.narr.push(this.stateList[i] - this.stateList[i - 1])
-      }
-      // newPhaselist
-      this.narr.reverse()// 阶段差
-      for (let i = 0; i < newPhaselist.length; i++) {
-        let stage = JSON.parse(JSON.stringify(newPhaselist[i]))
-        let stageItem = this.getStageItem(stage, rings, i)
-        stagesList.push(JSON.parse(JSON.stringify(stageItem)))
       }
-      this.stagesList = JSON.parse(JSON.stringify(stagesList))
     },
     getStageItem (stageArr, ringsList, i) {
       let res = {

package/package/kisscomps/components/Stages/index.vue

@@ -45,10 +45,6 @@
               </div>
             </div>
           </div>
-          <!-- <PatternWalkSvg class="patternWalk"
-                                :Data="side"
-                                :Width="'55'"
-                                :Height="'55'" /> -->
         </div>
       </div>
   </div>
@@ -101,7 +97,7 @@ export default {
     },
     stagesList () {
       let list = []
-      if (this.crossStatusData && this.phaseList) {
+      if (this.crossStatusData && this.crossStatusData.current_stage && this.phaseList && this.phaseList.length > 0) {
         let ringDataModel = new RingDataModel(this.crossStatusData, this.phaseList)
         list = ringDataModel.getStageData()
         if (this.isShowCurrentStage) {