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 | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
index 636df76..6d51bd0 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
@@ -62,20 +62,22 @@
<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="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
+
<el-table-column prop="status" show-overflow-tooltip width="100" label="设备状态">
<template v-slot="{ row }">
- {{ formatDeployLocation(row) }}
+ {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
</template>
</el-table-column>
+
<el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
- <el-table-column prop="defenseZoneName" show-overflow-tooltip width="120" label="场景" />
+ <el-table-column prop="defenseSceneName" show-overflow-tooltip width="120" 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 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="调度内容" />
@@ -107,22 +109,23 @@
@success="getList"
v-if="dialogVisible"
v-model="dialogVisible"
- :sceneList="sceneList"
:deviceList="deviceList"
/>
</basic-container>
</template>
<script setup>
+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 = () => ({
@@ -144,8 +147,8 @@
deviceType: [], // 设备类型
deviceStatus: [], // 设备状态
})
-const sceneList = ref([]) // 场景列表
const deviceList = ref([]) // 设备列表
+const route = useRoute()
// 注入字典到子组件
provide('dictObj', dictObj)
@@ -189,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()
@@ -217,12 +230,6 @@
})
}
-// 加载场景列表
-async function loadSceneList() {
- const res = await fwDefenseSceneListApi()
- sceneList.value = res?.data?.data ?? []
-}
-
// 加载设备列表
async function loadDeviceList() {
const res = await fwDeviceListApi()
@@ -231,7 +238,6 @@
onMounted(() => {
getDictList()
- loadSceneList()
loadDeviceList()
getList()
})
--
Gitblit v1.9.3