From f8c0e9b318d946439e9bd1584eae1fa932af6d96 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期五, 17 十一月 2023 16:32:38 +0800
Subject: [PATCH] 未生产中的完成进度显示0 因为plc 有数据 修改为可以显示数据
---
src/views/dashboard/components/TaskControl.vue | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/src/views/dashboard/components/TaskControl.vue b/src/views/dashboard/components/TaskControl.vue
index 6791ac2..03c17b4 100644
--- a/src/views/dashboard/components/TaskControl.vue
+++ b/src/views/dashboard/components/TaskControl.vue
@@ -21,8 +21,10 @@
寮�濮嬬敓浜�
</BigButton>
<template v-if="task?.Procedure.Status === 2 || task?.Procedure.Status === 3">
- <BigButton class="btn" bg-color="#ff9933">鎵撳嵃</BigButton>
- <BigButton class="btn" bg-color="#00cc33" @click="openReportModal">鎶ュ伐</BigButton>
+ <BigButton class="btn" bg-color="#ff9933" :disabled="task?.Procedure.Status === 3">鎵撳嵃</BigButton>
+ <BigButton class="btn" bg-color="#00cc33" :disabled="task?.Procedure.Status === 3" @click="openReportModal">
+ 鎶ュ伐
+ </BigButton>
<el-popconfirm
width="340"
confirm-button-text="纭畾"
@@ -36,7 +38,7 @@
@confirm="finishTaskProduce"
>
<template #reference>
- <BigButton class="btn" bg-color="#ff0000">瀹屾垚</BigButton>
+ <BigButton class="btn" bg-color="#ff0000" :disabled="task?.Procedure.Status === 3">瀹屾垚</BigButton>
</template>
</el-popconfirm>
</template>
@@ -119,7 +121,7 @@
if (!timestamp) {
return '--'
}
- const time = useDateFormat(timestamp * 1000, 'YYYY-MM-DD', { locales: 'zh-cn' })
+ const time = useDateFormat(timestamp * 1000, 'YYYY-MM-DD HH:mm:ss', { locales: 'zh-cn' })
return time.value
}
// 鎶ュ伐
@@ -137,10 +139,12 @@
align-items: start;
width: 100%;
}
-.task-info,
-.produce-btn {
- width: 50%;
+.task-info {
flex: 1;
+ height: 100%;
+}
+.produce-btn {
+ flex-shrink: 0;
height: 100%;
}
.produce-btn {
@@ -155,7 +159,6 @@
.task-info-item {
padding: 10px 20px;
- margin-bottom: 6px;
}
.task-info-title {
font-size: 18px;
@@ -165,7 +168,7 @@
font-size: 19px;
color: $content-text-color;
font-weight: 600;
- margin-top: 12px;
+ margin-top: 4px;
}
.produce-btn {
display: flex;
--
Gitblit v1.8.0