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/sceneConfig/FormDiaLog.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index 199e92d..aa78fb3 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -53,7 +53,7 @@
<div class="detail-title">关联区域</div>
<div class="command-table-container">
<div class="command-table-content">
- <el-table class="command-data-cockpit-table" ref="areaTableRef" :data="areaList" row-key="id">
+ <el-table class="command-table" ref="areaTableRef" :data="areaList" row-key="id">
<el-table-column prop="areaName" label="区域名称" />
<el-table-column prop="areaType" label="区域类型">
<template v-slot="{ row }">
@@ -68,29 +68,29 @@
<el-form class="dialog-form" v-else ref="formRef" :model="formData" :rules="rules" :disabled="readonly"
label-width="96px">
<el-form-item label="场景名称" prop="sceneName">
- <el-input class="command-data-cockpit-search-input" v-model="formData.sceneName" maxlength="50"
+ <el-input class="command-search-input" v-model="formData.sceneName" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="指挥点位置" prop="longitude">
<div class="val">{{ formatLocation(formData) }}</div>
</el-form-item>
<el-form-item label="场景类型" prop="sceneType">
- <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
+ <el-select class="command-select" popper-class="command-select-popper"
v-model="formData.sceneType" placeholder="请选择" clearable>
<el-option v-for="item in dictObj.sceneType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
</el-form-item>
<el-form-item label="负责人" prop="defenseLeader">
- <el-input class="command-data-cockpit-search-input" v-model="formData.defenseLeader" maxlength="50"
+ <el-input class="command-search-input" v-model="formData.defenseLeader" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="负责人电话" prop="leaderPhone">
- <el-input class="command-data-cockpit-search-input" v-model="formData.leaderPhone" maxlength="50"
+ <el-input class="command-search-input" v-model="formData.leaderPhone" maxlength="50"
placeholder="请输入" clearable />
</el-form-item>
<el-form-item label="设备模式" prop="deviceMode">
- <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
+ <el-select class="command-select" popper-class="command-select-popper"
v-model="formData.deviceMode" placeholder="请选择" clearable>
<el-option v-for="item in dictObj.deviceMode" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
@@ -106,12 +106,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="areaDivideIds" label-width="0">
- <el-table class="command-data-cockpit-table" ref="areaTableRef"
+ <el-table class="command-table" ref="areaTableRef"
:data="areaList.filter(item => item.areaName.includes(searchName))" row-key="id"
@selection-change="handleAreaSelectionChange">
<el-table-column type="selection" width="55" :reserve-selection="true" />
--
Gitblit v1.9.3