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/ProcessingInfo.vue | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/views/dashboard/components/ProcessingInfo.vue b/src/views/dashboard/components/ProcessingInfo.vue index fe317d6..ff2172b 100644 --- a/src/views/dashboard/components/ProcessingInfo.vue +++ b/src/views/dashboard/components/ProcessingInfo.vue @@ -5,13 +5,13 @@ </div> <div class="details"> <div class="row"> - <div class="col">宸ュ崟缂栧彿: {{ task?.Order?.workOrderId || '' }}</div> - <div class="col">璁㈠崟缂栧彿: {{ task?.Order?.orderId || '' }}</div> + <div class="col">宸ュ崟缂栧彿: {{ task?.Order?.workOrderId ?? '--' }}</div> + <div class="col">璁㈠崟缂栧彿: {{ task?.Order?.orderId ?? '--' }}</div> </div> <div class="row"> <div class="col">浜у搧鍚嶇О: {{ task?.Order?.productName || '--' }}</div> - <div class="col">鏁伴噺: {{ task?.Order?.amount || 0 }}{{ task?.Order?.unit }}</div> + <div class="col">鏁伴噺: {{ task?.Order?.amount ?? '--' }}{{ task?.Order?.unit }}</div> </div> <div class="row"> <div class="col">浜よ揣鏃ユ湡: {{ task?.Order?.deliverDate || '--' }}</div> @@ -26,8 +26,8 @@ <div class="col">閫氶亾: {{ isNumber(task?.Channel) ? CHANNEL_NAME_MAP[task?.Channel] : '--' }}</div> </div> <div class="row"> - <div class="col">瀹㈡埛鍚嶇О: {{ task?.Order?.customer || '' }}</div> - <div class="col">鍙傛暟瑕佹眰: {{ task?.Order?.parameter || '' }}</div> + <div class="col">瀹㈡埛鍚嶇О: {{ task?.Order?.customer || '--' }}</div> + <div class="col">鍙傛暟瑕佹眰: {{ task?.Order?.parameter || '--' }}</div> </div> </div> <div class="process"> @@ -92,19 +92,18 @@ * 璁$畻瀹屾垚杩涘害, 浠诲姟鐘舵�佹湭鐢熶骇鍥哄畾涓� 0% 宸插畬鎴愬浐瀹氫负 100% 鐢熶骇涓垯浠巔lc鑾峰彇 */ const processingPercent = computed(() => { - if (task?.value?.Procedure?.Status === 1) { - return 0 - } + // if (task?.value?.Procedure?.Status === 1) { + // return 0 + // } if (task?.value?.Procedure?.Status === 3) { return 100 } + // if (task?.value?.Procedure?.Status === 2 || task?.value?.Procedure?.Status === 1) { + // return calculateProgress(plcStore.plcInfo as Statistics) + // } - if (task?.value?.Procedure?.Status === 2) { - return calculateProgress(plcStore.plcInfo as Statistics) - } - - return 0 + return calculateProgress(plcStore.plcInfo as Statistics) }) /** @@ -115,7 +114,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 } </script> @@ -143,7 +142,7 @@ } } .details { - font-size: 18px; + font-size: 17px; padding: 10px 20px; color: $text-color; .row { @@ -158,7 +157,7 @@ } } .process { - font-size: 18px; + font-size: 17px; padding: 10px 20px; color: $text-color; display: flex; -- Gitblit v1.8.0