From c55adecce9078f2d4c80c64ba1f37e33a69f2c30 Mon Sep 17 00:00:00 2001
From: wj <347312259@qq.com>
Date: Fri, 9 Jun 2023 09:09:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F=E5=99=A8?=
=?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B9=B3=E5=9D=87=E6=B8=A9=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
psdc-ui/src/views/analyse/nhdb/index.vue | 80 ++++++++++++++++++----
psdc-ui/src/views/bigview/index.vue | 38 ++++++++++
psdc-ui/src/views/emonitor/wdcgq/index.vue | 49 +++++++++++--
3 files changed, 148 insertions(+), 19 deletions(-)
diff --git a/psdc-ui/src/views/analyse/nhdb/index.vue b/psdc-ui/src/views/analyse/nhdb/index.vue
index 188f9a6..de08251 100644
--- a/psdc-ui/src/views/analyse/nhdb/index.vue
+++ b/psdc-ui/src/views/analyse/nhdb/index.vue
@@ -25,7 +25,7 @@ const imgSrc = ref('../src/assets/images/策略icon.png')
const data = reactive({
celueInfoList:[
{
- sceneName:'策略一',
+ sceneName:'策略1',
data:[
{
key: 1,
@@ -44,13 +44,13 @@ const data = reactive({
},
{
key: 4,
- label:'单位时间能耗',
+ label:'单位时间用电',
startTime:'5kWh'
},
{
key: 5,
label:'执行前室内温度',
- startTime:'15℃'
+ startTime:'20℃'
},
{
key: 6,
@@ -60,7 +60,7 @@ const data = reactive({
{
key: 7,
label:'执行后室内温度',
- startTime:'19℃'
+ startTime:'29℃'
},
{
key: 8,
@@ -69,48 +69,98 @@ const data = reactive({
},
{
key: 9,
- label:'总能耗',
+ label:'总用电量',
startTime:'16kWh'
}
]
},
{
- sceneName:'策略二',
+ sceneName:'策略2',
data:[
{
key: 1,
label:'开始执行时间',
- startTime:'2023-06-08 15:00:00'
+ startTime:'2023-06-05 11:00:00'
},
{
key: 2,
label:'结束执行时间',
- startTime:'2023-06-08 18:00:00'
+ startTime:'2023-06-05 13:00:00'
},
{
key: 3,
label:'执行时长',
- startTime:'3h'
+ startTime:'2h'
},
{
key: 4,
- label:'单位时间能耗',
- startTime:'5kWh'
+ label:'单位时间用电',
+ startTime:'6kWh'
},
{
key: 5,
label:'执行前室内温度',
+ startTime:'22℃'
+ },
+ {
+ key: 6,
+ label:'执行前室外温度',
+ startTime:'15℃'
+ },
+ {
+ key: 7,
+ label:'执行后室内温度',
+ startTime:'30℃'
+ },
+ {
+ key: 8,
+ label:'执行后室外温度',
startTime:'15℃'
},
+ {
+ key: 9,
+ label:'总用电量',
+ startTime:'12kWh'
+ }
+ ]
+ },
+ {
+ sceneName:'策略3',
+ data:[
+ {
+ key: 1,
+ label:'开始执行时间',
+ startTime:'2023-06-05 11:00:00'
+ },
+ {
+ key: 2,
+ label:'结束执行时间',
+ startTime:'2023-06-05 13:00:00'
+ },
+ {
+ key: 3,
+ label:'执行时长',
+ startTime:'2h'
+ },
+ {
+ key: 4,
+ label:'单位时间用电',
+ startTime:'6kWh'
+ },
+ {
+ key: 5,
+ label:'执行前室内温度',
+ startTime:'22℃'
+ },
{
key: 6,
label:'执行前室外温度',
- startTime:'14℃'
+ startTime:'15℃'
},
{
key: 7,
label:'执行后室内温度',
- startTime:'19℃'
+ startTime:'30℃'
},
{
key: 8,
@@ -119,8 +169,8 @@ const data = reactive({
},
{
key: 9,
- label:'总能耗',
- startTime:'16kWh'
+ label:'总用电量',
+ startTime:'12kWh'
}
]
},
diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue
index 35026db..662030f 100644
--- a/psdc-ui/src/views/bigview/index.vue
+++ b/psdc-ui/src/views/bigview/index.vue
@@ -2,6 +2,7 @@
<div class="home">
<div class="header">
<h2>电能替代分布式控制试验平台</h2>
+ <div class="timer">{{timer}}</div>
<router-link :to="{path:'/control/manual'}" tag="div" class="back"><el-icon><HomeFilled /></el-icon></router-link>
</div>
<div class="main">
@@ -118,6 +119,7 @@ import {getTemperature,getDevicesInfo,getZdb} from '../../api/bigview/bigview'
/** 页面加载时*/
onMounted(()=>{
+ currentTime();
dcglChartFun();
kqyrbChartFun();
frdlChartFun();
@@ -128,6 +130,35 @@ onMounted(()=>{
dqglChartFun()
})
+/** 日期*/
+const timer = ref()
+//格式化日期
+function currentTime() {
+ var now = new Date();
+ var year;
+ var month;
+ var day;
+ var hour;
+ var minute;
+ var second;
+ var week;
+ var zeroFill = function(value) {
+ if (value < 10) {
+ value = '0' + value
+ }
+ return value
+ }
+ year = now.getFullYear();
+ month = zeroFill(now.getMonth() + 1);
+ day = zeroFill(now.getDate());
+ hour = zeroFill(now.getHours());
+ minute = zeroFill(now.getMinutes());
+ second = zeroFill(now.getSeconds());
+ week = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'][now.getDay()];
+ // return (`${year}${month}${day}`);
+ timer.value = `${year}-${month}-${day} ${hour}:${minute}:${second} ${week}`
+}
+
/** 8个温度传感器数据*/
const wdcgqArr = ref([])
function getWenduFun(){
@@ -844,6 +875,13 @@ onBeforeUnmount(() => {
height: 70px;
background-image: url("../../assets/images/headtitle.png");
background-size: 100% 100%;
+ .timer{
+ position: absolute;
+ top: 13px;
+ left: 30px;
+ font-size: 16px;
+ font-weight: bold;
+ }
h2{
font-size: 36px;
color: #AFEAFF;
diff --git a/psdc-ui/src/views/emonitor/wdcgq/index.vue b/psdc-ui/src/views/emonitor/wdcgq/index.vue
index 8a63c08..c5ee72f 100644
--- a/psdc-ui/src/views/emonitor/wdcgq/index.vue
+++ b/psdc-ui/src/views/emonitor/wdcgq/index.vue
@@ -1,7 +1,7 @@
<template>
<div class="app-container home">
<div class="top">
- <div class="card" v-for="(item,index) in data.info ">
+ <div class="card" v-for="item in data.wdcgqList ">
<div><img src="../../../assets/images/温度.png"></div>
<div>
<p style="color: #cccccc">{{item.name}}</p>
@@ -29,6 +29,48 @@ export default {
name: "wdcgq",
setup() {
let data = reactive({
+ wdcgqList:[
+ {
+ name:'室内温度传感器1',
+ temp:'25.64',
+ },
+ {
+ name:'室内温度传感器2',
+ temp:'25.51',
+ },
+ {
+ name:'室内温度传感器3',
+ temp:'25.36',
+ },
+ {
+ name:'室内温度传感器4',
+ temp:'25.11',
+ },
+ {
+ name:'室内平均温度',
+ temp:'25.38',
+ },
+ {
+ name:'室外温度传感器1',
+ temp:'25.64',
+ },
+ {
+ name:'室外温度传感器2',
+ temp:'25.51',
+ },
+ {
+ name:'室外温度传感器3',
+ temp:'25.36',
+ },
+ {
+ name:'室外温度传感器4',
+ temp:'25.11',
+ },
+ {
+ name:'室外平均温度',
+ temp:'25.38',
+ }
+ ],
info:[],
xinfo:[],
infos: [
@@ -268,16 +310,15 @@ p{
}
.top{
width: 100%;
- height: 260px;
display: flex;
flex-wrap: wrap;
justify-content: space-between;
}
.card{
- width: 24%;
+ width: 19.5%;
height: 110px;
background-color: #2F3D8A;
- margin-bottom: 20px;
+ margin-bottom: 12px;
display: flex;
justify-content: space-around;
align-items: center;