From af6b8c62f914e681e4ac325cb4be61d2aaa9ea7d Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期五, 21 三月 2025 15:58:27 +0800
Subject: [PATCH] Merge branch 'master' into develop1.0
---
zhitan-vue/src/views/index.vue | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zhitan-vue/src/views/index.vue b/zhitan-vue/src/views/index.vue
index 8c988a0..84f2c80 100644
--- a/zhitan-vue/src/views/index.vue
+++ b/zhitan-vue/src/views/index.vue
@@ -20,10 +20,11 @@
<div class="top-right">
<div class="right-name">
{{ item.energyName }}
+ <span v-if="item.energyUnit" class="unit">({{ item.energyUnit }})</span>
</div>
<div class="right-value">
<span> {{ item.count }}</span>
- <span class="unit">{{ item.energyUnit }}</span>
+ <!-- <span class="unit">{{ item.energyUnit }}</span> -->
</div>
</div>
</div>
@@ -379,7 +380,7 @@
right: "5%",
itemWidth: 14,
itemHeight: 14,
- itemGap: 60,
+ itemGap: 16,
textStyle: {
align: "left",
verticalAlign: "middle",
@@ -494,7 +495,7 @@
},
grid: {
top: "45",
- left: "7%",
+ left: "2%",
right: "5%",
bottom: "10",
containLabel: true,
@@ -777,7 +778,7 @@
right: "10%",
itemWidth: 14,
itemHeight: 14,
- itemGap: 50,
+ itemGap: 16,
textStyle: {
align: "left",
verticalAlign: "middle",
@@ -889,18 +890,23 @@
display: flex;
.top-icon {
- width: 69px;
- height: 69px;
+ width: 50px;
+ height: 50px;
background-size: 100% 100%;
}
.top-right {
- margin-left: 16px;
+ margin-left: 12px;
.right-name {
font-weight: bold;
font-size: 16px;
font-family: OPPOSans-Bold;
+ .unit {
+ margin-left: 2px;
+ font-size: 16px;
+ font-weight: normal;
+ }
}
.right-value {
--
Gitblit v1.9.3