From 04f9d03e29ce75b4aa0d108a1c2987fe2aaf61f6 Mon Sep 17 00:00:00 2001
From: tx <123456>
Date: 星期二, 15 四月 2025 12:44:41 +0800
Subject: [PATCH] 添加Open
---
/dev/null | 12 ------------
Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj | 10 ++++++----
Client/DesktopDebugFwOpen/Program.cs | 4 ++++
OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj | 3 +++
OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs | 15 +++++++++++++++
5 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/Client/DesktopDebugFwOpen/Program.cs b/Client/DesktopDebugFwOpen/Program.cs
index 7ae033e..0d75bf0 100644
--- a/Client/DesktopDebugFwOpen/Program.cs
+++ b/Client/DesktopDebugFwOpen/Program.cs
@@ -18,6 +18,10 @@
Application.SetCompatibleTextRenderingDefault(false);
DPumpHydr.OpenModel.ApiRequest apiRequest = new OpenModel.ApiRequest();
+ apiRequest.StepNumber = 1;
+
+
+
DPumpHydr.OpenFwUI.Volute.MainWindow mainWindow = new OpenFwUI.Volute.MainWindow();
var apiResult = mainWindow.Show(apiRequest);
// Application.Run(new Form1());
diff --git a/Model/DPumpHydr.Model.Open/ApiRequest.cs b/Model/DPumpHydr.Model.Open/ApiRequest.cs
deleted file mode 100644
index 978d16d..0000000
--- a/Model/DPumpHydr.Model.Open/ApiRequest.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DPumpHydr.OpenModel
-{
- public class ApiRequest
- {
- /// <summary>
- /// 璁捐姝ラ
- /// </summary>
- public int StepNumber { get; set; }
-
-
- }
-}
diff --git a/Model/DPumpHydr.Model.Open/ApiResult.cs b/Model/DPumpHydr.Model.Open/ApiResult.cs
deleted file mode 100644
index e7dbea6..0000000
--- a/Model/DPumpHydr.Model.Open/ApiResult.cs
+++ /dev/null
@@ -1,85 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DPumpHydr.OpenModel
-{
- /// <summary>
- /// 鎵ц杩斿洖鐨勯�氱敤绫伙紝璇ョ被涓嶅甫涓氬姟鏁版嵁锛屽彧浼氬憡璇夌敤鎴锋娆¤皟鐢ㄦ槸鍚︽垚鍔熶笌鍚︼紝浠ュ強涓�涓〃绀烘彁绀轰俊鎭殑瀛楃涓�
- /// </summary>
- public class ApiResult
- {
- /// <summary>
- /// 鐘舵�佷俊鎭�
- /// </summary>
- public ApiResultCode Code { get; set; }
-
- /// <summary>
- /// 鎻愮ず淇℃伅
- /// </summary>
- public string Message { get; set; }
-
-
-
-
-
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- public ApiResult()
- {
- this.Code = ApiResultCode.Success;
- }
-
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- /// <param name="type">缁撴灉鐘舵�佹爣璇�</param>
- /// <param name="message">鎻愮ず淇℃伅</param>
- public ApiResult(ApiResultCode type, string message)
- {
- this.Code = type;
- this.Message = message;
- }
-
- /// <summary>
- /// 鏋勯�犲嚱鏁帮紝榛樿杩斿洖鐘舵�丒rror
- /// </summary>
- /// <param name="message">鎻愮ず淇℃伅</param>
- public ApiResult(string message)
- {
- this.Code = ApiResultCode.Error;
- this.Message = message;
- }
-
- /// <summary>
- /// 鏋勯�犲嚱鏁�
- /// </summary>
- /// <param name="type">鐘舵�佹爣璇�</param>
- public ApiResult(ApiResultCode type) : this(type, "") { }
-
- /// <summary>
- /// 杩斿洖涓�涓〃绀洪�氱敤鐨勫嚭閿欏璞�
- /// </summary>
- /// <param name="message">鎻愮ず淇℃伅</param>
- /// <returns>閫氱敤鐨勫嚭閿欏璞�</returns>
- public static ApiResult Error(string message)
- {
- return new ApiResult(ApiResultCode.Error, message);
- }
-
- /// <summary>
- /// 杩斿洖涓�涓〃绀洪�氱敤鐨勬垚鍔熷璞�
- /// </summary>
- /// <param name="message">鎻愮ず淇℃伅</param>
- /// <returns>閫氱敤鐨勬垚鍔熷璞�</returns>
- public static ApiResult Success(string message = "")
- {
- return new ApiResult(ApiResultCode.Success, message);
- }
- }
-
-
-}
diff --git a/Model/DPumpHydr.Model.Open/ApiResultCode.cs b/Model/DPumpHydr.Model.Open/ApiResultCode.cs
deleted file mode 100644
index 67a5670..0000000
--- a/Model/DPumpHydr.Model.Open/ApiResultCode.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DPumpHydr.OpenModel
-{
-
- /// <summary>
- /// 鎵ц缁撴灉鐨勭姸鎬佹灇涓�
- /// </summary>
- public enum ApiResultCode
- {
- /// <summary>
- /// 鎴愬姛
- /// </summary>
- Success = 0,
-
- /// <summary>
- /// 闇�瑕佺敤鎴风‘璁�
- /// </summary>
- Cancel = -1,
-
- /// <summary>
- /// 澶辫触
- /// </summary>
- Error = -4,
-
- /// <summary>
- /// Token澶辨晥
- /// </summary>
- TokenExpire = -7,
- }
-
-}
diff --git a/Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj b/Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj
index 830dc3c..c6e1c95 100644
--- a/Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj
+++ b/Model/DPumpHydr.Model.Open/DPumpHydr.Model.Open.csproj
@@ -39,10 +39,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
- <Compile Include="ApiRequest.cs" />
- <Compile Include="ApiResult.cs" />
- <Compile Include="ApiResultCode.cs" />
- <Compile Include="DesignParameter.cs" />
+ <Compile Include="ApiRequest\ApiRequest.cs" />
+ <Compile Include="ApiResult\ApiResult.cs" />
+ <Compile Include="ApiResult\ApiResultCode.cs" />
+ <Compile Include="DesginParameters\OutflowParas\eOutflowStyle.cs" />
+ <Compile Include="DesginParameters\OutflowParas\OutflowParas.cs" />
+ <Compile Include="DesginParameters\DesignParameter.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/Model/DPumpHydr.Model.Open/DesignParameter.cs b/Model/DPumpHydr.Model.Open/DesignParameter.cs
deleted file mode 100644
index 0178ccf..0000000
--- a/Model/DPumpHydr.Model.Open/DesignParameter.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace DPumpHydr.OpenModel
-{
- public class DesignParameter
- {
- }
-}
diff --git a/OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj b/OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj
index 517395e..7554481 100644
--- a/OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj
+++ b/OpenUI/DPumpHydr.OpenFwUI.Volute/DPumpHydr.OpenFwUI.Volute.csproj
@@ -56,6 +56,9 @@
<DependentUpon>StepForm1.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="ViewModel\eOutflowStyle.cs" />
+ <Compile Include="ViewModel\OutflowParas.cs" />
+ <Compile Include="ViewModel\OutflowStyleHelper.cs" />
<EmbeddedResource Include="StepForm1.resx">
<DependentUpon>StepForm1.cs</DependentUpon>
</EmbeddedResource>
diff --git a/OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs b/OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs
index 3ee14a7..a98519f 100644
--- a/OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs
+++ b/OpenUI/DPumpHydr.OpenFwUI.Volute/MainWindow.cs
@@ -10,6 +10,21 @@
{
public DPumpHydr.OpenModel.ApiResult Show(DPumpHydr.OpenModel.ApiRequest Request)
{
+ if (Request.DesignParameter == null)
+ {
+ return new OpenModel.ApiResult() { Code = OpenModel.ApiResultCode.Error, Message = "DesignParameter 涓虹┖" };
+ }
+
+ if (Request.StepNumber == 3)
+ {
+ if (Request.DesignParameter.OutflowParas == null)
+ {
+ return new OpenModel.ApiResult() { Code = OpenModel.ApiResultCode.Error, Message = "OutflowParas 涓虹┖" };
+ }
+ var vm = new DPumpHydr.WinFrmUI.Volute.ViewModel.OutflowParas();
+ vm.Dia = Request.DesignParameter.OutflowParas.Dia;
+ vm.H1 = Request.DesignParameter.OutflowParas.H1;
+ }
StepForm1 frm = new StepForm1();
frm.ShowDialog();
DPumpHydr.OpenModel.ApiResult apiResult = new OpenModel.ApiResult();
--
Gitblit v1.9.3