From d3ef2f4d4f9c9d863ab76b3140271dcfe0a6179e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 13 Jan 2026 15:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index a703769..91c7626 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -149,13 +149,13 @@
const dictObj = inject('dictObj')
const rules = {
- sceneName: fieldRules(true, false, 50),
- sceneType: fieldRules(true, true),
- defenseLeader: fieldRules(true, false, 50),
- leaderPhone: fieldRules(true, false, 50),
- deviceMode: fieldRules(true, true),
- longitude: fieldRules(true, true),
- areaDivideIds: fieldRules(true, true),
+ sceneName: fieldRules(true, 50),
+ sceneType: fieldRules(true),
+ defenseLeader: fieldRules(true, 50),
+ leaderPhone: fieldRules(true, 50),
+ deviceMode: fieldRules(true),
+ longitude: fieldRules(true),
+ areaDivideIds: fieldRules(true),
}
// 关闭弹框
@@ -203,7 +203,6 @@
formData.value.areaDivideIds = ids.join(',')
formData.value.areaCount = ids.length
formData.value.defenseArea = calcDefenseArea(rows)
- formRef.value?.validateField('areaDivideIds')
}
function calcDefenseArea(rows) {
@@ -219,10 +218,10 @@
function syncAreaSelection() {
if (!areaTableRef.value) return
areaTableRef.value.clearSelection()
- const ids = new Set(getAreaIdList().map(String))
+ const ids = new Set(getAreaIdList())
const rows = []
areaList.value.forEach(row => {
- if (ids.has(String(row.id))) {
+ if (ids.has(row.id)) {
areaTableRef.value.toggleRowSelection(row, true)
rows.push(row)
}
--
Gitblit v1.9.3