From 5a7be6ac54b1e099eae276f550aa9cc9f3167be8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 25 Jun 2025 11:17:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 6 +++---
src/views/dataCenter/dataCenter.vue | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/dataCenter/dataCenter.vue b/src/views/dataCenter/dataCenter.vue
index 930e905..27963fd 100644
--- a/src/views/dataCenter/dataCenter.vue
+++ b/src/views/dataCenter/dataCenter.vue
@@ -124,7 +124,7 @@
/>
<!-- 地图 -->
<div
- v-if="dialogDetailList?.resultType === 4"
+ v-else-if="dialogDetailList?.resultType === 4"
id="detaildataCenterMap"
class="ztzf-cesium"
></div>
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 59731bd..f3f88f0 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -20,11 +20,11 @@
:style="{
color:
scope.row.status === 1
- ? '#ffe17e'
+ ? '#00CDC2'
: scope.row.status === 2
- ? '#ffa768'
+ ? '#FF720F'
: scope.row.status === 3
- ? '#8effac'
+ ? '#00AA2D'
: scope.row.status === 5
? '#FF4848'
: scope.row.status === 7
--
Gitblit v1.9.3