From 4d14154c36ac5692aadc036eed97fb9f1c410e2a Mon Sep 17 00:00:00 2001 From: wxr <464027401@qq.com> Date: 星期日, 23 五月 2021 14:46:03 +0800 Subject: [PATCH] Merge branch 'WJC' into temp-wxr --- HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs index 544fcaa..085e701 100644 --- a/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs +++ b/HDL_ON/UI/UI2/2-Classification/ClassificationPage.cs @@ -475,10 +475,9 @@ break; case ShowFunction.EnergyMonitoring: #region 鑳芥簮 - functionCount = FunctionList.List.GetElectricals().Count; - functionOnCount = FunctionList.List.GetElectricals().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count; + functionCount = FunctionList.List.GetEnergyList().Count; + functionOnCount = FunctionList.List.GetEnergyList().FindAll((obj) => obj.trait_on_off.curValue.ToString() == "on").Count; #endregion - //functionCount = 1; break; case ShowFunction.Environmental: #region 鐜鏁版嵁 -- Gitblit v1.8.0