From edd23f115dba31d764fdaf75a6207d888d0419d3 Mon Sep 17 00:00:00 2001
From: tangxu <tangxu76880903>
Date: 星期二, 26 三月 2024 13:52:09 +0800
Subject: [PATCH] 改API接口
---
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuResult.cs | 4
Calc/IStation.Calc.Core/计算基类/ErQuCalcBaseHelper_手动添加项目.cs | 2
Calc/IStation.Calc.Core/递归计算2/ErQuCalcHelper_2_递归_定水量_核心代码.cs | 2
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs | 18 +
Calc/IStation.Calc.Core/时间块移动/ErQuCalcHelper_1_时间快移动_核心代码.cs | 2
Calc/IStation.Calc.Core/时间块移动/ErQuCalcHelper_1_时间快移动.cs | 2
Library/IStation.Log.pdb | 0
Calc/IStation.Calc.Core/计算基类/ErQuCalcBaseHelper_长江.cs | 2
Library/IStation.Log.dll | 0
BLL/IStation.BLL.Connect/AnaPrj.cs | 10
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.designer.cs | 208 +++++++++++++++++-----
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs | 37 +---
WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj | 1
WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj | 1
Calc/IStation.Calc.Model/AnaRequest.cs | 8
Calc/IStation.Calc.Core/计算基类/ErQuCalcBaseHelper_TimeList.cs | 2
Calc/IStation.Calc.Core/InternalModel/TimeDataBundle.cs | 2
DAL/IStation.DAL.Paras/历史调度方案/HistoryAnaPrjFileHelper.cs | 14 +
Calc/IStation.Calc.Core/CalcPrj.cs | 52 ++++-
Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj | 1
Calc/IStation.Calc.Core/递归计算2/ErQuCalcHelper_2_递归_控制水位_核心代码.cs | 2
Calc/IStation.Calc.Core/InternalModel/PumpCurveInfo.cs | 2
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuParas.cs | 2
WebApi/Controllers/AnaPrjController.cs | 58 +++++-
WebApi/IStation.ChEr.WebApi.csproj.user | 2
Calc/IStation.Calc.Core/计算基类/ErQuCalcBaseHelper.cs | 2
Calc/IStation.Calc.Core/计算基类/ErQuCalcBaseHelper_水库.cs | 2
WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.resx | 48 ++--
Calc/IStation.Calc.Core/递归计算2/ErQuCalcHelper_2_递归.cs | 2
29 files changed, 322 insertions(+), 166 deletions(-)
diff --git a/BLL/IStation.BLL.Connect/AnaPrj.cs b/BLL/IStation.BLL.Connect/AnaPrj.cs
index a27e3f6..9cb406f 100644
--- a/BLL/IStation.BLL.Connect/AnaPrj.cs
+++ b/BLL/IStation.BLL.Connect/AnaPrj.cs
@@ -13,19 +13,18 @@
public class AnaPrj
{
public class SavePrjRequest
- {
- public string day { get; set; }
+ {
public IStation.CalcModel.AnaPrj prj { get; set; }
public IStation.CalcModel.AnaSetting settting { get; set; }
public IStation.CalcModel.AnaRequestBase requestBase { get; set; }
public bool isSubmit { get; set; }
}
- public static void SavePrj(DateTime day, CalcModel.AnaRequest ana_request , CalcModel.AnaSetting ana_settting,CalcModel.AnaPrj prj,bool isSubmit)
+ public static void SavePrj( CalcModel.AnaRequest ana_request , CalcModel.AnaSetting ana_settting,CalcModel.AnaPrj prj,bool isSubmit)
{
if (!ServiceParas.IsRemote)
{
- IStation.Common.HistoryAnaPrjFileHelper.SavePrj(day, ana_settting, ana_request == null ? null : new CalcModel.AnaRequestBase(ana_request), prj); return;
+ IStation.Common.HistoryAnaPrjFileHelper.SavePrj( ana_settting, ana_request == null ? null : new CalcModel.AnaRequestBase(ana_request), prj); return;
}
if (string.IsNullOrEmpty(ServiceParas.ApiServiceUrl))
@@ -40,8 +39,7 @@
string url = string.Format(@"{0}/AnaPrj/SavePrj", ServiceParas.ApiServiceUrl);
- SavePrjRequest request = new SavePrjRequest();
- request.day = day.ToString("yyyy-MM-dd");
+ SavePrjRequest request = new SavePrjRequest();
request.prj = prj;
request.requestBase = new CalcModel.AnaRequestBase(ana_request);
request.settting = ana_settting;
diff --git a/Calc/IStation.Calc.Core/CalcPrj.cs b/Calc/IStation.Calc.Core/CalcPrj.cs
index 6637510..f0ed17a 100644
--- a/Calc/IStation.Calc.Core/CalcPrj.cs
+++ b/Calc/IStation.Calc.Core/CalcPrj.cs
@@ -14,14 +14,38 @@
private List<Model.ElecPriceMonthSetting> _elePriceMonthList = null;
private List<IStation.CalcModel.PumpInfo> _allCalcPumpInfos;
+ public CalcPrj() { }
+
+ public string Calc(IStation.CalcModel.AnaRequest anaRequest, out AnaPrj defaultPrj)
+ {
+ InitalPumpInfo();
+ InitialElePrice();
+
+ var calcHelper = GetCalcHelper(anaRequest);
+ //string error_info = null;
+ //var prj = calcHelper.CalcOptPrjs(out error_info);
+
+ string error_info;
+ var anaPrjs = calcHelper.CalcOptPrjs(out error_info);
+
+ if (!string.IsNullOrEmpty(error_info) || anaPrjs == null || anaPrjs.Count() == 0)
+ {
+ defaultPrj = null;
+ return error_info;
+ }
+ anaPrjs.Sort(new AnaPrj.Comparer(anaRequest.CalcOptType));
+
+ defaultPrj = anaPrjs.First();
+
+ return null;
+ }
/// <summary>
/// 鏋勫缓璁＄畻杈呭姪绫�
/// </summary>
/// <param name="isIgnoreOpenLimitAble"></param>
/// <returns></returns>
- private IStation.Calc.ErQuCalcBaseHelper GetCalcHelper(IStation.CalcModel.AnaRequest _anaRequest)
- {
-
+ private IStation.Calc.ErQuCalcBaseHelper GetCalcHelper(IStation.CalcModel.AnaRequest anaRequest)
+ {
IStation.Calc.ErQuCalcBaseHelper calcHelper = IStation.Calc.ErQuCalcBaseHelper.Build();
calcHelper.MinOpenPumpMinute = IStation.AnaGlobalParas.Setting.MinOpenTimeMinute;
calcHelper.MinSwitchPumpMinute = IStation.AnaGlobalParas.Setting.MinSwitchTimeMinute;
@@ -36,15 +60,15 @@
calcHelper.CalcSpaceMinute = IStation.AnaGlobalParas.Setting.CalcSpaceMinuteQ;
calcHelper.MaxPumpSwitchCount = IStation.AnaGlobalParas.Setting.MaxPumpSwitchCountQ;
}
- DateTime rangeStartTime = _anaRequest.Day ;
- DateTime rangeEndTime = _anaRequest.Day.AddDays(1);
+ DateTime rangeStartTime = anaRequest.StartTime ;
+ DateTime rangeEndTime = anaRequest.EndTime;
calcHelper.SetPumpInfo(_allCalcPumpInfos);
calcHelper.SetCalcTimeRange(rangeStartTime, rangeEndTime);
- calcHelper.StartOpenCount = _anaRequest.StartOpenCount;// Convert.ToInt32(imageComboCurrentOpenCount.EditValue);
+ calcHelper.StartOpenCount = anaRequest.StartOpenCount;// Convert.ToInt32(imageComboCurrentOpenCount.EditValue);
calcHelper.ElecPrice = _elePriceMonthList;
- calcHelper.IsDispDebug = true;
+ calcHelper.IsDispDebug = false ;
calcHelper.OnShowDebugInfo += (info) =>
{
//if (tabPageDebug.PageVisible)
@@ -200,7 +224,7 @@
{
if (limit_times[0].Start == rangeStartTime)
{
- _anaRequest.StartOpenCount = -1;//涓嶈�冭檻
+ anaRequest.StartOpenCount = -1;//涓嶈�冭檻
}
}
}
@@ -208,7 +232,7 @@
- calcHelper.SetAnaRequest(_anaRequest);
+ calcHelper.SetAnaRequest(anaRequest);
@@ -221,8 +245,7 @@
/// </summary>
private void InitalPumpInfo()
{
- if (_allCalcPumpInfos == null)
- {
+
var allCurveList = IStation.Common.PumpCurve.GetAll();
var allPumpMapList = IStation.Common.PumpCurveMapping.GetAll();
var allPumpList = IStation.Common.Product.GetAllPump();
@@ -247,18 +270,17 @@
_allCalcPumpInfos.Add(calcPumpInfo);
}
- }
+
}
/// <summary>
///
/// </summary>
private void InitialElePrice()
{
- if (_elePriceMonthList == null)
- {
+
var allPrices = IStation.Common.ElecPrice.GetAll();
_elePriceMonthList = allPrices.First().Settings.MonthList;
- }
+
}
#endregion
diff --git a/Calc/IStation.Calc.Core/InternalModel/PumpCurveInfo.cs b/Calc/IStation.Calc.Core/InternalModel/PumpCurveInfo.cs
index c4da7a3..59dc40e 100644
--- a/Calc/IStation.Calc.Core/InternalModel/PumpCurveInfo.cs
+++ b/Calc/IStation.Calc.Core/InternalModel/PumpCurveInfo.cs
@@ -6,7 +6,7 @@
namespace IStation.CalcModel
{
- public class PumpCurveInfo
+ internal class PumpCurveInfo
{
public int PumpIndex { get; set; }
public long ID { get; set; }
diff --git a/Calc/IStation.Calc.Core/InternalModel/TimeDataBundle.cs b/Calc/IStation.Calc.Core/InternalModel/TimeDataBundle.cs
index 0c86078..6aec2f1 100644
--- a/Calc/IStation.Calc.Core/InternalModel/TimeDataBundle.cs
+++ b/Calc/IStation.Calc.Core/InternalModel/TimeDataBundle.cs
@@ -11,7 +11,7 @@
/// <summary>
///
/// </summary>
- public class TimeDataBundle
+ internal class TimeDataBundle
{
protected IStation.CalcModel.eCalcOptType _clacOptType = CalcModel.eCalcOptType.鍔熺巼;
public List<IStation.CalcModel.StationTimeData> TimeDatas;
diff --git "a/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250.cs" "b/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250.cs"
index 5188211..95a85d4 100644
--- "a/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250.cs"
+++ "b/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcHelper_1_鏃堕棿鍧楃Щ鍔� : ErQuCalcBaseHelper
+ internal partial class ErQuCalcHelper_1_鏃堕棿鍧楃Щ鍔� : ErQuCalcBaseHelper
{
diff --git "a/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250_\346\240\270\345\277\203\344\273\243\347\240\201.cs" "b/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
index 3c4be90..46c587c 100644
--- "a/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
+++ "b/Calc/IStation.Calc.Core/\346\227\266\351\227\264\345\235\227\347\247\273\345\212\250/ErQuCalcHelper_1_\346\227\266\351\227\264\345\277\253\347\247\273\345\212\250_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
@@ -7,7 +7,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcHelper_1_鏃堕棿鍧楃Щ鍔� : ErQuCalcBaseHelper
+ internal partial class ErQuCalcHelper_1_鏃堕棿鍧楃Щ鍔� : ErQuCalcBaseHelper
{
/// <summary>
/// 鍒嗘瀽鏍稿績(鎺у埗姘翠綅)
diff --git "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs" "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs"
index f41631e..b2744fa 100644
--- "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs"
+++ "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcBaseHelper
+ internal partial class ErQuCalcBaseHelper
{
/// <summary>
///
diff --git "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_TimeList.cs" "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_TimeList.cs"
index 250c309..72dd559 100644
--- "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_TimeList.cs"
+++ "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_TimeList.cs"
@@ -8,7 +8,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcBaseHelper
+ internal partial class ErQuCalcBaseHelper
{
protected int _timeDataListCount = 0;
protected List<TimePoint> _timeList;
diff --git "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\211\213\345\212\250\346\267\273\345\212\240\351\241\271\347\233\256.cs" "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\211\213\345\212\250\346\267\273\345\212\240\351\241\271\347\233\256.cs"
index 2a9a703..ffb349d 100644
--- "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\211\213\345\212\250\346\267\273\345\212\240\351\241\271\347\233\256.cs"
+++ "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\211\213\345\212\250\346\267\273\345\212\240\351\241\271\347\233\256.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcBaseHelper
+ internal partial class ErQuCalcBaseHelper
{
/// <summary>
/// 璁＄畻鎵嬪姩娣诲姞鐨勯」鐩�
diff --git "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\260\264\345\272\223.cs" "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\260\264\345\272\223.cs"
index 2ade0a1..55b0b85 100644
--- "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\260\264\345\272\223.cs"
+++ "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\346\260\264\345\272\223.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcBaseHelper
+ internal partial class ErQuCalcBaseHelper
{
protected double _start_level姘村簱姘翠綅;
diff --git "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\351\225\277\346\261\237.cs" "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\351\225\277\346\261\237.cs"
index c2194f5..dab30b2 100644
--- "a/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\351\225\277\346\261\237.cs"
+++ "b/Calc/IStation.Calc.Core/\350\256\241\347\256\227\345\237\272\347\261\273/ErQuCalcBaseHelper_\351\225\277\346\261\237.cs"
@@ -7,7 +7,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcBaseHelper
+ internal partial class ErQuCalcBaseHelper
{
//闀挎睙姘翠綅
protected List<IStation.Model.TimeWaterLevel> _riverWaterLevels = null;
diff --git "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222.cs" "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222.cs"
index 5d9adf9..e418c0f 100644
--- "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222.cs"
+++ "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcHelper_2_閫掑綊 : ErQuCalcBaseHelper
+ internal partial class ErQuCalcHelper_2_閫掑綊 : ErQuCalcBaseHelper
{
class BlockItemList
{
diff --git "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217_\346\240\270\345\277\203\344\273\243\347\240\201.cs" "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
index e5df434..86a43b0 100644
--- "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
+++ "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\345\256\232\346\260\264\351\207\217_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcHelper_2_閫掑綊 : ErQuCalcBaseHelper
+ internal partial class ErQuCalcHelper_2_閫掑綊 : ErQuCalcBaseHelper
{
List<List<Dictionary<int, BlockItemList>>> _dictCalcCache;
diff --git "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\346\216\247\345\210\266\346\260\264\344\275\215_\346\240\270\345\277\203\344\273\243\347\240\201.cs" "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\346\216\247\345\210\266\346\260\264\344\275\215_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
index e1ed551..62d4247 100644
--- "a/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\346\216\247\345\210\266\346\260\264\344\275\215_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
+++ "b/Calc/IStation.Calc.Core/\351\200\222\345\275\222\350\256\241\347\256\2272/ErQuCalcHelper_2_\351\200\222\345\275\222_\346\216\247\345\210\266\346\260\264\344\275\215_\346\240\270\345\277\203\344\273\243\347\240\201.cs"
@@ -6,7 +6,7 @@
namespace IStation.Calc
{
- public partial class ErQuCalcHelper_2_閫掑綊 : ErQuCalcBaseHelper
+ internal partial class ErQuCalcHelper_2_閫掑綊 : ErQuCalcBaseHelper
{
BlockItemList _globalOptSolution = null;
/// <summary>
diff --git a/Calc/IStation.Calc.Model/AnaRequest.cs b/Calc/IStation.Calc.Model/AnaRequest.cs
index 13cd11e..87a5a18 100644
--- a/Calc/IStation.Calc.Model/AnaRequest.cs
+++ b/Calc/IStation.Calc.Model/AnaRequest.cs
@@ -9,7 +9,8 @@
public class AnaRequest
{
public eCalcOptType CalcOptType { get; set; }
- public DateTime Day { get; set; }
+ public DateTime StartTime { get; set; }
+ public DateTime EndTime { get; set; }
public List<Model.TimeWaterLevel> WaterLevels闀挎睙 { get; set; }
public int StartOpenCount { get; set; } = -1;
public double? TotalFlow鍙栨按鎬婚噺 { get; set; }//鍗曚綅 鍚�
@@ -31,7 +32,7 @@
public AnaRequestBase() { }
public AnaRequestBase(AnaRequest rhs) {
this.CalcOptType = rhs.CalcOptType;
- this.Day = rhs.Day;
+ this.StartTime = rhs.StartTime; this.EndTime = rhs.EndTime;
this.StartOpenCount = rhs.StartOpenCount;
this.TotalFlow鍙栨按鎬婚噺 = rhs.TotalFlow鍙栨按鎬婚噺;
@@ -44,7 +45,8 @@
this.ReservoirMaxLimitHours = rhs.ReservoirMaxLimitHours;
}
public eCalcOptType CalcOptType { get; set; }
- public DateTime Day { get; set; }
+ public DateTime StartTime { get; set; }
+ public DateTime EndTime { get; set; }
public int StartOpenCount { get; set; } = -1;
public double? TotalFlow鍙栨按鎬婚噺 { get; set; }//鍗曚綅 鍚�
diff --git "a/DAL/IStation.DAL.Paras/\345\216\206\345\217\262\350\260\203\345\272\246\346\226\271\346\241\210/HistoryAnaPrjFileHelper.cs" "b/DAL/IStation.DAL.Paras/\345\216\206\345\217\262\350\260\203\345\272\246\346\226\271\346\241\210/HistoryAnaPrjFileHelper.cs"
index 4570b9d..71172fd 100644
--- "a/DAL/IStation.DAL.Paras/\345\216\206\345\217\262\350\260\203\345\272\246\346\226\271\346\241\210/HistoryAnaPrjFileHelper.cs"
+++ "b/DAL/IStation.DAL.Paras/\345\216\206\345\217\262\350\260\203\345\272\246\346\226\271\346\241\210/HistoryAnaPrjFileHelper.cs"
@@ -11,7 +11,7 @@
public class HistoryAnaPrjFileHelper
{
//淇濆瓨
- public static bool SavePrj(DateTime day, CalcModel.AnaSetting settting, IStation.CalcModel.AnaRequestBase requestBase, IStation.CalcModel.AnaPrj prj)
+ public static bool SavePrj( CalcModel.AnaSetting settting, IStation.CalcModel.AnaRequestBase requestBase, IStation.CalcModel.AnaPrj prj)
{
if(prj == null ||prj.BlockTimes == null || prj.BlockTimes.Count == 0) return false;
@@ -20,13 +20,13 @@
{
System.IO.Directory.CreateDirectory(root_folder);
}
- var month_folder = System.IO.Path.Combine(root_folder, day.ToString("yyyy-MM"));
+ var month_folder = System.IO.Path.Combine(root_folder, requestBase.StartTime.ToString("yyyy-MM"));
if (!System.IO.Directory.Exists(month_folder))
{
System.IO.Directory.CreateDirectory(month_folder);
}
string filePath = System.IO.Path.Combine(month_folder,
- string.Format("{0}.xml", day.ToString("yyyy-MM-dd")));
+ string.Format("{0}.xml", requestBase.StartTime.ToString("yyyy-MM-dd")));
if (File.Exists(filePath))
{
File.Delete(filePath);
@@ -341,10 +341,14 @@
node_CalcOptType.InnerText = requestBase.CalcOptType.ToString();
nodeAnaRequest.AppendChild(node_CalcOptType);
- XmlNode node_Day = xmlDoc.CreateElement("Day");
- node_Day.InnerText = requestBase.Day.ToString();
+ XmlNode node_Day = xmlDoc.CreateElement("StartTime");
+ node_Day.InnerText = requestBase.StartTime.ToString();
nodeAnaRequest.AppendChild(node_Day);
+ XmlNode node_EndTime = xmlDoc.CreateElement("EndTime");
+ node_EndTime.InnerText = requestBase.EndTime.ToString();
+ nodeAnaRequest.AppendChild(node_EndTime);
+
XmlNode node_StartOpenCount = xmlDoc.CreateElement("StartOpenCount");
node_StartOpenCount.InnerText = requestBase.StartOpenCount.ToString();
nodeAnaRequest.AppendChild(node_StartOpenCount);
diff --git a/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj b/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj
index c3ae322..864f981 100644
--- a/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj
+++ b/Desktop/IStation.Desktop.ChCalc/IStation.Desktop.ChCalc.csproj
@@ -109,7 +109,6 @@
<DependentUpon>frmMain.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
- <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<SubType>Designer</SubType>
diff --git a/Library/IStation.Log.dll b/Library/IStation.Log.dll
index 6139e77..74097cc 100644
--- a/Library/IStation.Log.dll
+++ b/Library/IStation.Log.dll
Binary files differ
diff --git a/Library/IStation.Log.pdb b/Library/IStation.Log.pdb
index f85c904..3717872 100644
--- a/Library/IStation.Log.pdb
+++ b/Library/IStation.Log.pdb
Binary files differ
diff --git a/WebApi/Controllers/AnaPrjController.cs b/WebApi/Controllers/AnaPrjController.cs
index 18366f1..89a71b5 100644
--- a/WebApi/Controllers/AnaPrjController.cs
+++ b/WebApi/Controllers/AnaPrjController.cs
@@ -101,8 +101,7 @@
public class SavePrjRequest
- {
- public string day { get; set; }
+ {
public IStation.CalcModel.AnaSetting settting { get; set; }
public IStation.CalcModel.AnaRequestBase requestBase { get; set; }
public IStation.CalcModel.AnaPrj prj { get; set; }
@@ -117,7 +116,7 @@
[HttpPost]
public async Task<IStation.Dto.ApiResult> SavePrj([FromBody] SavePrjRequest request)
{
- if (request == null || request.day == null)
+ if (request == null )
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
}
@@ -125,12 +124,8 @@
{
return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "prj null" };
}
- DateTime d;
- if (!DateTime.TryParse(request.day, out d))
- {
- return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day 鏍煎紡涓嶆纭�" };
- }
- var ret = Common.HistoryAnaPrjFileHelper.SavePrj(d, request.settting, request.requestBase, request.prj);
+
+ var ret = Common.HistoryAnaPrjFileHelper.SavePrj( request.settting, request.requestBase, request.prj);
if (request.isSubmit)
{
@@ -141,12 +136,12 @@
if(!string.IsNullOrEmpty(error))
{
- IStation.LogHelper.Info("Submit prj finish (fail) day:" + request.day+ ",error:" + error);
+ IStation.LogHelper.Info("Submit prj finish (fail) day:" + request.requestBase.StartTime + ",error:" + error);
return new IStation.Dto.ApiResult<string>(error) { Code = ApiResultCode.Error};
}
else
{
- IStation.LogHelper.Info("Submit prj finish (success) day:" + request.day);
+ IStation.LogHelper.Info("Submit prj finish (success) day:" + request.requestBase.StartTime);
}
}
@@ -156,6 +151,47 @@
+ /// <summary>
+ ///
+ /// </summary>
+ /// <param name="request"></param>
+ /// <returns></returns>
+ [Route("CalcPrj")]
+ [HttpPost]
+ public async Task<IStation.Dto.ApiResult> CalcPrj([FromBody] SavePrjRequest request)
+ {
+ if (request == null )
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "day null" };
+ }
+ if (request.prj == null)
+ {
+ return new IStation.Dto.ApiResult() { Code = ApiResultCode.Error, Message = "prj null" };
+ }
+
+ var ret = Common.HistoryAnaPrjFileHelper.SavePrj( request.settting, request.requestBase, request.prj);
+
+ if (request.isSubmit)
+ {
+ string error = await ZyConnectHelper.SubmitPrj(request.prj);//, (id) => { IStation.LogHelper.Info("SavePrj success id=" + id); }, (info) => { IStation.LogHelper.Info("SavePrj failse info:" + info); });//.Result;
+
+
+
+
+ if (!string.IsNullOrEmpty(error))
+ {
+ IStation.LogHelper.Info("Submit prj finish (fail) day:" + request.requestBase.StartTime + ",error:" + error);
+ return new IStation.Dto.ApiResult<string>(error) { Code = ApiResultCode.Error };
+ }
+ else
+ {
+ IStation.LogHelper.Info("Submit prj finish (success) day:" + request.requestBase.StartTime);
+ }
+ }
+
+
+ return new IStation.Dto.ApiResult<bool>(ret) { Code = ApiResultCode.Success };
+ }
diff --git a/WebApi/IStation.ChEr.WebApi.csproj.user b/WebApi/IStation.ChEr.WebApi.csproj.user
index ae50f9e..65c59ad 100644
--- a/WebApi/IStation.ChEr.WebApi.csproj.user
+++ b/WebApi/IStation.ChEr.WebApi.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort>44318</IISExpressSSLPort>
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj b/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj
index 06497f7..be90903 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/IStation.WinFrmUI.CalcErQu.csproj
@@ -315,7 +315,6 @@
<EmbeddedResource Include="PrjItemSpanTime\SetPrjItemSpanTimeDlg.resx">
<DependentUpon>SetPrjItemSpanTimeDlg.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="RangeCtrl\RunTimeRangePanel.resx">
<DependentUpon>RunTimeRangePanel.cs</DependentUpon>
</EmbeddedResource>
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs
index 0af3ba4..8e3ecc2 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.cs
@@ -99,7 +99,18 @@
{
IStation.CalcModel.AnaRequest request = new CalcModel.AnaRequest();
request.CalcOptType = GetOptCalcType();
- request.Day = GetAnaDay();
+ request.StartTime = new DateTime(dateEditDay.DateTime.Year, dateEditDay.DateTime.Month, dateEditDay.DateTime.Day, Convert.ToInt32(spinEditStart.EditValue), 0, 0);
+ if(Convert.ToInt32(spinEditStart.EditValue)<= Convert.ToInt32(spinEditEnd.EditValue))
+ {
+ request.EndTime = new DateTime(dateEditDay.DateTime.Year, dateEditDay.DateTime.Month, dateEditDay.DateTime.Day, Convert.ToInt32(spinEditEnd.EditValue), 0, 0);
+ }
+ else
+ {
+ request.EndTime = new DateTime(dateEditDay.DateTime.Year, dateEditDay.DateTime.Month, dateEditDay.DateTime.Day, Convert.ToInt32(spinEditEnd.EditValue), 0, 0);
+ request.EndTime.AddDays(1);
+ }
+
+
request.WaterLevels闀挎睙 = this._waterLevels闀挎睙;
request.StartOpenCount = Convert.ToInt32(
imageComboCurrentOpenCount.EditValue);
@@ -185,10 +196,7 @@
}
return sortType;
}
- public DateTime GetAnaDay()
- {
- return dateEditDay.DateTime;
- }
+
#endregion
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.designer.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.designer.cs
index ed89212..5e6b77a 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.designer.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.designer.cs
@@ -95,6 +95,11 @@
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.windowsUIButtonPanel1 = new DevExpress.XtraBars.Docking2010.WindowsUIButtonPanel();
+ this.spinEditStart = new DevExpress.XtraEditors.SpinEdit();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.spinEditEnd = new DevExpress.XtraEditors.SpinEdit();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.emptySpaceItem6 = new DevExpress.XtraLayout.EmptySpaceItem();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
this.layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit();
@@ -144,10 +149,17 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.spinEditStart.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.spinEditEnd.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem6)).BeginInit();
this.SuspendLayout();
//
// layoutControl1
//
+ this.layoutControl1.Controls.Add(this.spinEditEnd);
+ this.layoutControl1.Controls.Add(this.spinEditStart);
this.layoutControl1.Controls.Add(this.dropDownButton1);
this.layoutControl1.Controls.Add(this.BTN璁＄畻鏂规);
this.layoutControl1.Controls.Add(this.checkEdit姘翠綅闄愬埗);
@@ -180,7 +192,7 @@
// dropDownButton1
//
this.dropDownButton1.DropDownControl = this.popupMenu1;
- this.dropDownButton1.Location = new System.Drawing.Point(254, 135);
+ this.dropDownButton1.Location = new System.Drawing.Point(254, 159);
this.dropDownButton1.Name = "dropDownButton1";
this.dropDownButton1.Size = new System.Drawing.Size(124, 22);
this.dropDownButton1.StyleController = this.layoutControl1;
@@ -266,7 +278,7 @@
//
this.BTN璁＄畻鏂规.Appearance.BackColor = System.Drawing.Color.Navy;
this.BTN璁＄畻鏂规.Appearance.Options.UseBackColor = true;
- this.BTN璁＄畻鏂规.Location = new System.Drawing.Point(878, 125);
+ this.BTN璁＄畻鏂规.Location = new System.Drawing.Point(878, 149);
this.BTN璁＄畻鏂规.Name = "BTN璁＄畻鏂规";
this.BTN璁＄畻鏂规.ShowFocusRectangle = DevExpress.Utils.DefaultBoolean.True;
this.BTN璁＄畻鏂规.Size = new System.Drawing.Size(193, 40);
@@ -278,7 +290,7 @@
// checkEdit姘翠綅闄愬埗
//
this.checkEdit姘翠綅闄愬埗.Enabled = false;
- this.checkEdit姘翠綅闄愬埗.Location = new System.Drawing.Point(450, 135);
+ this.checkEdit姘翠綅闄愬埗.Location = new System.Drawing.Point(450, 159);
this.checkEdit姘翠綅闄愬埗.Name = "checkEdit姘翠綅闄愬埗";
this.checkEdit姘翠綅闄愬埗.Properties.Caption = " ";
this.checkEdit姘翠綅闄愬埗.Size = new System.Drawing.Size(27, 20);
@@ -288,23 +300,23 @@
//
// viewRealTimeRiverWaterLevelCtrl1
//
- this.viewRealTimeRiverWaterLevelCtrl1.Location = new System.Drawing.Point(2, 251);
+ this.viewRealTimeRiverWaterLevelCtrl1.Location = new System.Drawing.Point(2, 270);
this.viewRealTimeRiverWaterLevelCtrl1.Name = "viewRealTimeRiverWaterLevelCtrl1";
- this.viewRealTimeRiverWaterLevelCtrl1.Size = new System.Drawing.Size(1290, 279);
+ this.viewRealTimeRiverWaterLevelCtrl1.Size = new System.Drawing.Size(1290, 260);
this.viewRealTimeRiverWaterLevelCtrl1.TabIndex = 32;
//
// checkEdit閲嶆柊璁＄畻鏂规
//
- this.checkEdit閲嶆柊璁＄畻鏂规.Location = new System.Drawing.Point(874, 73);
+ this.checkEdit閲嶆柊璁＄畻鏂规.Location = new System.Drawing.Point(709, 97);
this.checkEdit閲嶆柊璁＄畻鏂规.Name = "checkEdit閲嶆柊璁＄畻鏂规";
this.checkEdit閲嶆柊璁＄畻鏂规.Properties.Caption = "寮哄埗閲嶆柊璁＄畻鏂规";
- this.checkEdit閲嶆柊璁＄畻鏂规.Size = new System.Drawing.Size(141, 20);
+ this.checkEdit閲嶆柊璁＄畻鏂规.Size = new System.Drawing.Size(413, 20);
this.checkEdit閲嶆柊璁＄畻鏂规.StyleController = this.layoutControl1;
this.checkEdit閲嶆柊璁＄畻鏂规.TabIndex = 31;
//
// textEdit鏈�浣庢按浣嶉檺鍒�
//
- this.textEdit鏈�浣庢按浣嶉檺鍒�.Location = new System.Drawing.Point(582, 135);
+ this.textEdit鏈�浣庢按浣嶉檺鍒�.Location = new System.Drawing.Point(582, 159);
this.textEdit鏈�浣庢按浣嶉檺鍒�.Name = "textEdit鏈�浣庢按浣嶉檺鍒�";
this.textEdit鏈�浣庢按浣嶉檺鍒�.Properties.Appearance.Options.UseTextOptions = true;
this.textEdit鏈�浣庢按浣嶉檺鍒�.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
@@ -314,7 +326,7 @@
//
// textEdit鏈�楂樻按浣嶉檺鍒�
//
- this.textEdit鏈�楂樻按浣嶉檺鍒�.Location = new System.Drawing.Point(773, 135);
+ this.textEdit鏈�楂樻按浣嶉檺鍒�.Location = new System.Drawing.Point(773, 159);
this.textEdit鏈�楂樻按浣嶉檺鍒�.Name = "textEdit鏈�楂樻按浣嶉檺鍒�";
this.textEdit鏈�楂樻按浣嶉檺鍒�.Properties.Appearance.Options.UseTextOptions = true;
this.textEdit鏈�楂樻按浣嶉檺鍒�.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
@@ -325,7 +337,7 @@
// checkEdit渚涙按鎬婚噺
//
this.checkEdit渚涙按鎬婚噺.Enabled = false;
- this.checkEdit渚涙按鎬婚噺.Location = new System.Drawing.Point(4, 135);
+ this.checkEdit渚涙按鎬婚噺.Location = new System.Drawing.Point(4, 159);
this.checkEdit渚涙按鎬婚噺.Name = "checkEdit渚涙按鎬婚噺";
this.checkEdit渚涙按鎬婚噺.Properties.Caption = "鍙栨按鎬婚噺(涓噈鲁):";
this.checkEdit渚涙按鎬婚噺.Size = new System.Drawing.Size(126, 20);
@@ -340,10 +352,10 @@
this.winStepPnl.Buttons.AddRange(new DevExpress.XtraEditors.ButtonPanel.IBaseButton[] {
new DevExpress.XtraBars.Docking2010.WindowsUIButton("璁＄畻鏂规", true, windowsUIButtonImageOptions1, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, null, true, false, true, "涓嬩竴姝�", -1, false)});
this.winStepPnl.ForeColor = System.Drawing.Color.White;
- this.winStepPnl.Location = new System.Drawing.Point(1163, 532);
+ this.winStepPnl.Location = new System.Drawing.Point(1154, 532);
this.winStepPnl.Margin = new System.Windows.Forms.Padding(0);
this.winStepPnl.Name = "winStepPnl";
- this.winStepPnl.Size = new System.Drawing.Size(131, 75);
+ this.winStepPnl.Size = new System.Drawing.Size(140, 75);
this.winStepPnl.TabIndex = 26;
this.winStepPnl.Text = "winStepPnl";
//
@@ -359,7 +371,7 @@
this.winBottomPnl.Location = new System.Drawing.Point(0, 532);
this.winBottomPnl.Margin = new System.Windows.Forms.Padding(0);
this.winBottomPnl.Name = "winBottomPnl";
- this.winBottomPnl.Size = new System.Drawing.Size(1163, 75);
+ this.winBottomPnl.Size = new System.Drawing.Size(1154, 75);
this.winBottomPnl.TabIndex = 25;
this.winBottomPnl.Text = "winBottomPnl";
//
@@ -389,7 +401,7 @@
// textEdit褰撳墠姘村簱姘翠綅
//
this.textEdit褰撳墠姘村簱姘翠綅.EditValue = "";
- this.textEdit褰撳墠姘村簱姘翠綅.Location = new System.Drawing.Point(501, 73);
+ this.textEdit褰撳墠姘村簱姘翠綅.Location = new System.Drawing.Point(336, 97);
this.textEdit褰撳墠姘村簱姘翠綅.Name = "textEdit褰撳墠姘村簱姘翠綅";
this.textEdit褰撳墠姘村簱姘翠綅.Properties.Appearance.Options.UseTextOptions = true;
this.textEdit褰撳墠姘村簱姘翠綅.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
@@ -399,16 +411,16 @@
//
// reservoirParasRequestCtrl
//
- this.reservoirParasRequestCtrl.Location = new System.Drawing.Point(2, 169);
+ this.reservoirParasRequestCtrl.Location = new System.Drawing.Point(2, 193);
this.reservoirParasRequestCtrl.Margin = new System.Windows.Forms.Padding(0);
this.reservoirParasRequestCtrl.Name = "reservoirParasRequestCtrl";
- this.reservoirParasRequestCtrl.Size = new System.Drawing.Size(1290, 30);
+ this.reservoirParasRequestCtrl.Size = new System.Drawing.Size(1290, 25);
this.reservoirParasRequestCtrl.TabIndex = 21;
//
// imageComboCurrentOpenCount
//
this.imageComboCurrentOpenCount.EditValue = -1;
- this.imageComboCurrentOpenCount.Location = new System.Drawing.Point(298, 73);
+ this.imageComboCurrentOpenCount.Location = new System.Drawing.Point(109, 97);
this.imageComboCurrentOpenCount.Name = "imageComboCurrentOpenCount";
this.imageComboCurrentOpenCount.Properties.Appearance.Options.UseTextOptions = true;
this.imageComboCurrentOpenCount.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
@@ -421,21 +433,21 @@
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("涓ゅ彴", 2, -1),
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("涓夊彴", 3, -1),
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("鍥涘彴", 4, -1)});
- this.imageComboCurrentOpenCount.Size = new System.Drawing.Size(91, 20);
+ this.imageComboCurrentOpenCount.Size = new System.Drawing.Size(115, 20);
this.imageComboCurrentOpenCount.StyleController = this.layoutControl1;
this.imageComboCurrentOpenCount.TabIndex = 19;
//
// imageComboSouceWL
//
this.imageComboSouceWL.EditValue = 0;
- this.imageComboSouceWL.Location = new System.Drawing.Point(95, 225);
+ this.imageComboSouceWL.Location = new System.Drawing.Point(95, 244);
this.imageComboSouceWL.Name = "imageComboSouceWL";
this.imageComboSouceWL.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.imageComboSouceWL.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("妲戒綅鎵嬪唽", 0, -1),
new DevExpress.XtraEditors.Controls.ImageComboBoxItem("鏉ユ簮缃戠珯 global-tide.nmdis.org.cn", 1, -1)});
- this.imageComboSouceWL.Size = new System.Drawing.Size(291, 20);
+ this.imageComboSouceWL.Size = new System.Drawing.Size(288, 20);
this.imageComboSouceWL.StyleController = this.layoutControl1;
this.imageComboSouceWL.TabIndex = 17;
this.imageComboSouceWL.SelectedIndexChanged += new System.EventHandler(this.imageComboSouceWL_SelectedIndexChanged);
@@ -443,7 +455,7 @@
// imageComboClacOptType
//
this.imageComboClacOptType.EditValue = 0;
- this.imageComboClacOptType.Location = new System.Drawing.Point(702, 73);
+ this.imageComboClacOptType.Location = new System.Drawing.Point(537, 97);
this.imageComboClacOptType.Name = "imageComboClacOptType";
this.imageComboClacOptType.Properties.Appearance.Options.UseTextOptions = true;
this.imageComboClacOptType.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
@@ -486,7 +498,7 @@
//
this.textEdit鍙栨按鎬婚噺涓�.EditValue = "";
this.textEdit鍙栨按鎬婚噺涓�.Enabled = false;
- this.textEdit鍙栨按鎬婚噺涓�.Location = new System.Drawing.Point(134, 135);
+ this.textEdit鍙栨按鎬婚噺涓�.Location = new System.Drawing.Point(134, 159);
this.textEdit鍙栨按鎬婚噺涓�.Name = "textEdit鍙栨按鎬婚噺涓�";
this.textEdit鍙栨按鎬婚噺涓�.Properties.Appearance.Options.UseTextOptions = true;
this.textEdit鍙栨按鎬婚噺涓�.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
@@ -526,25 +538,28 @@
this.layoutControlGroup6.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
this.layoutControlGroup6.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.emptySpaceItem2,
- this.btnRefresh姘翠綅,
- this.layoutControlItem3,
this.layoutControlItem8,
this.layoutControlItem5,
this.layoutControlItem6,
this.layoutControlItem11,
- this.labRefresh姘翠綅});
+ this.labRefresh姘翠綅,
+ this.layoutControlItem3,
+ this.layoutControlItem18,
+ this.btnRefresh姘翠綅,
+ this.layoutControlItem20,
+ this.emptySpaceItem6});
this.layoutControlGroup6.Location = new System.Drawing.Point(0, 47);
this.layoutControlGroup6.Name = "layoutControlGroup6";
this.layoutControlGroup6.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup6.Size = new System.Drawing.Size(1294, 52);
+ this.layoutControlGroup6.Size = new System.Drawing.Size(1294, 76);
this.layoutControlGroup6.Text = " 鍒嗘瀽鐩爣";
//
// emptySpaceItem2
//
this.emptySpaceItem2.AllowHotTrack = false;
- this.emptySpaceItem2.Location = new System.Drawing.Point(1015, 0);
+ this.emptySpaceItem2.Location = new System.Drawing.Point(1122, 24);
this.emptySpaceItem2.Name = "emptySpaceItem2";
- this.emptySpaceItem2.Size = new System.Drawing.Size(275, 26);
+ this.emptySpaceItem2.Size = new System.Drawing.Size(168, 26);
this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
//
// btnRefresh姘翠綅
@@ -552,11 +567,11 @@
this.btnRefresh姘翠綅.AllowHotTrack = false;
this.btnRefresh姘翠綅.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnRefresh姘翠綅.ImageOptions.SvgImage")));
this.btnRefresh姘翠綅.ImageOptions.SvgImageSize = new System.Drawing.Size(16, 16);
- this.btnRefresh姘翠綅.Location = new System.Drawing.Point(150, 0);
+ this.btnRefresh姘翠綅.Location = new System.Drawing.Point(404, 0);
this.btnRefresh姘翠綅.MaxSize = new System.Drawing.Size(39, 20);
this.btnRefresh姘翠綅.MinSize = new System.Drawing.Size(39, 20);
this.btnRefresh姘翠綅.Name = "btnRefresh姘翠綅";
- this.btnRefresh姘翠綅.Size = new System.Drawing.Size(39, 26);
+ this.btnRefresh姘翠綅.Size = new System.Drawing.Size(39, 24);
this.btnRefresh姘翠綅.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.btnRefresh姘翠綅.Text = " ";
this.btnRefresh姘翠綅.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@@ -572,7 +587,7 @@
this.layoutControlItem3.MaxSize = new System.Drawing.Size(150, 24);
this.layoutControlItem3.MinSize = new System.Drawing.Size(150, 24);
this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.Size = new System.Drawing.Size(150, 26);
+ this.layoutControlItem3.Size = new System.Drawing.Size(150, 24);
this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem3.Text = "鏃ユ湡:";
this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@@ -584,7 +599,7 @@
this.layoutControlItem8.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem8.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem8.Control = this.imageComboClacOptType;
- this.layoutControlItem8.Location = new System.Drawing.Point(641, 0);
+ this.layoutControlItem8.Location = new System.Drawing.Point(476, 24);
this.layoutControlItem8.MaxSize = new System.Drawing.Size(229, 26);
this.layoutControlItem8.MinSize = new System.Drawing.Size(229, 26);
this.layoutControlItem8.Name = "layoutControlItem8";
@@ -600,12 +615,13 @@
this.layoutControlItem5.AppearanceItemCaption.Options.UseTextOptions = true;
this.layoutControlItem5.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
this.layoutControlItem5.Control = this.imageComboCurrentOpenCount;
- this.layoutControlItem5.Location = new System.Drawing.Point(189, 0);
+ this.layoutControlItem5.CustomizationFormText = "寮�濮嬫椂寮�娉垫儏鍐�:";
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 24);
this.layoutControlItem5.MinSize = new System.Drawing.Size(159, 24);
this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.Size = new System.Drawing.Size(200, 26);
+ this.layoutControlItem5.Size = new System.Drawing.Size(224, 26);
this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
- this.layoutControlItem5.Text = "闆剁偣鏃跺紑娉垫儏鍐�:";
+ this.layoutControlItem5.Text = "寮�濮嬫椂寮�娉垫儏鍐�:";
this.layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
this.layoutControlItem5.TextSize = new System.Drawing.Size(100, 14);
this.layoutControlItem5.TextToControlDistance = 5;
@@ -613,16 +629,16 @@
// layoutControlItem6
//
this.layoutControlItem6.Control = this.checkEdit閲嶆柊璁＄畻鏂规;
- this.layoutControlItem6.Location = new System.Drawing.Point(870, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(705, 24);
this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.Size = new System.Drawing.Size(145, 26);
+ this.layoutControlItem6.Size = new System.Drawing.Size(417, 26);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.textEdit褰撳墠姘村簱姘翠綅;
- this.layoutControlItem11.Location = new System.Drawing.Point(389, 0);
+ this.layoutControlItem11.Location = new System.Drawing.Point(224, 24);
this.layoutControlItem11.MaxSize = new System.Drawing.Size(182, 24);
this.layoutControlItem11.MinSize = new System.Drawing.Size(182, 24);
this.layoutControlItem11.Name = "layoutControlItem11";
@@ -635,7 +651,7 @@
//
this.labRefresh姘翠綅.AllowHotTrack = false;
this.labRefresh姘翠綅.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("labRefresh姘翠綅.ImageOptions.Image")));
- this.labRefresh姘翠綅.Location = new System.Drawing.Point(571, 0);
+ this.labRefresh姘翠綅.Location = new System.Drawing.Point(406, 24);
this.labRefresh姘翠綅.MaxSize = new System.Drawing.Size(70, 20);
this.labRefresh姘翠綅.MinSize = new System.Drawing.Size(70, 20);
this.labRefresh姘翠綅.Name = "labRefresh姘翠綅";
@@ -666,10 +682,10 @@
this.emptySpaceItem8,
this.layoutControlItem14,
this.layoutControlItem19});
- this.layoutControlGroup3.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlGroup3.Location = new System.Drawing.Point(0, 123);
this.layoutControlGroup3.Name = "layoutControlGroup3";
this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup3.Size = new System.Drawing.Size(1294, 102);
+ this.layoutControlGroup3.Size = new System.Drawing.Size(1294, 97);
this.layoutControlGroup3.Text = "姘村簱鍙傛暟";
//
// layoutControlItem9
@@ -680,7 +696,7 @@
this.layoutControlItem9.MinSize = new System.Drawing.Size(5, 20);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem9.Size = new System.Drawing.Size(1290, 30);
+ this.layoutControlItem9.Size = new System.Drawing.Size(1290, 25);
this.layoutControlItem9.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
@@ -852,10 +868,10 @@
this.layoutControlItem4,
this.emptySpaceItem3,
this.layoutControlItem16});
- this.layoutControlGroup2.Location = new System.Drawing.Point(0, 201);
+ this.layoutControlGroup2.Location = new System.Drawing.Point(0, 220);
this.layoutControlGroup2.Name = "layoutControlGroup2";
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(1294, 331);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(1294, 312);
this.layoutControlGroup2.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup2.Text = "闀挎睙姘翠綅";
//
@@ -868,7 +884,7 @@
this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 26);
this.layoutControlItem4.MinSize = new System.Drawing.Size(147, 26);
this.layoutControlItem4.Name = "layoutControlItem4";
- this.layoutControlItem4.Size = new System.Drawing.Size(388, 26);
+ this.layoutControlItem4.Size = new System.Drawing.Size(385, 26);
this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem4.Text = "闀挎睙姘翠綅鏁版嵁婧�:";
this.layoutControlItem4.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
@@ -878,9 +894,9 @@
// emptySpaceItem3
//
this.emptySpaceItem3.AllowHotTrack = false;
- this.emptySpaceItem3.Location = new System.Drawing.Point(388, 0);
+ this.emptySpaceItem3.Location = new System.Drawing.Point(385, 0);
this.emptySpaceItem3.Name = "emptySpaceItem3";
- this.emptySpaceItem3.Size = new System.Drawing.Size(906, 26);
+ this.emptySpaceItem3.Size = new System.Drawing.Size(909, 26);
this.emptySpaceItem3.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem16
@@ -888,7 +904,7 @@
this.layoutControlItem16.Control = this.viewRealTimeRiverWaterLevelCtrl1;
this.layoutControlItem16.Location = new System.Drawing.Point(0, 26);
this.layoutControlItem16.Name = "layoutControlItem16";
- this.layoutControlItem16.Size = new System.Drawing.Size(1294, 283);
+ this.layoutControlItem16.Size = new System.Drawing.Size(1294, 264);
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem16.TextVisible = false;
//
@@ -900,7 +916,7 @@
this.layoutControlItem10.MinSize = new System.Drawing.Size(4, 61);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem10.Size = new System.Drawing.Size(1163, 75);
+ this.layoutControlItem10.Size = new System.Drawing.Size(1154, 75);
this.layoutControlItem10.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem10.TextVisible = false;
@@ -908,12 +924,12 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.winStepPnl;
- this.layoutControlItem12.Location = new System.Drawing.Point(1163, 532);
+ this.layoutControlItem12.Location = new System.Drawing.Point(1154, 532);
this.layoutControlItem12.MaxSize = new System.Drawing.Size(0, 75);
this.layoutControlItem12.MinSize = new System.Drawing.Size(4, 75);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlItem12.Size = new System.Drawing.Size(131, 75);
+ this.layoutControlItem12.Size = new System.Drawing.Size(140, 75);
this.layoutControlItem12.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem12.TextVisible = false;
@@ -928,6 +944,86 @@
this.windowsUIButtonPanel1.Size = new System.Drawing.Size(75, 23);
this.windowsUIButtonPanel1.TabIndex = 0;
this.windowsUIButtonPanel1.Text = "windowsUIButtonPanel1";
+ //
+ // spinEditStart
+ //
+ this.spinEditStart.EditValue = new decimal(new int[] {
+ 0,
+ 0,
+ 0,
+ 0});
+ this.spinEditStart.Location = new System.Drawing.Point(219, 73);
+ this.spinEditStart.MenuManager = this.barManager1;
+ this.spinEditStart.Name = "spinEditStart";
+ this.spinEditStart.Properties.Appearance.Options.UseTextOptions = true;
+ this.spinEditStart.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.spinEditStart.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.spinEditStart.Properties.IsFloatValue = false;
+ this.spinEditStart.Properties.MaskSettings.Set("mask", "N00");
+ this.spinEditStart.Properties.MaxValue = new decimal(new int[] {
+ 24,
+ 0,
+ 0,
+ 0});
+ this.spinEditStart.Size = new System.Drawing.Size(60, 20);
+ this.spinEditStart.StyleController = this.layoutControl1;
+ this.spinEditStart.TabIndex = 37;
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.spinEditStart;
+ this.layoutControlItem18.Location = new System.Drawing.Point(150, 0);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.Size = new System.Drawing.Size(129, 24);
+ this.layoutControlItem18.Text = " 寮�濮嬫椂闂�";
+ this.layoutControlItem18.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 20);
+ this.layoutControlItem18.TextToControlDistance = 5;
+ //
+ // spinEditEnd
+ //
+ this.spinEditEnd.EditValue = new decimal(new int[] {
+ 0,
+ 0,
+ 0,
+ 0});
+ this.spinEditEnd.Location = new System.Drawing.Point(348, 73);
+ this.spinEditEnd.MenuManager = this.barManager1;
+ this.spinEditEnd.Name = "spinEditEnd";
+ this.spinEditEnd.Properties.Appearance.Options.UseTextOptions = true;
+ this.spinEditEnd.Properties.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ this.spinEditEnd.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.spinEditEnd.Properties.IsFloatValue = false;
+ this.spinEditEnd.Properties.MaskSettings.Set("mask", "N00");
+ this.spinEditEnd.Properties.MaxValue = new decimal(new int[] {
+ 24,
+ 0,
+ 0,
+ 0});
+ this.spinEditEnd.Size = new System.Drawing.Size(56, 20);
+ this.spinEditEnd.StyleController = this.layoutControl1;
+ this.spinEditEnd.TabIndex = 38;
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.spinEditEnd;
+ this.layoutControlItem20.Location = new System.Drawing.Point(279, 0);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.Size = new System.Drawing.Size(125, 24);
+ this.layoutControlItem20.Text = "缁撴潫鏃堕棿";
+ this.layoutControlItem20.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 20);
+ this.layoutControlItem20.TextToControlDistance = 5;
+ //
+ // emptySpaceItem6
+ //
+ this.emptySpaceItem6.AllowHotTrack = false;
+ this.emptySpaceItem6.Location = new System.Drawing.Point(443, 0);
+ this.emptySpaceItem6.Name = "emptySpaceItem6";
+ this.emptySpaceItem6.Size = new System.Drawing.Size(847, 24);
+ this.emptySpaceItem6.TextSize = new System.Drawing.Size(0, 0);
//
// pageCalcParas
//
@@ -990,6 +1086,11 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.spinEditStart.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.spinEditEnd.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem6)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -1059,5 +1160,10 @@
private DevExpress.XtraBars.BarCheckItem bci鍓嶄袱鏃ュ彇姘存�婚噺;
private DevExpress.XtraBars.BarCheckItem bci鍓嶄笁鏃ュ彇姘存�婚噺;
private DevExpress.XtraLayout.SimpleLabelItem labRefresh姘翠綅;
+ private DevExpress.XtraEditors.SpinEdit spinEditStart;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraEditors.SpinEdit spinEditEnd;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem6;
}
}
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.resx b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.resx
index 29c7bb3..51e1e4c 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.resx
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcParas.resx
@@ -117,11 +117,11 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>181, 17</value>
- </metadata>
<metadata name="barManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>315, 17</value>
+ </metadata>
+ <metadata name="popupMenu1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>181, 17</value>
</metadata>
<assembly alias="DevExpress.Data.v22.2" name="DevExpress.Data.v22.2, Version=22.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
<data name="windowsUIButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -244,6 +244,27 @@
dWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="labRefresh姘翠綅.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACN0RVh0VGl0
+ bGUAQ29udmVydDtSZXBlYXQ7QXJyb3c7RXhjaGFuZ2V2I2jSAAADLklEQVQ4T3WTeyzVYRjHf665JpVL
+ p1rE0FSHCnXIyZG5JJNWyy2lo8vhhCjqCCmXgxhCTijXSclIiYNIpGz9QWJZQ2NM/qD+6ay2b+/bnJO1
+ 9W6fvZfneb7vb8/39zJ03HzmxqS0uDE3mg8yyc2uTBKlyZWG1K43uiD+Ibc1JNXWmu4JSlfruTTGAPgz
+ M4mNLsw32Ru6VCIoE1QJNFkn7qEz3k5KkNbk8yO8xEFs684yWI4rKQTi653ppBx4g80Slu4VRD3gNFyq
+ 5ExEVzn+jK7kYHKxHDNLLajquwhhmeOUf8rOAJKvphAgQzmswM4l/J5Dc5H0DNqHM/Fxtg6z39sxNF2N
+ kXkx+qfi0Pn5MjpGk3Ek1ZJWaskFlILS2ewICae7fuAaXo5mIa3uOILTd8MtxgSCYg6knwS4P3AIgiIb
+ 2IcYzmw7rB9C6tTlAions9kZec8DUdsrRFDq7nmn85vy7AI3uK8z0dx0OMkC8TV74BRmLLPw1stbY6Ju
+ TIsJih6oBWTseF/+OhChOTbYx9+YSM40CCoELS+ROcw8dV8a2WruI3vaQH2CLo3LBdQPJZjLvERm8Lpm
+ ju0eBlvJmeYy9CYtgjbH96xlZEkfLt59Df+kZhk505ULUNvojdoEPe9zt3ZFFHRIoyRvaFSHQC3T8U+o
+ SktvGEJZ5xhMD8SM0FxFEwmqNrxjBnxxU/bVigFZw/tZCAp6YGRqbe4dnuNzQlQjiZX0LuS9GMXxxEfY
+ 6BBWTGoULqgGJFb7C/K7vhRLx9E58R21HxYRW9qP0Cwposgni58M496rSZzKbIUZL3ZwrZU3/XFU5QIa
+ /NudePphAY/HllD47ity++dRPTiLtvFvKO+dQmxZH9wjK7DZUdi13vqoH60h/HWBF5ob4nvl0YywdBDi
+ 7jmIe+bgEVkHtl/mr22eSdMm3EttLLvTotVbnCxJ/ipaTAtX9kCdZbV/A/dU/h2f+EZZVO0IeBdqaJQ6
+ Irftj7WNo0uMkV0EWa54TG4RtXSibmhZcfmOnODC3v38ChpdY8oTMZu5cQyLE8MY741kDO2FjOG/AisG
+ /Rr6CumNesvr/w4AzG/fQnRfIXokewAAAABJRU5ErkJggg==
+</value>
+ </data>
<data name="btnRefresh姘翠綅.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIyLjIsIFZlcnNpb249MjIuMi40
@@ -265,27 +286,6 @@
MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo
LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2
Zz4L
-</value>
- </data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="labRefresh姘翠綅.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACN0RVh0VGl0
- bGUAQ29udmVydDtSZXBlYXQ7QXJyb3c7RXhjaGFuZ2V2I2jSAAADLklEQVQ4T3WTeyzVYRjHf665JpVL
- p1rE0FSHCnXIyZG5JJNWyy2lo8vhhCjqCCmXgxhCTijXSclIiYNIpGz9QWJZQ2NM/qD+6ay2b+/bnJO1
- 9W6fvZfneb7vb8/39zJ03HzmxqS0uDE3mg8yyc2uTBKlyZWG1K43uiD+Ibc1JNXWmu4JSlfruTTGAPgz
- M4mNLsw32Ru6VCIoE1QJNFkn7qEz3k5KkNbk8yO8xEFs684yWI4rKQTi653ppBx4g80Slu4VRD3gNFyq
- 5ExEVzn+jK7kYHKxHDNLLajquwhhmeOUf8rOAJKvphAgQzmswM4l/J5Dc5H0DNqHM/Fxtg6z39sxNF2N
- kXkx+qfi0Pn5MjpGk3Ek1ZJWaskFlILS2ewICae7fuAaXo5mIa3uOILTd8MtxgSCYg6knwS4P3AIgiIb
- 2IcYzmw7rB9C6tTlAions9kZec8DUdsrRFDq7nmn85vy7AI3uK8z0dx0OMkC8TV74BRmLLPw1stbY6Ju
- TIsJih6oBWTseF/+OhChOTbYx9+YSM40CCoELS+ROcw8dV8a2WruI3vaQH2CLo3LBdQPJZjLvERm8Lpm
- ju0eBlvJmeYy9CYtgjbH96xlZEkfLt59Df+kZhk505ULUNvojdoEPe9zt3ZFFHRIoyRvaFSHQC3T8U+o
- SktvGEJZ5xhMD8SM0FxFEwmqNrxjBnxxU/bVigFZw/tZCAp6YGRqbe4dnuNzQlQjiZX0LuS9GMXxxEfY
- 6BBWTGoULqgGJFb7C/K7vhRLx9E58R21HxYRW9qP0Cwposgni58M496rSZzKbIUZL3ZwrZU3/XFU5QIa
- /NudePphAY/HllD47ity++dRPTiLtvFvKO+dQmxZH9wjK7DZUdi13vqoH60h/HWBF5ob4nvl0YywdBDi
- 7jmIe+bgEVkHtl/mr22eSdMm3EttLLvTotVbnCxJ/ipaTAtX9kCdZbV/A/dU/h2f+EZZVO0IeBdqaJQ6
- Irftj7WNo0uMkV0EWa54TG4RtXSibmhZcfmOnODC3v38ChpdY8oTMZu5cQyLE8MY741kDO2FjOG/AisG
- /Rr6CumNesvr/w4AzG/fQnRfIXokewAAAABJRU5ErkJggg==
</value>
</data>
</root>
\ No newline at end of file
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs
index 1c3d1b0..5ca1fdb 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageCalcResult.cs
@@ -17,7 +17,7 @@
{
private eAnaPrjType _anaPrjType = eAnaPrjType.Opt;
- private DateTime _anaDay = DateTime.Today;
+
private IStation.CalcModel.AnaRequest _anaRequest;
@@ -73,7 +73,7 @@
{
if (this._currentViewPrj == null)
return;
- IStation.BLL.AnaPrj.SavePrj(this._anaDay,this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj, false);
+ IStation.BLL.AnaPrj.SavePrj( this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj, false);
MessageBox.Show("淇濆瓨鎴愬姛");
@@ -95,7 +95,7 @@
return;
AlertTool.ShowInfo(this.ParentForm, "鎻愮ず", "寮�濮嬮摼鎺ユ湇鍔″櫒");
- IStation.BLL.AnaPrj.SavePrj(this._anaDay, this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj,true );
+ IStation.BLL.AnaPrj.SavePrj( this._anaRequest, IStation.AnaGlobalParas.Setting, _currentViewPrj,true );
};
break;
@@ -110,8 +110,11 @@
case "鐢典环淇℃伅":
ui_btn.Click += (sender, e) =>
{
+ if (this._currentViewPrj == null)
+ return;
+
ViewElecPriceByDay frm = new ViewElecPriceByDay();
- frm.SetBindingData(this._anaDay);
+ frm.SetBindingData(this._currentViewPrj.StartTime);
frm.Show();
};
break;
@@ -283,26 +286,7 @@
- /// <summary>
- ///
- /// </summary>
- /// <param name="startTime"></param>
- /// <param name="endTime"></param>
- private void GetAnaRangeTime(out DateTime startTime, out DateTime endTime)
- {
- var day = this._anaDay;
- var startHour = IStation.AnaGlobalParas.Setting.StartHourPerDay;
- if (startHour < 1)
- {
- startTime = day;
- endTime = startTime.AddDays(1);
- }
- else
- {
- startTime = new DateTime(day.Year, day.Month, day.Day, startHour, 0, 0);
- endTime = startTime.AddDays(1);
- }
- }
+
/// <summary>
/// 璁＄畻 鎵嬪姩
@@ -312,8 +296,7 @@
this._anaRequest = anaRequest;
if (anaRequest == null)
return;
-
- this._anaDay = anaRequest.Day;
+
if (anaRequest.WaterLevels闀挎睙 == null)
{
@@ -366,7 +349,7 @@
if (anaRequest == null)
return;
- this._anaDay = anaRequest.Day;
+
if (anaRequest.WaterLevels闀挎睙 == null)
{
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuParas.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuParas.cs
index ad9323e..657c6b7 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuParas.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuParas.cs
@@ -68,7 +68,7 @@
{
IStation.CalcModel.AnaRequest request = new CalcModel.AnaRequest();
request.CalcOptType = GetOptCalcType();
- request.Day = GetAnaDay();
+
request.WaterLevels闀挎睙 = this._waterLevels闀挎睙;
//if (checkEdit渚涙按鎬婚噺.Checked)
diff --git a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuResult.cs b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuResult.cs
index 5867a68..867b499 100644
--- a/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuResult.cs
+++ b/WinFrmUI/IStation.WinFrmUI.CalcErQu/Wizard/pageManuResult.cs
@@ -354,7 +354,7 @@
if (anaRequest == null)
return;
- this._anaDay = anaRequest.Day;
+ this._anaDay = anaRequest.StartTime;
if (anaRequest.WaterLevels闀挎睙 == null)
{
@@ -407,7 +407,7 @@
if (anaRequest == null)
return;
- this._anaDay = anaRequest.Day;
+ this._anaDay = anaRequest.StartTime;
if (anaRequest.WaterLevels闀挎睙 == null)
{
diff --git a/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj b/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj
index 351345e..81db5e0 100644
--- a/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj
+++ b/WinFrmUI/IStation.WinFrmUI.Monitor/IStation.WinFrmUI.Monitor.csproj
@@ -248,7 +248,6 @@
<EmbeddedResource Include="monitor\chart\TimeValueEasyChartView.resx">
<DependentUpon>TimeValueEasyChartView.cs</DependentUpon>
</EmbeddedResource>
- <EmbeddedResource Include="Properties\licenses.licx" />
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
--
Gitblit v1.9.3