From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 applications/drone-command/src/views/areaManage/precinctInfo/index.vue |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/applications/drone-command/src/views/areaManage/precinctInfo/index.vue b/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
index a81fb81..71c88c4 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
@@ -14,7 +14,7 @@
 
 		<div class="ztzf-table-toolbar">
 			<el-button :icon="Plus" color="#284FE3" type="primary" @click="openForm('add')">新增</el-button>
-			<el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
+			<el-button :icon="Delete" color="#1A2652" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
 		</div>
 
 		<div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
@@ -22,12 +22,12 @@
 				<el-table class="ztzf-data-cockpit-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="stationName" show-overflow-tooltip width="160" label="派出所名称" />
-					<el-table-column prop="address" show-overflow-tooltip width="200" label="位置" />
-					<el-table-column prop="longitude" show-overflow-tooltip width="120" label="经度" />
-					<el-table-column prop="latitude" show-overflow-tooltip width="120" label="纬度" />
-					<el-table-column prop="contactPerson" show-overflow-tooltip width="120" label="联系人" />
-					<el-table-column prop="contactPhone" show-overflow-tooltip width="140" label="联系方式" />
+					<el-table-column prop="stationName" show-overflow-tooltip label="派出所名称" />
+					<el-table-column prop="address" show-overflow-tooltip label="位置" />
+					<el-table-column prop="longitude" show-overflow-tooltip label="经度" />
+					<el-table-column prop="latitude" show-overflow-tooltip label="纬度" />
+					<el-table-column prop="contactPerson" show-overflow-tooltip label="联系人" />
+					<el-table-column prop="contactPhone" show-overflow-tooltip label="联系方式" />
 					<el-table-column label="操作" class-name="operation-btns">
 						<template v-slot="{ row }">
 							<el-link @click="openForm('edit', row)">编辑</el-link>
@@ -49,7 +49,7 @@
 </template>
 
 <script setup>
-import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
+import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
 import { nextTick, onMounted, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { fwPoliceStationPageApi, fwPoliceStationRemoveApi } from './precinctInfoApi'
@@ -62,7 +62,7 @@
 })
 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) // 查询表单实例

--
Gitblit v1.9.3