zjk/H100PowerManger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

完善了显示,修改了复合管控的通信协议

Browse Source
This commit is contained in:
zjk
2025-06-03 20:05:08 +08:00
parent 2be7ce203e
commit 8fab3bdf06
21 changed files with 543 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pPowerManger/httpserver/data.h
+116 -9
View File
@@ -189,7 +189,7 @@ const std::string DATA_HTML = R"(
</div>
</div>
<button class="collapsible">电池系统</button>
<button class="collapsible">锂电池系统</button>
<div class="content">
<div class="system-data-grid">
<div class="data-item">
@@ -201,13 +201,37 @@ const std::string DATA_HTML = R"(
<span class="data-value" id="dyn-soc">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表电池电压:</span>
<span class="data-label">仪表电池LINK电压:</span>
<span class="data-value" id="ins-voltage-link">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力电池电压:</span>
<span class="data-label">仪表电池PACK电压:</span>
<span class="data-value" id="ins-voltage-pack">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表电池正极绝缘电阻:</span>
<span class="data-value" id="ins-resistance-pos">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表电池负极绝缘电阻:</span>
<span class="data-value" id="ins-resistance-neg">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力电池LINK电压:</span>
<span class="data-value" id="dyn-voltage-link">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力电池PACK电压:</span>
<span class="data-value" id="dyn-voltage-pack">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力电池正极绝缘电阻:</span>
<span class="data-value" id="dyn-resistance-pos">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力电池负极绝缘电阻:</span>
<span class="data-value" id="dyn-resistance-neg">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表电池电流:</span>
<span class="data-value" id="ins-current">正在加载...</span>
@@ -262,6 +286,38 @@ const std::string DATA_HTML = R"(
<span class="data-label">动力继电器2:</span>
<span class="data-value" id="dyn-relay-status2">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表正极继电器:</span>
<span class="data-value" id="ins-pos-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表充电继电器:</span>
<span class="data-value" id="ins-charge-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表预充继电器:</span>
<span class="data-value" id="ins-precharge-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">仪表负极继电器:</span>
<span class="data-value" id="ins-neg-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力正极继电器:</span>
<span class="data-value" id="dyn-pos-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力充电继电器:</span>
<span class="data-value" id="dyn-charge-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力预充继电器:</span>
<span class="data-value" id="dyn-precharge-relay-status">正在加载...</span>
</div>
<div class="data-item">
<span class="data-label">动力负极继电器:</span>
<span class="data-value" id="dyn-neg-relay-status">正在加载...</span>
</div>
</div>
</div>
@@ -956,10 +1012,28 @@ function updateSystemData(data) {
document.getElementById('dyn-soc').textContent = (data.dyn_soc).toFixed(1) + '%';
}
if (data.ins_voltage_link !== undefined) {
document.getElementById('ins-voltage-link').textContent = (data.ins_voltage_link ).toFixed(2) + ' V';
document.getElementById('ins-voltage-link').textContent = (data.ins_voltage_link).toFixed(2) + ' V';
}
if (data.ins_voltage_pack !== undefined) {
document.getElementById('ins-voltage-pack').textContent = (data.ins_voltage_pack).toFixed(2) + ' V';
}
if (data.ins_resistance_pos !== undefined) {
document.getElementById('ins-resistance-pos').textContent = (data.ins_resistance_pos).toFixed(2) + ' kΩ';
}
if (data.ins_resistance_neg !== undefined) {
document.getElementById('ins-resistance-neg').textContent = (data.ins_resistance_neg).toFixed(2) + ' kΩ';
}
if (data.dyn_voltage_link !== undefined) {
document.getElementById('dyn-voltage-link').textContent = (data.dyn_voltage_link ).toFixed(2) + ' V';
document.getElementById('dyn-voltage-link').textContent = (data.dyn_voltage_link).toFixed(2) + ' V';
}
if (data.dyn_voltage_pack !== undefined) {
document.getElementById('dyn-voltage-pack').textContent = (data.dyn_voltage_pack).toFixed(2) + ' V';
}
if (data.dyn_resistance_pos !== undefined) {
document.getElementById('dyn-resistance-pos').textContent = (data.dyn_resistance_pos).toFixed(2) + ' kΩ';
}
if (data.dyn_resistance_neg !== undefined) {
document.getElementById('dyn-resistance-neg').textContent = (data.dyn_resistance_neg).toFixed(2) + ' kΩ';
}
if (data.ins_current !== undefined) {
document.getElementById('ins-current').textContent = (data.ins_current).toFixed(2) + ' A';
@@ -974,18 +1048,18 @@ function updateSystemData(data) {
document.getElementById('dyn-total-energy').textContent = data.dyn_total_energy + ' Wh';
}
if (data.ins_power_input !== undefined) {
document.getElementById('ins-power-input').textContent = data.ins_power_input + ' W';
document.getElementById('ins-power-input').textContent = data.ins_power_input + ' KW';
}
if (data.dyn_power_input !== undefined) {
document.getElementById('dyn-power-input').textContent = data.dyn_power_input + ' W';
document.getElementById('dyn-power-input').textContent = data.dyn_power_input + ' KW';
}
if (data.ins_max_discharge_power !== undefined) {
document.getElementById('ins-max-discharge-power').textContent =
(data.ins_max_discharge_power * 0.05).toFixed(2) + ' kW';
(data.ins_max_discharge_power).toFixed(2) + ' kW';
}
if (data.dyn_max_discharge_power !== undefined) {
document.getElementById('dyn-max-discharge-power').textContent =
(data.dyn_max_discharge_power * 0.05).toFixed(2) + ' kW';
(data.dyn_max_discharge_power).toFixed(2) + ' kW';
}
// 继电器状态
@@ -1001,6 +1075,30 @@ function updateSystemData(data) {
if (data.dyn_relay_status2 !== undefined) {
document.getElementById('dyn-relay-status2').textContent = (data.dyn_relay_status2);
}
if (data.ins_pos_relay_status !== undefined) {
document.getElementById('ins-pos-relay-status').textContent = getRelayStatusText(data.ins_pos_relay_status);
}
if (data.ins_charge_relay_status !== undefined) {
document.getElementById('ins-charge-relay-status').textContent = getRelayStatusText(data.ins_charge_relay_status);
}
if (data.ins_precharge_relay_status !== undefined) {
document.getElementById('ins-precharge-relay-status').textContent = getRelayStatusText(data.ins_precharge_relay_status);
}
if (data.ins_neg_relay_status !== undefined) {
document.getElementById('ins-neg-relay-status').textContent = getRelayStatusText(data.ins_neg_relay_status);
}
if (data.dyn_pos_relay_status !== undefined) {
document.getElementById('dyn-pos-relay-status').textContent = getRelayStatusText(data.dyn_pos_relay_status);
}
if (data.dyn_charge_relay_status !== undefined) {
document.getElementById('dyn-charge-relay-status').textContent = getRelayStatusText(data.dyn_charge_relay_status);
}
if (data.dyn_precharge_relay_status !== undefined) {
document.getElementById('dyn-precharge-relay-status').textContent = getRelayStatusText(data.dyn_precharge_relay_status);
}
if (data.dyn_neg_relay_status !== undefined) {
document.getElementById('dyn-neg-relay-status').textContent = getRelayStatusText(data.dyn_neg_relay_status);
}
// 报警标志
if (data.ins_emergency_status !== undefined) {
@@ -1542,6 +1640,15 @@ if (data.power_a_bus_status) {
}
}
// 继电器状态文本转换
function getRelayStatusText(status) {
const statuses = {
1: '接通',
2: '断开'
};
return statuses[status] || '无效';
}
// 紧急状态文本转换
function getEmergencyStatusText(status) {
const statuses = {