From a35b8eec96aac2793de732c3fb7513cd6c5b2e4c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 一月 2025 14:39:34 +0800
Subject: [PATCH] 最新版本541200007

---
 screen/src/views/LogisticsCenter.vue |   61 ++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/screen/src/views/LogisticsCenter.vue b/screen/src/views/LogisticsCenter.vue
index c371f99..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>
@@ -518,14 +518,23 @@
     { name: '婢抽棬鐗瑰埆琛屾斂鍖�', code:'820003',value: 0 },
     { name: '鍗楁捣璇稿矝', code:'',value: 0 },
   ]
+  let totalNum = 0
+  mapList.value.forEach(i => {
+    totalNum += i.yearNum
+  })
   mapData.forEach(item => {
     item.monthNum = 0
     item.yearNum = 0
     mapList.value.forEach(ite => {
       if (item.code == ite.code) {
-        item.value = ite.yearNum
+        item.value = 0
         item.monthNum = ite.monthNum
         item.yearNum = ite.yearNum
+        if(totalNum > 0){
+          item.rate = ((ite.yearNum / totalNum) * 100).toFixed(2)
+          item.value = (ite.yearNum / totalNum).toFixed(4)
+          
+        }
       }
     })
   })
@@ -535,10 +544,14 @@
     visualMap: {
       type: 'piecewise',
       pieces: [
-        { min: 100000, max: 99999999999, label: '鍑哄簱閲�10w浠ヤ笂', color: '#be6f2b' },
-        { min: 50000, max: 100000, label: '鍑哄簱閲�5-10w', color: '#c39332' },
-        { min: 20000, max: 50000, label: '鍑哄簱閲�2-5w', color: '#5ecbaf' },
-        { min: -1, max: 20000, label: '鍑哄簱閲�2w浠ヤ笅', color: '#3561a4' },
+        { min: 0.05, max: 99999999999, label: '璋冩嫧閲忓崰姣�5%浠ヤ笂', color: '#be6f2b' },
+        { min: 0.02, max: 0.05, label: '璋冩嫧閲忓崰姣�2%~5%', color: '#c39332' },
+        { min: 0.01, max: 0.02, label: '璋冩嫧閲忓崰姣�1%~2%', color: '#5ecbaf' },
+        { min: -1, max: 0.01, label: '璋冩嫧閲忓崰姣�1%浠ヤ笅', color: '#3561a4' },
+        // { min: 100000, max: 99999999999, label: '鍑哄簱閲�10w浠ヤ笂', color: '#be6f2b' },
+        // { min: 50000, max: 100000, label: '鍑哄簱閲�5-10w', color: '#c39332' },
+        // { min: 20000, max: 50000, label: '鍑哄簱閲�2-5w', color: '#5ecbaf' },
+        // { min: -1, max: 20000, label: '鍑哄簱閲�2w浠ヤ笅', color: '#3561a4' },
       ],
       itemWidth: 22,
       itemHeight: 22,
@@ -644,15 +657,22 @@
                         <div class="item-state-con">
                           <span class="dot bj"></span>
                           <span class="item-state-num">
-                            <span class="text">鏈湀鍑哄簱閲忥細</span>
-                            <span class="num">${params.data.monthNum}涓囨敮</span>
+                            <span class="text">鏈湀璋冩嫧閲忥細</span>
+                            <span class="num">${params.data.monthNum}绠�</span>
                           </span>
                         </div>
-                         <div class="item-state-con">
+                        <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="text">鏈勾璋冩嫧閲忥細</span>
+                            <span class="num">${params.data.yearNum}绠�</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.rate || 0}%</span>
                           </span>
                         </div>
                        </div>`
@@ -1220,7 +1240,7 @@
         nameTextStyle: {
           color: '#869CC9',
         },
-        name: '涓囨敮',
+        name: '绠�',
         nameGap: 16,
         type: 'value',
         axisLabel: {
@@ -1422,7 +1442,7 @@
     }],
     yAxis: [
       {
-        name: '涓囨敮',
+        name: '绠�',
         nameGap: 16,
         type: 'value',
         axisLabel: {
@@ -2139,7 +2159,6 @@
       .static_wrap {
         display: flex;
         justify-content: space-between;
-        align-items: center;
         margin: 30px 0 14px;
 
         .item {
@@ -2243,7 +2262,7 @@
               align-items: center;
               justify-content: center;
               min-width: 76px;
-              border: 1px solid #fff;
+              border: 1px solid #FECE01;
 
               .icon {
                 position: absolute;
@@ -2260,7 +2279,7 @@
 
             .tag1 {
               background-color: #28F0CC;
-
+              border: 1px solid #28F0CC;
               .icon {
                 background-color: #28F0CC;
               }

--
Gitblit v1.9.3