0606

src/pPowerManger/httpserver/data.h

@@ -249,11 +249,11 @@ const std::string DATA_HTML = R"(
             <span class="data-value" id="dyn-total-energy">正在加载...</span>
         </div>
         <div class="data-item">
-            <span class="data-label">仪表电池输入功率:</span>
+            <span class="data-label">仪表电池接入功率:</span>
             <span class="data-value" id="ins-power-input">正在加载...</span>
         </div>
         <div class="data-item">
-            <span class="data-label">动力电池输入功率:</span>
+            <span class="data-label">动力电池接入功率:</span>
             <span class="data-value" id="dyn-power-input">正在加载...</span>
         </div>
         <div class="data-item">
@@ -264,6 +264,14 @@ const std::string DATA_HTML = R"(
             <span class="data-label">动力电池最大放电功率:</span>
             <span class="data-value" id="dyn-max-discharge-power">正在加载...</span>
         </div>
+        <div class="data-item">
+            <span class="data-label">仪表电池充放电状态:</span>
+            <span class="data-value" id="ins-charge-status">正在加载...</span>
+        </div>
+        <div class="data-item">
+            <span class="data-label">动力电池充放电状态:</span>
+            <span class="data-value" id="dyn-charge-status">正在加载...</span>
+        </div>
     </div>
 </div>
 
@@ -380,6 +388,22 @@ const std::string DATA_HTML = R"(
             <span class="data-label">动力紧急状态:</span>
             <span class="data-value" id="dyn-emergency-status">正在加载...</span>
         </div>
+        <div class="data-item">
+            <span class="data-label">充电等级:</span>
+            <span class="data-value" id="dyn-charge-level">正在加载...</span>
+        </div>
+        <div class="data-item">
+            <span class="data-label">仪表电池漏水状态:</span>
+            <span class="data-value" id="water-leak-status-from-insbat">正在加载...</span>
+        </div>
+        <div class="data-item">
+            <span class="data-label">动力电池漏水状态:</span>
+            <span class="data-value" id="water-leak-status-from-dynbat">正在加载...</span>
+        </div>
+        <div class="data-item">
+            <span class="data-label">DCDC状态:</span>
+            <span class="data-value" id="dcdc-status-from-insbat">正在加载...</span>
+        </div>
     </div>
 </div>
 
@@ -1061,6 +1085,14 @@ function updateSystemData(data) {
         document.getElementById('dyn-max-discharge-power').textContent = 
             (data.dyn_max_discharge_power).toFixed(2) + ' kW';
     }
+    if (data.ins_charge_status !== undefined) {
+        document.getElementById('ins-charge-status').textContent = 
+            getChargeStatusText(data.ins_charge_status);
+    }
+    if (data.dyn_charge_status !== undefined) {
+        document.getElementById('dyn-charge-status').textContent = 
+            getChargeStatusText(data.dyn_charge_status);
+    }
 
     // 继电器状态
     if (data.ins_relay_status1 !== undefined) {
@@ -1107,6 +1139,18 @@ function updateSystemData(data) {
     if (data.dyn_emergency_status !== undefined) {
         document.getElementById('dyn-emergency-status').textContent = getEmergencyStatusText(data.dyn_emergency_status);
     }
+    if (data.dyn_charge_level !== undefined) {
+        document.getElementById('dyn-charge-level').textContent = getChargeLevelText(data.dyn_charge_level);
+    }
+    if (data.water_leak_status_from_insbat !== undefined) {
+        document.getElementById('water-leak-status-from-insbat').textContent = getWaterLeakStatusText(data.water_leak_status_from_insbat);
+    }
+    if (data.water_leak_status_from_dynbat !== undefined) {
+        document.getElementById('water-leak-status-from-dynbat').textContent = getWaterLeakStatusText(data.water_leak_status_from_dynbat);
+    }
+    if (data.dcdc_status_from_insbat !== undefined) {
+        document.getElementById('dcdc-status-from-insbat').textContent = getDCDCStatusText(data.dcdc_status_from_insbat);
+    }
     if (data.dyn_alarm_flag1 !== undefined) {
         document.getElementById('dyn-alarm-flag1').textContent = data.dyn_alarm_flag1;
     }
@@ -1640,6 +1684,16 @@ if (data.power_a_bus_status) {
     }
 }
 
+// 充放电状态文本转换
+function getChargeStatusText(status) {
+    const statuses = {
+        0: '无效',
+        16: '充电',
+        32: '放电'
+    };
+    return statuses[status] || '未知状态';
+}
+
 // 继电器状态文本转换
 function getRelayStatusText(status) {
     const statuses = {
@@ -1649,6 +1703,26 @@ function getRelayStatusText(status) {
     return statuses[status] || '无效';
 }
 
+// 充电等级文本转换
+function getChargeLevelText(level) {
+    const levels = {
+        1: '1级(不限)',
+        2: '2级(限功率)',
+        3: '3级(关闭)'
+    };
+    return levels[level] || '未知等级';
+}
+
+// 漏水状态文本转换
+function getWaterLeakStatusText(status) {
+    return status === 0 ? '正常' : '异常漏水';
+}
+
+// DCDC状态文本转换
+function getDCDCStatusText(status) {
+    return status === 0 ? '正常' : '故障';
+}
+
 // 紧急状态文本转换
 function getEmergencyStatusText(status) {
     const statuses = {