From f925f12d5263c94644bddf6fd2ac3d23b77791cf Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 19 Jan 2026 14:32:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
index 31dcb77..5a878d3 100644
--- a/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/defenseZone/FormDiaLog.vue
@@ -34,7 +34,7 @@
<div class="detail-title">关联场景</div>
<div class="command-table-container">
<div class="command-table-content">
- <el-table class="command-data-cockpit-table" :data="sceneList" row-key="id">
+ <el-table class="command-table" :data="sceneList" row-key="id">
<el-table-column prop="sceneName" label="场景名称" />
<el-table-column prop="sceneType" label="场景类型">
<template v-slot="{ row }">
@@ -49,7 +49,7 @@
<el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly"
label-width="96px">
<el-form-item label="防区名称" prop="zoneName">
- <el-input class="command-data-cockpit-search-input" v-model="formData.zoneName" maxlength="50"
+ <el-input class="command-search-input" v-model="formData.zoneName" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="防区面积" prop="zoneArea">
@@ -62,12 +62,12 @@
关联场景
</div>
- <el-input class="command-data-cockpit-search-input" v-model="searchName" placeholder="请输入"
+ <el-input class="command-search-input" v-model="searchName" placeholder="请输入"
clearable></el-input>
</div>
<el-form-item prop="defenseSceneIds" label-width="0">
- <el-table class="command-data-cockpit-table" ref="sceneTableRef"
+ <el-table class="command-table" ref="sceneTableRef"
:data="sceneList.filter(item => item.sceneName.includes(searchName))" row-key="id"
@selection-change="handleSceneSelectionChange">
<el-table-column type="selection" width="55" :reserve-selection="true" />
--
Gitblit v1.9.3