From 1fa7647813a3a23466f81829d135722703499138 Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Thu, 7 Sep 2023 17:33:42 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E7=AD=96=E7=95=A5=E7=BB=93=E6=9E=9C?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/analyse/nhdb/index.vue | 161 +---------------------- 1 file changed, 2 insertions(+), 159 deletions(-) diff --git a/psdc-ui/src/views/analyse/nhdb/index.vue b/psdc-ui/src/views/analyse/nhdb/index.vue index 6064f92..5842705 100644 --- a/psdc-ui/src/views/analyse/nhdb/index.vue +++ b/psdc-ui/src/views/analyse/nhdb/index.vue @@ -54,164 +54,7 @@ import {getCelueList} from '@/api/analyse/nhdb/nhdb' const imgSrc = ref('../src/assets/images/策略icon.png') const data = reactive({ - celueInfoList:[ - // { - // sceneName:'电磁锅炉供暖策略', - // data:[ - // { - // key: 1, - // label:'开始执行时间', - // startTime:'2023-06-08 15:00:00' - // }, - // { - // key: 2, - // label:'结束执行时间', - // startTime:'2023-06-08 18:00:00' - // }, - // { - // key: 3, - // label:'执行前室内温度', - // startTime:'20℃' - // }, - // { - // key: 4, - // label:'执行前室外温度', - // startTime:'14℃' - // }, - // { - // key: 5, - // label:'执行后室内温度', - // startTime:'29℃' - // }, - // { - // key: 6, - // label:'执行后室外温度', - // startTime:'15℃' - // }, - // { - // key: 7, - // label:'执行时长', - // startTime:'3h' - // }, - // {}, - // { - // key: 8, - // label:'单位时间用电', - // startTime:'5kWh' - // }, - // {}, - // { - // key: 9, - // label:'总用电量', - // startTime:'16kWh' - // } - // ] - // }, - // { - // sceneName:'空气源热泵供暖策略', - // 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:'22℃' - // }, - // { - // key: 4, - // label:'执行前室外温度', - // startTime:'15℃' - // }, - // { - // key: 5, - // label:'执行后室内温度', - // startTime:'30℃' - // }, - // { - // key: 6, - // label:'执行后室外温度', - // startTime:'15℃' - // }, - // { - // key: 7, - // label:'执行时长', - // startTime:'2h' - // }, - // {}, - // { - // key: 8, - // label:'单位时间用电', - // startTime:'6kWh' - // }, - // {}, - // { - // key: 9, - // label:'总用电量', - // startTime:'12kWh' - // } - // ] - // }, - // { - // sceneName:'空气源热泵供暖策略', - // 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:'22℃' - // }, - // { - // key: 4, - // label:'执行前室外温度', - // startTime:'15℃' - // }, - // { - // key: 5, - // label:'执行后室内温度', - // startTime:'30℃' - // }, - // { - // key: 6, - // label:'执行后室外温度', - // startTime:'15℃' - // }, - // { - // key: 7, - // label:'执行时长', - // startTime:'2h' - // }, - // {}, - // { - // key: 8, - // label:'单位时间用电', - // startTime:'6kWh' - // }, - // {}, - // { - // key: 9, - // label:'总用电量', - // startTime:'12kWh' - // } - // ] - // }, - ] + celueInfoList:[] }) onMounted(()=>{ @@ -219,7 +62,7 @@ onMounted(()=>{ forId(); setTimeout(()=>{ indoorChartFun(); - },300) + },1000) }) From 993d36729df00619d43af11f80e13f0bfcad145d Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Thu, 7 Sep 2023 17:56:16 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E7=AB=AF=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/analyse/nhtj/index.vue | 10 +++++++++- psdc-ui/src/views/control/timer/index.vue | 12 ++++++++++-- psdc-ui/src/views/emonitor/wdcgq/index.vue | 2 ++ 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/psdc-ui/src/views/analyse/nhtj/index.vue b/psdc-ui/src/views/analyse/nhtj/index.vue index 4f67089..69e628a 100644 --- a/psdc-ui/src/views/analyse/nhtj/index.vue +++ b/psdc-ui/src/views/analyse/nhtj/index.vue @@ -59,7 +59,7 @@ - +
@@ -551,6 +551,14 @@ const { filterForm } = toRefs(data); .app-container{ padding: 8px; } + .chartBox{ + width: 100%; + height: 250px; + #chart{ + width: 100%; + height: 100%; + } + } } diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue index 4fccc0d..efa3d2b 100644 --- a/psdc-ui/src/views/control/timer/index.vue +++ b/psdc-ui/src/views/control/timer/index.vue @@ -16,7 +16,7 @@ - + Date: Thu, 7 Sep 2023 18:22:42 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=B9=B3=E6=9D=BF=E7=AB=AF=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- psdc-ui/src/views/emonitor/db/index.vue | 4 ++-- psdc-ui/src/views/emonitor/drgl/index.vue | 4 ++-- psdc-ui/src/views/emonitor/frdl/index.vue | 4 ++-- psdc-ui/src/views/emonitor/kqyrb/index.vue | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue index c73e23a..ce918df 100644 --- a/psdc-ui/src/views/emonitor/db/index.vue +++ b/psdc-ui/src/views/emonitor/db/index.vue @@ -67,7 +67,6 @@ export default { emonth:'-- ', glData:[], glXz:[ - "00:00", "00:15", "00:30", "00:45", @@ -162,7 +161,7 @@ export default { "23:00", "23:15", "23:30", - "23:45" + "23:45", ], fdlData:'', fdlXz:'', @@ -190,6 +189,7 @@ export default { delete res.data.todayUsePowers.userId let arr = Object.values(res.data.todayUsePowers) data.glData=arr + console.log(data.glData) } //当前功率饼图 diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue index 3f6f1fe..9f5ed40 100644 --- a/psdc-ui/src/views/emonitor/drgl/index.vue +++ b/psdc-ui/src/views/emonitor/drgl/index.vue @@ -102,7 +102,6 @@ export default { runStatus:'-- ', glData:[], glXz:[ - "00:00", "00:15", "00:30", "00:45", @@ -197,7 +196,8 @@ export default { "23:00", "23:15", "23:30", - "23:45" + "23:45", + "00:00", ], dayData:[], dayXz:[], diff --git a/psdc-ui/src/views/emonitor/frdl/index.vue b/psdc-ui/src/views/emonitor/frdl/index.vue index 58d354e..d3436bd 100644 --- a/psdc-ui/src/views/emonitor/frdl/index.vue +++ b/psdc-ui/src/views/emonitor/frdl/index.vue @@ -99,7 +99,6 @@ export default { runStatus:'-- ', glData:[], glXz:[ - "00:00", "00:15", "00:30", "00:45", @@ -194,7 +193,8 @@ export default { "23:00", "23:15", "23:30", - "23:45" + "23:45", + "00:00", ], dayData:[], dayXz:[], diff --git a/psdc-ui/src/views/emonitor/kqyrb/index.vue b/psdc-ui/src/views/emonitor/kqyrb/index.vue index 849d27c..bda2bf8 100644 --- a/psdc-ui/src/views/emonitor/kqyrb/index.vue +++ b/psdc-ui/src/views/emonitor/kqyrb/index.vue @@ -102,7 +102,6 @@ export default { runStatus:'-- ', glData:[], glXz:[ - "00:00", "00:15", "00:30", "00:45", @@ -197,7 +196,8 @@ export default { "23:00", "23:15", "23:30", - "23:45" + "23:45", + "00:00", ], dayData:[], dayXz:[],