From 22a23b05b25e4b5c616f65989ac0ca16324f4c29 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 18:23:41 +0800
Subject: [PATCH] Merge branch 'dev' into test
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index a23d4d4..516ba77 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -94,7 +94,6 @@
if (res.data.code !== 0) return;
jobListData.value = res.data.data.records;
total.value = res.data.data.total;
- console.log('任务管理列表',jobListData.value);
});
};
@@ -113,15 +112,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