From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/LogisticsEfficiency.vue | 34 +++++++++++++++-------------------
1 files changed, 15 insertions(+), 19 deletions(-)
diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue
index ea7a49a..fa890af 100644
--- a/screen/src/views/LogisticsEfficiency.vue
+++ b/screen/src/views/LogisticsEfficiency.vue
@@ -47,7 +47,7 @@
data1.monthLastOutTotal) / data1.monthLastOutTotal) * 100).toFixed(1)) }}%</span>
<span v-else-if="activeTab1 == 1 && data1.yearLastOutTotal">{{ Math.abs((((data1.yearOutTotal -
data1.yearLastOutTotal) / data1.yearLastOutTotal) * 100).toFixed(1)) }}%</span>
- <span v-else>-</span>
+ <span v-else style="margin-left: 10px;">-</span>
</div>
</div>
<div class="train_wrap">
@@ -137,22 +137,26 @@
<img src="@/assets/images/energy_ef/ic_renwuzongliang@2x.png" alt="">
<div class="content">
<div class="name">褰撳墠浠诲姟閲�</div>
- <div class="num"><span>{{ data4.planTaskNum }}</span>涓囨敮</div>
+ <div class="num"><span>{{ activeTab4 == 0 ? data1.currentOutNum : data1.currentInNum }}</span>涓囨敮</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/energy_ef/ic_wanchengrenwu@2x.png" alt="">
<div class="content">
<div class="name">褰撴棩瀹屾垚浠诲姟鎬婚噺</div>
- <div class="num"><span class="today">{{ data4.finishTaskNum }}</span>涓囨敮</div>
+ <div class="num"><span v-if="data1.currentOutDoneNum || data1.currentInDoneNum" class="today">{{ activeTab4 == 0 ? data1.currentOutDoneNum :
+ data1.currentInDoneNum
+ }}</span>涓囨敮</div>
</div>
</div>
<div class="item">
<img src="@/assets/images/energy_ef/ic_bili@2x.png" alt="">
<div class="content">
<div class="name">宸插畬鎴愭瘮渚�</div>
- <div class="num" v-if="data4.finishTaskNum && data4.planTaskNum"><span class="finish">{{ ((
- data4.finishTaskNum / data4.planTaskNum) * 100).toFixed(1) }}%</span>涓囨敮</div>
+ <div class="num">
+ <span v-if="activeTab4 == 0 && data1.currentOutNum" class="finish">{{ ((data1.currentOutDoneNum / data1.currentOutNum) * 100).toFixed(1) }}%</span>
+ <span v-if="activeTab4 == 1 && data1.currentInNum" class="finish">{{ ((data1.currentInDoneNum / data1.currentInNum) * 100).toFixed(1) }}%</span>
+ </div>
</div>
</div>
</div>
@@ -870,17 +874,9 @@
dataList3.value = result
})
}
-const data4 = ref({})
const activeTab4 = ref(0)
const tabClick4 = (val) => {
activeTab4.value = val
- getData4()
-}
-const getData4 = () => {
- wljobData({ queryType: activeTab4.value }).then(res => {
- const result = res.data
- data4.value = result
- })
}
const dataList5 = ref([])
const data5 = ref(0)
@@ -947,7 +943,7 @@
getData1()
getData2()
getData3()
- getData4()
+ // getData4()
getData5()
getData6()
getData7()
@@ -994,15 +990,15 @@
.num {
margin-right: 10px;
font-weight: bold;
- font-size: 46px;
- height: 44px;
- line-height: 52px;
+ font-size: 44px;
+ height: 48px;
+ line-height: 50px;
font-weight: bold;
color: #00F2F3;
letter-spacing: 3px;
background-image: -webkit-linear-gradient(top,
- #01D9FE 0%,
- #0177FE 60%,
+ #1cdafb 0%,
+ #0177FE 70%,
#0177FE 100%);
-webkit-background-clip: text;
-webkit-text-fill-color: transparent;
--
Gitblit v1.9.3