openatc-components 0.4.14 → 0.4.16

package/package/kisscomps/components/PatternOptimize/PatternOptimize.vue

@@ -129,9 +129,6 @@ export default {
       type: String,
       default: 'Header'
     },
-    isOptimize: {
-      type: Boolean
-    },
     tableRing: {
       type: Array
     },
@@ -183,17 +180,9 @@ export default {
     this.addMin()
   },
   watch: {
-    isOptimize: {
-      handler: function (val) {
-        if (val) {
-          this.optimize()
-        }
-      },
-      deep: true
-    },
     list: {
       handler: function () {
-        this.addMin()
+        // this.addMin()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -215,17 +204,22 @@ export default {
   methods: {
     optimize () {
       let _that = this
-      let newPha = []
-      for (let i = 0; i < _that.rings.rings.length; i++) {
-        newPha.push(..._that.rings.rings[i])
-      }
-      let phaseData = newPha.map(item => {
-        return {
-          id: item.id,
-          flowperhour: item.flowperhour,
-          saturation: item.saturation
-        }
+      // let newPha = []
+      // for (let i = 0; i < _that.rings.rings.length; i++) {
+      //   newPha.push(..._that.rings.rings[i])
+      // }
+      this.tableRing.map(item => {
+        delete item.desc
       })
+      // const filteredData = newPha.filter(item => item !== undefined)
+      // console.log(filteredData, 'filteredData')
+      // let phaseData = filteredData.map(item => {
+      //   return {
+      //     id: item.id,
+      //     flowperhour: item.flowperhour,
+      //     saturation: item.saturation
+      //   }
+      // })
       //   let patternList = _that.$store.state.globalParam.tscParam.patternList
       //   console.log(patternList, 'patternList')
       let pattern = _that.rings
@@ -234,12 +228,12 @@ export default {
         'optcycle': _that.optimizecycle,
         'phaseList': _that.phaseList,
         'pattern': pattern,
-        'phases': phaseData
+        'phases': this.tableRing
       }
       let isValidata = []
-      for (let j = 0; j < newPha.length; j++) {
-        let comNum = (newPha[j].length / 4) * 1700 * 0.8
-        isValidata.push(newPha[j].flowperhour > comNum)
+      for (let j = 0; j < this.tableRing.length; j++) {
+        let comNum = (this.tableRing[j].length / 4) * 1700 * 0.8
+        isValidata.push(this.tableRing[j].flowperhour > comNum)
       }
       if (isValidata.includes(true)) {
         this.$confirm(this.$t('openatccomponents.overview.maxFlow'),