openatc-components 0.4.17 → 0.4.18

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

@@ -24,7 +24,7 @@
             </el-select>
             <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
             <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
-        <!-- <el-button type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
+        <el-button v-if="isTentative" type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button>
     </div>
     <el-table class="tb-edit" ref="singleTables" row-key="id" :data="tableRing" element-loading-text="Loading" :max-height="tableHeight" fit highlight-current-row id="footerBtn">
       <el-table-column prop="id" sortable align="center" :label="$t('openatccomponents.overview.id')">
@@ -131,6 +131,10 @@ export default {
       type: String,
       default: 'Header'
     },
+    isTentative: {
+      type: Boolean,
+      default: false
+    },
     tableRing: {
       type: Array
     },
@@ -179,7 +183,7 @@ export default {
   },
   created () {
     // this.addMinSplit()
-    this.addMin()
+    // this.addMin()
   },
   watch: {
     list: {

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

@@ -300,6 +300,7 @@
             :tableRing="tableRing"
             :showStyle="showStyle"
             :styles="styles"
+            :isTentative="true"
             @handleSplit="handleSplit"
           >
           </pattern-optimize>

package/package/kisscomps/components/StageOptimize/StageOptimize.vue

@@ -11,7 +11,46 @@
  **/
 <template>
 <div>
-  <div v-if="this.nowNumber === 1" class="optimizetype">
+  <div class="optimizetype">
+        <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
+        <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
+            <el-option
+                v-for="item in typeOptions"
+                :key="item.value"
+                :label="$t('openatccomponents.overview.type' + item.value)"
+                :value="item.value"
+                >
+            </el-option>
+            </el-select>
+            <span class="optimiNum">{{$t('openatccomponents.pattern.optimizecycle')}}</span>
+            <el-input v-model="optimizecycle" clearable :placeholder="$t('openatccomponents.common.enter')"></el-input>
+        <!-- <el-button type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
+    </div>
+    <el-table class="tb-edit" ref="singleTables" row-key="id" :data="tableRing" element-loading-text="Loading" :max-height="tableHeight" fit highlight-current-row id="footerBtn">
+      <el-table-column prop="id" sortable align="center" :label="$t('openatccomponents.overview.id')">
+        <template slot-scope="scope">
+          <span>{{scope.row.id}}</span>
+        </template>
+      </el-table-column>
+      <el-table-column class="table-column" :label="$t('openatccomponents.overview.phase')" align="center">
+        <template slot-scope="scope">
+          <xdrdirselector Width="70px" Height="70px" Widths="58px" Heights="58px" :Datas="styles" :Data="showStyle" :showlist="scope.row.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+        </template>
+      </el-table-column>
+      <el-table-column class="table-column" :label="$t('openatccomponents.overview.flow')" align="center">
+        <template slot-scope="scope">
+          <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="scope.row.flowperhour" ref="type"></el-input-number>
+          <!-- <span>{{scope.row.flowperhour}}</span> -->
+        </template>
+      </el-table-column>
+      <el-table-column align="center" :label="$t('openatccomponents.overview.saturationflow')">
+        <template slot-scope="scope">
+          <el-input-number :controls="false" class="col-content" size="small"  :step="1" v-model.number="scope.row.saturation" ref="types"></el-input-number>
+          <!-- <span>{{scope.row.saturation}}</span> -->
+        </template>
+      </el-table-column>
+    </el-table>
+  <!-- <div v-if="this.nowNumber === 1" class="optimizetype">
       <span>{{$t('openatccomponents.pattern.optimizetype')}}</span>
       <el-select v-model="value" clearable :placeholder="$t('openatccomponents.common.select')">
         <el-option
@@ -68,7 +107,7 @@
           </el-row>
         </div>
       </draggable>
-  </div>
+  </div> -->
 </div>
 </template>
 <script>
@@ -84,14 +123,15 @@ export default {
   },
   data () {
     return {
-      showStyle: {
-        left: '2px',
-        top: '0px'
-      },
-      styles: {
-        left: '1px',
-        top: '0px'
-      },
+      // showStyle: {
+      //   left: '2px',
+      //   top: '0px'
+      // },
+      // styles: {
+      //   left: '1px',
+      //   top: '0px'
+      // },
+      tableHeight: 400,
       typeOptions: [{
         value: 'flow-split-opt'
       }, {
@@ -106,6 +146,15 @@ export default {
       type: String,
       default: 'Header'
     },
+    tableRing: {
+      type: Array
+    },
+    showStyle: {
+      type: Object
+    },
+    styles: {
+      type: Object
+    },
     contrloType: {
       type: String
     },
@@ -154,12 +203,12 @@ export default {
   },
   created () {
     // this.addMinSplit()
-    this.addMin()
+    // this.addMin()
   },
   watch: {
     list: {
       handler: function () {
-        this.addMin()
+        // this.addMin()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -179,7 +228,7 @@ export default {
     },
     stageData: {
       handler: function () {
-        this.addMins()
+        // this.addMins()
         // let list = this.$refs.type
         // let flow = this.$refs.types
         // console.log(this.list, 'list')
@@ -201,16 +250,19 @@ 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])
+      // }
+      // let phaseData = newPha.map(item => {
+      //   return {
+      //     id: item.id,
+      //     flowperhour: item.flowperhour,
+      //     saturation: item.saturation
+      //   }
+      // })
+      this.tableRing.map(item => {
+        delete item.desc
       })
       //   let patternList = _that.$store.state.globalParam.tscParam.patternList
       //   console.log(patternList, 'patternList')
@@ -220,12 +272,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'),
@@ -270,25 +322,25 @@ export default {
           console.log(error)
         })
       }
-    },
-    addMins () {
-      for (let i of this.stageData) {
-          if (!i.flowperhour || !i.saturation) {
-            i.flowperhour = 0
-            i.saturation = 1700
-            i.length = this.list.length
-          }
-      }
-    },
-    addMin () {
-      for (let i of this.list) {
-        if (!i.flowperhour || !i.saturation) {
-          i.flowperhour = 0
-          i.saturation = 1700
-          i.length = this.list.length
-        }
-      }
     }
+    // addMins () {
+    //   for (let i of this.stageData) {
+    //       if (!i.flowperhour || !i.saturation) {
+    //         i.flowperhour = 0
+    //         i.saturation = 1700
+    //         i.length = this.list.length
+    //       }
+    //   }
+    // },
+    // addMin () {
+    //   for (let i of this.list) {
+    //     if (!i.flowperhour || !i.saturation) {
+    //       i.flowperhour = 0
+    //       i.saturation = 1700
+    //       i.length = this.list.length
+    //     }
+    //   }
+    // }
   }
 }
 </script>
@@ -297,7 +349,7 @@ export default {
   width: 100%;
 }
 .optimizetype{
-  position: absolute;
+  // position: absolute;
   margin:0 0 10PX 0;
   .el-input {
     width: 80PX;