From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/EnergyConsum.vue | 498 ++++++++++++++++++++++++++++--------------------------
1 files changed, 257 insertions(+), 241 deletions(-)
diff --git a/screen/src/views/EnergyConsum.vue b/screen/src/views/EnergyConsum.vue
index 475cde1..d408457 100644
--- a/screen/src/views/EnergyConsum.vue
+++ b/screen/src/views/EnergyConsum.vue
@@ -1,241 +1,243 @@
<template>
- <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="" />
- <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀</div>
- <div class="time">
- <span class="date">{{ date }}</span>
- <span class="week">{{ week }}</span>
- <span class="time">{{ time }}</span>
- </div>
- </div>
- <div class="main_content">
- <div class="left_box">
- <div class="left_box_one">
- <div class="com_header">
- <div class="title">
- <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <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>
- </div>
- </div>
- </div>
- <div class="left_box_two">
- <div class="com_header">
- <div class="title">
- <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>瀹炴椂璐熻嵎鏇茬嚎</div>
- </div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
- </div>
- <div class="load_wrap">
- <div class="loadRef"></div>
- </div>
- </div>
- <div class="left_box_three">
- <div class="com_header">
- <div class="title">
- <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>鏈堣兘鑰楀垎鏋�</div>
- </div>
- <div class="tabs">
- <div class="tab active">鐢ㄧ數</div>
- <div class="separate"></div>
- <div class="tab">鐢ㄦ按</div>
- <div class="separate"></div>
- <div class="tab">鐢ㄦ皵</div>
- </div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
- </div>
- <div class="energy_wrap">
- <div class="energyRef"></div>
- </div>
+ <v-scale-screen width="1920" height="960" :fullScreen="true">
+ <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="" />
+ <div class="title">瀹夋嘲鏅烘収鐗╂祦鍥尯-缁胯壊浣庣⒊杩愯惀</div>
+ <div class="time_wrap">
+ <span class="date">{{ date }}</span>
+ <span class="week">{{ week }}</span>
+ <span class="time">{{ time }}</span>
</div>
</div>
- <div class="center_box">
- <div class="center_box_one">
- <div class="list">
- <div class="item">
- <div class="header">
- <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="main_content">
+ <div class="left_box">
+ <div class="left_box_one">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <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>
+ </div>
+ </div>
+ </div>
+ <div class="left_box_two">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>瀹炴椂璐熻嵎鏇茬嚎</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="load_wrap">
+ <div class="loadRef"></div>
+ </div>
+ </div>
+ <div class="left_box_three">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>鏈堣兘鑰楀垎鏋�</div>
+ </div>
+ <div class="tabs">
+ <div class="tab active">鐢ㄧ數</div>
+ <div class="separate"></div>
+ <div class="tab">鐢ㄦ按</div>
+ <div class="separate"></div>
+ <div class="tab">鐢ㄦ皵</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="energy_wrap">
+ <div class="energyRef"></div>
+ </div>
+ </div>
+ </div>
+ <div class="center_box">
+ <div class="center_box_one">
+ <div class="list">
+ <div class="item">
+ <div class="header">
+ <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>
+ </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="lab">鐜瘮</span>
+ <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ <span class="val">11</span>
</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="lab">鐜瘮</span>
- <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
- </div>
- </div>
- <div class="item">
- <div class="header">
- <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="item">
+ <div class="header">
+ <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>
+ </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="lab">鐜瘮</span>
+ <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ <span class="val">11</span>
</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="lab">鐜瘮</span>
- <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
- </div>
- </div>
- <div class="item">
- <div class="header">
- <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="item">
+ <div class="header">
+ <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>
+ </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="lab">鐜瘮</span>
+ <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
+ <span class="val">11</span>
</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="lab">鐜瘮</span>
- <img class="icon" src="@/assets/images/ic_down.webp" alt="" />
- <span class="val">11</span>
+ </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">240<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>
+ <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>
+ <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>
+ <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>
+ <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="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="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="name">鏈湀鐢ㄧ數</div>
+ <div class="unit">kw路h</div>
+ <img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
</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">240<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>
- <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>
- <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>
- <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>
- <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="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="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="name">鏈湀鐢ㄧ數</div>
- <div class="unit">kw路h</div>
- <img src="@/assets/images/ic_dianliang_b@2x.png" class="bg" alt="" />
- </div>
- </div>
- </div>
- </div>
- <div class="right_box">
- <div class="right_box_one">
- <div class="com_header">
- <div class="title">
- <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>鏈湀纰虫帓鏀鹃噺缁熻</div>
- </div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
- </div>
- <div class="content">
- <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>
- </div>
- </div>
- <div class="right_box_two">
- <div class="com_header">
- <div class="title">
- <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>涓婃湀娌硅�楁帓琛岀粺璁�</div>
- </div>
- <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 class="right_box">
+ <div class="right_box_one">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>鏈湀纰虫帓鏀鹃噺缁熻</div>
</div>
- <div class="num">1000</div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="content">
+ <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>
</div>
</div>
- </div>
- <div class="right_box_three">
- <div class="com_header">
- <div class="title">
- <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
- <div>鏈堟补鑰楀垎鏋�</div>
+ <div class="right_box_two">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>涓婃湀娌硅�楁帓琛岀粺璁�</div>
+ </div>
+ <div class="tabs">娌硅�楋細L</div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
</div>
- <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ <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>
+ <div class="num">1000</div>
+ </div>
+ </div>
</div>
- <div class="wrap">
- <div class="analyseRef"></div>
+ <div class="right_box_three">
+ <div class="com_header">
+ <div class="title">
+ <img src="@/assets/images/ic_title@2x.png" class="icon" alt="" />
+ <div>鏈堟补鑰楀垎鏋�</div>
+ </div>
+ <img src="@/assets/images/title@2x.png" class="bg" alt="" />
+ </div>
+ <div class="wrap">
+ <div class="analyseRef"></div>
+ </div>
</div>
</div>
</div>
</div>
- </div>
+ </v-scale-screen>
</template>
<script setup>
@@ -243,6 +245,8 @@
import dayjs from 'dayjs'
import ChargeRate from '@/components/ChargeRate.vue'
import * as echarts from 'echarts'
+import VScaleScreen from 'v-scale-screen'
+
const weekMap = ['鏄熸湡鏃�', '鏄熸湡涓�', '鏄熸湡浜�', '鏄熸湡涓�', '鏄熸湡鍥�', '鏄熸湡浜�', '鏄熸湡鍏�',]
const date = ref(dayjs().format('YYYY.MM.DD'))
@@ -285,7 +289,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: [1,2,3,4,5,5]
+ data: [1, 2, 3, 4, 5, 5]
},
yAxis: {
type: 'value',
@@ -312,7 +316,7 @@
},
series: [
{
- data: [1,2,3,4,4,5].map(i => {
+ data: [1, 2, 3, 4, 4, 5].map(i => {
return {
name: i,
value: i,
@@ -397,7 +401,7 @@
xAxis: {
type: 'category',
boundaryGap: false,
- data: [1,2,3,4,5,5]
+ data: [1, 2, 3, 4, 5, 5]
},
yAxis: {
type: 'value',
@@ -424,7 +428,7 @@
},
series: [
{
- data: [1,2,3,4,4,4000].map(i => {
+ data: [1, 2, 3, 4, 4, 4000].map(i => {
return {
name: i,
value: i,
@@ -501,7 +505,7 @@
},
xAxis: {
type: 'category',
- data: [1,2,3,4,4,5]
+ data: [1, 2, 3, 4, 4, 5]
},
yAxis: {
type: 'value',
@@ -519,7 +523,7 @@
},
series: [
{
- data: [1,2,3,4,5],
+ data: [1, 2, 3, 4, 5],
type: 'bar',
barWidth: 10,
itemStyle: {
@@ -546,7 +550,7 @@
initOperation()
initLoadReal()
initEnergy()
-})
+})
</script>
@@ -590,11 +594,13 @@
.left_box_two {
margin-bottom: 20px;
- .load_wrap{
+
+ .load_wrap {
width: 100%;
height: 210px;
padding: 12px 12px;
- .loadRef{
+
+ .loadRef {
width: 100%;
height: 100%;
}
@@ -602,10 +608,11 @@
}
.left_box_three {
- .energy_wrap{
+ .energy_wrap {
width: 100%;
height: 200px;
- .energyRef{
+
+ .energyRef {
width: 100%;
height: 100%;
}
@@ -804,6 +811,7 @@
.right_box_one {
margin-bottom: 20px;
+
.content {
height: 164px;
display: flex;
@@ -824,15 +832,19 @@
}
}
}
- .right_box_two{
+
+ .right_box_two {
margin-bottom: 20px;
- .list{
+
+ .list {
padding: 20px 24px 4px;
- .line{
+
+ .line {
display: flex;
align-items: center;
margin-bottom: 16px;
- .top{
+
+ .top {
font-weight: 500;
font-size: 12px;
width: 33px;
@@ -843,19 +855,22 @@
box-shadow: inset 0px 0px 3px 0px #01D9FE;
margin-right: 10px;
}
- .id_card{
+
+ .id_card {
color: #DBEAEA;
font-weight: 500;
margin-right: 14px;
font-size: 14px;
}
- .num{
+
+ .num {
font-weight: 500;
font-size: 13px;
color: #DBEAEA;
margin-left: 15px;
}
- .wrap{
+
+ .wrap {
flex: 1;
height: 20px;
border: 1px solid #686B6B;
@@ -863,10 +878,12 @@
}
}
}
- .right_box_three{
- .wrap{
+
+ .right_box_three {
+ .wrap {
padding: 8px;
- .analyseRef{
+
+ .analyseRef {
width: 100%;
height: 210px;
}
@@ -962,7 +979,7 @@
-webkit-text-fill-color: transparent;
}
- .time {
+ .time_wrap {
font-size: 26px;
font-weight: 600;
background-image: -webkit-linear-gradient(top,
@@ -1000,11 +1017,10 @@
}
.main_app {
- width: 100%;
- min-height: 100vh;
+ width: 1920px;
+ height: 980px;
color: #ffffff;
position: relative;
-
.main_bg {
position: absolute;
left: 0;
--
Gitblit v1.9.3