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/sceneConfig/index.vue | 152 +++++++++++++++++++++++++-------------------------
1 files changed, 75 insertions(+), 77 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
index 92be17e..23fcc99 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/index.vue
@@ -1,77 +1,74 @@
<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams">
- <el-row :gutter="16">
- <el-col :span="4">
- <el-form-item label="场景名称" prop="sceneName">
- <el-input v-model="searchParams.sceneName" placeholder="请输入" clearable @clear="handleSearch" />
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="场景类型" prop="sceneType">
- <el-select v-model="searchParams.sceneType" placeholder="请选择" clearable @change="handleSearch">
- <el-option
- v-for="item in dictObj.sceneType"
- :key="item.dictKey"
- :label="item.dictValue"
- :value="item.dictKey"
- />
- </el-select>
- </el-form-item>
- </el-col>
- <el-col :span="4">
- <el-form-item label="场景状态" prop="status">
- <el-select v-model="searchParams.status" placeholder="请选择" clearable @change="handleSearch">
- <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
- </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="ztzf-page-history-search">
+ <el-form-item label="场景名称" prop="sceneName">
+ <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.sceneName" placeholder="请输入"
+ clearable @clear="handleSearch" />
+ </el-form-item>
+
+ <el-form-item label="场景类型" prop="sceneType">
+ <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
+ v-model="searchParams.sceneType" placeholder="请选择" clearable @change="handleSearch">
+ <el-option v-for="item in dictObj.sceneType" :key="item.dictKey" :label="item.dictValue"
+ :value="item.dictKey" />
+ </el-select>
+ </el-form-item>
+
+ <el-form-item label="场景状态" prop="status">
+ <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
+ v-model="searchParams.status" placeholder="请选择" clearable @change="handleSearch">
+ <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value" />
+ </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>
+
+ <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="sceneName" label="场景名称" />
- <el-table-column prop="sceneType" label="场景类型">
- <template v-slot="{ row }">
- {{ getDictLabel(row.sceneType, dictObj.sceneType) }}
- </template>
- </el-table-column>
- <el-table-column label="指挥点位置">
- <template v-slot="{ row }">
- {{ formatLocation(row) }}
- </template>
- </el-table-column>
- <el-table-column prop="defenseLeader" label="防控负责人" />
- <el-table-column prop="leaderPhone" label="防控负责人电话" />
- <el-table-column prop="areaCount" label="区域数量" />
- <el-table-column prop="counterDeviceCount" label="反制设备数量" />
- <el-table-column prop="detectDeviceCount" label="探测设备数量" />
- <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="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="sceneName" show-overflow-tooltip width="130" label="场景名称" />
+ <el-table-column prop="sceneType" show-overflow-tooltip width="120" label="场景类型">
+ <template v-slot="{ row }">
+ {{ getDictLabel(row.sceneType, dictObj.sceneType) }}
+ </template>
+ </el-table-column>
+ <el-table-column show-overflow-tooltip width="150" label="指挥点位置">
+ <template v-slot="{ row }">
+ {{ formatLocation(row) }}
+ </template>
+ </el-table-column>
+ <el-table-column prop="defenseLeader" show-overflow-tooltip width="120" label="防控负责人" />
+ <el-table-column prop="leaderPhone" show-overflow-tooltip width="140" label="防控负责人电话" />
+ <el-table-column prop="areaCount" show-overflow-tooltip width="110" label="区域数量" />
+ <el-table-column prop="counterDeviceCount" show-overflow-tooltip width="120" label="反制设备数量" />
+ <el-table-column prop="detectDeviceCount" show-overflow-tooltip width="120" label="探测设备数量" />
+ <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="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 v-if="dialogVisible" v-model="dialogVisible" ref="dialogRef" @success="getList" />
@@ -79,6 +76,7 @@
</template>
<script setup>
+import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
import { nextTick, onMounted, provide, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { fwDefenseScenePageApi, fwDefenseSceneRemoveApi } from './sceneConfigApi'
@@ -109,7 +107,7 @@
])
// 获取列表
-async function getList() {
+async function getList () {
loading.value = true
try {
const res = await fwDefenseScenePageApi(searchParams.value)
@@ -121,20 +119,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(',')
@@ -145,11 +143,11 @@
}
// 勾选值设置
-function handleSelectionChange(rows) {
+function handleSelectionChange (rows) {
selectedIds.value = rows.map(item => item.id)
}
-function formatLocation(row) {
+function formatLocation (row) {
if (row?.longitude == null || row?.latitude == null) return ''
return `${_.round(row.longitude, 6)}, ${_.round(row.latitude, 6)}`
}
@@ -162,14 +160,14 @@
provide('dictObj', dictObj)
// 获取字典
-function getDictList() {
+function getDictList () {
getDictionaryByCode('sceneType,deviceMode,areaType').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