From 945093283bfe840784e968028f73a20f1232c25d Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 24 十二月 2024 10:08:39 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- screen/src/views/LogisticsEfficiency.vue | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/screen/src/views/LogisticsEfficiency.vue b/screen/src/views/LogisticsEfficiency.vue index fa890af..ed5ea60 100644 --- a/screen/src/views/LogisticsEfficiency.vue +++ b/screen/src/views/LogisticsEfficiency.vue @@ -144,8 +144,10 @@ <img src="@/assets/images/energy_ef/ic_wanchengrenwu@2x.png" alt=""> <div class="content"> <div class="name">褰撴棩瀹屾垚浠诲姟鎬婚噺</div> - <div class="num"><span v-if="data1.currentOutDoneNum || data1.currentInDoneNum" class="today">{{ activeTab4 == 0 ? data1.currentOutDoneNum : - data1.currentInDoneNum + <div class="num"><span v-if="data1.currentOutDoneNum || data1.currentInDoneNum" class="today">{{ + activeTab4 == + 0 ? data1.currentOutDoneNum : + data1.currentInDoneNum }}</span>涓囨敮</div> </div> </div> @@ -154,8 +156,10 @@ <div class="content"> <div class="name">宸插畬鎴愭瘮渚�</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> + <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> @@ -943,11 +947,19 @@ getData1() getData2() getData3() - // getData4() getData5() getData6() getData7() + setInterval(() => { + getData1() + getData2() + getData3() + getData5() + getData6() + getData7() + }, 1000 * 60 * 10) + setTimeout(() => { loopFn1() loopFn2() -- Gitblit v1.9.3