From 80c915239301b1f0e3a732a6318e7743709e9489 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 31 三月 2025 16:01:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
index 103c747..58b2753 100644
--- a/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
+++ b/src/views/structural/capabilityAndLaboratory/capabilityComponents/EditForm.vue
@@ -318,7 +318,9 @@
this.editForm.sample = JSON.parse(this.editForm.sample)
this.editForm.radiusList = this.editForm.radiusList && JSON.parse(this.editForm.radiusList)
this.editForm.method = JSON.parse(this.editForm.method)
- this.$set(this.editForm, 'deviceId', this.editForm.deviceIds && this.editForm.deviceIds.split(","))
+ const ids = this.editForm.deviceIds && this.editForm.deviceIds.split(",") || [];
+ const numericIds = ids.map(Number);
+ this.$set(this.editForm, 'deviceId', numericIds);
}
},
// 鎻愪氦缂栬緫
@@ -448,7 +450,7 @@
search({ status: 0 }).then((res) => {
if (res.code === 200 && res.data) {
this.equipOptions = res.data.map((m) => {
- m.value = m.managementNumber;
+ m.value = m.id;
m.label = m.deviceName;
return m;
});
--
Gitblit v1.9.3