From ebd0ec4f51288042b6fc5bf714b1febbb63cfacc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Fri, 09 Jan 2026 18:03:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/precinctInfo/index.vue | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 deletions(-)
diff --git a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue b/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
similarity index 61%
rename from applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
rename to applications/drone-command/src/views/areaManage/precinctInfo/index.vue
index 6a0aee0..ed6d369 100644
--- a/applications/drone-command/src/views/basicManage/deviceStock/deviceStock.vue
+++ b/applications/drone-command/src/views/areaManage/precinctInfo/index.vue
@@ -1,15 +1,10 @@
-<template>
+<template>
<basic-container>
<el-form ref="queryParamsRef" :model="searchParams">
<el-row :gutter="16">
<el-col :span="4">
- <el-form-item label="名称" prop="deviceName">
- <el-input v-model="searchParams.deviceName" placeholder="请输入" clearable @clear="getList" />
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="类型" prop="deviceType">
- <el-input v-model="searchParams.deviceType" placeholder="请输入" clearable @clear="getList" />
+ <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">
@@ -22,22 +17,24 @@
</el-form>
<div>
<el-button type="primary" @click="handleAdd">新增</el-button>
+ <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
</div>
- <el-table v-loading="loading" :data="list">
+ <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="deviceName" label="名称" />
- <el-table-column prop="deviceType" label="类型" />
- <el-table-column prop="deviceModel" label="设备型号" />
- <el-table-column prop="deviceSpecification" 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="handleView(row)" type="primary">查看</el-link>
<el-link @click="handleEdit(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"
@@ -53,14 +50,12 @@
<script setup>
import { onMounted, ref } from 'vue'
-import { ElMessageBox } from 'element-plus'
-import { fwDeviceListApi, fwDeviceRemoveApi } from '@/views/basicManage/deviceStock/fwDevice'
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { fwPoliceStationPageApi, fwPoliceStationRemoveApi } from './precinctInfoApi'
import FormDiaLog from './FormDiaLog.vue'
const initSearchParams = () => ({
- // 查询参数默认值
- deviceName: '', // 设备名称
- deviceType: '', // 设备类型
+ stationName: '', // 名称
current: 1, // 当前页
size: 10, // 每页大小
})
@@ -68,6 +63,7 @@
const total = ref(0) // 总条数
const loading = ref(false) // 列表加载中
const list = ref([]) // 列表数据
+const selectedIds = ref([]) // 勾选的ID列表
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例
@@ -75,7 +71,7 @@
async function getList() {
loading.value = true
try {
- const res = await fwDeviceListApi(searchParams.value)
+ const res = await fwPoliceStationPageApi(searchParams.value)
list.value = res?.data?.data?.records ?? []
total.value = res?.data?.data?.total ?? 0
} finally {
@@ -108,11 +104,20 @@
// 删除
async function handleDelete(row) {
- await ElMessageBox.confirm('确认删除该设备吗?', '提示', { type: 'warning' })
- await fwDeviceRemoveApi({ ids: [row.id] })
+ const tips = row ? '该条' : '选中的项'
+ await ElMessageBox.confirm(`确认删除${tips}吗?`, '提示', { type: 'warning' })
+ const ids = row ? row.id : selectedIds.value.join(',')
+ await fwPoliceStationRemoveApi({ ids })
+ ElMessage.success('删除成功')
+ selectedIds.value = []
getList()
}
+// 勾选值设置
+function handleSelectionChange(rows) {
+ selectedIds.value = rows.map(item => item.id)
+}
+
// 新增
function handleAdd() {
dialogRef.value?.open({ mode: 'add' })
--
Gitblit v1.9.3