openatc-components 0.4.8 → 0.4.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.4.8",
+  "version": "0.4.11",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

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

@@ -11,7 +11,7 @@
  **/
 <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
@@ -24,9 +24,31 @@
             </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 type="primary" @click="optimize()">{{$t('openatccomponents.pattern.inoptimize')}}</el-button> -->
     </div>
-  <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px'}">
+    <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>
+        </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>
+        </template>
+      </el-table-column>
+    </el-table>
+  <!-- <div class="common-board-column" :style="{marginTop:this.nowNumber === 1 ? 0 : '50px'}">
     <div class="common-board-column-header">
       {{headerText}}
     </div>
@@ -68,7 +90,7 @@
         </el-row>
       </div>
     </draggable>
-  </div>
+  </div> -->
 </div>
 </template>
 <script>
@@ -84,14 +106,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: 300,
       typeOptions: [{
         value: 'flow-split-opt'
       }, {
@@ -106,6 +129,18 @@ export default {
       type: String,
       default: 'Header'
     },
+    isOptimize: {
+      type: Boolean
+    },
+    tableRing: {
+      type: Array
+    },
+    showStyle: {
+      type: Object
+    },
+    styles: {
+      type: Object
+    },
     id: {
       type: Number
     },
@@ -148,6 +183,14 @@ export default {
     this.addMin()
   },
   watch: {
+    isOptimize: {
+      handler: function (val) {
+        if (val) {
+          this.optimize()
+        }
+      },
+      deep: true
+    },
     list: {
       handler: function () {
         this.addMin()

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

@@ -24,19 +24,20 @@
                       <!-- <patternwalksvg :showWalk="item.peddirection" :Width="'32'" :Height="'34'"></patternwalksvg> -->
                       <xdrdirselector  Width="60px" Height="60px" Widths="50px" Heights="50px" :showlist="item.direction"></xdrdirselector>
                     </div>
-                    <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;">
-                      <div class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
+                    <div v-if="isShowTip" class="box" style="position: absolute; left:40px; width:40px; top: -1px;z-index:999">
+                      <div @click="focusInput(item.id)" class="ring-nums">{{$t('openatccomponents.phase.phase')}}{{item.id}}</div>
                       <div v-if="isMove" class="ring-nums">{{item.split}}</div>
                       <el-input-number
                         v-if="!isMove"
                         class="ring-nums"
+                        :ref="'inputNumbers' + item.id"
                         size="small"
                         :controls="false"
                         :min="0"
                         :step="1"
                         v-model.number="item.split"
                         @change="handleEdit(item)"
-                        style="width: 24px"
+                        style="width: 42px"
                       ></el-input-number>
                     </div>
                   </div>
@@ -424,6 +425,11 @@ export default {
         }
       })
     },
+    focusInput (id) {
+      if (!this.isMove) {
+        this.$refs['inputNumbers' + id][0].focus()
+      }
+    },
     handleEdit (val) {
       this.patternStatusList.map(d => {
         d.map(r => {