From 2f5861703779dd20fdbd8d61b1d06531d1d80fc3 Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期五, 24 十一月 2023 11:05:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before
---
src/views/product/workbench/index.vue | 44 +++++++++++++++++++++++---------------------
1 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/src/views/product/workbench/index.vue b/src/views/product/workbench/index.vue
index fd3b46e..cbb0fa3 100644
--- a/src/views/product/workbench/index.vue
+++ b/src/views/product/workbench/index.vue
@@ -528,10 +528,11 @@
</el-form-item>
</el-form>
</div>
+ <!-- :style="{ backgroundColor: taskStatusColor() }" -->
<div class="task-div-content" >
<div v-if="!isShowNormalTracking" class="task-list-div" >
- <operationTaskPane
- ref="operateTaskDiv" :style="{ backgroundColor: taskStatusColor() }"
+ <operationTaskPane
+ ref="operateTaskDiv"
:workstationId="dutyForm.workstationId"
:productSn="operateTaskForm.SN"
:orderNumber="operateTaskForm.orderNumber"
@@ -544,7 +545,7 @@
</div>
<div v-if="isShowNormalTracking" class="task-list-div" >
<operationTaskTable
- ref="operateTaskTableDiv" :style="{ backgroundColor: taskStatusColor() }"
+ ref="operateTaskTableDiv"
:workstationId="dutyForm.workstationId"
:productSn="operateTaskForm.SN"
:orderNumber="operateTaskForm.orderNumber"
@@ -1438,7 +1439,6 @@
box-sizing: border-box;
overflow-y: auto;
margin-bottom: 10px;
-
}
.task-list-div {
@@ -1673,8 +1673,8 @@
}
},
methods: {
- changeCurrOperateTask() {},
- refreshWorkReportPageData() {},
+ // changeCurrOperateTask() {},
+ // refreshWorkReportPageData() {},
refreshOperateTasksByConditions() {
this.$nextTick(() => {
this.refreshOperateTasks()
@@ -2519,23 +2519,25 @@
},
computed: {
...mapGetters(['userInfo', 'tagWel', 'permissions']),
+// 鍗婁釜鏈堜箣鍓嶆槸榛勮壊 褰撳ぉ鍜屼笁澶╀箣鍐呭氨鏄孩鑹� 涓夊ぉ涔嬪悗灏辨槸钃濊壊
+// taskStatusColor() {
+// return function(date) {
+// const now = new Date();
+// const halfMonthAgo = new Date(now - 15 * 24 * 60 * 60 * 1000);
+// const threeDaysAgo = new Date(now - 3 * 24 * 60 * 60 * 1000);
+// const oneDayAgo = new Date(now - 24 * 60 * 60 * 1000);
+// const today = new Date(now);
- taskStatusColor() {
- return function() {
- const now = new Date();
- const threeDaysAgo = new Date(now - 3 * 24 * 60 * 60 * 1000);
- const oneDayAgo = new Date(now - 24 * 60 * 60 * 1000);
- const today = new Date(now);
+// if (halfMonthAgo <= date && date <= threeDaysAgo) {
+// return 'yellow';
+// } else if (today <= date && date <= threeDaysAgo) {
+// return 'red';
+// } else {
+// return 'blue';
+// }
+// };
+// }
- if (threeDaysAgo <= today && today <= oneDayAgo) {
- return 'yellow';
- } else if (today <= threeDaysAgo) {
- return 'blue';
- } else {
- return 'red';
- }
- };
- }
},
created() {
document.title = '宸ヤ綔鍙扳�斺�擬ES'
--
Gitblit v1.9.3