From e135ffaa14f74496402596502d2c1e3be9f38d85 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 21 Apr 2025 11:33:44 +0800
Subject: [PATCH] Merge branch 'test' of http://139.196.74.78:10010/r/drone/command-center-dashboard into test
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index fe788c3..de734ad 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -35,7 +35,7 @@
<span>{{ scope.row.event_number ? scope.row.event_number : '/' }}</span>
</template>
</el-table-column>
- <el-table-column prop="begin_time" label="任务时间" />
+ <el-table-column prop="create_time" label="任务时间" />
<el-table-column prop="creator_name" label="创建人" />
<el-table-column label="操作" >
<template #default="scope">
@@ -94,6 +94,8 @@
if (res.data.code !== 0) return;
jobListData.value = res.data.data.records;
total.value = res.data.data.total;
+ console.log('任务管理列表',jobListData.value);
+
});
};
// 状态文字
@@ -111,15 +113,13 @@
// 查看当前任务详情 如果是一台机则显示详情 如果是多台机则进入集群调度(暂未开发)
let rowData = ref({});
const handleDetail = (row) => {
- if (row.device_sns.length === 1){
- rowData.value = row? row : {};
- if (row.status === 2 || row.status === 1){
- isShowCurrentTaskDetails.value = true;
- } else{
- isShowDeviceJobDetails.value = true
- }
- }else{
- ElMessage.warning('即将跳转到集群调度');
+ if (!row.device_sns.length) return ElMessage.warning('没有device_sns');
+ if (row.device_sns.length !== 1) return ElMessage.success('即将跳转到集群调度');
+ rowData.value = row? row : {};
+ if (row.status === 2 || row.status === 1){
+ isShowCurrentTaskDetails.value = true;
+ } else{
+ isShowDeviceJobDetails.value = true
}
};
--
Gitblit v1.9.3