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 | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index 5e15016..ee3f45b 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -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="任务类型" />
@@ -66,6 +64,7 @@
};
// 状态文字
const getStatusText = (status) => {
+ console.log('哒哒哒',status)
const statusMap = {
1: '待执行',
2: '执行中',
--
Gitblit v1.9.3