From d5e65bafff7cfe6d4c01abc6aacfd6dd2c9285f6 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 19 Apr 2025 10:09:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
index e875c03..2463a6a 100644
--- a/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/TaskManage/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -20,10 +20,10 @@
<el-table-column label="任务状态" >
<template #default="scope">
<span :style="{
- color: scope.row.status === 1 ? '#e36913' :
- scope.row.status === 2 ? '#ffc398' :
- scope.row.status === 3 ? '#afd9fb' :
- scope.row.status === 4 ? '#11c4ff' : '8cfea7'
+ color: scope.row.status === 1 ? '#ffe17e' :
+ scope.row.status === 2 ? '#ffa768' :
+ scope.row.status === 3 ? '#8effac' :
+ scope.row.status === 5 ? '#ff8e8e':''
}">
{{ scope.row.status ? getStatusText(scope.row.status) : '' }}
</span>
@@ -63,7 +63,7 @@
v-if="isShowCurrentTaskDetails"
v-model:show="isShowCurrentTaskDetails"
:id="rowData.id"/>
- <!-- 历史人物详情 -->
+ <!-- 历史任务详情 -->
<DeviceJobDetails
v-if="isShowDeviceJobDetails"
v-model:show="isShowDeviceJobDetails"
--
Gitblit v1.9.3