From 6098f630d190c3ba51a3749716ccc8ada2b450c8 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期一, 20 十一月 2023 11:32:41 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/operation-task-pane.vue | 29 ++++++++++++++++++++---------
1 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/src/views/product/workbench/operation-task-pane.vue b/src/views/product/workbench/operation-task-pane.vue
index d559810..7484173 100644
--- a/src/views/product/workbench/operation-task-pane.vue
+++ b/src/views/product/workbench/operation-task-pane.vue
@@ -18,9 +18,17 @@
<img class="selectedImg" src="/img/workbench/icon_selected.png" />
<div class="header">
<div>宸ュ崟鍙凤細{{ item.taskNo }}</div>
- <div class="tag" :style="{ backgroundColor: getTagColor(item.planFinishDay) }">
- {{ getTagText(item.planFinishDay) }}
- </div>
+ <!-- <div class="tag" :style="{ backgroundColor: getTagColor(item.planFinishDay) }">
+ {{ getTagText(item.planFinishDay) }}
+ </div> -->
+ <el-alert
+ center
+ style="width: 80px;height:30px;line-height: 30px;"
+ :title="getTagText(item.planFinishDay)"
+ :type="getTagColor(item.planFinishDay)"
+ effect="dark"
+ :closable="false">
+ </el-alert>
<!-- <div>璁″垝鍙凤細{{ item.mpsNo }}</div> -->
<div
:class="[
@@ -99,12 +107,12 @@
.tag{
width: 80px;
height: 30px;
+line-height: 30px;
border-radius:15% ;
text-align: center;
-text-size:8px;
+font-size:8px;
color:white;
align-content: 30px;
-
}
@@ -341,7 +349,7 @@
}
},
computed: {
- ...mapGetters(['permissions'])
+ ...mapGetters(['permissions']),
},
created() {
if (!this.defaultOperationId) {
@@ -382,14 +390,17 @@
const today = new Date();
const planDate = new Date(planFinishDay);
if (planDate < today) {
- return 'rgba( 255,0,0,1)'; // 瓒呮湡涓虹孩鑹�
+ //return 'rgba( 255,0,0,1)'; // 瓒呮湡涓虹孩鑹�
+ return 'error'; // 瓒呮湡涓虹孩鑹�
} else {
const timeDiff = planDate.getTime() - today.getTime();
const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
if (daysDiff <= 3) {
- return 'rgba(255,204,62, 1)'; // 涓存湡涓洪粍鑹�
+ //return 'rgba(255,204,62, 1)'; // 涓存湡涓洪粍鑹�
+ return 'warning'; // 涓存湡涓洪粍鑹�
} else {
- return 'rgba(86,219, 25,1)'; // 姝ｅ父涓虹豢鑹�
+ //return 'rgba(86,219, 25,1)'; // 姝ｅ父涓虹豢鑹�
+ return 'success'; // 姝ｅ父涓虹豢鑹�
}
}
},
--
Gitblit v1.9.3