From 41d11d9db46ccd44163860f6be6bfd2137aff369 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 07 一月 2025 09:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsCenter.vue | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index 9f37ba8..1f74d2b 100644
--- a/screen/src/views/LogisticsCenter.vue
+++ b/screen/src/views/LogisticsCenter.vue
@@ -148,14 +148,14 @@
<img src="@/assets/images/LogisticsCenter/ic_jinrijihua@2x.png" alt="">
<div class="content">
<div class="name">褰撴棩璁㈠崟閲�</div>
- <div class="num"><span class="blue">{{ cneterData.currentOrderNum }}</span>涓囨敮</div>
+ <div class="num"><span class="blue" v-if="cneterData.currentOrderNum">{{ cneterData.currentOrderNum.toFixed(0) }}</span>绠�</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/LogisticsCenter/ic_jinrijihua@2.png" alt="">
<div class="content">
<div class="name">褰撴棩璁″垝閲�</div>
- <div class="num"><span>{{ cneterData.currentPlanNum }}</span>涓囨敮</div>
+ <div class="num"><span v-if="cneterData.currentPlanNum">{{ cneterData.currentPlanNum.toFixed(0) }}</span>绠�</div>
<div class="unit">杞︽锛歿{ cneterData.currentPlanCarNum }}</div>
</div>
</div>
@@ -163,7 +163,7 @@
<img src="@/assets/images/LogisticsCenter/ic_jinrichuku@2x.png" alt="">
<div class="content">
<div class="name">浠婃棩鍑哄簱閲�</div>
- <div class="num"><span class="finish">{{ cneterData.crrentOutNum }}</span>涓囨敮</div>
+ <div class="num"><span v-if="cneterData.crrentOutNum" class="finish">{{ cneterData.crrentOutNum.toFixed(0) }}</span>绠�</div>
<div class="unit">杞︽锛歿{ cneterData.crrentOutCarNum }}</div>
</div>
</div>
@@ -171,7 +171,7 @@
<img src="@/assets/images/LogisticsCenter/ic_jinriweichu@2x.png" alt="">
<div class="content">
<div class="name">鍓╀綑浠诲姟閲�</div>
- <div class="num"><span class="today">{{ cneterData.crrentRestNum }}</span>涓囨敮</div>
+ <div class="num"><span v-if="cneterData.crrentRestNum" class="today">{{ cneterData.crrentRestNum.toFixed(0) }}</span>绠�</div>
<div class="unit">杞︽锛歿{ cneterData.crrentRestCarNum }}</div>
</div>
</div>
@@ -278,7 +278,7 @@
<div class="side">
鍏ㄧ渷锛�
<span>{{ data5.currentNum }}</span>
- <span class="unit">涓囨敮 | </span>
+ <span class="unit">绠� | </span>
<span v-if="data5.totalNum">{{ ((data5.currentNum / data5.totalNum) * 100).toFixed(1) }}%</span>
</div>
</div>
@@ -295,7 +295,7 @@
<div class="side">
鍏ㄧ渷锛�
<span>{{ data6.currentNum }}</span>
- <span class="unit">涓囨敮 | </span>
+ <span class="unit">绠� | </span>
<span v-if="data6.totalNum">{{ ((data6.currentNum / data6.totalNum) * 100).toFixed(1) }}%</span>
</div>
</div>
@@ -658,14 +658,14 @@
<span class="dot bj"></span>
<span class="item-state-num">
<span class="text">鏈湀璋冩嫧閲忥細</span>
- <span class="num">${params.data.monthNum}涓囨敮</span>
+ <span class="num">${params.data.monthNum}绠�</span>
</span>
</div>
<div class="item-state-con">
<span class="dot yj"></span>
<span class="item-state-num">
<span class="text">鏈勾璋冩嫧閲忥細</span>
- <span class="num">${params.data.yearNum}涓囨敮</span>
+ <span class="num">${params.data.yearNum}绠�</span>
</span>
</div>
<div class="item-state-con">
@@ -1240,7 +1240,7 @@
nameTextStyle: {
color: '#869CC9',
},
- name: '涓囨敮',
+ name: '绠�',
nameGap: 16,
type: 'value',
axisLabel: {
@@ -1442,7 +1442,7 @@
}],
yAxis: [
{
- name: '涓囨敮',
+ name: '绠�',
nameGap: 16,
type: 'value',
axisLabel: {
@@ -2159,7 +2159,6 @@
.static_wrap {
display: flex;
justify-content: space-between;
- align-items: center;
margin: 30px 0 14px;
.item {
@@ -2263,7 +2262,7 @@
align-items: center;
justify-content: center;
min-width: 76px;
- border: 1px solid #fff;
+ border: 1px solid #FECE01;
.icon {
position: absolute;
@@ -2280,7 +2279,7 @@
.tag1 {
background-color: #28F0CC;
-
+ border: 1px solid #28F0CC;
.icon {
background-color: #28F0CC;
}
--
Gitblit v1.9.3