|
@@ -26,8 +26,8 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
- <el-form-item :label="t('iotDevice.yfCode')" prop="yfCode">
|
|
|
- <el-input v-model="formData.yfCode" placeholder="请输入油服设备编码" />
|
|
|
+ <el-form-item :label="t('iotDevice.yfCode')" prop="yfDeviceCode">
|
|
|
+ <el-input v-model="formData.yfDeviceCode" placeholder="请输入油服设备编码" />
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
@@ -428,7 +428,7 @@ const yfclasses = ref([])
|
|
|
const formData = ref({
|
|
|
id: undefined,
|
|
|
yfClass: undefined,
|
|
|
- yfCode: undefined,
|
|
|
+ yfDeviceCode: undefined,
|
|
|
enableDate: undefined,
|
|
|
deviceCode: undefined,
|
|
|
deviceName: undefined,
|
|
@@ -466,7 +466,7 @@ const formData = ref({
|
|
|
})
|
|
|
const formRules = reactive({
|
|
|
yfClass: [{ required: true, message: '编码类别不能为空', trigger: 'blur' }],
|
|
|
- yfCode: [{ required: true, message: '油服编码不能为空', trigger: 'blur' }],
|
|
|
+ yfDeviceCode: [{ required: true, message: '油服编码不能为空', trigger: 'blur' }],
|
|
|
assetClass: [{ required: true, message: '资产类别不能为空', trigger: 'blur' }],
|
|
|
deviceCode: [{ required: true, message: '设备编码不能为空', trigger: 'blur' }],
|
|
|
deviceName: [{ required: true, message: '设备名称不能为空', trigger: 'blur' }],
|
|
@@ -483,7 +483,7 @@ const handleYfClassChange = async (value) =>{
|
|
|
console.log(value)
|
|
|
const prefix = value.join('')
|
|
|
const last = await IotDeviceApi.getMaxCode(prefix)
|
|
|
- formData.value.yfCode = prefix+last
|
|
|
+ formData.value.yfDeviceCode = prefix+last
|
|
|
}
|
|
|
const assetclasschange = () => {
|
|
|
const assetClass = formData.value.assetClass
|
|
@@ -625,7 +625,7 @@ const submitForm = async () => {
|
|
|
}))
|
|
|
formData.value.templateJson = JSON.stringify(list.value)
|
|
|
}
|
|
|
- formData.value.yfClass = formData.value.yfClass.join('');
|
|
|
+ formData.value.yfClass = formData.value.yfClass.join(',');
|
|
|
const data = formData.value as unknown as IotDeviceVO
|
|
|
if (formType.value === 'create') {
|
|
|
await IotDeviceApi.createIotDevice(data)
|
|
@@ -662,11 +662,13 @@ onMounted(async () => {
|
|
|
formData.value.brandName = iotDevice.brandName;
|
|
|
formData.value.manufacturerName = iotDevice.zzName;
|
|
|
formData.value.supplierName = iotDevice.supplierName;
|
|
|
+ if (iotDevice.yfClass) {
|
|
|
+ formData.value.yfClass = iotDevice.yfClass.split(',');
|
|
|
+ }
|
|
|
list.value = JSON.parse(iotDevice.templateJson);
|
|
|
list.value.forEach((item) => {
|
|
|
formData.value[item.code] = item.value;
|
|
|
})
|
|
|
- debugger
|
|
|
} finally {
|
|
|
formLoading.value = false
|
|
|
}
|