From c97b83d83d0d44a225197a561b5c222316d96bc3 Mon Sep 17 00:00:00 2001
From: zhangwen <3466561528@qq.com>
Date: Tue, 13 Jan 2026 16:27:50 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BA=86=E8=A3=85=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=8A=E9=80=81=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E7=8E=B0=E5=9C=A8=E5=8F=AA=E4=B8=8A?=
 =?UTF-8?q?=E9=80=81=E4=BA=8C=E6=AC=A1=E5=80=BC=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 LFtid1056/PQSMsg.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/LFtid1056/PQSMsg.h b/LFtid1056/PQSMsg.h
index fb3a222..44b76af 100644
--- a/LFtid1056/PQSMsg.h
+++ b/LFtid1056/PQSMsg.h
@@ -599,10 +599,10 @@ public:
             for (int j = 0; j < 4; j++) {
                 if (i == 0) {  // 电压
                     if (j == 2) { // 正序
-                        UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT;
+                        UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fPT;
                     }
                     else if (j < 3) {
-                        UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fPT;
+                        UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fPT;
                     }
                     else {
                         UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);
@@ -610,7 +610,7 @@ public:
                 }
                 else {  // 电流
                     if (j < 3) {
-                        UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]) * fCT;
+                        UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);// *fCT;
                     }
                     else {
                         UI_Seq[i][j] = IntToFloat(SrcData.UI_Seq[i][j]);
@@ -635,16 +635,16 @@ public:
         // 总功率
         for (int i = 0; i < 4; i++) {
             for (int j = 0; j < 3; j++) {
-                Total_Power[i][j] = IntToFloat(SrcData.Total_Power[i][j]) * fPT * fCT;
+                Total_Power[i][j] = IntToFloat(SrcData.Total_Power[i][j]);// *fPT* fCT;
             }
         }
 
         // 谐波功率
         for (int i = 0; i < 4; i++) {
             for (int j = 0; j < HARMNUM; j++) {
-                Harm_Power[i][j].P = IntToFloat(SrcData.Harm_Power[i][j].P) * fPT * fCT;
-                Harm_Power[i][j].Q = IntToFloat(SrcData.Harm_Power[i][j].Q) * fPT * fCT;
-                Harm_Power[i][j].S = IntToFloat(SrcData.Harm_Power[i][j].S) * fPT * fCT;
+                Harm_Power[i][j].P = IntToFloat(SrcData.Harm_Power[i][j].P);// * fPT * fCT;
+                Harm_Power[i][j].Q = IntToFloat(SrcData.Harm_Power[i][j].Q);// *fPT* fCT;
+                Harm_Power[i][j].S = IntToFloat(SrcData.Harm_Power[i][j].S);// *fPT* fCT;
             }
         }
 
@@ -656,10 +656,10 @@ public:
 
             for (int j = 0; j < HARMNUM; j++) {
                 if (i < 3) { // 电压谐波
-                    FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]) * fPT;
+                    FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]);// *fPT;
                 }
                 else { // 电流谐波
-                    FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]) * fCT;
+                    FuHarm[i][j] = IntToFloat(SrcData.FuHarm[i][j]);// *fCT;
                 }
 
                 FuHarmPhase[i][j] = IntToFloat(SrcData.FuHarmPhase[i][j]);
@@ -671,10 +671,10 @@ public:
         // RMS值
         for (int i = 0; i < 9; i++) {
             if (i > 2 && i < 6) { // 电流 (索引3,4,5)
-                Rms[i] = IntToFloat(SrcData.Rms[i]) * fCT;
+                Rms[i] = IntToFloat(SrcData.Rms[i]);// *fCT;
             }
             else { // 电压和其他
-                Rms[i] = IntToFloat(SrcData.Rms[i]) * fPT;
+                Rms[i] = IntToFloat(SrcData.Rms[i]);// *fPT;
             }
         }
     }