From da2a4e58ecc7c5da0a3ec726708a16c21e7f60e3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 07 Apr 2025 15:34:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index ccf669e..ee3f45b 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -1,6 +1,6 @@
<!-- 任务统计表格 -->
<template>
- <SearchBox></SearchBox>
+ <SearchBox @search="searchClick"></SearchBox>
<div class="task-intermediate-content">
<el-table :data="jobListData" style="width: 100%" height="calc(100vh - 180px)">
<el-table-column label="序号" width="60">
@@ -15,9 +15,7 @@
<el-table-column prop="ai_type_str" label="关联算法" />
<el-table-column prop="status" label="任务状态" >
<template #default="scope">
- <el-tag :type="getStatusType(scope.row.status)">
- {{ getStatusText(scope.row.status) }}
- </el-tag>
+ {{ scope.row.status ? getStatusText(scope.row.status) : '' }}
</template>
</el-table-column>
<el-table-column prop="industry_type_str" label="任务类型" />
@@ -51,13 +49,14 @@
const jobListParams = reactive({
page: 1,
limit: 10,
+ searchParams:{}
});
const jobListData = ref([]);
const total = ref(0);
// 获取任务列表
const getJobList = () => {
- jobList({current:1,size:10}).then(res => {
+ jobList(jobListParams).then(res => {
if (res.data.code !== 0) return;
jobListData.value = res.data.data.records;
total.value = res.data.data.total;
@@ -65,6 +64,7 @@
};
// 状态文字
const getStatusText = (status) => {
+ console.log('哒哒哒',status)
const statusMap = {
1: '待执行',
2: '执行中',
@@ -104,6 +104,14 @@
getJobList();
};
+// 传参查询条件
+const searchClick = (params) => {
+ jobListParams.page = 1;
+ jobListParams.limit = 10;
+ jobListParams.searchParams = params;
+ getJobList();
+};
+
onMounted(() => {
getJobList();
});
@@ -112,10 +120,10 @@
<style lang="scss" scoped>
.task-intermediate-content {
position: absolute;
- top: 190px;
+ top: 200px;
width: calc(100% - 400px - 400px - 100px);
left: 450px;
- height: 770px;
+ height: 760px;
display: flex;
flex-direction: column;
justify-content: space-between;
--
Gitblit v1.9.3