From 5d21d930174f6b065632834743d4ba3a07d4e7f7 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 21 Apr 2025 11:20:05 +0800
Subject: [PATCH] Merge branch 'master' into test
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 23 +++++++++--------------
1 files changed, 9 insertions(+), 14 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 8ed3524..b76722b 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -63,11 +63,11 @@
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
:id="rowData.id"/>
- <!-- 历史人物详情 -->
+ <!-- 历史任务详情 -->
<DeviceJobDetails
v-if="isShowDeviceJobDetails"
v-model:show="isShowDeviceJobDetails"
- :wayLineJodInfoId="wayLineJodInfoId"/>
+ :wayLineJodInfoId="rowData.id"/>
</template>
<script setup>
@@ -85,7 +85,6 @@
});
const jobListData = ref([]);
const total = ref(0);
-let wayLineJodInfoId = ref('')
let isShowDeviceJobDetails = ref(false);
let isShowCurrentTaskDetails = ref(false);
@@ -112,17 +111,13 @@
// 查看当前任务详情 如果是一台机则显示详情 如果是多台机则进入集群调度(暂未开发)
let rowData = ref({});
const handleDetail = (row) => {
- if (row.device_sns.length === 1){
- console.log(row)
- if (row.status === 2 || row.status === 1){
- rowData.value = row? row : {};
- isShowCurrentTaskDetails.value = true;
- } else{
- wayLineJodInfoId.value = row.id
- 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