From b95cf940af8e01e4eca30b2599b029c2f645bd1e Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 29 四月 2024 10:44:26 +0800
Subject: [PATCH] feat:创建新分支
---
src/views/dashboard/components/TaskInfo.vue | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/views/dashboard/components/TaskInfo.vue b/src/views/dashboard/components/TaskInfo.vue
index d0ba6e1..ec96d96 100644
--- a/src/views/dashboard/components/TaskInfo.vue
+++ b/src/views/dashboard/components/TaskInfo.vue
@@ -12,14 +12,25 @@
</div>
<div class="task-info-content">
<div class="row">
- <div class="col">宸ュ崟鍙�: {{ task.Order.workOrderId }}</div>
- <div class="col">鐢熶骇鏁伴噺锛歿{ task.Order.amount || 0 }}{{ task.Order.unit }}</div>
+ <div class="col">
+ 宸ュ崟鍙�:
+ <span>{{ task.Order.workOrderId }}</span>
+ </div>
+ <div class="col">
+ 鐢熶骇鏁伴噺: <span>{{ task.Order.amount || 0 }}{{ task.Order.unit }}</span>
+ </div>
</div>
<div class="row">
- <div class="col">褰撳墠浠诲姟: {{ task.Procedure.procedure.procedureName || '' }}</div>
- <div class="col">浜у搧鍚嶇О锛歿{ task.Order.productName || '' }}</div>
+ <div class="col">
+ 褰撳墠浠诲姟:
+ <span>{{ task.Procedure?.procedure?.procedureName || '' }}</span>
+ </div>
+ <div class="col">
+ 浜у搧鍚嶇О:
+ <span>{{ task.Order.productName || '' }}</span>
+ </div>
</div>
- <div class="row">璁″垝鏃堕棿: {{ planTimeText }}</div>
+ <div class="row">璁″垝鏃堕棿:{{ planTimeText }}</div>
</div>
</div>
</template>
@@ -41,7 +52,7 @@
const planTimeText = computed(() => {
const format = (date: number) => {
- return useDateFormat(date, 'YYYY-MM-DD', { locales: 'zh-cn' })
+ return useDateFormat(date, 'YYYY-MM-DD HH:mm:ss', { locales: 'zh-cn' })
}
const startTime = task.value.Procedure?.startTime
@@ -83,8 +94,8 @@
background-color: $status-done;
}
.task-info-content {
- font-size: 13px;
- padding: 10px 20px;
+ font-size: 12px;
+ padding: 10px 15px;
color: $text-color;
.row {
width: 100%;
@@ -95,6 +106,14 @@
.col {
width: 50%;
flex: 1;
+ span {
+ width: calc(100% - 60px);
+ white-space: nowrap;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: inline-block;
+ vertical-align: middle;
+ }
}
}
.active {
--
Gitblit v1.8.0