From 2522b0f5f4c3571b3cdbe1f68b68c2fb4e2ed255 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 21 Jan 2026 15:59:53 +0800
Subject: [PATCH] feat:区域弹窗名称调整，样式调整
---
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 34 +++++++++++++++++++---------------
1 files changed, 19 insertions(+), 15 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..98731b6 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -14,10 +14,12 @@
</div>
<div class="right-container">
<div class="header">
- {{ titleEnum[dialogMode] }}
+ <span>{{ titleEnum[dialogMode] }}</span>
+
+ <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
</div>
- <div class="dialog-container" v-if="readonly">
+ <div class="content" v-if="readonly">
<div class="detail-title">场景详情</div>
<el-row>
<el-col :span="24">
@@ -30,7 +32,7 @@
</el-col>
<el-col :span="24">
<div class="label">场景类型</div>
- <div class="val">{{ getDictLabel(formData.sceneType, dictObj.sceneType) }}</div>
+ <div class="val">{{ getDictLabel(formData.sceneType, dictObj.CommandSceneType) }}</div>
</el-col>
<el-col :span="24">
<div class="label">负责人</div>
@@ -53,7 +55,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 +70,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-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"
+ <el-option v-for="item in dictObj.CommandSceneType" :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-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-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,17 +108,17 @@
关联区域
</div>
- <el-input class="command-data-cockpit-search-input" v-model="searchName" placeholder="请输入"
+ <el-input class="command-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" />
- <el-table-column prop="areaName" label="区域名称" />
- <el-table-column prop="areaType" label="区域类型">
+ <el-table-column type="selection" width="55" />
+ <el-table-column prop="areaName" show-overflow-tooltip label="区域名称" />
+ <el-table-column prop="areaType" show-overflow-tooltip label="区域类型">
<template v-slot="{ row }">
{{ getDictLabel(row.areaType, dictObj.areaType) }}
</template>
@@ -139,6 +141,8 @@
</template>
<script setup>
+import { Close } from '@element-plus/icons-vue'
+
import { computed, inject, nextTick, onMounted, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import { fwDefenseSceneDetailApi, fwDefenseSceneSubmitApi } from './sceneConfigApi'
--
Gitblit v1.9.3