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