Quellcode durchsuchen

网页功率显示为kw,网页显示3相电压为380.

liyi vor 11 Monaten
Ursprung
Commit
af29047242
1 geänderte Dateien mit 8 neuen und 8 gelöschten Zeilen
  1. 8 8
      pro/src/appweb_handle.c

+ 8 - 8
pro/src/appweb_handle.c

@@ -1022,7 +1022,7 @@ static void overallStatusMonitoring(void* conn)
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
                     strcpy(pall->_total_voltage.xAxis[i], __globalPowerInfo._total_voltage.xAxis[i]);
-                    pall->_total_voltage.ydata[i] = __globalPowerInfo._total_voltage.ydata[i];
+                    pall->_total_voltage.ydata[i] = __globalPowerInfo._total_voltage.ydata[i] * 1.732;
                 }
 
                 // 返回电压统计
@@ -1158,7 +1158,7 @@ static void overallStatusMonitoring(void* conn)
             for (int i = 0; i < TOTAL_COUNT; i++)
             {
                 strcpy(pall->_total_power.xAxis[i], __globalPowerInfo._total_power.xAxis[i]);
-                pall->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i];
+                pall->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i]/1000.0;
             }
 
             // 返回功率统计
@@ -1175,7 +1175,7 @@ static void overallStatusMonitoring(void* conn)
             for (int i = 0; i < TOTAL_COUNT; i++)
             {
                 strcpy(pall->_total_power.xAxis[i], __globalPowerInfo._total_power.xAxis[i]);
-                pall->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i];
+                pall->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i]/1000.0;
             }
 
             // 返回功率统计
@@ -1367,9 +1367,9 @@ static void overallStatusMonitoring(void* conn)
         for(int i=0;i< TOTAL_COUNT;i++)
         {
             strcpy(_over_all_pwr_back_info._Power_Trend_Info.xAxis[i],__PowerTrendInfo._power_trend_info.xAxis[i]);
-            _over_all_pwr_back_info._Power_Trend_Info.ydata[POWER_MERITORIOUS_TYPE][i] = __PowerTrendInfo._power_trend_info.ydata[POWER_MERITORIOUS_TYPE][i];
-            _over_all_pwr_back_info._Power_Trend_Info.ydata[POWER_REACTIVE_TYPE][i] = __PowerTrendInfo._power_trend_info.ydata[POWER_REACTIVE_TYPE][i];
-            _over_all_pwr_back_info._Power_Trend_Info.ydata[POWER_APPARENT_TYPE][i] = __PowerTrendInfo._power_trend_info.ydata[POWER_APPARENT_TYPE][i];
+            _over_all_pwr_back_info._Power_Trend_Info.ydata[POWER_MERITORIOUS_TYPE][i] = __PowerTrendInfo._power_trend_info.ydata[POWER_MERITORIOUS_TYPE][i]/1000.0;
+            _over_all_pwr_back_info._Power_Trend_Info.ydata[POWER_REACTIVE_TYPE][i] = __PowerTrendInfo._power_trend_info.ydata[POWER_REACTIVE_TYPE][i]/1000.0;
+            _over_all_pwr_back_info._Power_Trend_Info.ydata[POWER_APPARENT_TYPE][i] = __PowerTrendInfo._power_trend_info.ydata[POWER_APPARENT_TYPE][i]/1000.0;
         }
       #else   
         for(int i=0;i< TOTAL_COUNT;i++)
@@ -2004,7 +2004,7 @@ static void channelStatusMonitoring(void* conn)
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
                     strcpy(pch->_total_power.xAxis[i], __globalPowerInfo._total_power.xAxis[i]);
-                    pch->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i];
+                    pch->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i]/1000.0;
                 }
 
                 // 返回功率统计
@@ -2024,7 +2024,7 @@ static void channelStatusMonitoring(void* conn)
                 for (int i = 0; i < TOTAL_COUNT; i++)
                 {
                     strcpy(pch->_total_power.xAxis[i], __globalPowerInfo._total_power.xAxis[i]);
-                    pch->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i];
+                    pch->_total_power.ydata[i] = __globalPowerInfo._total_power.ydata[i]/1000.0;
                 }
 
                 // 返回功率统计