From cc42e168d58901f9f09d1a0d80eadd0826994a76 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Tue, 13 Jan 2026 11:40:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/areaManage/partition/index.vue |  185 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 180 insertions(+), 5 deletions(-)

diff --git a/applications/drone-command/src/views/areaManage/partition/index.vue b/applications/drone-command/src/views/areaManage/partition/index.vue
index 14a6b62..34c9406 100644
--- a/applications/drone-command/src/views/areaManage/partition/index.vue
+++ b/applications/drone-command/src/views/areaManage/partition/index.vue
@@ -1,9 +1,184 @@
 <template>
-   <basic-container>
-    区域划分
-  </basic-container>
+	<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>
+		<div>
+			<el-button type="primary" @click="openForm('add')">新增</el-button>
+			<el-button type="danger" :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>
+
+		<FormDiaLog v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" @success="getList" />
+	</basic-container>
 </template>
+
 <script setup>
+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 { getDictLabel } from '@ztzf/utils'
+
+const initSearchParams = () => ({
+	areaName: '', // 区域名称
+	areaType: '', // 区域类型
+	current: 1, // 当前页
+	size: 10, // 每页大小
+})
+
+const searchParams = ref(initSearchParams()) // 查询参数
+const total = ref(0) // 总条数
+const loading = ref(false) // 列表加载中
+const list = ref([]) // 列表数据
+const selectedIds = ref([]) // 勾选的ID列表
+const queryParamsRef = ref(null) // 查询表单实例
+const dialogRef = ref(null) // 弹框实例
+const dialogVisible = ref(false)
+
+// 获取列表
+async function getList() {
+	loading.value = true
+	try {
+		const res = await fwAreaDividePageApi(searchParams.value)
+		list.value = res?.data?.data?.records ?? []
+		total.value = res?.data?.data?.total ?? 0
+	} finally {
+		loading.value = false
+	}
+}
+
+// 查询
+function handleSearch() {
+	searchParams.value.current = 1
+	getList()
+}
+
+// 重置查询
+function resetForm() {
+	queryParamsRef.value?.resetFields()
+	searchParams.value.current = 1
+	getList()
+}
+
+// 删除
+async function handleDelete(row) {
+	const tips = row ? '该条' : '选中的项'
+	await ElMessageBox.confirm(`确认删除${tips}吗?`, '提示', { type: 'warning' })
+	const ids = row ? row.id : selectedIds.value.join(',')
+	await fwAreaDivideRemoveApi({ ids })
+	ElMessage.success('删除成功')
+	selectedIds.value = []
+	getList()
+}
+
+// 勾选值设置
+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) {
+	if (!row?.flyDateStart && !row?.flyDateEnd) return ''
+	return `${row.flyDateStart || '-'} ~ ${row.flyDateEnd || '-'}`
+}
+
+const dictObj = ref({
+	areaType: [], //区域类型
+	controlLevel: [], //管控级别
+})
+provide('dictObj', dictObj)
+
+// 获取字典
+function getDictList() {
+	getDictionaryByCode('areaType,controlLevel').then(res => {
+		dictObj.value = res.data.data
+	})
+}
+
+// 新增/编辑/查看 弹框
+function openForm(mode, row) {
+	dialogVisible.value = true
+	nextTick(() => {
+		dialogRef.value?.open({ mode, row })
+	})
+}
+
+onMounted(() => {
+	getList()
+	getDictList()
+})
 </script>
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>

--
Gitblit v1.9.3