diff --git a/src/views/HandleControl/index.vue b/src/views/HandleControl/index.vue
index 2f27797..278ff4c 100644
--- a/src/views/HandleControl/index.vue
+++ b/src/views/HandleControl/index.vue
@@ -242,7 +242,8 @@ RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
powerPhases.value[2].power = res.cPower + 'kW'
powerPhases.value[2].factor = res.cPowerFactor
- energyParams.value.activeEnergy = res.activeEnergy + 'A'
+ energyParams.value.activeEnergy = res.activeEnergy + 'kW·h'
+ energyParams.value.activePower = res.activePower + 'kW'
energyParams.value.powerFactor = res.powerFactor
})
@@ -273,7 +274,7 @@ const powerPhases = ref([
const energyParams = ref({
dcVoltage: '0.0V',
- activeEnergy: '0kwh',
+ activeEnergy: '0kW·h',
activePower: '0kW',
powerFactor: '0'
})
diff --git a/src/views/Monitoring/index.vue b/src/views/Monitoring/index.vue
index 4f295a1..95f62f7 100644
--- a/src/views/Monitoring/index.vue
+++ b/src/views/Monitoring/index.vue
@@ -91,7 +91,7 @@
直流电流: {{ circuit.A }}A
-
电源: {{ circuit.V }}V
+
直流电压: {{ circuit.V ? circuit.V?.toFixed(2) : 0 }}V
功率: {{ circuit.Kw }}kw
@@ -112,7 +112,7 @@
直流电流: {{ circuit.A }}A
-
电源: {{ circuit.V }}V
+
直流电压: {{ circuit.V ? circuit.V?.toFixed(2) : 0 }}V
功率: {{ circuit.Kw }}kw
@@ -269,7 +269,7 @@ const powerPhases = ref([
const energyParams = ref({
dcVoltage: '0.0V',
- activeEnergy: '0kwh',
+ activeEnergy: '0kW·h',
activePower: '0kW',
powerFactor: '0'
})
@@ -393,7 +393,8 @@ const getInfo = () => {
powerPhases.value[2].power = res.cPower + 'kW'
powerPhases.value[2].factor = res.cPowerFactor
- energyParams.value.activeEnergy = res.activeEnergy + 'A'
+ energyParams.value.activeEnergy = res.activeEnergy + 'kW·h'
+ energyParams.value.activePower = res.activePower + 'kW'
energyParams.value.powerFactor = res.powerFactor
})
RPC.post('/m9z/getDeviceStatus2', { comm_uid: commit_uid }).then((res) => {
diff --git a/src/views/ParamsConfig/TableDialog.vue b/src/views/ParamsConfig/TableDialog.vue
index 55e97b2..79c0e4a 100644
--- a/src/views/ParamsConfig/TableDialog.vue
+++ b/src/views/ParamsConfig/TableDialog.vue
@@ -25,7 +25,7 @@ function closed() {
- {{ row.CurrentPWMDuty && row.CurrentPWMDuty + '%' }}
+ {{ row.CurrentPWMDuty && row.CurrentPWMDuty?.toFixed(2) + '%' }}
diff --git a/src/views/ParamsConfig/index.vue b/src/views/ParamsConfig/index.vue
index c893452..4a1e2d4 100644
--- a/src/views/ParamsConfig/index.vue
+++ b/src/views/ParamsConfig/index.vue
@@ -32,12 +32,12 @@