From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/EnergyConsum.vue | 424 ++++++++++++++++++++++++++++++++++------------------
1 files changed, 279 insertions(+), 145 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 0284eb7..9229a23 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -1,9 +1,9 @@
<template>
- <v-scale-screen width="1920" height="960" :fullScreen="true">
+ <v-scale-screen width="1920" height="960">
<div class="main_app">
<img src="@/assets/images/bg_main_app.png" class="main_bg" alt="" />
<div class="main_header">
- <img src="@/assets/images/maintitle@2x.png" class="main_header_bg" alt="" />
+ <img src="@/assets/images/maintitle.gif" class="main_header_bg" alt="" />
<div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀</div>
<div class="time_wrap">
<span class="date">{{ date }}</span>
@@ -25,7 +25,9 @@
<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" style="color: #68cfb2;" v-if="data1.smokeBoxTotal || data1.smokeBoxTotal == 0">{{
+ data1.smokeBoxTotal.toLocaleString()
+ }}</span><span>鍙�</span></div>
</div>
</div>
</div>
@@ -40,6 +42,9 @@
<div class="load_wrap">
<div class="loadRef"></div>
</div>
+ <!-- <div v-show="data4.length == 0" class="empty_wrap load_wrap">
+ <img src="@/assets/images/default_empty.png" alt="">
+ </div> -->
</div>
<div class="left_box_three">
<div class="com_header">
@@ -48,11 +53,11 @@
<div>鏈堣兘鑰楀垎鏋�</div>
</div>
<div class="tabs">
- <div class="tab active">鐢ㄧ數</div>
+ <div class="tab" :class="{ active: activeTab2 == 0 }" @click="tabsClick2(0)">鐢ㄦ按</div>
<div class="separate"></div>
- <div class="tab">鐢ㄦ按</div>
+ <div class="tab" :class="{ active: activeTab2 == 3 }" @click="tabsClick2(3)">鐢ㄧ數</div>
<div class="separate"></div>
- <div class="tab">鐢ㄦ皵</div>
+ <div class="tab" :class="{ active: activeTab2 == 1 }" @click="tabsClick2(1)">鐢ㄦ皵</div>
</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
@@ -69,16 +74,37 @@
<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.total.toLocaleString() }}
+ </div>
</div>
</div>
- <div class="static">
+ <div class="static" v-if="data1.electricityQuantity">
<span class="lab">鍚屾瘮</span>
- <img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">{{ data1.electricityYear }}</span>
+ <template v-if="data1.electricityQuantity.sameNum">
+ <img v-if="data1.electricityQuantity.totalNum > data1.electricityQuantity.sameNum" class="icon"
+ src="@/assets/images/ic_up.webp" alt="" />
+ <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ </template>
+ <span class="val"
+ v-if="data1.electricityQuantity.totalNum && data1.electricityQuantity.totalNum != 0">{{
+ Math.abs(((data1.electricityQuantity.totalNum -
+ data1.electricityQuantity.sameNum) / data1.electricityQuantity.totalNum * 100).toFixed(1))
+ }}%</span>
+ <span class="val" v-else style="margin-left: 4px;"> -</span>
<span class="lab">鐜瘮</span>
- <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">{{ data1.gasMonth }}</span>
+ <template v-if="data1.electricityQuantity.ringNum">
+ <img v-if="data1.electricityQuantity.totalNum > data1.electricityQuantity.ringNum" class="icon"
+ src="@/assets/images/ic_up.webp" alt="" />
+ <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ </template>
+
+ <span class="val"
+ v-if="data1.electricityQuantity.totalNum && data1.electricityQuantity.totalNum != 0">{{
+ Math.abs(((data1.electricityQuantity.totalNum -
+ data1.electricityQuantity.ringNum) / data1.electricityQuantity.totalNum * 100).toFixed(1))
+ }}%</span>
+ <span class="val" v-else style="margin-left: 4px;"> -</span>
</div>
</div>
<div class="item">
@@ -86,16 +112,30 @@
<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.total.toLocaleString() }}</div>
</div>
</div>
- <div class="static">
+ <div class="static" v-if="data1.waterQuantity">
<span class="lab">鍚屾瘮</span>
- <img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">{{ data1.waterMonth }}</span>
+ <template v-if="data1.waterQuantity.sameNum">
+ <img v-if="data1.waterQuantity.totalNum > data1.waterQuantity.sameNum" class="icon"
+ src="@/assets/images/ic_up.webp" alt="" />
+ <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ </template>
+ <span class="val" v-if="data1.waterQuantity.sameNum && data1.waterQuantity.sameNum != 0">{{
+ Math.abs(((data1.waterQuantity.totalNum -
+ data1.waterQuantity.sameNum) / data1.waterQuantity.sameNum * 100).toFixed(1)) }}%</span>
+ <span class="val" v-else style="margin-left: 4px;">-</span>
<span class="lab">鐜瘮</span>
- <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">{{ data1.waterYear }}</span>
+ <template v-if="data1.waterQuantity.ringNum">
+ <img v-if="data1.waterQuantity.totalNum > data1.waterQuantity.ringNum" class="icon"
+ src="@/assets/images/ic_up.webp" alt="" />
+ <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ </template>
+ <span class="val" v-if="data1.waterQuantity.ringNum && data1.waterQuantity.ringNum != 0">{{
+ Math.abs(((data1.waterQuantity.totalNum -
+ data1.waterQuantity.ringNum) / data1.waterQuantity.ringNum * 100).toFixed(1)) }}%</span>
+ <span class="val" v-else style="margin-left: 4px;">-</span>
</div>
</div>
<div class="item">
@@ -103,65 +143,86 @@
<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.total.toLocaleString() }}</div>
</div>
</div>
- <div class="static">
+ <div class="static" v-if="data1.gasQuantity">
<span class="lab">鍚屾瘮</span>
- <img class="icon" src="@/assets/images/ic_up.webp" alt="" />
- <span class="val">{{ data1.gasMonth }}</span>
+ <template v-if="data1.gasQuantity.sameNum">
+ <img v-if="data1.gasQuantity.totalNum > data1.gasQuantity.sameNum" class="icon"
+ src="@/assets/images/ic_up.webp" alt="" />
+ <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ </template>
+ <span class="val" v-if="data1.gasQuantity.totalNum && data1.gasQuantity.totalNum != 0">{{
+ Math.abs(((data1.gasQuantity.totalNum - data1.gasQuantity.sameNum) / data1.gasQuantity.totalNum
+ * 100).toFixed(1))
+ }}%</span>
+ <span class="val" v-else style="margin-left: 4px;">-</span>
<span class="lab">鐜瘮</span>
- <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">{{ data1.gasYear }}</span>
+ <template v-if="data1.gasQuantity.sameNum">
+ <img v-if="data1.gasQuantity.totalNum > data1.gasQuantity.ringNum" class="icon"
+ src="@/assets/images/ic_up.webp" alt="" />
+ <img v-else class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ </template>
+ <span class="val" v-if="data1.gasQuantity.totalNum && data1.gasQuantity.totalNum != 0">{{
+ Math.abs(((data1.gasQuantity.totalNum - data1.gasQuantity.ringNum) / data1.gasQuantity.totalNum
+ * 100).toFixed(1))
+ }}%</span>
+ <span class="val" v-else style="margin-left: 4px;">-</span>
</div>
</div>
</div>
</div>
<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">{{ 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">{{ 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">{{ 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">{{ 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">{{ 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">{{ data1.yesterdayElectricity }}</div>
+ <template v-if="data6 && data6 && data6.length > 0">
+ <div class="item item1" v-if="data6.length > 4">
+ <div class="num fs_linear">{{ data6[4].value }}<span class="unit">kw路h</span></div>
+ <div class="name">{{ data6[4].name }}</div>
+ <img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
+ </div>
+ <div class="item item2" v-if="data6.length > 1">
+ <div class="num fs_linear">{{ data6[1].value }}<span class="unit">kw路h</span></div>
+ <div class="name">{{ data6[1].name }}</div>
+ <img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
+ </div>
+ <div class="item item3" v-if="data6.length > 2">
+ <div class="num fs_linear">{{ data6[2].value }}<span class="unit">kw路h</span></div>
+ <div class="name">{{ data6[2].name }}</div>
+ <img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
+ </div>
+ <div class="item item4" v-if="data6.length > 3">
+ <div class="num fs_linear">{{ data6[3].value }}<span class="unit">kw路h</span></div>
+ <div class="name">{{ data6[3].name }}</div>
+ <img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
+ </div>
+ <div class="item item5">
+ <div class="num fs_linear">{{ data6[0].value }}<span class="unit">kw路h</span></div>
+ <div class="name">{{ data6[0].name }}</div>
+ <img src="@/assets/images/bg_data@2x.png" class="bg" alt="" />
+ </div>
+ </template>
+ <div class="bottom_wrap" v-if="data1.yesterdayElectricity">
+ <div class="bottom bottom1" @click="changeacDay(3)">
+ <div :class="{active: activeDays == 3}" class="num fs_linear">{{ data1.yesterdayElectricity.total || 0 }}</div>
<div class="name">鏄ㄦ棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
- <img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
+ <img v-if="activeDays == 3" src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
+ <img v-else src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</div>
- <div class="bottom bottom2">
- <div class="num">{{ data1.todayElectricity }}</div>
+ <div class="bottom bottom2" @click="changeacDay(1)">
+ <div :class="{active: activeDays == 1}" class="num">{{ data1.todayElectricity.total || 0 }}</div>
<div class="name">浠婃棩鐢ㄧ數</div>
<div class="unit">kw路h</div>
- <img src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
+ <img v-if="activeDays == 1" src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
+ <img v-else src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</div>
- <div class="bottom bottom3">
- <div class="num fs_linear">{{ data1.monthElectricity }}</div>
+ <div class="bottom bottom3" @click="changeacDay(2)">
+ <div :class="{active: activeDays == 2}" class="num fs_linear">{{ data1.monthElectricity.total || 0 }}</div>
<div class="name">鏈湀鐢ㄧ數</div>
<div class="unit">kw路h</div>
- <img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
+ <img v-if="activeDays == 2" src="@/assets/images/ic_dianliang@2x.png" class="bg" alt="" />
+ <img v-else src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</div>
</div>
</div>
@@ -179,7 +240,9 @@
<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 == 0">{{ data1.carbon.toLocaleString()
+ }}</span><span>鍚�</span>
+ </div>
</div>
</div>
</div>
@@ -192,15 +255,21 @@
<div class="tabs">娌硅�楋細L</div>
<img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <div class="list">
- <div class="line" v-for="item, i in 6">
- <div class="top"><span v-if="i < 3">top</span>{{ i }}</div>
- <div class="id_card">鐨朅12313</div>
- <div class="wrap">
- <ChargeRate :rate="15" :color />
+ <div v-if="data3 && data3.length > 0" class="list">
+ <template v-for="item, i in data3">
+ <div v-if="i < 6" class="line">
+ <div class="top"><span v-if="i < 3">top</span>{{ i + 1 }}</div>
+ <div class="id_card">{{ item.carNo }}</div>
+ <div class="wrap">
+ <ChargeRate :rate="item.rate" :color="i > 2 ? 'cyan' : '#e3a83a'" />
+ </div>
+ <div class="num">{{ item.quantity }}</div>
</div>
- <div class="num">1000</div>
- </div>
+ </template>
+
+ </div>
+ <div v-if="data3.length == 0" class="empty_wrap list">
+ <img src="@/assets/images/default_empty.png" alt="">
</div>
</div>
<div class="right_box_three">
@@ -232,6 +301,8 @@
zxenergyDataList,
zxlastMonthOil,
zxloadCurve,
+ zxenergyRegionData,
+ regionDataRanking
} from '@/api'
@@ -276,7 +347,13 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: [1, 2, 3, 4, 5, 5]
+ data: data5.value.map(i => dayjs(i.timeData).format('M'))
+ },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ },
},
yAxis: {
type: 'value',
@@ -295,20 +372,15 @@
}
},
grid: {
- top: '16%',
+ top: '22%',
left: '4%',
- right: '2%',
+ right: '6%',
bottom: '2%',
containLabel: true
},
series: [
{
- data: [1, 2, 3, 4, 4, 5].map(i => {
- return {
- name: i,
- value: i,
- }
- }),
+ data: data5.value.map(i => i.energy),
type: 'line',
areaStyle: {
normal: {
@@ -344,7 +416,7 @@
width: 2, // 绾挎潯绮楃粏
},
symbol: 'circle',
- symbolSize: 10,
+ symbolSize: 6,
itemStyle: {
normal: {
color: '#F3BD00', //鎶樼嚎鐐圭殑棰滆壊
@@ -364,27 +436,31 @@
var myChart = echarts.init(document.querySelector('.loadRef'))
// 缁樺埗鍥捐〃
myChart.setOption({
- // tooltip: {
- // trigger: 'axis',
- // axisPointer: {
- // type: 'line'
- // },
- // formatter: function (params) {
- // setTimeout(() => {
- // console.log('params', params)
- // })
- // return `
- // <div style="background-color: #091123;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
- // <div>${params[0].name}鎬婚攢鍞(涓囧厓)</div>
- // <div style="display: flex;align-items: center;">
- // <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #ebbf40;"></div>
- // <div style="margin: 0 4px 0 6px;">鎬婚攢鍞�</div>
- // <span style="color: #ebbf40;">${params[0].value}</span>
- // </div>
- // </div>
- // `
- // }
- // },
+ tooltip: {
+ trigger: 'axis',
+ axisPointer: {
+ type: 'line'
+ },
+ // trigger: 'axis',
+ // axisPointer: {
+ // type: 'line'
+ // },
+ // formatter: function (params) {
+ // setTimeout(() => {
+ // console.log('params', params)
+ // })
+ // return `
+ // <div style="background-color: #091123;margin: -12px;padding: 14px;border: 2px solid rgba(1,217,254,0.5);color: #fff;">
+ // <div>${params[0].name}鎬婚攢鍞(涓囧厓)</div>
+ // <div style="display: flex;align-items: center;">
+ // <div style="width: 10px;height: 10px;border-radius: 50%;background-color: #ebbf40;"></div>
+ // <div style="margin: 0 4px 0 6px;">鎬婚攢鍞�</div>
+ // <span style="color: #ebbf40;">${params[0].value}</span>
+ // </div>
+ // </div>
+ // `
+ // }
+ },
xAxis: {
type: 'category',
boundaryGap: false,
@@ -407,7 +483,7 @@
}
},
grid: {
- top: '16%',
+ top: '18%',
left: '4%',
right: '2%',
bottom: '2%',
@@ -415,7 +491,7 @@
},
series: [
{
- data: data4.value.map(i => i.energy),
+ data: data4.value.map(i => i.energy),
type: 'line',
areaStyle: {
normal: {
@@ -426,7 +502,7 @@
y2: 1,
colorStops: [{
offset: 0,
- color: "rgba(192, 156, 53,.7)" // 0% 澶勭殑棰滆壊
+ color: "#2e6ab5" // 0% 澶勭殑棰滆壊
}, {
offset: 1,
color: "#1b1b12" // 100% 澶勭殑棰滆壊
@@ -443,18 +519,18 @@
x2: 0,
y2: 1,
colorStops: [{
- offset: 0, color: '#F3BD00' // 0% 澶勭殑棰滆壊
+ offset: 0, color: '#2e6ab5' // 0% 澶勭殑棰滆壊
}, {
- offset: 1, color: '#F3BD00' // 100% 澶勭殑棰滆壊
+ offset: 1, color: '#2e6ab5' // 100% 澶勭殑棰滆壊
}],
},
width: 2, // 绾挎潯绮楃粏
},
symbol: 'circle',
- symbolSize: 10,
+ symbolSize: 0,
itemStyle: {
normal: {
- color: '#F3BD00', //鎶樼嚎鐐圭殑棰滆壊
+ color: '#2e6ab5', //鎶樼嚎鐐圭殑棰滆壊
},
},
smooth: true
@@ -466,15 +542,43 @@
myChart.resize()
})
}
-const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
+
+const data1 = ref({})
+const getData1 = () => {
+ zxcenterData().then(res => {
+ const result = res.data
+ data1.value = result
+ })
+}
+const activeDays = ref('1')
+const data6 = ref({})
+const changeacDay = (val) => {
+ activeDays.value = val
+ getData6()
+}
+const getData6 = () => {
+ regionDataRanking({type: activeDays.value}).then(res => {
+ const result = res.data
+ data6.value = result
+ })
+}
+
+
+const activeTab2 = ref(0)
+const tabsClick2 = (v) => {
+ activeTab2.value = v
+ getData2()
+}
+const data2 = ref([])
const initEnergy = () => {
var myChart = echarts.init(document.querySelector('.energyRef'))
// 缁樺埗鍥捐〃
- const arr = ['#68e2e3', '#50afd3', '#377cdb', '#d5ae3a']
+ let unit = activeTab2.value == 0 ? '鍗曚綅锛歵' : activeTab2.value == 3 ? '鍗曚綅锛歬w路h' : '鍗曚綅锛歮鲁'
+
myChart.setOption({
grid: {
top: '20%',
- left: '2%',
+ left: '6%',
right: '2%',
bottom: '4%',
containLabel: true
@@ -487,11 +591,11 @@
},
xAxis: {
type: 'category',
- data: [1, 2, 3, 4, 4, 5]
+ data: data2.value.map(i => dayjs(i.timeData).format('M'))
},
yAxis: {
type: 'value',
- name: 'kw路h',
+ name: unit,
nameTextStyle: {
padding: [0, 0, 4, -30] // 鍥涗釜鏁板瓧鍒嗗埆涓轰笂鍙充笅宸︿笌鍘熶綅缃窛绂�
},
@@ -505,7 +609,7 @@
},
series: [
{
- data: [1, 2, 3, 4, 5],
+ data: data2.value.map(i => i.energy),
type: 'bar',
barWidth: 10,
itemStyle: {
@@ -513,11 +617,11 @@
color: new echarts.graphic.LinearGradient(
0, 0, 0, 1,
[
- { offset: 0, color: arr[1] },
- { offset: 1, color: '#080807' }
+ { offset: 0, color: '#50afd3' },
+ { offset: 1, color: '#1d4861' }
]
),
- barBorderRadius: [10, 10, 0, 0]
+ barBorderRadius: [3, 3, 0, 0]
}
}
}
@@ -527,25 +631,25 @@
myChart.resize()
})
}
-
-const data1 = ref({})
-const getData1 = () => {
- zxcenterData().then(res => {
- const result = res.data
- })
-}
-const data2 = ref([])
const getData2 = () => {
- zxenergyDataList().then(res => {
- const result = res.data
+ zxenergyDataList({ type: activeTab2.value }).then(res => {
+ const result = res.data || []
data2.value = result
+ initEnergy()
})
}
const data3 = ref([])
const getData3 = () => {
zxlastMonthOil().then(res => {
- const result = res.data
- data3.value = result
+ const result = res.data || []
+ if (result.length > 0) {
+ data3.value = result.map(i => {
+ if (i.quantity || i.quantity == 0) {
+ i.rate = ((i.quantity / result[0].quantity) * 25).toFixed(0)
+ }
+ return i
+ })
+ }
})
}
const data4 = ref([])
@@ -553,7 +657,18 @@
zxloadCurve().then(res => {
const result = res.data
data4.value = result
- initLoadReal()
+ if (data4.value && data4.value.length > 0) {
+ initLoadReal()
+ }
+ })
+}
+
+const data5 = ref([])
+const getData5 = () => {
+ zxenergyDataList({ type: 2 }).then(res => {
+ const result = res.data
+ data5.value = result
+ initOperation()
})
}
@@ -562,6 +677,18 @@
getData2()
getData3()
getData4()
+ getData5()
+ getData6()
+ setInterval(() => {
+ getData4()
+ }, 1000 * 60)
+ setInterval(() => {
+ getData1()
+ getData2()
+ getData3()
+ getData5()
+ getData6()
+ }, 1000 * 60 * 60)
})
@@ -606,8 +733,7 @@
.load_wrap {
width: 100%;
- height: 210px;
- padding: 12px 12px;
+ height: 250px;
.loadRef {
width: 100%;
@@ -619,7 +745,7 @@
.left_box_three {
.energy_wrap {
width: 100%;
- height: 200px;
+ height: 250px;
.energyRef {
width: 100%;
@@ -700,7 +826,6 @@
height: 544px;
.item {
- width: 120px;
height: 112px;
position: absolute;
text-align: center;
@@ -723,9 +848,12 @@
}
.bg {
+ margin: 0 auto;
width: 120px;
height: 88px;
top: 24px;
+ left: 50%;
+ transform: translate(-50%, 0);
}
}
@@ -770,7 +898,7 @@
position: absolute;
text-align: center;
padding-top: 70px;
-
+ cursor: pointer;
.num {
font-size: 24px;
color: #D0FFFA;
@@ -786,6 +914,12 @@
.unit {
font-size: 14px;
color: #D0FFFA;
+ }
+ .active {
+ font-size: 36px;
+ color: #01D9FE;
+ font-weight: bold;
+ margin-bottom: 10px;
}
}
@@ -803,14 +937,8 @@
bottom: -0px;
left: 50%;
transform: translate(-50%, 0);
- padding-top: 50px;
+ /* padding-top: 50px; */
- .num {
- font-size: 36px;
- color: #01D9FE;
- line-height: 54px;
- font-weight: bold;
- }
}
}
}
@@ -847,6 +975,7 @@
.list {
padding: 20px 24px 4px;
+ height: 250px;
.line {
display: flex;
@@ -868,8 +997,9 @@
.id_card {
color: #DBEAEA;
font-weight: 500;
- margin-right: 14px;
- font-size: 14px;
+ margin-right: 6px;
+ font-size: 13px;
+ width: 68px;
}
.num {
@@ -877,6 +1007,7 @@
font-size: 13px;
color: #DBEAEA;
margin-left: 15px;
+ width: 40px;
}
.wrap {
@@ -890,11 +1021,9 @@
.right_box_three {
.wrap {
- padding: 8px;
-
.analyseRef {
width: 100%;
- height: 210px;
+ height: 250px;
}
}
}
@@ -934,6 +1063,10 @@
align-items: center;
font-size: 14px;
color: #d2e0ff;
+
+ .tab {
+ cursor: pointer;
+ }
.separate {
width: 1px;
@@ -1029,6 +1162,7 @@
height: 980px;
color: #ffffff;
position: relative;
+
.main_bg {
position: absolute;
left: 0;
--
Gitblit v1.9.3