From 6c93aedfeeb66023f9506083517aee1a4e18e24d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 28 三月 2024 19:46:12 +0800
Subject: [PATCH] 修改历史方案界面
---
Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs | 124 +++++++++++++++++------------------------
1 files changed, 51 insertions(+), 73 deletions(-)
diff --git a/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs b/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs
index 1907875..b042526 100644
--- a/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs
+++ b/Model/IStation.Model.Basic/waterLevel/PumpRunParas.cs
@@ -9,7 +9,7 @@
{
/// <summary>
- /// 涓�娈垫椂闂寸殑杩愯鍙傛暟
+ /// 杩愯鍙傛暟
/// <summary>
public class PumpRunParasDays
{
@@ -83,78 +83,56 @@
public string Isopen { get; set; }
}
-
- public class PumpWater
+ public class RunParasData
{
- /// <summary>
- /// 鏍囩
- /// </summary>
- public string Tag { get; set; }
- /// <summary>
- /// 鍙栨按閲�
- /// </summary>
- public List<Water> Values { get; set; }
+ /// <summary>
+ /// 鏁版嵁鏃ユ湡
+ /// </summary>
+ public DateTime DateTime { get; set; }
+ /// <summary>
+ /// 娉佃繍琛岀姸鎬�
+ /// </summary>
+ public List<RunParasBlock> Pump1 { get; set; }
+ public List<RunParasBlock> Pump2 { get; set; }
+ public List<RunParasBlock> Pump3 { get; set; }
+ public List<RunParasBlock> Pump4 { get; set; }
+ public List<RunParasBlock> Pump5 { get; set; }
+ /// <summary>
+ /// 鎬诲彇姘撮噺
+ /// </summary>
+ public double FlowIn { get; set; }
+ /// <summary>
+ /// 鎬荤敤鐢甸噺
+ /// </summary>
+ public double Electric { get; set; }
+ /// <summary>
+ /// 鎬荤數璐�
+ /// </summary>
+ public double Money { get; set; }
+ }
+ public class RunParasBlock
+ {
+ /// <summary>
+ /// 寮�濮嬫椂闂�
+ /// </summary>
+ public DateTime StartTime { get; set; }
+ /// <summary>
+ /// 缁撴潫鏃堕棿
+ /// </summary>
+ public DateTime EndTime { get; set; }
+ /// <summary>
+ /// 鍙栨按閲�
+ /// </summary>
+ public double FlowIn { get; set; }
+ /// <summary>
+ /// 鐢ㄧ數閲�
+ /// </summary>
+ public double Electric { get; set; }
+ /// <summary>
+ /// 鐢佃垂
+ /// </summary>
+ public double Money { get; set; }
+ }
}
-
-
- public class Water
- {
- /// <summary>
- /// 鏃堕棿
- /// </summary>
- public DateTime DateTime { get; set; }
- /// <summary>
- /// 鍙栨按閲�
- /// </summary>
- public double SingleWater { get; set; }
- }
-
-
- public class electricity
- {
- /// <summary>
- /// 鏍囩
- /// </summary>
- public string Tag { get; set; }
- /// <summary>
- /// 鏈夊姛鐢佃兘
- /// </summary>
- public List<Ele> TotalEle { get; set; }
- }
-
-
- //鐢佃兘
- public class Ele
- {
- /// <summary>
- /// 鏃堕棿
- /// </summary>
- public DateTime DateTime { get; set; }
- /// <summary>
- /// 璇︾粏鐢ㄧ數閲�
- /// </summary>
- public double Value { get; set; }
- }
-
-
-
- /// <summary>
- /// APi鏁版嵁鏆傚瓨绫�
- /// </summary>
- public class RunParasData
- {
- /// <summary>
- /// 娉佃繍琛岀姸鎬�
- /// </summary>
- public List<(DateTime, DateTime, int)> TimeRunParas { get; set; }
- /// <summary>
- /// 鍙栨按閲�
- /// </summary>
- public List<double> Water { get; set; }
- /// <summary>
- /// 鐢ㄧ數閲�
- /// </summary>
- public List<double> Electric { get; set; }
- }
-}
+
--
Gitblit v1.9.3