From 04cd5b43197a8831c1e1637acf96bacb7a7116fa Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 17 Apr 2025 11:01:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 6271d34..19ef1b7 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -59,13 +59,13 @@
<!-- 添加任务 -->
<AddTask v-model:show="isShowAddTask" @refresh="searchClick"/>
<!-- 当前任务详情 -->
- <CurrentTaskDetails v-if="isShowCurrentTaskDetails" v-model:show="isShowCurrentTaskDetails" :rowData="rowData"/>
+ <CurrentTaskDetails v-if="isShowCurrentTaskDetails" v-model:show="isShowCurrentTaskDetails" :id="rowData.id"/>
</template>
<script setup>
import SearchBox from '../SearchBox.vue';
import AddTask from './AddTask.vue';
-import CurrentTaskDetails from './CurrentTaskDetails/CurrentTaskDetails.vue';
+import CurrentTaskDetails from '@/components/CurrentTaskDetails/CurrentTaskDetails.vue';
import { jobList } from '@/api/home/task';
import { ElMessage } from 'element-plus'
@@ -105,7 +105,7 @@
if (row.status === 2 || row.status === 1){
rowData.value = row? row : {};
isShowCurrentTaskDetails.value = true;
- }else{
+ } else{
ElMessage.warning('todo 跳历史任务详情')
}
}else{
--
Gitblit v1.9.3