diff --git a/psdc-ui/src/views/analyse/nhfx/index.vue b/psdc-ui/src/views/analyse/nhfx/index.vue index a89cb93..8e60d74 100644 --- a/psdc-ui/src/views/analyse/nhfx/index.vue +++ b/psdc-ui/src/views/analyse/nhfx/index.vue @@ -1,10 +1,18 @@ diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index 4036821..43cd513 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -2,7 +2,7 @@

电能替代分布式控制试验平台

- 返回后台 + 返回后台
@@ -149,14 +149,15 @@ // import {ref,reactive} from 'vue' import {getTemperature} from '../../api/bigview/bigview' -// getWendu(); +getWendu(); -// const wendi1 = ref(0) -// function getWendu(){ -// getTemperature().then((res)=>{ -// console.log(res.data.data) -// }) -// } +const wendi1 = ref(0) +function getWendu(){ + console.log('请求接口') + getTemperature().then((res)=>{ + console.log(res.data) + }) +} @@ -281,7 +282,7 @@ import {getTemperature} from '../../api/bigview/bigview' .my3D_img{ width: 100%; height: 100%; - padding: 20px 60px 0 60px; + padding: 20px 70px 0 70px; img{ width: 100%; height: 100%; diff --git a/psdc-ui/src/views/control/manual/index.vue b/psdc-ui/src/views/control/manual/index.vue index 45619ba..d00109d 100644 --- a/psdc-ui/src/views/control/manual/index.vue +++ b/psdc-ui/src/views/control/manual/index.vue @@ -1,6 +1,6 @@ @@ -284,9 +346,9 @@ const onSubmit3 = () => { } } .control_table{ + position: relative; width: 100%; height: 90%; - border: 1px solid red; } } } @@ -306,5 +368,20 @@ const onSubmit3 = () => { ::v-deep .el-input__inner{ color: #f3ffff; } +::v-deep .el-pagination{ + position: absolute; + bottom: 10px; + left: 50%; + transform: translateX(-50%); +} +::v-deep .el-pagination__total{ + color: #f3ffff; +} +::v-deep .el-pagination__jump{ + color: #f3ffff; +} +::v-deep .el-pager{ + margin: 0 5px; +} diff --git a/psdc-ui/src/views/control/timer/index.vue b/psdc-ui/src/views/control/timer/index.vue index 1db90ce..916a378 100644 --- a/psdc-ui/src/views/control/timer/index.vue +++ b/psdc-ui/src/views/control/timer/index.vue @@ -1,16 +1,240 @@ diff --git a/psdc-ui/src/views/emonitor/db/index.vue b/psdc-ui/src/views/emonitor/db/index.vue index f49338e..f48ef9e 100644 --- a/psdc-ui/src/views/emonitor/db/index.vue +++ b/psdc-ui/src/views/emonitor/db/index.vue @@ -35,17 +35,13 @@
当前功率
-
- pic -
+
当前功率总览
-
- pic -
+
@@ -53,16 +49,178 @@
今日用电量总览
-
- pic -
+
- diff --git a/psdc-ui/src/views/emonitor/drgl/index.vue b/psdc-ui/src/views/emonitor/drgl/index.vue index a660c78..9a84059 100644 --- a/psdc-ui/src/views/emonitor/drgl/index.vue +++ b/psdc-ui/src/views/emonitor/drgl/index.vue @@ -95,6 +95,7 @@ export default { }, yAxis: { type: 'value', + name: "kWh", splitLine:{ show:true, lineStyle:{ @@ -112,7 +113,7 @@ export default { }, series: [ { - name: "用户量", + name: "日用电量", type: "bar", data: [5, 20, 36, 10, 10, 20], itemStyle:{ @@ -141,6 +142,7 @@ export default { }, yAxis: { type: 'value', + name: "kWh", splitLine:{ show:true, lineStyle:{ @@ -158,7 +160,7 @@ export default { }, series: [ { - name: "用户量", + name: "月用电量", type: "bar", data: [5, 20, 36, 10, 10, 20], itemStyle:{ @@ -187,6 +189,7 @@ export default { }, yAxis: { type: 'value', + name: "kW", splitLine:{ show:true, lineStyle:{ @@ -204,7 +207,7 @@ export default { }, series: [ { - name: "用户量", + name: "当前功率", type: "line", data: [5, 20, 36, 10, 10, 20], itemStyle:{ @@ -219,6 +222,12 @@ export default { myChart4.setOption({ title: {}, tooltip: {}, + legend: { + data: ['进水', '出水'], + textStyle:{ + color:'#BEC3DA' + } + }, textStyle:{ color:'#BEC3DA' }, @@ -233,6 +242,7 @@ export default { }, yAxis: { type: 'value', + name: "℃", splitLine:{ show:true, lineStyle:{ @@ -250,12 +260,22 @@ export default { }, series: [ { - name: "用户量", - type: "line", - data: [5, 20, 36, 10, 10, 20], + name: '进水', + type: 'line', + stack: 'Total', + itemStyle:{ + color:'#2F8EE0' + }, + data: [120, 132, 101, 134, 90, 230, 210] + }, + { + name: '出水', + type: 'line', + stack: 'Total', itemStyle:{ color:'#2F8EE0' }, + data: [220, 182, 191, 234, 290, 330, 310] }, ], }); diff --git a/psdc-ui/src/views/emonitor/frdl/index.vue b/psdc-ui/src/views/emonitor/frdl/index.vue index b76f813..a14818e 100644 --- a/psdc-ui/src/views/emonitor/frdl/index.vue +++ b/psdc-ui/src/views/emonitor/frdl/index.vue @@ -38,40 +38,236 @@
日用电量
-
- pic -
+
月用电量
-
- pic -
+
当前功率
-
- pic -
+
当前温度
-
- pic -
+
- diff --git a/psdc-ui/src/views/emonitor/kqyrb/index.vue b/psdc-ui/src/views/emonitor/kqyrb/index.vue index d6f00b6..3dcb56c 100644 --- a/psdc-ui/src/views/emonitor/kqyrb/index.vue +++ b/psdc-ui/src/views/emonitor/kqyrb/index.vue @@ -42,40 +42,251 @@
日用电量
-
- pic -
+
月用电量
-
- pic -
+
当前功率
-
- pic -
+
当前温度
-
- pic -
+
- diff --git a/psdc-ui/src/views/emonitor/wdcgq/index.vue b/psdc-ui/src/views/emonitor/wdcgq/index.vue index e6a39cb..289628b 100644 --- a/psdc-ui/src/views/emonitor/wdcgq/index.vue +++ b/psdc-ui/src/views/emonitor/wdcgq/index.vue @@ -64,16 +64,79 @@
实时温度总览
-
- pic -
+
- diff --git a/psdc-ui/src/views/emonitor/xrgl/index.vue b/psdc-ui/src/views/emonitor/xrgl/index.vue index d6f00b6..b9f77d5 100644 --- a/psdc-ui/src/views/emonitor/xrgl/index.vue +++ b/psdc-ui/src/views/emonitor/xrgl/index.vue @@ -42,40 +42,251 @@
日用电量
-
- pic -
+
月用电量
-
- pic -
+
当前功率
-
- pic -
+
当前温度
-
- pic -
+
-