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/taskSchedule/index.vue | 91 ++++++++++++++++++++++++++-------------------
1 files changed, 52 insertions(+), 39 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
index ccae3ce..6d51bd0 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
@@ -1,9 +1,10 @@
-<template>
+<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
+ <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
<el-form-item label="设备名称" prop="deviceId">
<el-select
- class="ztzf-data-cockpit-search-input"
+ class="command-select"
+ popper-class="command-select-popper"
v-model="searchParams.deviceId"
placeholder="请选择"
clearable
@@ -13,27 +14,30 @@
<el-option v-for="item in deviceList" :key="item.id" :label="item.deviceName" :value="item.id" />
</el-select>
</el-form-item>
- <el-form-item label="设备类型" prop="deviceType">
+
+ <el-form-item label="设备状态" prop="status">
<el-select
- class="ztzf-data-cockpit-search-input"
- v-model="searchParams.deviceType"
+ class="command-select"
+ popper-class="command-select-popper"
+ v-model="searchParams.status"
placeholder="请选择"
clearable
@clear="handleSearch"
@change="handleSearch"
>
<el-option
- v-for="item in dictObj.deviceType"
+ v-for="item in dictObj.deviceStatus"
:key="item.dictKey"
:label="item.dictValue"
:value="item.dictKey"
/>
</el-select>
</el-form-item>
- <el-form-item label="设备编号" prop="deviceCode">
+
+ <el-form-item label="设备编码" prop="deviceSn">
<el-input
- class="ztzf-data-cockpit-search-input"
- v-model="searchParams.deviceCode"
+ class="command-input"
+ v-model="searchParams.deviceSn"
placeholder="请输入"
clearable
@clear="handleSearch"
@@ -46,32 +50,34 @@
</el-form-item>
</el-form>
- <div class="ztzf-table-toolbar">
+ <div class="command-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)">
- <div class="ztzf-table-content ztzf-table-content-bg">
- <el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
+ <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" @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="deviceName" show-overflow-tooltip width="140" label="设备名称" />
- <el-table-column prop="deviceCode" show-overflow-tooltip width="140" label="设备编码" />
- <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
+ <el-table-column prop="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
+
+ <el-table-column prop="status" show-overflow-tooltip width="100" label="设备状态">
<template v-slot="{ row }">
{{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
</template>
</el-table-column>
- <el-table-column prop="areaDivideName" show-overflow-tooltip width="120" label="区域" />
+
+ <el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
<el-table-column prop="defenseSceneName" show-overflow-tooltip width="120" label="场景" />
- <el-table-column show-overflow-tooltip width="200" label="调度位置">
+ <el-table-column show-overflow-tooltip label="调度位置">
<template v-slot="{ row }">{{ row.longitude }}, {{ row.latitude }}</template>
</el-table-column>
<el-table-column prop="dispatchUser" show-overflow-tooltip width="100" label="调度人员" />
- <el-table-column show-overflow-tooltip width="180" label="调度日期">
+ <el-table-column show-overflow-tooltip label="调度日期">
<template v-slot="{ row }">
- {{ formatDispatchDate(row) }}
+ {{dayjs(row.dispatchStartTime).format('YYYY-MM-DD')}}至{{dayjs(row.dispatchEndTime).format('YYYY-MM-DD')}}
</template>
</el-table-column>
<el-table-column prop="dispatchContent" show-overflow-tooltip width="160" label="调度内容" />
@@ -86,9 +92,9 @@
</el-table>
</div>
- <div class="ztzf-table-pagination">
+ <div class="command-table-pagination">
<el-pagination
- popper-class="ztzf-data-cockpit-select-popper"
+ popper-class="command-select-popper"
v-model:current-page="searchParams.current"
v-model:page-size="searchParams.size"
layout="total, prev, pager, next, sizes"
@@ -103,34 +109,35 @@
@success="getList"
v-if="dialogVisible"
v-model="dialogVisible"
- :sceneList="sceneList"
:deviceList="deviceList"
/>
</basic-container>
</template>
<script setup>
-import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
+import dayjs from 'dayjs'
+import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
import { nextTick, onMounted, ref, provide } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { fwTaskSchedulePageApi, fwTaskScheduleRemoveApi } from './taskScheduleApi'
-import { fwDefenseSceneListApi } from '@/views/areaManage/sceneConfig/sceneConfigApi'
import { fwDeviceListApi } from '@/views/basicManage/deviceStock/fwDevice'
import { getDictionaryByCode } from '@/api/system/dictbiz'
import FormDiaLog from './FormDiaLog.vue'
import { getDictLabel } from '@ztzf/utils'
+import { saveOperationLog } from '@ztzf/apis'
+import { useRoute } from 'vue-router'
// 初始化查询参数
const initSearchParams = () => ({
deviceId: '', // 设备名称
- deviceType: '', // 设备类型
- deviceCode: '', // 设备编号
+ status: '', // 设备状态
+ deviceSn: '', // 设备编号
current: 1, // 当前页
size: 10, // 每页大小
})
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) // 查询表单实例
@@ -140,8 +147,8 @@
deviceType: [], // 设备类型
deviceStatus: [], // 设备状态
})
-const sceneList = ref([]) // 场景列表
const deviceList = ref([]) // 设备列表
+const route = useRoute()
// 注入字典到子组件
provide('dictObj', dictObj)
@@ -153,7 +160,10 @@
}
return row.dispatchStartTime || row.dispatchEndTime || ''
}
-
+function formatDeployLocation(row) {
+ if (!row.longitude || !row.latitude) return ''
+ return `${row.longitude}, ${row.latitude}`
+}
// 获取列表
async function getList() {
loading.value = true
@@ -182,9 +192,19 @@
// 删除
async function handleDelete(row) {
const tips = row ? '该条' : '选中的项'
- await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', { type: 'warning' })
+ await ElMessageBox.confirm(`确认删除${tips}吗？`, '提示', {
+ type: 'warning',
+ customClass: 'command-page-view-message-box',
+ confirmButtonClass: 'command-message-box-confirm',
+ cancelButtonClass: 'command-message-box-cancel',
+ })
const ids = row ? row.id : selectedIds.value.join(',')
await fwTaskScheduleRemoveApi({ ids })
+ saveOperationLog({
+ requestUri: route.path,
+ title: `${route.name || '任务调度'}-删除`,
+ type: 1
+ })
ElMessage.success('删除成功')
selectedIds.value = []
getList()
@@ -210,12 +230,6 @@
})
}
-// 加载场景列表
-async function loadSceneList() {
- const res = await fwDefenseSceneListApi()
- sceneList.value = res?.data?.data ?? []
-}
-
// 加载设备列表
async function loadDeviceList() {
const res = await fwDeviceListApi()
@@ -224,7 +238,6 @@
onMounted(() => {
getDictList()
- loadSceneList()
loadDeviceList()
getList()
})
--
Gitblit v1.9.3