From 5aebe96b3a06ca74203efeb20016b1c939363ad6 Mon Sep 17 00:00:00 2001 From: Lufaneng Date: Wed, 10 Dec 2025 10:21:33 +0800 Subject: [PATCH] 1 --- src/views/HandleControl/index.vue | 72 +++++++++++++++---------------- src/views/Monitoring/index.vue | 36 ++++++++-------- vite.config.js | 3 +- 3 files changed, 56 insertions(+), 55 deletions(-) diff --git a/src/views/HandleControl/index.vue b/src/views/HandleControl/index.vue index ed2f82a..03ad771 100644 --- a/src/views/HandleControl/index.vue +++ b/src/views/HandleControl/index.vue @@ -253,24 +253,24 @@ const week = ref('') const weekDays = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六']; const phaseLoading = ref(true) RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => { - powerPhases.value[0].voltage = res.aVoltage + 'V' - powerPhases.value[0].current = res.aElectricCurrent + 'A' - powerPhases.value[0].power = res.aPower + 'kW' - powerPhases.value[0].factor = res.aPowerFactor - - powerPhases.value[1].voltage = res.bVoltage + 'V' - powerPhases.value[1].current = res.bElectricCurrent + 'A' - powerPhases.value[1].power = res.bPower + 'kW' - powerPhases.value[1].factor = res.bPowerFactor - - powerPhases.value[2].voltage = res.cVoltage + 'V' - powerPhases.value[2].current = res.cElectricCurrent + 'A' - powerPhases.value[2].power = res.cPower + 'kW' - powerPhases.value[2].factor = res.cPowerFactor - - energyParams.value.activeEnergy = res.activeEnergy + 'kW·h' - energyParams.value.activePower = res.activePower + 'kW' - energyParams.value.powerFactor = res.powerFactor + powerPhases.value[0].voltage = res.aVoltage ? res.aVoltage + 'V' : '0V' + powerPhases.value[0].current = res.aElectricCurrent ? res.aElectricCurrent + 'A' : '0A' + powerPhases.value[0].power = res.aPower ? res.aPower + 'kW' : '0kW' + powerPhases.value[0].factor = res.aPowerFactor ? res.aPowerFactor : 0 + + powerPhases.value[1].voltage = res.bVoltage ? res.bVoltage + 'V' : '0V' + powerPhases.value[1].current = res.bElectricCurrent ? res.bElectricCurrent + 'A' : '0A' + powerPhases.value[1].power = res.bPower ? res.bPower + 'kW' : '0kW' + powerPhases.value[1].factor = res.bPowerFactor ? res.bPowerFactor : 0 + + powerPhases.value[2].voltage = res.cVoltage ? res.cVoltage + 'V' : '0V' + powerPhases.value[2].current = res.cElectricCurrent ? res.cElectricCurrent + 'A' : '0A' + powerPhases.value[2].power = res.cPower ? res.cPower + 'kW' : '0kW' + powerPhases.value[2].factor = res.cPowerFactor ? res.cPowerFactor : 0 + + energyParams.value.activeEnergy = res.activeEnergy ? res.activeEnergy + 'kW·h' : '0kW·h' + energyParams.value.activePower = res.activePower ? res.activePower + 'kW' : '0kW' + energyParams.value.powerFactor = res.powerFactor ? res.powerFactor : 0 }).finally(() => { phaseLoading.value = false }) @@ -426,24 +426,24 @@ const refresh = () => { getInfo() phaseLoading.value = true RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => { - powerPhases.value[0].voltage = res.aVoltage + 'V' - powerPhases.value[0].current = res.aElectricCurrent + 'A' - powerPhases.value[0].power = res.aPower + 'kW' - powerPhases.value[0].factor = res.aPowerFactor - - powerPhases.value[1].voltage = res.bVoltage + 'V' - powerPhases.value[1].current = res.bElectricCurrent + 'A' - powerPhases.value[1].power = res.bPower + 'kW' - powerPhases.value[1].factor = res.bPowerFactor - - powerPhases.value[2].voltage = res.cVoltage + 'V' - powerPhases.value[2].current = res.cElectricCurrent + 'A' - powerPhases.value[2].power = res.cPower + 'kW' - powerPhases.value[2].factor = res.cPowerFactor - - energyParams.value.activeEnergy = res.activeEnergy + 'kW·h' - energyParams.value.activePower = res.activePower + 'kW' - energyParams.value.powerFactor = res.powerFactor + powerPhases.value[0].voltage = res.aVoltage ? res.aVoltage + 'V' : '0V' + powerPhases.value[0].current = res.aElectricCurrent ? res.aElectricCurrent + 'A' : '0A' + powerPhases.value[0].power = res.aPower ? res.aPower + 'kW' : '0kW' + powerPhases.value[0].factor = res.aPowerFactor ? res.aPowerFactor : 0 + + powerPhases.value[1].voltage = res.bVoltage ? res.bVoltage + 'V' : '0V' + powerPhases.value[1].current = res.bElectricCurrent ? res.bElectricCurrent + 'A' : '0A' + powerPhases.value[1].power = res.bPower ? res.bPower + 'kW' : '0kW' + powerPhases.value[1].factor = res.bPowerFactor ? res.bPowerFactor : 0 + + powerPhases.value[2].voltage = res.cVoltage ? res.cVoltage + 'V' : '0V' + powerPhases.value[2].current = res.cElectricCurrent ? res.cElectricCurrent + 'A' : '0A' + powerPhases.value[2].power = res.cPower ? res.cPower + 'kW' : '0kW' + powerPhases.value[2].factor = res.cPowerFactor ? res.cPowerFactor : 0 + + energyParams.value.activeEnergy = res.activeEnergy ? res.activeEnergy + 'kW·h' : '0kW·h' + energyParams.value.activePower = res.activePower ? res.activePower + 'kW' : '0kW' + energyParams.value.powerFactor = res.powerFactor ? res.powerFactor : 0 }).finally(() => { phaseLoading.value = false }) diff --git a/src/views/Monitoring/index.vue b/src/views/Monitoring/index.vue index 8b6fe04..fcfcc54 100644 --- a/src/views/Monitoring/index.vue +++ b/src/views/Monitoring/index.vue @@ -434,24 +434,24 @@ const getInfo = () => { infoLoading.value = true phaseLoading.value = true RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => { - powerPhases.value[0].voltage = res.aVoltage + 'V' - powerPhases.value[0].current = res.aElectricCurrent + 'A' - powerPhases.value[0].power = res.aPower + 'kW' - powerPhases.value[0].factor = res.aPowerFactor - - powerPhases.value[1].voltage = res.bVoltage + 'V' - powerPhases.value[1].current = res.bElectricCurrent + 'A' - powerPhases.value[1].power = res.bPower + 'kW' - powerPhases.value[1].factor = res.bPowerFactor - - powerPhases.value[2].voltage = res.cVoltage + 'V' - powerPhases.value[2].current = res.cElectricCurrent + 'A' - powerPhases.value[2].power = res.cPower + 'kW' - powerPhases.value[2].factor = res.cPowerFactor - - energyParams.value.activeEnergy = res.activeEnergy + 'kW·h' - energyParams.value.activePower = res.activePower + 'kW' - energyParams.value.powerFactor = res.powerFactor + powerPhases.value[0].voltage = res.aVoltage ? res.aVoltage + 'V' : '0V' + powerPhases.value[0].current = res.aElectricCurrent ? res.aElectricCurrent + 'A' : '0A' + powerPhases.value[0].power = res.aPower ? res.aPower + 'kW' : '0kW' + powerPhases.value[0].factor = res.aPowerFactor ? res.aPowerFactor : 0 + + powerPhases.value[1].voltage = res.bVoltage ? res.bVoltage + 'V' : '0V' + powerPhases.value[1].current = res.bElectricCurrent ? res.bElectricCurrent + 'A' : '0A' + powerPhases.value[1].power = res.bPower ? res.bPower + 'kW' : '0kW' + powerPhases.value[1].factor = res.bPowerFactor ? res.bPowerFactor : 0 + + powerPhases.value[2].voltage = res.cVoltage ? res.cVoltage + 'V' : '0V' + powerPhases.value[2].current = res.cElectricCurrent ? res.cElectricCurrent + 'A' : '0A' + powerPhases.value[2].power = res.cPower ? res.cPower + 'kW' : '0kW' + powerPhases.value[2].factor = res.cPowerFactor ? res.cPowerFactor : 0 + + energyParams.value.activeEnergy = res.activeEnergy ? res.activeEnergy + 'kW·h' : '0kW·h' + energyParams.value.activePower = res.activePower ? res.activePower + 'kW' : '0kW' + energyParams.value.powerFactor = res.powerFactor ? res.powerFactor : 0 }).finally(() => { phaseLoading.value = false }) diff --git a/vite.config.js b/vite.config.js index 945a41a..1a0098f 100644 --- a/vite.config.js +++ b/vite.config.js @@ -59,7 +59,8 @@ export default defineConfig({ open: true, proxy: { '/jsonrpc': { - target: 'https://lamp.ruixininfo.com', + // target: 'https://lamp.ruixininfo.com', + target: 'http://171.208.94.46:7070', changeOrigin: true, secure: false, },