diff --git a/src/views/Monitoring/index.vue b/src/views/Monitoring/index.vue index 0f8085f..b732e2e 100644 --- a/src/views/Monitoring/index.vue +++ b/src/views/Monitoring/index.vue @@ -248,26 +248,29 @@ const getLineData = () => { // }).finally(() => { // lineDataLoading.value = false // }) - RPC.post('/lightm/rtu/minHis', { CommUid: commit_uid, recdDate: recdDate.value }).then((res) => { - // 直流电流、电源、功率 - // console.log(res) - agvEnergy.value = res.agvEnergy?.toFixed(3) - maxEnergy.value = res.maxEnergy?.toFixed(3) - // lineData.value = transformminHisData(res.minutesEnergy) - }).finally(() => { - lineDataLoading.value = false - }) + // RPC.post('/lightm/rtu/minHis', { CommUid: commit_uid, recdDate: recdDate.value }).then((res) => { + // // 直流电流、电源、功率 + // // console.log(res) + // agvEnergy.value = res.agvEnergy?.toFixed(3) + // maxEnergy.value = res.maxEnergy?.toFixed(3) + // // lineData.value = transformminHisData(res.minutesEnergy) + // }).finally(() => { + // lineDataLoading.value = false + // }) RPC.post('/hisMinEnergy/getMinEnergyListByDay', { CommUid: commit_uid, day: recdDate.value }).then((res) => { // 直流电流、电源、功率 console.log(res) + + agvEnergy.value = res.avg?.toFixed(3) || 0 + maxEnergy.value = res.max?.toFixed(3) || 0 const arr = [] - for (let k in res) { + for (let k in res?.energy) { arr.push(k) } lineData.value = arr.map(item => { return { name: item, - value: res[item] + value: res?.energy[item] } }) // agvEnergy.value = res.agvEnergy?.toFixed(3)