1

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
     })

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,
       },