From 2f8216198bcf091bf7758326aef222d6631b258f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 05 十一月 2024 14:00:11 +0800
Subject: [PATCH] ll
---
screen/src/views/EnergyConsum.vue | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index e885fb9..938e91a 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -25,7 +25,7 @@
<img src="@/assets/images/nenghao_ic1.png" class="co2" alt="">
<div>
<div class="name">鏈勾绱寰幆鐑熺</div>
- <div><span class="num">{{ data1.smokeBoxTotal }}</span><span>鍙�</span></div>
+ <div><span class="num" v-if="data1.smokeBoxTotal">{{ data1.smokeBoxTotal.toLocaleString() }}</span><span>鍙�</span></div>
</div>
</div>
</div>
@@ -69,7 +69,7 @@
<img class="icon" src="@/assets/images/ic_yongdian@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄧ數(kw路h)</div>
- <div class="num">{{ data1.electricityQuantity }}</div>
+ <div class="num" v-if="data1.electricityQuantity">{{ data1.electricityQuantity.toLocaleString() }}</div>
</div>
</div>
<div class="static">
@@ -86,7 +86,7 @@
<img class="icon" src="@/assets/images/ic_yongshui@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ按(t)</div>
- <div class="num">{{ data1.waterQuantity }}</div>
+ <div class="num" v-if="data1.waterQuantity">{{ data1.waterQuantity.toLocaleString() }}</div>
</div>
</div>
<div class="static">
@@ -103,7 +103,7 @@
<img class="icon" src="@/assets/images/ic_yongqi@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ皵(t)</div>
- <div class="num">{{ data1.gasQuantity }}</div>
+ <div class="num" v-if="data1.gasQuantity">{{ data1.gasQuantity.toLocaleString() }}</div>
</div>
</div>
<div class="static">
@@ -179,7 +179,7 @@
<img src="@/assets/images/ic_co2@2x.png" class="co2" alt="">
<div>
<div class="name">鏈湀绱纰虫帓鏀�</div>
- <div><span class="num">{{ data1.carbon }}</span><span>鍚�</span></div>
+ <div><span class="num" v-if="data1.carbon">{{ data1.carbon.toLocaleString() }}</span><span>鍚�</span></div>
</div>
</div>
</div>
@@ -197,7 +197,7 @@
<div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
<div class="id_card">{{ item.carNo }}</div>
<div class="wrap">
- <ChargeRate :rate="item.rate" :color />
+ <ChargeRate :rate="item.rate" :color="i > 2 ? 'cyan': '#e3a83a'" />
</div>
<div class="num">{{ item.quantity }}</div>
</div>
@@ -303,7 +303,7 @@
grid: {
top: '26%',
left: '4%',
- right: '2%',
+ right: '6%',
bottom: '2%',
containLabel: true
},
@@ -476,8 +476,8 @@
// 缁樺埗鍥捐〃
myChart.setOption({
grid: {
- top: '26%',
- left: '2%',
+ top: '24%',
+ left: '6%',
right: '2%',
bottom: '4%',
containLabel: true
@@ -494,7 +494,7 @@
},
yAxis: {
type: 'value',
- name: 'kw路h',
+ name: '鍗曚綅锛歬w路h',
nameTextStyle: {
padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
@@ -520,7 +520,7 @@
{ offset: 1, color: '#1d4861' }
]
),
- barBorderRadius: [10, 10, 0, 0]
+ barBorderRadius: [3, 3, 0, 0]
}
}
}
--
Gitblit v1.9.3