From 3cd1502eb1bc81218539e687156a4b3ae85f77be Mon Sep 17 00:00:00 2001 From: Lufaneng Date: Wed, 10 Sep 2025 09:40:16 +0800 Subject: [PATCH] 1 --- src/views/Monitoring/index.vue | 21 ++++++++++++++++++++- vite.config.js | 2 +- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/src/views/Monitoring/index.vue b/src/views/Monitoring/index.vue index 5ed445a..0f8085f 100644 --- a/src/views/Monitoring/index.vue +++ b/src/views/Monitoring/index.vue @@ -253,7 +253,26 @@ const getLineData = () => { // console.log(res) agvEnergy.value = res.agvEnergy?.toFixed(3) maxEnergy.value = res.maxEnergy?.toFixed(3) - lineData.value = transformminHisData(res.minutesEnergy) + // lineData.value = transformminHisData(res.minutesEnergy) + }).finally(() => { + lineDataLoading.value = false + }) + RPC.post('/hisMinEnergy/getMinEnergyListByDay', { CommUid: commit_uid, day: recdDate.value }).then((res) => { + // 直流电流、电源、功率 + console.log(res) + const arr = [] + for (let k in res) { + arr.push(k) + } + lineData.value = arr.map(item => { + return { + name: item, + value: res[item] + } + }) + // agvEnergy.value = res.agvEnergy?.toFixed(3) + // maxEnergy.value = res.maxEnergy?.toFixed(3) + // lineData.value = transformminHisData(res.minutesEnergy) }).finally(() => { lineDataLoading.value = false }) diff --git a/vite.config.js b/vite.config.js index f011535..e2e0e7c 100644 --- a/vite.config.js +++ b/vite.config.js @@ -59,7 +59,7 @@ export default defineConfig({ open: true, proxy: { '/jsonrpc': { - target: 'https://cd-databoard-lamp.ruixininfo.com', + target: 'https://cd-lamp.ruixininfo.com', changeOrigin: true, secure: false, },