Parcourir la source

3相进单相出网页

liyi il y a 5 mois
Parent
commit
5e04f174af
2 fichiers modifiés avec 20 ajouts et 16 suppressions
  1. 8 6
      nor_web/AC3-AC1/index.html
  2. 12 10
      nor_web/h_html/index_html.h

+ 8 - 6
nor_web/AC3-AC1/index.html

@@ -214,11 +214,11 @@
 
                     <div class="summary-grid">
 
-                        <div class="summary-item"><div class="summary-label">总电压 (V)</div><div class="summary-value" id="totalVoltage">0.0<span class="summary-unit">V</span></div></div>
+                        <div class="summary-item"><div class="summary-label" id="All-V">总电压 (V)</div><div class="summary-value" id="totalVoltage">0.0<span class="summary-unit">V</span></div></div>
                         <div class="summary-item"><div class="summary-label">总电流 (A)</div><div class="summary-value" id="totalCurrent">0.0<span class="summary-unit">A</span></div></div>
-                        <div class="summary-item"><div class="summary-label">总有功功率 (W)</div><div class="summary-value" id="totalActivePower">0<span class="summary-unit">W</span></div></div>
-                        <div class="summary-item"><div class="summary-label">总无功功率 (var)</div><div class="summary-value" id="totalReactivePower">0<span class="summary-unit">var</span></div></div>
-                        <div class="summary-item"><div class="summary-label">总视在功率 (VA)</div><div class="summary-value" id="totalApparentPower">0<span class="summary-unit">VA</span></div></div>
+                        <div class="summary-item"><div class="summary-label">总有功功率 (kW)</div><div class="summary-value" id="totalActivePower">0<span class="summary-unit">W</span></div></div>
+                        <div class="summary-item"><div class="summary-label">总无功功率 (kvar)</div><div class="summary-value" id="totalReactivePower">0<span class="summary-unit">var</span></div></div>
+                        <div class="summary-item"><div class="summary-label">总视在功率 (kVA)</div><div class="summary-value" id="totalApparentPower">0<span class="summary-unit">VA</span></div></div>
                         <div class="summary-item"><div class="summary-label">总功率因数</div><div class="summary-value" id="totalPowerFactor">0.00<span class="summary-unit"></span></div></div>
                         <div class="summary-item"><div class="summary-label">总耗电量(kWh)</div><div class="summary-value" id="totalConsumer">0.00<span class="summary-unit">kWh</span></div></div>
                     </div>
@@ -1371,6 +1371,8 @@
             {
                 if(show_l_info == 0)
                 {
+                    //总电压 (V)
+                    document.getElementById('All-V').innerHTML = '<div class="summary-label" id="All-V">线电压 (V)</div>'
                     totalVoltage = all_channel.voltage;
                     totalCurrent = all_channel.current;
                     totalActivePower = all_channel.power;
@@ -1380,6 +1382,7 @@
                     totalConsumer = all_channel.consump;
                 }else 
                 {
+                    document.getElementById('All-V').innerHTML = '<div class="summary-label" id="All-V">相电压 (V)</div>'
                     totalVoltage = all_l_channel[show_l_info-1].voltage;
                     totalCurrent = all_l_channel[show_l_info-1].current;
                     totalActivePower = all_l_channel[show_l_info-1].power;
@@ -1395,8 +1398,7 @@
             document.getElementById('totalReactivePower').innerHTML = totalReactivePower.toLocaleString() + '<span class="summary-unit">kvar</span>';
             document.getElementById('totalApparentPower').innerHTML = totalApparentPower.toLocaleString() + '<span class="summary-unit">kVA</span>';
             document.getElementById('totalPowerFactor').innerHTML = totalPf.toFixed(3);
-            document.getElementById('totalConsumer').innerHTML = totalConsumer.toFixed(2) + '<span class="summary-unit">kWh</span>';
-            
+            document.getElementById('totalConsumer').innerHTML = totalConsumer.toFixed(2) + '<span class="summary-unit">kWh</span>';   
         }
 
         function updateWsStatus(connected, message) {

+ 12 - 10
nor_web/h_html/index_html.h

@@ -1,7 +1,7 @@
 /* 自动生成的文本数据头文件 */
 /* 源文件: index.html */
-/* 文件大小: 133988 字节 */
-/* 生成时间: 2026-05-04 13:58:49 */
+/* 文件大小: 134278 字节 */
+/* 生成时间: 2026-05-05 09:09:16 */
 /* 编码: utf-8 */
 #ifndef P_INDEX_HTML_H
 #define P_INDEX_HTML_H
@@ -226,11 +226,11 @@ const char *p_index_html =
     
     "                    <div class=\"summary-grid\">\n"
     
-    "                        <div class=\"summary-item\"><div class=\"summary-label\">总电压 (V)</div><div class=\"summary-value\" id=\"totalVoltage\">0.0<span class=\"summary-unit\">V</span></div></div>\n"
+    "                        <div class=\"summary-item\"><div class=\"summary-label\" id=\"All-V\">总电压 (V)</div><div class=\"summary-value\" id=\"totalVoltage\">0.0<span class=\"summary-unit\">V</span></div></div>\n"
     "                        <div class=\"summary-item\"><div class=\"summary-label\">总电流 (A)</div><div class=\"summary-value\" id=\"totalCurrent\">0.0<span class=\"summary-unit\">A</span></div></div>\n"
-    "                        <div class=\"summary-item\"><div class=\"summary-label\">总有功功率 (W)</div><div class=\"summary-value\" id=\"totalActivePower\">0<span class=\"summary-unit\">W</span></div></div>\n"
-    "                        <div class=\"summary-item\"><div class=\"summary-label\">总无功功率 (var)</div><div class=\"summary-value\" id=\"totalReactivePower\">0<span class=\"summary-unit\">var</span></div></div>\n"
-    "                        <div class=\"summary-item\"><div class=\"summary-label\">总视在功率 (VA)</div><div class=\"summary-value\" id=\"totalApparentPower\">0<span class=\"summary-unit\">VA</span></div></div>\n"
+    "                        <div class=\"summary-item\"><div class=\"summary-label\">总有功功率 (kW)</div><div class=\"summary-value\" id=\"totalActivePower\">0<span class=\"summary-unit\">W</span></div></div>\n"
+    "                        <div class=\"summary-item\"><div class=\"summary-label\">总无功功率 (kvar)</div><div class=\"summary-value\" id=\"totalReactivePower\">0<span class=\"summary-unit\">var</span></div></div>\n"
+    "                        <div class=\"summary-item\"><div class=\"summary-label\">总视在功率 (kVA)</div><div class=\"summary-value\" id=\"totalApparentPower\">0<span class=\"summary-unit\">VA</span></div></div>\n"
     "                        <div class=\"summary-item\"><div class=\"summary-label\">总功率因数</div><div class=\"summary-value\" id=\"totalPowerFactor\">0.00<span class=\"summary-unit\"></span></div></div>\n"
     "                        <div class=\"summary-item\"><div class=\"summary-label\">总耗电量(kWh)</div><div class=\"summary-value\" id=\"totalConsumer\">0.00<span class=\"summary-unit\">kWh</span></div></div>\n"
     "                    </div>\n"
@@ -1383,6 +1383,8 @@ const char *p_index_html =
     "            {\n"
     "                if(show_l_info == 0)\n"
     "                {\n"
+    "                    //总电压 (V)\n"
+    "                    document.getElementById('All-V').innerHTML = '<div class=\"summary-label\" id=\"All-V\">线电压 (V)</div>'\n"
     "                    totalVoltage = all_channel.voltage;\n"
     "                    totalCurrent = all_channel.current;\n"
     "                    totalActivePower = all_channel.power;\n"
@@ -1392,6 +1394,7 @@ const char *p_index_html =
     "                    totalConsumer = all_channel.consump;\n"
     "                }else \n"
     "                {\n"
+    "                    document.getElementById('All-V').innerHTML = '<div class=\"summary-label\" id=\"All-V\">相电压 (V)</div>'\n"
     "                    totalVoltage = all_l_channel[show_l_info-1].voltage;\n"
     "                    totalCurrent = all_l_channel[show_l_info-1].current;\n"
     "                    totalActivePower = all_l_channel[show_l_info-1].power;\n"
@@ -1407,8 +1410,7 @@ const char *p_index_html =
     "            document.getElementById('totalReactivePower').innerHTML = totalReactivePower.toLocaleString() + '<span class=\"summary-unit\">kvar</span>';\n"
     "            document.getElementById('totalApparentPower').innerHTML = totalApparentPower.toLocaleString() + '<span class=\"summary-unit\">kVA</span>';\n"
     "            document.getElementById('totalPowerFactor').innerHTML = totalPf.toFixed(3);\n"
-    "            document.getElementById('totalConsumer').innerHTML = totalConsumer.toFixed(2) + '<span class=\"summary-unit\">kWh</span>';\n"
-    "            \n"
+    "            document.getElementById('totalConsumer').innerHTML = totalConsumer.toFixed(2) + '<span class=\"summary-unit\">kWh</span>';   \n"
     "        }\n"
     
     "        function updateWsStatus(connected, message) {\n"
@@ -2311,9 +2313,9 @@ const char *p_index_html =
 ;
 
 // 文本数据大小(包括null终止符)
-const size_t p_index_html_size = 133989;
+const size_t p_index_html_size = 134279;
 
 // 文本长度(字符数)
-const size_t p_index_html_length = 131439;
+const size_t p_index_html_length = 131711;
 
 #endif /* P_INDEX_HTML_H */