lufaneng
/
central-control
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
main
Lufaneng 1 year ago
parent 5f4904d3ce
commit 4c5ad53065
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File

5
src/views/HandleControl/index.vue
Unescape View File

@ -242,7 +242,8 @@ RPC.post('/adl400/readPhaseData', { comm_uid: commit_uid }).then(res => {
powerPhases.value[2].power = res.cPower + 'kW' powerPhases.value[2].power = res.cPower + 'kW'
powerPhases.value[2].factor = res.cPowerFactor 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 energyParams.value.powerFactor = res.powerFactor
}) })
@ -273,7 +274,7 @@ const powerPhases = ref([
const energyParams = ref({ const energyParams = ref({
dcVoltage: '0.0V', dcVoltage: '0.0V',
activeEnergy: '0kwh', activeEnergy: '0kW·h',
activePower: '0kW', activePower: '0kW',
powerFactor: '0' powerFactor: '0'
}) })

9
src/views/Monitoring/index.vue
Unescape View File

@ -91,7 +91,7 @@
<div class="circuitStatus"> <div class="circuitStatus">
<div class="line">直流电流: <span>{{ circuit.A }}A</span></div> <div class="line">直流电流: <span>{{ circuit.A }}A</span></div>
<div class="line"> <div class="line">
<div class="line_item">电源: <span>{{ circuit.V }}V</span></div> <div class="line_item">直流电压: <span>{{ circuit.V ? circuit.V?.toFixed(2) : 0 }}V</span></div>
<div class="line_item">功率: <span>{{ circuit.Kw }}kw</span></div> <div class="line_item">功率: <span>{{ circuit.Kw }}kw</span></div>
</div> </div>
</div> </div>
@ -112,7 +112,7 @@
<div class="circuitStatus"> <div class="circuitStatus">
<div class="line">直流电流: <span>{{ circuit.A }}A</span></div> <div class="line">直流电流: <span>{{ circuit.A }}A</span></div>
<div class="line"> <div class="line">
<div class="line_item">电源: <span>{{ circuit.V }}V</span></div> <div class="line_item">直流电压: <span>{{ circuit.V ? circuit.V?.toFixed(2) : 0 }}V</span></div>
<div class="line_item">功率: <span>{{ circuit.Kw }}kw</span></div> <div class="line_item">功率: <span>{{ circuit.Kw }}kw</span></div>
</div> </div>
</div> </div>
@ -269,7 +269,7 @@ const powerPhases = ref([
const energyParams = ref({ const energyParams = ref({
dcVoltage: '0.0V', dcVoltage: '0.0V',
activeEnergy: '0kwh', activeEnergy: '0kW·h',
activePower: '0kW', activePower: '0kW',
powerFactor: '0' powerFactor: '0'
}) })
@ -393,7 +393,8 @@ const getInfo = () => {
powerPhases.value[2].power = res.cPower + 'kW' powerPhases.value[2].power = res.cPower + 'kW'
powerPhases.value[2].factor = res.cPowerFactor 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 energyParams.value.powerFactor = res.powerFactor
}) })
RPC.post('/m9z/getDeviceStatus2', { comm_uid: commit_uid }).then((res) => { RPC.post('/m9z/getDeviceStatus2', { comm_uid: commit_uid }).then((res) => {

2
src/views/ParamsConfig/TableDialog.vue
Unescape View File

@ -25,7 +25,7 @@ function closed() {
<el-table-column align="center" prop="DeviceAddress" label="设备地址" /> <el-table-column align="center" prop="DeviceAddress" label="设备地址" />
<el-table-column align="center" prop="CurrentPWMDuty" label="电流PWM"> <el-table-column align="center" prop="CurrentPWMDuty" label="电流PWM">
<template #default="{ row }"> <template #default="{ row }">
{{ row.CurrentPWMDuty && row.CurrentPWMDuty + '%' }} {{ row.CurrentPWMDuty && row.CurrentPWMDuty?.toFixed(2) + '%' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" prop="VoltagePWMDuty" label="电压PWM"> <el-table-column align="center" prop="VoltagePWMDuty" label="电压PWM">

4
src/views/ParamsConfig/index.vue
Unescape View File

@ -32,12 +32,12 @@
<div class="item"> <div class="item">
<div class="key">大地经度</div> <div class="key">大地经度</div>
<!-- <el-input v-model="formField.lat" style="width: 100px" placeholder="请输入" :formatter="(value) => `${value}˚`" :parser="(value) => value.replace(/˚/g, '')" /> --> <!-- <el-input v-model="formField.lat" style="width: 100px" placeholder="请输入" :formatter="(value) => `${value}˚`" :parser="(value) => value.replace(/˚/g, '')" /> -->
<el-input-number :min="0" :max="180" v-model="formField.lat" style="width: 100px" placeholder="请输入" :controls="false" /> <el-input-number :min="0" :max="180" v-model="formField.lgn" style="width: 100px" placeholder="请输入" :controls="false" />
</div> </div>
<div class="item"> <div class="item">
<div class="key">大地纬度</div> <div class="key">大地纬度</div>
<!-- <el-input v-model="formField.lgn" style="width: 100px" placeholder="请输入" :formatter="(value) => `${value}˚`" :parser="(value) => value.replace(/˚/g, '')" /> --> <!-- <el-input v-model="formField.lgn" style="width: 100px" placeholder="请输入" :formatter="(value) => `${value}˚`" :parser="(value) => value.replace(/˚/g, '')" /> -->
<el-input-number :min="0" :max="90" v-model="formField.lgn" style="width: 100px" placeholder="请输入" :controls="false" /> <el-input-number :min="0" :max="90" v-model="formField.lat" style="width: 100px" placeholder="请输入" :controls="false" />
</div> </div>
</div> </div>
<div class="line"> <div class="line">

Write Preview
Loading…
Cancel
Save