From 0b8879efdd2888bfecc51d51afe8c4040b1b9050 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 21 Jan 2026 15:26:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 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..802e387 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/taskSchedule/index.vue
@@ -62,11 +62,13 @@
<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 show-overflow-tooltip label="调度位置">
@@ -75,7 +77,7 @@
<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="调度内容" />
@@ -114,6 +116,7 @@
</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'
@@ -189,7 +192,12 @@
// 删除
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 })
ElMessage.success('删除成功')
--
Gitblit v1.9.3