From ace847c89da4a0a772aa513b4343d8fc54a0adc9 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 23 十月 2025 17:49:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/SecurityControl.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/screen/src/views/SecurityControl.vue b/screen/src/views/SecurityControl.vue
index b16eb42..5cd621b 100644
--- a/screen/src/views/SecurityControl.vue
+++ b/screen/src/views/SecurityControl.vue
@@ -99,7 +99,7 @@
<div class="safe_left_dian" :style="{ backgroundColor: item.color }"></div>
<div class="safe_left_name">{{item.name}}</div>
</div>
- <div class="safe_num" :style="{ color: item.color }">{{item.total}}</div>
+ <div class="safe_num" :style="{ color: item.color }">{{item.value}}</div>
</div>
<!-- <div class="safe_chat_info_row">-->
<!-- <div class="safe_left">-->
@@ -312,7 +312,7 @@
<div class="com_header">
<div class="title">
<img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>闅愭偅闅忔墜鎷�</div>
+ <div>鏈湀闅愭偅闅忔墜鎷�</div>
</div>
<img src="@/assets/images/task/title@2x.png" class="bg" alt="" />
</div>
@@ -369,7 +369,7 @@
</div>
</div>
<div v-if="arr1.length == 0" style="width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;">
- <img src="@/assets/images/default_empty.png" style="width: 120px; height: 120px;" alt="">
+ <img src="@/assets/images/default_nowarning.png" style="width: 150px; height: 150px;" alt="">
</div>
</div>
</div>
@@ -408,7 +408,7 @@
</div>
</div>
<div v-if="arr2.length == 0" style="width: 100%; height: 100%; display: flex; align-items: center; justify-content: center;">
- <img src="@/assets/images/default_empty.png" style="width: 120px; height: 120px;" alt="">
+ <img src="@/assets/images/default_nowarning.png" style="width: 150px; height: 150px;" alt="">
</div>
</div>
</div>
@@ -816,6 +816,7 @@
CarList.value = []
getEnergyCenterData().then(res => {
if (res.code == 200) {
+ totalCar.value = 0
const result = res.data
data.value = result
res.data.inParkCarList.forEach(item => {
@@ -829,7 +830,7 @@
} else if (item.name === '璐ц繍杞﹁締') {
CarList.value.push({ name: '璐ц繍杞﹁締', value: item.total, color: '#01ABFE' })
} else if (item.name === '鏈煡杞﹁締') {
- CarList.value.push({ name: '鏈煡杞﹁締', value: item.total, color: '#0028ff' })
+ CarList.value.push({ name: '鏈煡杞﹁締', value: item.total, color: '#cccccc' })
}
})
nextTick(() => {
@@ -902,7 +903,7 @@
return i
})
- dataList3.value = [...dataList3.value, ...dataList3.value, ...dataList3.value, ...dataList3.value]
+ // dataList3.value = [...dataList3.value, ...dataList3.value, ...dataList3.value, ...dataList3.value]
// initEchart3()
})
}
--
Gitblit v1.9.3