From 77be404d9d2b3fa11c7ba0890dcdf2bb0b5d6a1c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 31 十月 2024 17:14:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/EnergyConsum.vue | 155 +++++++++++++++++++++++++++------------------------
1 files changed, 82 insertions(+), 73 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index c745f28..0284eb7 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -17,34 +17,15 @@
<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/title@2x.png" class="bg" alt="" />
</div>
<div class="content">
- <div class="item">
- <div class="lab">A鐩哥數娴�(A)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">B鐩哥數娴�(A)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">C鐩哥數娴�(A)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">鏈夊姛鍔熺巼(KW)</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">鍔熺巼鍥犳暟</div>
- <div class="val">60</div>
- </div>
- <div class="item">
- <div class="lab">鏈夊姛鐢靛害(掳)</div>
- <div class="val">60</div>
+ <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>
</div>
</div>
@@ -88,16 +69,16 @@
<img class="icon" src="@/assets/images/ic_yongdian@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄧ數(kw路h)</div>
- <div class="num">450</div>
+ <div class="num">{{ data1.electricityQuantity }}</div>
</div>
</div>
<div class="static">
<span class="lab">鍚屾瘮</span>
<img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.electricityYear }}</span>
<span class="lab">鐜瘮</span>
<img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.gasMonth }}</span>
</div>
</div>
<div class="item">
@@ -105,16 +86,16 @@
<img class="icon" src="@/assets/images/ic_yongshui@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ按(t)</div>
- <div class="num">450</div>
+ <div class="num">{{ data1.waterQuantity }}</div>
</div>
</div>
<div class="static">
<span class="lab">鍚屾瘮</span>
<img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.waterMonth }}</span>
<span class="lab">鐜瘮</span>
<img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.waterYear }}</span>
</div>
</div>
<div class="item">
@@ -122,16 +103,16 @@
<img class="icon" src="@/assets/images/ic_yongqi@2x.png" alt="" />
<div class="content">
<div class="name">涓婃湀鐢ㄦ皵(t)</div>
- <div class="num">450</div>
+ <div class="num">{{ data1.gasQuantity }}</div>
</div>
</div>
<div class="static">
<span class="lab">鍚屾瘮</span>
<img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.gasMonth }}</span>
<span class="lab">鐜瘮</span>
<img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ <span class="val">{{ data1.gasYear }}</span>
</div>
</div>
</div>
@@ -139,45 +120,45 @@
<div class="center_box_two">
<img class="bg" src="@/assets/images/img_city@2x.png" alt="" />
<div class="item item1">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
+ <div class="num fs_linear">{{ data1.workHouseQuantity }}<span class="unit">kw路h</span></div>
<div class="name">鑱斿悎宸ユ埧</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item2">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.officeQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鍔炲叕妤�</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item3">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.parkQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鐗╂祦鍥尯</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item4">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.productHouseQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鎴愬搧搴�</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="item item5">
- <div class="num fs_linear">240<span class="unit">kw路h</span></div>
- <div class="name">鑱斿悎宸ユ埧</div>
+ <div class="num fs_linear">{{ data1.powerQuantity }}<span class="unit">kw路h</span></div>
+ <div class="name">鍔ㄥ姏绔欐埧</div>
<img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
</div>
<div class="bottom_wrap">
<div class="bottom bottom1">
- <div class="num fs_linear">240</div>
+ <div class="num fs_linear">{{ data1.yesterdayElectricity }}</div>
<div class="name">鏄ㄦ棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</div>
<div class="bottom bottom2">
- <div class="num">240</div>
+ <div class="num">{{ data1.todayElectricity }}</div>
<div class="name">浠婃棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
</div>
<div class="bottom bottom3">
- <div class="num fs_linear">240</div>
+ <div class="num fs_linear">{{ data1.monthElectricity }}</div>
<div class="name">鏈湀鐢ㄧ數</div>
<div class="unit">kw路h</div>
<img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
@@ -198,7 +179,7 @@
<img src="@/assets/images/ic_co2@2x.png" class="co2" alt="">
<div>
<div class="name">鏈湀绱纰虫帓鏀�</div>
- <div><span class="num">22.22</span><span>鍚�</span></div>
+ <div><span class="num">{{ data1.carbon }}</span><span>鍚�</span></div>
</div>
</div>
</div>
@@ -246,6 +227,12 @@
import ChargeRate from '@/components/ChargeRate.vue'
import * as echarts from 'echarts'
import VScaleScreen from 'v-scale-screen'
+import {
+ zxcenterData,
+ zxenergyDataList,
+ zxlastMonthOil,
+ zxloadCurve,
+} from '@/api'
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
@@ -401,7 +388,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: [1, 2, 3, 4, 5, 5]
+ data: data4.value.map(i => i.timeData)
},
yAxis: {
type: 'value',
@@ -428,12 +415,7 @@
},
series: [
{
- data: [1, 2, 3, 4, 4, 4000].map(i => {
- return {
- name: i,
- value: i,
- }
- }),
+ data: data4.value.map(i => i.energy),
type: 'line',
areaStyle: {
normal: {
@@ -546,10 +528,41 @@
})
}
+const data1 = ref({})
+const getData1 = () => {
+ zxcenterData().then(res => {
+ const result = res.data
+ })
+}
+const data2 = ref([])
+const getData2 = () => {
+ zxenergyDataList().then(res => {
+ const result = res.data
+ data2.value = result
+ })
+}
+const data3 = ref([])
+const getData3 = () => {
+ zxlastMonthOil().then(res => {
+ const result = res.data
+ data3.value = result
+ })
+}
+const data4 = ref([])
+const getData4 = () => {
+ zxloadCurve().then(res => {
+ const result = res.data
+ data4.value = result
+ initLoadReal()
+ })
+}
+
onMounted(() => {
- initOperation()
- initLoadReal()
- initEnergy()
+ getData1()
+ getData2()
+ getData3()
+ getData4()
+
})
@@ -568,26 +581,22 @@
margin-bottom: 20px;
.content {
- width: 100%;
- padding: 24px 5%;
+ height: 164px;
display: flex;
- flex-wrap: wrap;
+ align-items: center;
+ justify-content: center;
- .item {
- width: 33.3%;
- margin-bottom: 12px;
+ .co2 {
+ width: 100px;
+ margin-right: 30px;
+ }
- .lab {
- font-size: 14px;
- color: #ffffff;
- }
-
- .val {
- font-weight: 600;
- font-size: 20px;
- color: #01d9fe;
- margin-top: 4px;
- }
+ .num {
+ margin-top: 10px;
+ color: #01D9FE;
+ font-weight: 600;
+ font-size: 36px;
+ margin-right: 2px;
}
}
}
--
Gitblit v1.9.3