WinFrmUI/IStation.WinFrmUI.Monitor/HistoryDataAPiHelper.cs
@@ -164,7 +164,7 @@ return mergedList; } /* public List <Model.PumpWater> GetWaterData() { @@ -198,13 +198,13 @@ fs.Close(); return pumpISopenlist; } */ /// <summary> /// 获取有功电能 /// </summary> /// <returns></returns> public List<Model.electricity> GetEleData() /* public List<Model.electricity> GetEleData() { string path = System.IO.Path.Combine(IStation.DataFolderHelper.GetRootPath(), "二取机泵参数", "AmountEle.csv"); @@ -235,7 +235,7 @@ } fs.Close(); return pumpISopenlist; } }*/ } }