diff --git a/src/views/equipmentManagement/devices/index.vue b/src/views/equipmentManagement/devices/index.vue
index ab3ef0f..8cde2dc 100644
--- a/src/views/equipmentManagement/devices/index.vue
+++ b/src/views/equipmentManagement/devices/index.vue
@@ -116,7 +116,7 @@
-
+
@@ -164,21 +164,21 @@
-
+
-
+
-
+
@@ -358,6 +358,16 @@ const initData: PageData = {
deviceType: [
{ required: true, message: '请选择设备类型', trigger: 'blur' },
],
+ bluetoothName: [
+ { required: true, message: '请输入蓝牙名称', trigger: 'blur' },
+ ],
+ deviceMac: [
+ { required: true, message: '请输入设备MAC', trigger: 'blur' },
+ ],
+ deviceImei: [
+ { required: true, message: '请输入设备IMEI', trigger: 'blur' },
+ ],
+
}
};
const data = reactive>(initData);
@@ -533,7 +543,6 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
showMacField.value = false;
showImeiField.value = false;
communicationModeInfo.value = null;
-
// 编辑时如果有值,根据已有值确定显示哪个字段
if (form.value.id) {
if (form.value.deviceMac) {
@@ -549,7 +558,7 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
isProcessing = true;
// 新增或编辑时没有值,根据设备类型获取通讯方式
try {
- userFormRef.value?.clearValidate(['deviceMac', 'deviceImei']);
+ userFormRef.value?.clearValidate(['deviceMac', 'deviceImei','bluetoothName']);
if (!deviceTypeId) {
return;
}
@@ -565,6 +574,7 @@ const handleDeviceTypeChange = async (deviceTypeId: string | number) => {
showMacField.value = false;
showImeiField.value = true;
form.value.deviceMac = ''; // 清空MAC
+ form.value.bluetoothName = '' // 清空蓝牙名称
}
}
} catch (error) {
diff --git a/src/views/system/user/profile/index.vue b/src/views/system/user/profile/index.vue
index 7c1389a..97d70ae 100644
--- a/src/views/system/user/profile/index.vue
+++ b/src/views/system/user/profile/index.vue
@@ -55,9 +55,9 @@
-
+