From 115bd56702e2ce09b7a7c1e6bb5e93e2f6174cdf Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Wed, 16 Apr 2025 20:50:13 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 5e0d423..6271d34 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -59,7 +59,7 @@
<!-- 添加任务 -->
<AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
<!-- 当前任务详情 -->
- <CurrentTaskDetails v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
+ <CurrentTaskDetails v-if="isShowCurrentTaskDetails" v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
</template>
<script setup>
@@ -71,7 +71,7 @@
const jobListParams = reactive({
current: 1,
- size: 8,
+ size: 10,
searchParams:{}
});
const jobListData = ref([]);
@@ -102,8 +102,12 @@
let rowData = ref({});
const handleDetail = (row) => {
if (row.device_sns.length === 1){
- isShowCurrentTaskDetails.value = true;
- rowData.value = row? row : {};
+ if (row.status === 2 || row.status === 1){
+ rowData.value = row? row : {};
+ isShowCurrentTaskDetails.value = true;
+ }else{
+ ElMessage.warning('todo 跳历史任务详情')
+ }
}else{
ElMessage.warning('即将跳转到集群调度');
}
@@ -126,8 +130,6 @@
jobListParams.current = 1;
jobListParams.size = 10;
jobListParams.searchParams = params;
- // 存储查询条件 ，用于统计图搜索
-
getJobList();
};
@@ -159,6 +161,7 @@
.task-table {
height: 528px;
margin-top: 18px;
+ overflow: auto;
}
.current-details {
--
Gitblit v1.9.3