From 46f71f1985eabbf84926d6416659370f1e8c8c3e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 14 Jan 2026 11:39:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

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

diff --git a/applications/drone-command/src/views/areaManage/precinctInfo/index.vue b/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
index 526806d..7ba96d7 100644
--- a/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
@@ -1,47 +1,47 @@
 <template>
 	<basic-container>
-		<el-form ref="queryParamsRef" :model="searchParams">
-			<el-row :gutter="16">
-				<el-col :span="4">
-					<el-form-item label="派出所名称" prop="stationName">
-						<el-input v-model="searchParams.stationName" placeholder="请输入" clearable @clear="handleSearch" />
-					</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="ztzf-page-history-search">
+			<el-form-item label="派出所名称" prop="stationName">
+				<el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.stationName" placeholder="请输入"
+					clearable @clear="handleSearch" />
+			</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>
+
+		<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>
 		</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="stationName" label="派出所名称" />
-			<el-table-column prop="address" label="位置" />
-			<el-table-column prop="longitude" label="经度" />
-			<el-table-column prop="latitude" label="纬度" />
-			<el-table-column prop="contactPerson" label="联系人" />
-			<el-table-column prop="contactPhone" label="联系方式" />
-			<el-table-column label="操作">
-				<template v-slot="{ row }">
-					<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="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+			<div class="ztzf-table-content ztzf-table-content-bg">
+				<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 label="操作" class-name="operation-btns">
+						<template v-slot="{ row }">
+							<el-link @click="openForm('edit', row)">编辑</el-link>
+							<el-link @click="handleDelete(row)">删除</el-link>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+
+			<div class="ztzf-table-pagination">
+				<el-pagination popper-class="ztzf-data-cockpit-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 ref="dialogRef" @success="getList" v-if="dialogVisible" v-model="dialogVisible" />
@@ -49,7 +49,8 @@
 </template>
 
 <script setup>
-import { onMounted, ref } from 'vue'
+import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
+import { nextTick, onMounted, ref } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { fwPoliceStationPageApi, fwPoliceStationRemoveApi } from './precinctInfoApi'
 import FormDiaLog from './FormDiaLog.vue'
@@ -69,7 +70,7 @@
 const dialogVisible = ref(false)
 
 // 获取列表
-async function getList() {
+async function getList () {
 	loading.value = true
 	try {
 		const res = await fwPoliceStationPageApi(searchParams.value)
@@ -81,20 +82,20 @@
 }
 
 // 查询
-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' })
 	const ids = row ? row.id : selectedIds.value.join(',')
@@ -105,12 +106,12 @@
 }
 
 // 勾选值设置
-function handleSelectionChange(rows) {
+function handleSelectionChange (rows) {
 	selectedIds.value = rows.map(item => item.id)
 }
 
 // 新增
-function openForm(mode, row) {
+function openForm (mode, row) {
 	dialogVisible.value = true
 	nextTick(() => {
 		dialogRef.value?.open({ mode, row })

--
Gitblit v1.9.3