tongshanglei 3 роки тому
батько
коміт
af2370f464
2 змінених файлів з 17 додано та 11 видалено
  1. 4 0
      src/views/device/hydraulic/index.vue
  2. 13 11
      src/views/device/wrench/index.vue

+ 4 - 0
src/views/device/hydraulic/index.vue

@@ -421,6 +421,8 @@ export default {
         name: true,
         brand: true,
         supplier: true,
+        max_pressure:true,
+        min_pressure:true,
         model_name: true,
         is_used:true,
         online_time: true
@@ -530,6 +532,8 @@ export default {
         name: true,
         brand: true,
         supplier: true,
+         max_pressure:true,
+        min_pressure:true,
         model: true,
         online_time: true
       };

+ 13 - 11
src/views/device/wrench/index.vue

@@ -121,7 +121,7 @@
         align="center"
         v-if="showColumn.depart_name"
         :show-overflow-tooltip="true"
-        width="150"
+       
       />
       <!-- <el-table-column
         prop="alarm_state_text"
@@ -140,7 +140,7 @@
             >
         </template>
       </el-table-column> -->
-
+<!-- 
       <el-table-column
         prop="net_state"
         label="在线状态"
@@ -154,14 +154,14 @@
           <el-tag type="gray" v-else-if="record.row.net_state == '1'">离线</el-tag>
           <el-tag type="danger" v-else>从未上线</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop="number"
         label="编号"
         align="center"
         v-if="showColumn.number"
         :show-overflow-tooltip="true"
-        width="150"
+        min-width="120"
       />
       <el-table-column
         prop="name"
@@ -183,7 +183,7 @@
         align="center"
         v-if="showColumn.supplier"
         :show-overflow-tooltip="true"
-        width="120"
+        min-width="120"
       />
       <el-table-column
         prop="model_name"
@@ -209,22 +209,20 @@
         width="120"
       >
         <template slot-scope="record">
-          <el-tag type="danger" v-if="record.row.is_used == 0"
-            >未使用</el-tag
-          >
+          <el-tag type="danger" v-if="record.row.is_used == 0">未使用</el-tag>
           <el-tag type="success" v-else>已使用</el-tag>
         </template>
       </el-table-column> -->
-       <el-table-column
+      <el-table-column
         prop="online_time"
         label="在线时间"
         align="center"
         v-if="showColumn.online_time"
-        width="180"
+        width="150"
         sortable
       />
 
-       <el-table-column
+      <el-table-column
         prop="max_pressure"
         label="最大压力"
         align="center"
@@ -535,6 +533,10 @@ export default {
         name: true,
         brand: true,
         supplier: true,
+         max_pressure:true,
+        min_pressure:true,
+        min_torque:true,
+        max_torque:true,
         model: true,
         online_time: true
       };