From bd27dbc86a34a96dfff1807929d9ea21e794248a Mon Sep 17 00:00:00 2001 From: Cc Date: Thu, 20 Feb 2025 14:27:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/monitor.js | 14 +++ src/views/iot/ywry/index.vue | 6 +- src/views/iot/ywry/qcode.vue | 34 +++--- src/views/server/siteDetails/energy.vue | 123 ++++++++++++++++++++ src/views/server/siteDetails/index.vue | 12 ++ src/views/server/siteDetails/site.vue | 5 +- src/views/server/siteDetails/technology.vue | 1 + 7 files changed, 173 insertions(+), 22 deletions(-) create mode 100644 src/views/server/siteDetails/energy.vue diff --git a/src/api/monitor.js b/src/api/monitor.js index adaf23c..8fc6d6d 100644 --- a/src/api/monitor.js +++ b/src/api/monitor.js @@ -102,6 +102,20 @@ export function deviceCode(data) { data, }); } + +export function energyStorage(data) { + return request({ + url: + '/device/energyStorage?deviceId=' + + data.deviceCode + + '&page=' + + data.page + + '&size=' + + data.size, + method: 'get', + data, + }); +} //传感器数据 可读 export function sensorsOfWrite(data) { return request({ diff --git a/src/views/iot/ywry/index.vue b/src/views/iot/ywry/index.vue index 3224223..6fcf610 100644 --- a/src/views/iot/ywry/index.vue +++ b/src/views/iot/ywry/index.vue @@ -239,7 +239,11 @@ export default { productAttribute(code).then(res => { this.dialogqrcodeVisible = true; this.codeId = row.billNo; - this.codeUrl = 'http://sm.lidinghb.com?materialCode=' + code; + this.codeUrl = + 'http://sm.lidinghb.com?materialCode=' + + code + + '&billNo=' + + row.billNo; this.qrinfoData = res.data; }); }, diff --git a/src/views/iot/ywry/qcode.vue b/src/views/iot/ywry/qcode.vue index 6add361..665cd81 100644 --- a/src/views/iot/ywry/qcode.vue +++ b/src/views/iot/ywry/qcode.vue @@ -93,7 +93,7 @@ onMounted(() => { diff --git a/src/views/server/siteDetails/index.vue b/src/views/server/siteDetails/index.vue index 870d12b..8b81260 100644 --- a/src/views/server/siteDetails/index.vue +++ b/src/views/server/siteDetails/index.vue @@ -111,6 +111,13 @@ :deviceCode="queryForm.deviceCode" > + + + + @@ -126,6 +133,7 @@ import waterIndex from './water'; import imageIndex from './image'; import readableIndex from './readable'; import onlyIndex from './only'; +import energyIndex from './energy'; import siteIndex from './site'; export default { components: { @@ -136,6 +144,7 @@ export default { imageIndex, readableIndex, onlyIndex, + energyIndex, }, data() { return { @@ -187,10 +196,13 @@ export default { }, handleDataClick(tab, event) { const deviceCode = this.queryForm.deviceCode; + const deviceId = this.queryForm.id; if (tab.paneName == 'data-first') { this.$refs['readable'].showData({ deviceCode: deviceCode }); } else if (tab.paneName == 'data-second') { this.$refs['only'].showData({ deviceCode: deviceCode }); + } else if (tab.paneName == 'data-third') { + this.$refs['energy'].showData({ deviceCode: deviceId }); } }, //获取站点列表 diff --git a/src/views/server/siteDetails/site.vue b/src/views/server/siteDetails/site.vue index 91d08b4..f0681ad 100644 --- a/src/views/server/siteDetails/site.vue +++ b/src/views/server/siteDetails/site.vue @@ -9,7 +9,7 @@ 全屏