瀏覽代碼

易用性修改

dongjh 1 年之前
父節點
當前提交
be2547f536

+ 23 - 31
src/views/module_tpm/equipment/EquipmentList.vue

@@ -131,21 +131,12 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleDetail(record)">详情</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <!-- <a @click="handleDetail(record)">详情</a>
+          <a-divider type="vertical" /> -->
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
 
       </a-table>
@@ -200,6 +191,7 @@
             title:'设备名称',
             align:"center",
             dataIndex: 'equipmentname',
+            width:200,
           },
           {
             title:'设备分类',
@@ -223,7 +215,7 @@
             dataIndex: 'spaceid_dictText'
           },
           {
-            title:'周期',
+            title:'送检周期',
             align:"center",
             dataIndex: 'equipmentCycle'
           },
@@ -232,21 +224,21 @@
             align:"center",
             dataIndex: 'cycleUnit_dictText'
           },
-          {
-            title:'出厂编号',
-            align:"center",
-            dataIndex: 'factoryNo'
-          },
-          {
-            title:'出厂日期',
-            align:"center",
-            dataIndex: 'productDate'
-          },
-          {
-            title:'启用日期',
-            align:"center",
-            dataIndex: 'activeDate'
-          },
+          // {
+          //   title:'出厂编号',
+          //   align:"center",
+          //   dataIndex: 'factoryNo'
+          // },
+          // {
+          //   title:'出厂日期',
+          //   align:"center",
+          //   dataIndex: 'productDate'
+          // },
+          // {
+          //   title:'启用日期',
+          //   align:"center",
+          //   dataIndex: 'activeDate'
+          // },
           {
             title:'责任部门',
             align:"center",
@@ -272,7 +264,7 @@
             dataIndex: 'action',
             align:"center",
             fixed:"right",
-            width:147,
+            width:127,
             scopedSlots: { customRender: 'action' }
           }
         ],

+ 3 - 3
src/views/module_tpm/equipment/modules/EquipmentForm.vue

@@ -60,9 +60,9 @@
             </a-form-model-item>
           </a-col>
           <a-col :span="12">
-            <a-form-model-item label="周期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentCycle">
-              <a-input-number v-model="model.equipmentCycle" style="width:49%;" placeholder="请输入周期" />
-              <j-dict-select-tag type="list" v-model="model.cycleUnit" dictCode="cycle_unit" style="width:49%;" placeholder="请选择周期单位" />
+            <a-form-model-item label="送检周期" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="equipmentCycle">
+              <a-input-number v-model="model.equipmentCycle" style="width:49%;" placeholder="请输入送检周期" />
+              <j-dict-select-tag type="list" v-model="model.cycleUnit" dictCode="cycle_unit" style="width:49%;" placeholder="请选择送检周期单位" />
             </a-form-model-item>
             <!-- <a-form-model-item prop="cycleUnit" style="width:40%;">
             </a-form-model-item> -->

+ 10 - 17
src/views/module_tpm/equipmentTree/EquipmentTreeList.vue

@@ -89,21 +89,12 @@
 
         <span slot="action" slot-scope="text, record">
           <a @click="handleEdit(record)">编辑</a>
-
           <a-divider type="vertical" />
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item>
-                <a @click="handleAddChild(record)">添加下级</a>
-              </a-menu-item>
-              <a-menu-item>
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-            </a-menu>
-          </a-dropdown>
+          <a @click="handleAddChild(record)">添加下级</a>
+          <a-divider type="vertical" />
+          <a-popconfirm title="确定删除吗?" @confirm="() => handleDeleteNode(record.id)" placement="topLeft">
+            <a>删除</a>
+          </a-popconfirm>
         </span>
 
       </a-table>
@@ -136,19 +127,21 @@
           {
             title:'设备分类名称',
             align:"left",
-            dataIndex: 'name'
+            dataIndex: 'name',
+            width:400,
           },
           {
             title:'排序',
             align:"right",
-            dataIndex: 'sortorder'
+            dataIndex: 'sortorder',
+            width:167,
           },
           {
             title: '操作',
             dataIndex: 'action',
             align:"center",
             fixed:"right",
-            width:147,
+            width:167,
             scopedSlots: { customRender: 'action' },
           }
         ],