From 9ae3baca4c8730fcc5f7c8daf3b6368cec554ae6 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 25 十二月 2024 18:39:13 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- screen/src/views/SecurityControl.vue | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue index 233548d..f8f77ea 100644 --- a/screen/src/views/SecurityControl.vue +++ b/screen/src/views/SecurityControl.vue @@ -164,7 +164,7 @@ <img src="@/assets/images/SecurityControl/title_short@2x.png" class="bg" alt=""> </div> <div class="num_wrap"> - <div class="num">{{ data.internalCarTotal }}</div> + <div class="num">{{ data.inParkCarTotal || 0 }}</div> <img src="@/assets/images/SecurityControl/anfang_ic_data@2x.png" class="bg" alt=""> </div> </div> @@ -423,7 +423,7 @@ </div> <div class="list two-swiper"> <div class="swiper-wrapper"> - <template v-for="item, i in dataList2.filter(i => i.total > 0)"> + <template v-for="item, i in dataList2.filter(i => i.totalNum > 0)"> <div class="item two-swiper-slide swiper-slide"> <div class="line"> <div class="driver">{{ item.deviceType }}</div> @@ -826,6 +826,8 @@ } return item }) + console.log('dataList2', dataList2.value); + data2.value = total if (online >= outline) { temp.push({ name: '鍦ㄧ嚎', value: online, rate: ((online / (online + outline)) * 100).toFixed(1) }) -- Gitblit v1.9.3