From ae1843cf0ddfa2ae5b82e033ea46cfc895a51ee6 Mon Sep 17 00:00:00 2001 From: wj <347312259@qq.com> Date: Fri, 12 May 2023 17:26:18 +0800 Subject: [PATCH] 11 --- psdc-ui/src/api/bigview/bigview.js | 6 +- psdc-ui/src/api/control/manual.js | 6 + psdc-ui/src/views/bigview/index.vue | 532 ++++++++++++++++++--- psdc-ui/src/views/control/manual/index.vue | 241 +++++----- 4 files changed, 603 insertions(+), 182 deletions(-) create mode 100644 psdc-ui/src/api/control/manual.js diff --git a/psdc-ui/src/api/bigview/bigview.js b/psdc-ui/src/api/bigview/bigview.js index 2ec33c4..0e9cf09 100644 --- a/psdc-ui/src/api/bigview/bigview.js +++ b/psdc-ui/src/api/bigview/bigview.js @@ -1,6 +1,10 @@ import request from '@/utils/request' -//8个温度传感器接口 +/** 8个温度传感器接口*/ export function getTemperature() { return request.get('/indexLook/8wd') +} +/**运行设备工作信息查询接口*/ +export function getDevicesInfo() { + return request.get('/indexLook/devicesInfo') } \ No newline at end of file diff --git a/psdc-ui/src/api/control/manual.js b/psdc-ui/src/api/control/manual.js new file mode 100644 index 0000000..6e886f9 --- /dev/null +++ b/psdc-ui/src/api/control/manual.js @@ -0,0 +1,6 @@ +import request from '@/utils/request' + +/** 获取设备*/ +export function getDevice() { + return request.get('/control/manual/deviceStatusList') +} \ No newline at end of file diff --git a/psdc-ui/src/views/bigview/index.vue b/psdc-ui/src/views/bigview/index.vue index 43cd513..83a3a4f 100644 --- a/psdc-ui/src/views/bigview/index.vue +++ b/psdc-ui/src/views/bigview/index.vue @@ -2,7 +2,7 @@

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

- 返回后台 +
@@ -13,14 +13,14 @@
-

当前状态:开启

-

进水温度:25

-

出水温度:85

-

今日能耗:23kWh

+

当前状态:{{ dcglRunStatus }}

+

进水温度:{{ dcglThermometerValueIn }}

+

出水温度:{{ dcglThermometerValueOut }}

+

今日能耗:{{ dcglTodayUseEnergy }}kWh

-
+
@@ -30,14 +30,14 @@
-

当前状态:开启

-

进水温度:25

-

出水温度:85

-

今日能耗:23kWh

+

当前状态:{{ xrglRunStatus }}

+

进水温度:{{ xrglThermometerValueIn }}

+

出水温度:{{ xrglThermometerValueOut }}

+

今日能耗:{{ xrglTodayUseEnergy }}kWh

-
+
@@ -58,50 +58,15 @@
-
+
当前功率
-
-
温度传感器1
-
-
26℃
-
-
-
温度传感器2
-
-
26℃
-
-
-
温度传感器3
-
-
26℃
-
-
-
温度传感器4
-
-
26℃
-
-
-
温度传感器5
-
-
26℃
-
-
-
温度传感器6
+
+
{{ item.deviceName }}
-
26℃
-
-
-
温度传感器7
-
-
26℃
-
-
-
温度传感器8
-
-
26℃
+
{{ item.thermometerValue }}℃
@@ -121,7 +86,7 @@
-
+
@@ -137,7 +102,7 @@
-
+
@@ -146,21 +111,448 @@