Просмотр исходного кода

feat(device): 井盖拉开力设备增加类型字段并调整列表展示

- 在设备表单中增加类型字段,为必填项- 调整设备列表展示,将型号和类型分开显示- 更新设备详情展示,先显示类型再显示型号
- 优化设备型号输入,改为文本输入框
nahida 1 год назад
Родитель
Сommit
a9b4b2201a
1 измененных файлов с 12 добавлено и 4 удалено
  1. 12 4
      src/views/device/manhole/ldzh/jgkl.vue

+ 12 - 4
src/views/device/manhole/ldzh/jgkl.vue

@@ -49,6 +49,9 @@ const addFormRules = {
   ],
   model: [
     { required: true, message: '请输入设备型号', trigger: 'blur' }
+  ],
+  type: [
+    { required: true, message: '请输入设备类型', trigger: 'blur' }
   ]
 }
 const addFormRef = ref(null)
@@ -391,9 +394,10 @@ onMounted(() => {
       <el-table-column type="index" label="序号" width="60" align="center"/>
       <el-table-column prop="deviceName" label="设备名称" min-width="150" show-overflow-tooltip/>
       <el-table-column prop="deviceNumber" label="设备编号" min-width="150" show-overflow-tooltip/>
-      <el-table-column prop="model" label="型号" min-width="120" show-overflow-tooltip>
+      <el-table-column prop="model" label="型号" min-width="150" show-overflow-tooltip/>
+      <el-table-column prop="type" label="类型" min-width="120" show-overflow-tooltip>
         <template #default="{row}">
-          {{deviceType[row.model]}}
+          {{deviceType[row.type]}}
         </template>
       </el-table-column>
       <el-table-column prop="location" label="位置" min-width="150" show-overflow-tooltip/>
@@ -470,8 +474,9 @@ onMounted(() => {
       <el-descriptions :column="2" border>
         <el-descriptions-item label="设备名称">{{ currentDevice.deviceName }}</el-descriptions-item>
         <el-descriptions-item label="设备编号">{{ currentDevice.deviceNumber }}</el-descriptions-item>
-        <el-descriptions-item label="型号">{{ deviceType[currentDevice.model] }}</el-descriptions-item>
+        <el-descriptions-item label="类型">{{ deviceType[currentDevice.type] }}</el-descriptions-item>
         <el-descriptions-item label="位置">{{ currentDevice.location }}</el-descriptions-item>
+        <el-descriptions-item label="型号">{{ currentDevice.model }}</el-descriptions-item>
         <el-descriptions-item label="在线状态">
           <span v-if="currentDevice.onlineStatus === 1" class="flex items-center text-green-500">
             <Wifi class="w-4 h-4 mr-1"/>
@@ -551,7 +556,10 @@ onMounted(() => {
           <el-input v-model="addForm.deviceNumber" placeholder="请输入设备编号"/>
         </el-form-item>
         <el-form-item label="型号" prop="model">
-          <el-select v-model="addForm.model" placeholder="请输入设备型号">
+          <el-input v-model="addForm.model" placeholder="请输入型号"/>
+        </el-form-item>
+        <el-form-item label="类型" prop="model">
+          <el-select v-model="addForm.type" placeholder="请输入设备型号">
             <el-option
                 v-for="(item,index) in deviceType"
                 :key="item.value"