From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整

---
 applications/drone-command/src/views/areaManage/partition/index.vue |  179 ++++++++++++++++++++++++++++++-----------------------------
 1 files changed, 91 insertions(+), 88 deletions(-)

diff --git a/applications/drone-command/src/views/areaManage/partition/index.vue b/applications/drone-command/src/views/areaManage/partition/index.vue
index 820a8a3..9f81fd7 100644
--- a/applications/drone-command/src/views/areaManage/partition/index.vue
+++ b/applications/drone-command/src/views/areaManage/partition/index.vue
@@ -1,79 +1,72 @@
 <template>
 	<basic-container>
-		<el-form ref="queryParamsRef" :model="searchParams">
-			<el-row :gutter="16">
-				<el-col :span="4">
-					<el-form-item label="区域名称" prop="areaName">
-						<el-input v-model="searchParams.areaName" placeholder="请输入" clearable @clear="handleSearch" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="区域类型" prop="areaType">
-						<el-select v-model="searchParams.areaType" placeholder="请选择" clearable @change="handleSearch">
-							<el-option
-								v-for="item in dictObj.areaType"
-								:key="item.dictKey"
-								:label="item.dictValue"
-								:value="item.dictKey"
-							/>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item>
-						<el-button @click="resetForm">重置</el-button>
-						<el-button type="primary" @click="handleSearch">查询</el-button>
-					</el-form-item>
-				</el-col>
-			</el-row>
+		<el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
+			<el-form-item label="区域名称" prop="areaName">
+				<el-input class="command-input" v-model="searchParams.areaName" placeholder="请输入"
+					clearable @clear="handleSearch" />
+			</el-form-item>
+			<el-form-item label="区域类型" prop="areaTypeKeys">
+				<el-select class="command-select" popper-class="command-select-popper"
+					v-model="searchParams.areaTypeKeys" placeholder="请选择" clearable @change="handleSearch">
+					<el-option v-for="item in dictObj.areaType" :key="item.dictKey" :label="item.dictValue"
+						:value="item.dictKey" />
+				</el-select>
+			</el-form-item>
+
+			<el-form-item class="history-search-actions">
+				<el-button :icon="RefreshRight" @click="resetForm"></el-button>
+				<el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
+			</el-form-item>
 		</el-form>
-		<div>
-			<el-button type="primary" @click="openForm('add')">新增</el-button>
-			<el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
+
+		<div class="command-table-toolbar">
+			<el-button :icon="Plus" color="#284FE3" type="primary" @click="openForm('add')">新增</el-button>
+			<el-button :icon="Delete" color="#1A2652" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
 		</div>
-		<el-table v-loading="loading" :data="list" @selection-change="handleSelectionChange">
-			<el-table-column type="selection" width="55" />
-			<el-table-column type="index" width="60" label="序号" />
-			<el-table-column prop="areaName" label="区域名称" />
-			<el-table-column label="区域位置">
-				<template v-slot="{ row }">
-					{{ formatLocation(row) }}
-				</template>
-			</el-table-column>
-			<el-table-column prop="areaSize" label="区域面积(k㎡)" />
-			<el-table-column prop="areaType" label="区域类型">
-				<template v-slot="{ row }">
-					{{ getDictLabel(row.areaType, dictObj.areaType) }}
-				</template>
-			</el-table-column>
-			<el-table-column prop="triggerCondition" label="触发条件" />
-			<el-table-column prop="responseMechanism" label="响应机制" />
-			<el-table-column prop="controlLevel" label="管控级别">
-				<template v-slot="{ row }">
-					{{ getDictLabel(row.controlLevel, dictObj.controlLevel) }}
-				</template>
-			</el-table-column>
-			<el-table-column prop="policeStationName" label="关联派出所" />
-			<el-table-column label="可飞行时间段">
-				<template v-slot="{ row }">
-					{{ formatFlyDate(row) }}
-				</template>
-			</el-table-column>
-			<el-table-column label="操作">
-				<template v-slot="{ row }">
-					<el-link @click="openForm('view', row)" type="primary">查看</el-link>
-					<el-link @click="openForm('edit', row)" type="warning">编辑</el-link>
-					<el-link @click="handleDelete(row)" type="danger">删除</el-link>
-				</template>
-			</el-table-column>
-		</el-table>
-		<div>
-			<el-pagination
-				v-model:current-page="searchParams.current"
-				v-model:page-size="searchParams.size"
-				:total="total"
-				@change="getList"
-			/>
+
+		<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+			<div class="command-table-content command-table-content-bg">
+				<el-table class="command-table" :data="list" @selection-change="handleSelectionChange">
+					<el-table-column type="selection" width="46" />
+					<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
+					<el-table-column prop="areaName" show-overflow-tooltip width="150" label="区域名称" />
+					<el-table-column prop="areaTypeKeys" show-overflow-tooltip width="196" label="区域类型">
+						<template v-slot="{ row }">
+							{{ getDictLabel(row.areaTypeKeys, dictObj.areaType) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="triggerCondition" show-overflow-tooltip label="触发条件">
+						<template v-slot="{ row }">
+							{{ getDictLabel(row.triggerCondition, dictObj.triggeringCondition) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="responseMechanism" show-overflow-tooltip label="响应机制" />
+					<el-table-column prop="controlLevel" show-overflow-tooltip label="管控级别">
+						<template v-slot="{ row }">
+							{{ getDictLabel(row.controlLevel, dictObj.controlLevel) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="policeStationName" show-overflow-tooltip label="关联派出所" />
+					<el-table-column show-overflow-tooltip width="300" label="可飞行时间段">
+						<template v-slot="{ row }">
+							{{ formatFlyDate(row) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" class-name="operation-btns">
+						<template v-slot="{ row }">
+							<el-link @click="openForm('view', row)">查看</el-link>
+							<el-link @click="openForm('edit', row)">编辑</el-link>
+							<el-link @click="handleDelete(row)">删除</el-link>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+
+			<div class="command-table-pagination">
+				<el-pagination popper-class="command-select-popper"
+					v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
+					layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
+			</div>
 		</div>
 
 		<FormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" @success="getList" />
@@ -81,31 +74,35 @@
 </template>
 
 <script setup>
+import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
 import { nextTick, onMounted, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { fwAreaDividePageApi, fwAreaDivideRemoveApi } from './partitionApi'
 import FormDiaLog from './FormDiaLog.vue'
 import { getDictionaryByCode } from '@/api/system/dictbiz'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
 import { getDictLabel } from '@ztzf/utils'
 
 const initSearchParams = () => ({
 	areaName: '', // 区域名称
-	areaType: '', // 区域类型
+	areaTypeKeys: '', // 区域类型
 	current: 1, // 当前页
 	size: 10, // 每页大小
 })
 
 const searchParams = ref(initSearchParams()) // 查询参数
 const total = ref(0) // 总条数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
 const list = ref([]) // 列表数据
 const selectedIds = ref([]) // 勾选的ID列表
 const queryParamsRef = ref(null) // 查询表单实例
 const dialogRef = ref(null) // 弹框实例
 const dialogVisible = ref(false)
+const route = useRoute()
 
 // 获取列表
-async function getList() {
+async function getList () {
 	loading.value = true
 	try {
 		const res = await fwAreaDividePageApi(searchParams.value)
@@ -117,40 +114,45 @@
 }
 
 // 查询
-function handleSearch() {
+function handleSearch () {
 	searchParams.value.current = 1
 	getList()
 }
 
 // 重置查询
-function resetForm() {
+function resetForm () {
 	queryParamsRef.value?.resetFields()
 	searchParams.value.current = 1
 	getList()
 }
 
 // 删除
-async function handleDelete(row) {
+async function handleDelete (row) {
 	const tips = row ? '该条' : '选中的项'
-	await ElMessageBox.confirm(`确认删除${tips}吗?`, '提示', { type: 'warning' })
+	await ElMessageBox.confirm(`确认删除${tips}吗?`, '提示', { 
+		type: 'warning',
+		customClass: 'command-page-view-message-box',
+		confirmButtonClass: 'command-message-box-confirm',
+		cancelButtonClass: 'command-message-box-cancel',
+	})
 	const ids = row ? row.id : selectedIds.value.join(',')
 	await fwAreaDivideRemoveApi({ ids })
+	saveOperationLog({
+		requestUri: route.path,
+		title: `${route.name || '区域划分'}-删除`,
+		type: 1,
+	})
 	ElMessage.success('删除成功')
 	selectedIds.value = []
 	getList()
 }
 
 // 勾选值设置
-function handleSelectionChange(rows) {
+function handleSelectionChange (rows) {
 	selectedIds.value = rows.map(item => item.id)
 }
 
-function formatLocation(row) {
-	if (row?.longitude == null || row?.latitude == null) return ''
-	return `${row.longitude}, ${row.latitude}`
-}
-
-function formatFlyDate(row) {
+function formatFlyDate (row) {
 	if (!row?.flyDateStart && !row?.flyDateEnd) return ''
 	return `${row.flyDateStart || '-'} ~ ${row.flyDateEnd || '-'}`
 }
@@ -158,19 +160,20 @@
 const dictObj = ref({
 	areaType: [], //区域类型
 	controlLevel: [], //管控级别
+	triggeringCondition: [], //触发条件
 	deviceType: [],
 })
 provide('dictObj', dictObj)
 
 // 获取字典
 function getDictList() {
-	getDictionaryByCode('areaType,controlLevel,deviceType').then(res => {
+	getDictionaryByCode('areaType,controlLevel,deviceType,triggeringCondition').then(res => {
 		dictObj.value = res.data.data
 	})
 }
 
 // 新增/编辑/查看 弹框
-function openForm(mode, row) {
+function openForm (mode, row) {
 	dialogVisible.value = true
 	nextTick(() => {
 		dialogRef.value?.open({ mode, row })

--
Gitblit v1.9.3