From 89380e6260a75d1d3b94de687ebcc2f50d50659d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Feb 2026 15:44:33 +0800
Subject: [PATCH] feat:环境变量配置调整
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue | 154 +++++++++++++++++++++++++++++++--------------------
1 files changed, 94 insertions(+), 60 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
index 084c898..34735d3 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
@@ -1,16 +1,31 @@
-<template>
+<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
- <el-form-item label="名称" prop="deviceName">
- <el-input class="ztzf-data-cockpit-search-input" v-model="searchParams.deviceName" placeholder="请输入"
- clearable @clear="handleSearch" />
+ <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
+ <el-form-item label="设备名称" prop="deviceName">
+ <el-input
+ class="command-input"
+ v-model="searchParams.deviceName"
+ placeholder="请输入"
+ clearable
+ @clear="handleSearch"
+ />
</el-form-item>
- <el-form-item label="类型" prop="deviceType">
- <el-select class="ztzf-data-cockpit-select" popper-class="ztzf-data-cockpit-select-popper"
- v-model="searchParams.deviceType" placeholder="请选择" clearable @change="handleSearch">
- <el-option v-for="item in dictObj.deviceType" :key="item.dictKey" :label="item.dictValue"
- :value="item.dictKey" />
+ <el-form-item label="设备类型" prop="deviceType">
+ <el-select
+ class="command-select"
+ popper-class="command-select-popper"
+ v-model="searchParams.deviceType"
+ placeholder="请选择"
+ clearable
+ @change="handleSearch"
+ >
+ <el-option
+ v-for="item in dictObj.deviceType"
+ :key="item.dictKey"
+ :label="item.dictValue"
+ :value="item.dictKey"
+ />
</el-select>
</el-form-item>
@@ -20,32 +35,32 @@
</el-form-item>
</el-form>
- <div class="ztzf-table-toolbar">
+ <div class="command-table-toolbar">
<el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
</div>
- <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">
+ <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <div class="command-table-content command-table-content-bg">
+ <el-table class="command-table" :data="list">
<el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
- <el-table-column prop="deviceName" show-overflow-tooltip width="140" label="设备名称" />
- <el-table-column prop="deviceType" show-overflow-tooltip width="120" label="设备类型">
+ <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
+ <el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
<template v-slot="{ row }">
{{ getDictLabel(row.deviceType, dictObj.deviceType) }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip width="160" label="部署位置">
+ <el-table-column show-overflow-tooltip label="部署位置">
<template v-slot="{ row }">
{{ formatDeployLocation(row) }}
</template>
</el-table-column>
- <el-table-column prop="deviceModel" show-overflow-tooltip width="110" label="型号" />
- <el-table-column show-overflow-tooltip width="120" label="覆盖范围">
+ <el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
+ <el-table-column show-overflow-tooltip label="覆盖范围(m)">
<template v-slot="{ row }">
{{ formatRange(row) }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip width="150" label="设备编码">
+ <el-table-column show-overflow-tooltip label="设备编码">
<template v-slot="{ row }">
{{ formatDeviceCode(row) }}
</template>
@@ -60,14 +75,19 @@
</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 class="command-table-pagination">
+ <el-pagination
+ popper-class="command-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>
- <DetectionRangeDialog ref="dialogRef" @success="getList" />
+ <DetectionRangeDialog ref="dialogRef" @success="getList" v-model="visible" v-if="visible" />
</basic-container>
</template>
<script setup>
@@ -78,6 +98,8 @@
import { getDictLabel } from '@ztzf/utils'
import { detectionRangePageApi, detectionRangeSubmitApi } from '@/api/detectionCountermeasure/detectionRange'
import DetectionRangeDialog from './DetectionRangeDialog.vue'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
const initSearchParams = () => ({
deviceName: '', // 设备名称
@@ -87,7 +109,7 @@
size: 10, // 每页大小
})
const searchParams = ref(initSearchParams()) // 查询参数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const total = ref(0) // 总数
const queryParamsRef = ref(null) // 查询表单实例
@@ -95,11 +117,12 @@
const dictObj = ref({
deviceType: [], // 设备类型
})
-
+const visible = ref(false)
+const route = useRoute()
provide('dictObj', dictObj)
// 获取列表
-async function getList () {
+async function getList() {
loading.value = true
try {
const res = await detectionRangePageApi(searchParams.value)
@@ -111,74 +134,85 @@
}
// 查询
-function handleSearch () {
+function handleSearch() {
searchParams.value.current = 1
getList()
}
// 重置查询
-function resetForm () {
+function resetForm() {
queryParamsRef.value?.resetFields()
searchParams.value.current = 1
getList()
}
// 新增
-function handleAdd () {
- dialogRef.value?.open({ mode: 'add' })
+function handleAdd() {
+ visible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode: 'add' })
+ })
}
// 查看
-function handleView (row) {
- dialogRef.value?.open({ mode: 'view', row: { ...row } })
+function handleView(row) {
+ visible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode: 'view', row: { ...row } })
+ })
}
// 编辑
-function handleEdit (row) {
- dialogRef.value?.open({ mode: 'edit', row: { ...row } })
+function handleEdit(row) {
+ visible.value = true
+ nextTick(() => {
+ dialogRef.value?.open({ mode: 'edit', row: { ...row } })
+ })
}
// 删除
-async function handleDelete (row) {
- await ElMessageBox.confirm('确认删除该条数据吗？', '提示', { type: 'warning' })
+async function handleDelete(row) {
+ await ElMessageBox.confirm('确认删除该条数据吗？', '提示', {
+ type: 'warning',
+ customClass: 'command-page-view-message-box',
+ confirmButtonClass: 'command-message-box-confirm',
+ cancelButtonClass: 'command-message-box-cancel',
+ })
await detectionRangeSubmitApi({ id: row.id, effectiveRangeKm: 0 })
+
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '侦测范围管理'}-删除`,
+ type: 1
+ })
+
ElMessage.success('删除成功')
getList()
}
// 获取字典
-function getDictList () {
+function getDictList() {
getDictionaryByCode('deviceType').then(res => {
dictObj.value = res.data.data
})
}
-function formatDeployLocation (row) {
- if (!row) return '-'
- const location = row.deployLocation ?? row.address ?? row.location ?? row.deployAddress
- if (Array.isArray(location) && location.length) {
- return location.filter(value => value !== null && value !== undefined).join(',')
- }
- if (typeof location === 'string' && location.trim()) {
- return location
- }
- const longitude = row.deployLongitude ?? row.longitude
- const latitude = row.deployLatitude ?? row.latitude
- if (longitude != null || latitude != null) {
- return `${longitude ?? '-'},${latitude ?? '-'}`
- }
- return '-'
+function formatDeployLocation(row) {
+ if (!row.longitude || !row.latitude) return ''
+ return `${row.longitude}, ${row.latitude}`
}
-function formatRange (row) {
+function formatRange(row) {
if (!row) return '-'
- const value = row.effectiveRangeKm ?? row.range
- return value === null || value === undefined || value === '' ? '-' : value
+
+ let value = row.effectiveRangeKm ?? row.range
+
+ return value === null || value === undefined || value === '' ? '-' : Number(value).toFixed(0)
}
-function formatDeviceCode (row) {
- if (!row) return '-'
- return row.deviceCode || row.deviceSn || row.deviceNo || '-'
+function formatDeviceCode(row) {
+ if (!row) return ''
+ return row.deviceSn
}
onMounted(() => {
--
Gitblit v1.9.3