From 234ed90eaa92f2e02a78dfa164703de7547bf8c5 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 08 二月 2025 18:29:53 +0800
Subject: [PATCH] 1
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.cs | 6
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.Designer.cs | 297 +++++++++----------
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.resx | 4
Application/HStation.Application.Assets.Core/23-translation/02-main/AssetsCoolingMain_Controller.cs | 19 +
Application/HStation.Application.Assets.Core/03-elbow/02-main/AssetsElbowMain_Controller.cs | 19 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.cs | 14
WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.cs | 0
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.cs | 1
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.Designer.cs | 2
Application/HStation.Application.Assets.Core/02-valve/02-main/AssetsValveMain_Controller.cs | 19 +
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/04-excelHelper/TranslationExcelHelper.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.resx | 4
Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.csproj.user | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/00-core/WechatBindingCtrl.cs | 8
WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.Designer.cs | 2
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx | 75 +++++
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs | 18 +
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs | 85 +++--
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.Designer.cs | 209 +++++++------
WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.resx | 4
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 1
WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml | 7
WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.resx | 4
52 files changed, 539 insertions(+), 351 deletions(-)
diff --git a/Application/HStation.Application.Assets.Core/02-valve/02-main/AssetsValveMain_Controller.cs b/Application/HStation.Application.Assets.Core/02-valve/02-main/AssetsValveMain_Controller.cs
index c4a641f..77778f1 100644
--- a/Application/HStation.Application.Assets.Core/02-valve/02-main/AssetsValveMain_Controller.cs
+++ b/Application/HStation.Application.Assets.Core/02-valve/02-main/AssetsValveMain_Controller.cs
@@ -98,6 +98,25 @@
return id;
}
+ /// <summary>
+ /// 鎵归噺鎻掑叆
+ /// </summary>
+ [Route("Inserts@V1.0")]
+ [HttpPost]
+ public async Task<bool> Inserts(List<AddAssetsValveMainInput> inputList)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = inputList.Select(x => x.Adapt<AddAssetsValveMainInput, Model.AssetsValveMain>()).ToList();
+ list.ForEach(x =>
+ {
+ x.SortCode = _service.GetMaxSortCode(x.SeriesID) + 1 + list.IndexOf(x);
+ });
+ var bol = _service.Inserts(list);
+ return bol;
+ });
+ }
+
#endregion Insert
#region Update
diff --git a/Application/HStation.Application.Assets.Core/03-elbow/02-main/AssetsElbowMain_Controller.cs b/Application/HStation.Application.Assets.Core/03-elbow/02-main/AssetsElbowMain_Controller.cs
index 234c507..26ea52a 100644
--- a/Application/HStation.Application.Assets.Core/03-elbow/02-main/AssetsElbowMain_Controller.cs
+++ b/Application/HStation.Application.Assets.Core/03-elbow/02-main/AssetsElbowMain_Controller.cs
@@ -98,6 +98,25 @@
return id;
}
+ /// <summary>
+ /// 鎵归噺鎻掑叆
+ /// </summary>
+ [Route("Inserts@V1.0")]
+ [HttpPost]
+ public async Task<bool> Inserts(List<AddAssetsElbowMainInput> inputList)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = inputList.Select(x => x.Adapt<AddAssetsElbowMainInput, Model.AssetsElbowMain>()).ToList();
+ list.ForEach(x =>
+ {
+ x.SortCode = _service.GetMaxSortCode(x.SeriesID) + 1 + list.IndexOf(x);
+ });
+ var bol = _service.Inserts(list);
+ return bol;
+ });
+ }
+
#endregion Insert
#region Update
diff --git a/Application/HStation.Application.Assets.Core/23-translation/02-main/AssetsCoolingMain_Controller.cs b/Application/HStation.Application.Assets.Core/23-translation/02-main/AssetsCoolingMain_Controller.cs
index 2acf0f0..2861cdb 100644
--- a/Application/HStation.Application.Assets.Core/23-translation/02-main/AssetsCoolingMain_Controller.cs
+++ b/Application/HStation.Application.Assets.Core/23-translation/02-main/AssetsCoolingMain_Controller.cs
@@ -98,6 +98,25 @@
return id;
}
+ /// <summary>
+ /// 鎵归噺鎻掑叆
+ /// </summary>
+ [Route("Inserts@V1.0")]
+ [HttpPost]
+ public async Task<bool> Inserts([Required] List<AddAssetsTranslationMainInput> inputList)
+ {
+ return await Task.Factory.StartNew(() =>
+ {
+ var list = inputList.Select(x => x.Adapt<AddAssetsTranslationMainInput, Model.AssetsTranslationMain>()).ToList();
+ list.ForEach(x =>
+ {
+ x.SortCode = _service.GetMaxSortCode(x.SeriesID) + 1 + list.IndexOf(x);
+ });
+ var bol = _service.Inserts(list);
+ return bol;
+ });
+ }
+
#endregion Insert
#region Update
diff --git a/Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.csproj.user b/Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.csproj.user
index 7f10306..142cb01 100644
--- a/Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.csproj.user
+++ b/Entry/HStation.Entry.Xhs.Core/HStation.Entry.Xhs.Core.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>
- <NameOfLastUsedPublishProfile>D:\WorkData\git\HStation\XHS\Entry\HStation.Entry.Xhs.Core\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\WorkData\HStation\XHS.V1.0\Entry\HStation.Entry.Xhs.Core\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ActiveDebugProfile>IIS Express</ActiveDebugProfile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.Designer.cs
index be268f6..333f362 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.Designer.cs
@@ -30,15 +30,15 @@
{
components = new Container();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ txtTagName = new DevExpress.XtraEditors.TextEdit();
+ setFlagsEditCtrl1 = new SetFlagsEditCtrl();
BtnOk = new DevExpress.XtraEditors.SimpleButton();
simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
TextEditName = new DevExpress.XtraEditors.TextEdit();
- DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
TextEditErosion = new DevExpress.XtraEditors.TextEdit();
TextEditRatedPower = new DevExpress.XtraEditors.TextEdit();
TextEditRatedeffciency = new DevExpress.XtraEditors.TextEdit();
TextEditD2 = new DevExpress.XtraEditors.TextEdit();
- TextEditTagName = new DevExpress.XtraEditors.TextEdit();
TextEditRatedHead = new DevExpress.XtraEditors.TextEdit();
TextEditRatedFlow = new DevExpress.XtraEditors.TextEdit();
TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
@@ -46,18 +46,16 @@
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
- layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
@@ -66,16 +64,16 @@
tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((ISupportInitialize)txtTagName.Properties).BeginInit();
((ISupportInitialize)TextEditName.Properties).BeginInit();
- ((ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
((ISupportInitialize)TextEditErosion.Properties).BeginInit();
((ISupportInitialize)TextEditRatedPower.Properties).BeginInit();
((ISupportInitialize)TextEditRatedeffciency.Properties).BeginInit();
((ISupportInitialize)TextEditD2.Properties).BeginInit();
- ((ISupportInitialize)TextEditTagName.Properties).BeginInit();
((ISupportInitialize)TextEditRatedHead.Properties).BeginInit();
((ISupportInitialize)TextEditRatedFlow.Properties).BeginInit();
((ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
@@ -83,18 +81,16 @@
((ISupportInitialize)layoutControlItem4).BeginInit();
((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
- ((ISupportInitialize)tabbedControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlGroup1).BeginInit();
- ((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)layoutControlItem1).BeginInit();
- ((ISupportInitialize)layoutControlItem9).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)layoutControlItem7).BeginInit();
- ((ISupportInitialize)layoutControlItem10).BeginInit();
- ((ISupportInitialize)layoutControlItem3).BeginInit();
((ISupportInitialize)layoutControlItem2).BeginInit();
- ((ISupportInitialize)layoutControlItem12).BeginInit();
+ ((ISupportInitialize)layoutControlItem3).BeginInit();
+ ((ISupportInitialize)layoutControlItem10).BeginInit();
((ISupportInitialize)layoutControlItem11).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
+ ((ISupportInitialize)layoutControlItem7).BeginInit();
+ ((ISupportInitialize)layoutControlItem12).BeginInit();
+ ((ISupportInitialize)layoutControlItem14).BeginInit();
+ ((ISupportInitialize)layoutControlItem6).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
((ISupportInitialize)layoutControlItem13).BeginInit();
((ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
@@ -103,20 +99,22 @@
((ISupportInitialize)tabbedControlGroup2).BeginInit();
((ISupportInitialize)layoutControlGroup3).BeginInit();
((ISupportInitialize)layoutControlGroup4).BeginInit();
- ((ISupportInitialize)layoutControlItem27).BeginInit();
+ ((ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
+ ((ISupportInitialize)layoutControlItem5).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(DescriptionTextEdit);
+ layoutControl1.Controls.Add(txtTagName);
+ layoutControl1.Controls.Add(setFlagsEditCtrl1);
layoutControl1.Controls.Add(BtnOk);
layoutControl1.Controls.Add(simpleButton1);
layoutControl1.Controls.Add(TextEditName);
- layoutControl1.Controls.Add(DescriptionTextEdit);
layoutControl1.Controls.Add(TextEditErosion);
layoutControl1.Controls.Add(TextEditRatedPower);
layoutControl1.Controls.Add(TextEditRatedeffciency);
layoutControl1.Controls.Add(TextEditD2);
- layoutControl1.Controls.Add(TextEditTagName);
layoutControl1.Controls.Add(TextEditRatedHead);
layoutControl1.Controls.Add(TextEditRatedFlow);
layoutControl1.Controls.Add(TextEditRatedSpeed);
@@ -128,6 +126,21 @@
layoutControl1.Size = new Size(661, 428);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
+ //
+ // txtTagName
+ //
+ txtTagName.Location = new Point(441, 104);
+ txtTagName.Name = "txtTagName";
+ txtTagName.Size = new Size(212, 20);
+ txtTagName.StyleController = layoutControl1;
+ txtTagName.TabIndex = 8;
+ //
+ // setFlagsEditCtrl1
+ //
+ setFlagsEditCtrl1.Location = new Point(117, 104);
+ setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
+ setFlagsEditCtrl1.Size = new Size(211, 20);
+ setFlagsEditCtrl1.TabIndex = 7;
//
// BtnOk
//
@@ -161,14 +174,6 @@
TextEditName.StyleController = layoutControl1;
TextEditName.TabIndex = 0;
//
- // DescriptionTextEdit
- //
- DescriptionTextEdit.Location = new Point(20, 164);
- DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(621, 218);
- DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 11;
- //
// TextEditErosion
//
TextEditErosion.Location = new Point(441, 8);
@@ -195,23 +200,15 @@
//
// TextEditD2
//
- TextEditD2.Location = new Point(441, 32);
+ TextEditD2.Location = new Point(441, 80);
TextEditD2.Name = "TextEditD2";
TextEditD2.Size = new Size(212, 20);
TextEditD2.StyleController = layoutControl1;
TextEditD2.TabIndex = 4;
//
- // TextEditTagName
- //
- TextEditTagName.Location = new Point(117, 104);
- TextEditTagName.Name = "TextEditTagName";
- TextEditTagName.Size = new Size(536, 20);
- TextEditTagName.StyleController = layoutControl1;
- TextEditTagName.TabIndex = 9;
- //
// TextEditRatedHead
//
- TextEditRatedHead.Location = new Point(441, 80);
+ TextEditRatedHead.Location = new Point(441, 32);
TextEditRatedHead.Name = "TextEditRatedHead";
TextEditRatedHead.Size = new Size(212, 20);
TextEditRatedHead.StyleController = layoutControl1;
@@ -239,7 +236,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, tabbedControlGroup1, layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem10, layoutControlItem11, layoutControlItem12, layoutControlItem9, layoutControlItem6, layoutControlItem7 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem10, layoutControlItem11, layoutControlItem9, layoutControlItem7, layoutControlItem12, layoutControlItem14, layoutControlItem6, layoutControlItem5 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(661, 428);
@@ -271,35 +268,6 @@
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
- // tabbedControlGroup1
- //
- tabbedControlGroup1.Location = new Point(0, 120);
- tabbedControlGroup1.Name = "tabbedControlGroup1";
- tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(649, 270);
- tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
- tabbedControlGroup1.Text = "璇存槑";
- //
- // layoutControlGroup1
- //
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
- layoutControlGroup1.Location = new Point(0, 0);
- layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(625, 222);
- layoutControlGroup1.Text = "璇存槑";
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = DescriptionTextEdit;
- layoutControlItem5.Location = new Point(0, 0);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(625, 222);
- layoutControlItem5.Text = "璇存槑:";
- layoutControlItem5.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
- layoutControlItem5.TextSize = new Size(0, 0);
- layoutControlItem5.TextToControlDistance = 0;
- layoutControlItem5.TextVisible = false;
- //
// layoutControlItem1
//
layoutControlItem1.AllowHtmlStringInCaption = true;
@@ -309,55 +277,6 @@
layoutControlItem1.Size = new Size(324, 24);
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(97, 14);
- //
- // layoutControlItem9
- //
- layoutControlItem9.AllowHtmlStringInCaption = true;
- layoutControlItem9.Control = TextEditRatedeffciency;
- layoutControlItem9.Location = new Point(324, 48);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(325, 24);
- layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼(%):";
- layoutControlItem9.TextSize = new Size(97, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = TextEditTagName;
- layoutControlItem6.Location = new Point(0, 96);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(649, 24);
- layoutControlItem6.Text = "鏍囩鍚嶇О:";
- layoutControlItem6.TextSize = new Size(97, 14);
- //
- // layoutControlItem7
- //
- layoutControlItem7.AllowHtmlStringInCaption = true;
- layoutControlItem7.Control = TextEditRatedHead;
- layoutControlItem7.Location = new Point(324, 72);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(325, 24);
- layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼(m):";
- layoutControlItem7.TextSize = new Size(97, 14);
- //
- // layoutControlItem10
- //
- layoutControlItem10.AllowHtmlStringInCaption = true;
- layoutControlItem10.Control = TextEditRatedPower;
- layoutControlItem10.Location = new Point(0, 48);
- layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(324, 24);
- layoutControlItem10.Text = "<color=red>*</color>棰濆畾鍔熺巼(KW):";
- layoutControlItem10.TextSize = new Size(97, 14);
- //
- // layoutControlItem3
- //
- layoutControlItem3.AllowHtmlStringInCaption = true;
- layoutControlItem3.Control = TextEditRatedFlow;
- layoutControlItem3.Location = new Point(0, 24);
- layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(324, 24);
- layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺(m鲁/h):";
- layoutControlItem3.TextSize = new Size(97, 14);
//
// layoutControlItem2
//
@@ -369,14 +288,25 @@
layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��(r/min):";
layoutControlItem2.TextSize = new Size(97, 14);
//
- // layoutControlItem12
+ // layoutControlItem3
//
- layoutControlItem12.Control = TextEditD2;
- layoutControlItem12.Location = new Point(324, 24);
- layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(325, 24);
- layoutControlItem12.Text = "鍙惰疆澶栧緞(mm):";
- layoutControlItem12.TextSize = new Size(97, 14);
+ layoutControlItem3.AllowHtmlStringInCaption = true;
+ layoutControlItem3.Control = TextEditRatedFlow;
+ layoutControlItem3.Location = new Point(0, 24);
+ layoutControlItem3.Name = "layoutControlItem3";
+ layoutControlItem3.Size = new Size(324, 24);
+ layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺(m鲁/h):";
+ layoutControlItem3.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem10
+ //
+ layoutControlItem10.AllowHtmlStringInCaption = true;
+ layoutControlItem10.Control = TextEditRatedPower;
+ layoutControlItem10.Location = new Point(0, 48);
+ layoutControlItem10.Name = "layoutControlItem10";
+ layoutControlItem10.Size = new Size(324, 24);
+ layoutControlItem10.Text = "<color=red>*</color>棰濆畾鍔熺巼(KW):";
+ layoutControlItem10.TextSize = new Size(97, 14);
//
// layoutControlItem11
//
@@ -386,6 +316,53 @@
layoutControlItem11.Size = new Size(325, 24);
layoutControlItem11.Text = "姘旇殌(m):";
layoutControlItem11.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem9
+ //
+ layoutControlItem9.AllowHtmlStringInCaption = true;
+ layoutControlItem9.Control = TextEditRatedeffciency;
+ layoutControlItem9.Location = new Point(324, 48);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(325, 24);
+ layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼(%):";
+ layoutControlItem9.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem7
+ //
+ layoutControlItem7.AllowHtmlStringInCaption = true;
+ layoutControlItem7.Control = TextEditRatedHead;
+ layoutControlItem7.Location = new Point(324, 24);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(325, 24);
+ layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼(m):";
+ layoutControlItem7.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem12
+ //
+ layoutControlItem12.Control = TextEditD2;
+ layoutControlItem12.Location = new Point(324, 72);
+ layoutControlItem12.Name = "layoutControlItem12";
+ layoutControlItem12.Size = new Size(325, 24);
+ layoutControlItem12.Text = "鍙惰疆澶栧緞(mm):";
+ layoutControlItem12.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem14
+ //
+ layoutControlItem14.Control = setFlagsEditCtrl1;
+ layoutControlItem14.Location = new Point(0, 96);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(324, 24);
+ layoutControlItem14.Text = "鏍囩:";
+ layoutControlItem14.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = txtTagName;
+ layoutControlItem6.Location = new Point(324, 96);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(325, 24);
+ layoutControlItem6.Text = "鏍囧織:";
+ layoutControlItem6.TextSize = new Size(97, 14);
//
// dxErrorProvider1
//
@@ -442,20 +419,27 @@
//
// layoutControlGroup4
//
- layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem27 });
layoutControlGroup4.Location = new Point(0, 0);
layoutControlGroup4.Name = "layoutControlGroup1";
- layoutControlGroup4.Size = new Size(645, 42);
+ layoutControlGroup4.Size = new Size(645, 56);
layoutControlGroup4.Text = "璇存槑";
//
- // layoutControlItem27
+ // DescriptionTextEdit
//
- layoutControlItem27.Control = DescriptionTextEdit;
- layoutControlItem27.Location = new Point(0, 0);
- layoutControlItem27.Name = "layoutControlItem5";
- layoutControlItem27.Size = new Size(645, 42);
- layoutControlItem27.Text = "璇存槑:";
- layoutControlItem27.TextSize = new Size(59, 14);
+ DescriptionTextEdit.Location = new Point(117, 128);
+ DescriptionTextEdit.Name = "DescriptionTextEdit";
+ DescriptionTextEdit.Size = new Size(536, 266);
+ DescriptionTextEdit.StyleController = layoutControl1;
+ DescriptionTextEdit.TabIndex = 10;
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = DescriptionTextEdit;
+ layoutControlItem5.Location = new Point(0, 120);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(649, 270);
+ layoutControlItem5.Text = "璇存槑:";
+ layoutControlItem5.TextSize = new Size(97, 14);
//
// AddPumpProductMainDlg
//
@@ -468,13 +452,12 @@
Text = "娣诲姞鍨嬪彿";
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)txtTagName.Properties).EndInit();
((ISupportInitialize)TextEditName.Properties).EndInit();
- ((ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
((ISupportInitialize)TextEditErosion.Properties).EndInit();
((ISupportInitialize)TextEditRatedPower.Properties).EndInit();
((ISupportInitialize)TextEditRatedeffciency.Properties).EndInit();
((ISupportInitialize)TextEditD2.Properties).EndInit();
- ((ISupportInitialize)TextEditTagName.Properties).EndInit();
((ISupportInitialize)TextEditRatedHead.Properties).EndInit();
((ISupportInitialize)TextEditRatedFlow.Properties).EndInit();
((ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
@@ -482,18 +465,16 @@
((ISupportInitialize)layoutControlItem4).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
- ((ISupportInitialize)tabbedControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlGroup1).EndInit();
- ((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)layoutControlItem1).EndInit();
- ((ISupportInitialize)layoutControlItem9).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)layoutControlItem7).EndInit();
- ((ISupportInitialize)layoutControlItem10).EndInit();
- ((ISupportInitialize)layoutControlItem3).EndInit();
((ISupportInitialize)layoutControlItem2).EndInit();
- ((ISupportInitialize)layoutControlItem12).EndInit();
+ ((ISupportInitialize)layoutControlItem3).EndInit();
+ ((ISupportInitialize)layoutControlItem10).EndInit();
((ISupportInitialize)layoutControlItem11).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
+ ((ISupportInitialize)layoutControlItem7).EndInit();
+ ((ISupportInitialize)layoutControlItem12).EndInit();
+ ((ISupportInitialize)layoutControlItem14).EndInit();
+ ((ISupportInitialize)layoutControlItem6).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
((ISupportInitialize)layoutControlItem13).EndInit();
((ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
@@ -502,7 +483,8 @@
((ISupportInitialize)tabbedControlGroup2).EndInit();
((ISupportInitialize)layoutControlGroup3).EndInit();
((ISupportInitialize)layoutControlGroup4).EndInit();
- ((ISupportInitialize)layoutControlItem27).EndInit();
+ ((ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
+ ((ISupportInitialize)layoutControlItem5).EndInit();
ResumeLayout(false);
}
@@ -511,7 +493,6 @@
private DevExpress.XtraLayout.LayoutControl layoutControl1;
private DevExpress.XtraEditors.TextEdit TextEditName;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraEditors.MemoEdit DescriptionTextEdit;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.SimpleButton BtnOk;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
@@ -524,8 +505,6 @@
private DevExpress.XtraEditors.SimpleButton simpleButton1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraEditors.TextEdit TextEditTagName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit TextEditErosion;
private DevExpress.XtraEditors.TextEdit TextEditRatedPower;
private DevExpress.XtraEditors.TextEdit TextEditRatedeffciency;
@@ -534,9 +513,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
- private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.SimpleButton btnCancel;
private DevExpress.XtraEditors.TextEdit MotorFrequencyTextEdit;
private DevExpress.XtraEditors.TextEdit TagNameTextEdit;
@@ -549,6 +525,11 @@
private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup2;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private SetFlagsEditCtrl setFlagsEditCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraEditors.TextEdit txtTagName;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraEditors.MemoEdit DescriptionTextEdit;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.cs
index 7340f38..f341011 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/AddPumpProductMainDlg.cs
@@ -1,4 +1,5 @@
锘縰sing HStation.Vmo;
+using Yw;
namespace HStation.WinFrmUI.Xhs.PumpProduct
{
@@ -20,6 +21,8 @@
{
_AssetsPumpMain = new Vmo.AssetsPumpMainVmo();
_AssetsPumpMain.SeriesID = AssetsPumpSeriesVmo.ID;
+ var flags = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(HStation.Assets.DataType.PumpMain);
+ this.setFlagsEditCtrl1.SetBindingData(flags?.Select(x => x.Name).ToList(), null);
}
public event Func<Vmo.AssetsPumpMainVmo, Task<bool>> ReloadDataEvent = null;
@@ -62,7 +65,8 @@
if (!(Valid()))
return;
_AssetsPumpMain.Name = TextEditName.Text.Trim();
- _AssetsPumpMain.TagName = TextEditTagName.Text.Trim();
+ _AssetsPumpMain.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
+ _AssetsPumpMain.TagName = this.txtTagName.Text.Trim();
double ratedFlow;
double.TryParse(TextEditRatedFlow.Text.Trim(), out ratedFlow);
_AssetsPumpMain.RatedFlow = ratedFlow;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.Designer.cs
index ba59636..f7e70e5 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.Designer.cs
@@ -38,7 +38,6 @@
TextEditRatedPower = new DevExpress.XtraEditors.TextEdit();
TextEditRatedeffciency = new DevExpress.XtraEditors.TextEdit();
TextEditD2 = new DevExpress.XtraEditors.TextEdit();
- TextEditTagName = new DevExpress.XtraEditors.TextEdit();
TextEditRatedHead = new DevExpress.XtraEditors.TextEdit();
TextEditRatedFlow = new DevExpress.XtraEditors.TextEdit();
TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
@@ -50,13 +49,16 @@
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ txtTagName = new DevExpress.XtraEditors.TextEdit();
+ setFlagsEditCtrl1 = new SetFlagsEditCtrl();
+ layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -65,7 +67,6 @@
((ISupportInitialize)TextEditRatedPower.Properties).BeginInit();
((ISupportInitialize)TextEditRatedeffciency.Properties).BeginInit();
((ISupportInitialize)TextEditD2.Properties).BeginInit();
- ((ISupportInitialize)TextEditTagName.Properties).BeginInit();
((ISupportInitialize)TextEditRatedHead.Properties).BeginInit();
((ISupportInitialize)TextEditRatedFlow.Properties).BeginInit();
((ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
@@ -77,17 +78,21 @@
((ISupportInitialize)layoutControlItem5).BeginInit();
((ISupportInitialize)emptySpaceItem1).BeginInit();
((ISupportInitialize)layoutControlItem8).BeginInit();
- ((ISupportInitialize)layoutControlItem7).BeginInit();
- ((ISupportInitialize)layoutControlItem6).BeginInit();
- ((ISupportInitialize)layoutControlItem9).BeginInit();
- ((ISupportInitialize)layoutControlItem10).BeginInit();
((ISupportInitialize)layoutControlItem11).BeginInit();
+ ((ISupportInitialize)layoutControlItem10).BeginInit();
+ ((ISupportInitialize)layoutControlItem9).BeginInit();
((ISupportInitialize)layoutControlItem12).BeginInit();
+ ((ISupportInitialize)layoutControlItem7).BeginInit();
((ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((ISupportInitialize)txtTagName.Properties).BeginInit();
+ ((ISupportInitialize)layoutControlItem6).BeginInit();
+ ((ISupportInitialize)layoutControlItem13).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(txtTagName);
+ layoutControl1.Controls.Add(setFlagsEditCtrl1);
layoutControl1.Controls.Add(BtnOk);
layoutControl1.Controls.Add(simpleButton1);
layoutControl1.Controls.Add(TextEditName);
@@ -96,7 +101,6 @@
layoutControl1.Controls.Add(TextEditRatedPower);
layoutControl1.Controls.Add(TextEditRatedeffciency);
layoutControl1.Controls.Add(TextEditD2);
- layoutControl1.Controls.Add(TextEditTagName);
layoutControl1.Controls.Add(TextEditRatedHead);
layoutControl1.Controls.Add(TextEditRatedFlow);
layoutControl1.Controls.Add(TextEditRatedSpeed);
@@ -112,11 +116,11 @@
//
BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(413, 413);
+ BtnOk.Location = new Point(519, 413);
BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(113, 22);
+ BtnOk.Size = new Size(66, 22);
BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 11;
+ BtnOk.TabIndex = 10;
BtnOk.Text = "纭畾";
BtnOk.Click += BtnOk_ClickAsync;
//
@@ -125,18 +129,18 @@
simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
simpleButton1.Appearance.Options.UseBackColor = true;
simpleButton1.DialogResult = DialogResult.Cancel;
- simpleButton1.Location = new Point(530, 413);
+ simpleButton1.Location = new Point(589, 413);
simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(123, 22);
+ simpleButton1.Size = new Size(64, 22);
simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 12;
+ simpleButton1.TabIndex = 11;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
//
TextEditName.Location = new Point(117, 8);
TextEditName.Name = "TextEditName";
- TextEditName.Size = new Size(184, 20);
+ TextEditName.Size = new Size(211, 20);
TextEditName.StyleController = layoutControl1;
TextEditName.TabIndex = 0;
//
@@ -146,13 +150,13 @@
DescriptionTextEdit.Name = "DescriptionTextEdit";
DescriptionTextEdit.Size = new Size(536, 281);
DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 10;
+ DescriptionTextEdit.TabIndex = 9;
//
// TextEditErosion
//
- TextEditErosion.Location = new Point(414, 8);
+ TextEditErosion.Location = new Point(441, 8);
TextEditErosion.Name = "TextEditErosion";
- TextEditErosion.Size = new Size(239, 20);
+ TextEditErosion.Size = new Size(212, 20);
TextEditErosion.StyleController = layoutControl1;
TextEditErosion.TabIndex = 2;
//
@@ -160,47 +164,39 @@
//
TextEditRatedPower.Location = new Point(117, 56);
TextEditRatedPower.Name = "TextEditRatedPower";
- TextEditRatedPower.Size = new Size(184, 20);
+ TextEditRatedPower.Size = new Size(211, 20);
TextEditRatedPower.StyleController = layoutControl1;
TextEditRatedPower.TabIndex = 5;
//
// TextEditRatedeffciency
//
- TextEditRatedeffciency.Location = new Point(414, 56);
+ TextEditRatedeffciency.Location = new Point(441, 56);
TextEditRatedeffciency.Name = "TextEditRatedeffciency";
- TextEditRatedeffciency.Size = new Size(239, 20);
+ TextEditRatedeffciency.Size = new Size(212, 20);
TextEditRatedeffciency.StyleController = layoutControl1;
TextEditRatedeffciency.TabIndex = 6;
//
// TextEditD2
//
- TextEditD2.Location = new Point(414, 32);
+ TextEditD2.Location = new Point(441, 80);
TextEditD2.Name = "TextEditD2";
- TextEditD2.Size = new Size(239, 20);
+ TextEditD2.Size = new Size(212, 20);
TextEditD2.StyleController = layoutControl1;
- TextEditD2.TabIndex = 4;
- //
- // TextEditTagName
- //
- TextEditTagName.Location = new Point(117, 104);
- TextEditTagName.Name = "TextEditTagName";
- TextEditTagName.Size = new Size(536, 20);
- TextEditTagName.StyleController = layoutControl1;
- TextEditTagName.TabIndex = 9;
+ TextEditD2.TabIndex = 8;
//
// TextEditRatedHead
//
- TextEditRatedHead.Location = new Point(414, 80);
+ TextEditRatedHead.Location = new Point(441, 32);
TextEditRatedHead.Name = "TextEditRatedHead";
- TextEditRatedHead.Size = new Size(239, 20);
+ TextEditRatedHead.Size = new Size(212, 20);
TextEditRatedHead.StyleController = layoutControl1;
- TextEditRatedHead.TabIndex = 8;
+ TextEditRatedHead.TabIndex = 4;
//
// TextEditRatedFlow
//
TextEditRatedFlow.Location = new Point(117, 32);
TextEditRatedFlow.Name = "TextEditRatedFlow";
- TextEditRatedFlow.Size = new Size(184, 20);
+ TextEditRatedFlow.Size = new Size(211, 20);
TextEditRatedFlow.StyleController = layoutControl1;
TextEditRatedFlow.TabIndex = 3;
//
@@ -208,7 +204,7 @@
//
TextEditRatedSpeed.Location = new Point(117, 80);
TextEditRatedSpeed.Name = "TextEditRatedSpeed";
- TextEditRatedSpeed.Size = new Size(184, 20);
+ TextEditRatedSpeed.Size = new Size(211, 20);
TextEditRatedSpeed.StyleController = layoutControl1;
TextEditRatedSpeed.TabIndex = 7;
//
@@ -218,7 +214,7 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5, emptySpaceItem1, layoutControlItem8, layoutControlItem6, layoutControlItem11, layoutControlItem10, layoutControlItem9, layoutControlItem12, layoutControlItem7 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5, emptySpaceItem1, layoutControlItem8, layoutControlItem11, layoutControlItem10, layoutControlItem12, layoutControlItem7, layoutControlItem9, layoutControlItem6, layoutControlItem13 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(661, 443);
@@ -230,7 +226,7 @@
layoutControlItem1.Control = TextEditName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(297, 24);
+ layoutControlItem1.Size = new Size(324, 24);
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(97, 14);
//
@@ -240,7 +236,7 @@
layoutControlItem2.Control = TextEditRatedSpeed;
layoutControlItem2.Location = new Point(0, 72);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(297, 24);
+ layoutControlItem2.Size = new Size(324, 24);
layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��(r/min):";
layoutControlItem2.TextSize = new Size(97, 14);
//
@@ -250,16 +246,16 @@
layoutControlItem3.Control = TextEditRatedFlow;
layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(297, 24);
+ layoutControlItem3.Size = new Size(324, 24);
layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺(m鲁/h):";
layoutControlItem3.TextSize = new Size(97, 14);
//
// layoutControlItem4
//
layoutControlItem4.Control = BtnOk;
- layoutControlItem4.Location = new Point(405, 405);
+ layoutControlItem4.Location = new Point(511, 405);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(117, 26);
+ layoutControlItem4.Size = new Size(70, 26);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
//
@@ -277,46 +273,26 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 405);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(405, 26);
+ emptySpaceItem1.Size = new Size(511, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem8
//
layoutControlItem8.Control = simpleButton1;
- layoutControlItem8.Location = new Point(522, 405);
+ layoutControlItem8.Location = new Point(581, 405);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(127, 26);
+ layoutControlItem8.Size = new Size(68, 26);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
- // layoutControlItem7
+ // layoutControlItem11
//
- layoutControlItem7.AllowHtmlStringInCaption = true;
- layoutControlItem7.Control = TextEditRatedHead;
- layoutControlItem7.Location = new Point(297, 72);
- layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(352, 24);
- layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼(m):";
- layoutControlItem7.TextSize = new Size(97, 14);
- //
- // layoutControlItem6
- //
- layoutControlItem6.Control = TextEditTagName;
- layoutControlItem6.Location = new Point(0, 96);
- layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(649, 24);
- layoutControlItem6.Text = "鏍囩鍚嶇О:";
- layoutControlItem6.TextSize = new Size(97, 14);
- //
- // layoutControlItem9
- //
- layoutControlItem9.AllowHtmlStringInCaption = true;
- layoutControlItem9.Control = TextEditRatedeffciency;
- layoutControlItem9.Location = new Point(297, 48);
- layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(352, 24);
- layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼(%):";
- layoutControlItem9.TextSize = new Size(97, 14);
+ layoutControlItem11.Control = TextEditErosion;
+ layoutControlItem11.Location = new Point(324, 0);
+ layoutControlItem11.Name = "layoutControlItem11";
+ layoutControlItem11.Size = new Size(325, 24);
+ layoutControlItem11.Text = "姘旇殌(m):";
+ layoutControlItem11.TextSize = new Size(97, 14);
//
// layoutControlItem10
//
@@ -324,31 +300,75 @@
layoutControlItem10.Control = TextEditRatedPower;
layoutControlItem10.Location = new Point(0, 48);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(297, 24);
+ layoutControlItem10.Size = new Size(324, 24);
layoutControlItem10.Text = "<color=red>*</color>棰濆畾鍔熺巼(KW):";
layoutControlItem10.TextSize = new Size(97, 14);
//
- // layoutControlItem11
+ // layoutControlItem9
//
- layoutControlItem11.Control = TextEditErosion;
- layoutControlItem11.Location = new Point(297, 0);
- layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(352, 24);
- layoutControlItem11.Text = "姘旇殌(m):";
- layoutControlItem11.TextSize = new Size(97, 14);
+ layoutControlItem9.AllowHtmlStringInCaption = true;
+ layoutControlItem9.Control = TextEditRatedeffciency;
+ layoutControlItem9.Location = new Point(324, 48);
+ layoutControlItem9.Name = "layoutControlItem9";
+ layoutControlItem9.Size = new Size(325, 24);
+ layoutControlItem9.Text = "<color=red>*</color>棰濆畾鏁堢巼(%):";
+ layoutControlItem9.TextSize = new Size(97, 14);
//
// layoutControlItem12
//
layoutControlItem12.Control = TextEditD2;
- layoutControlItem12.Location = new Point(297, 24);
+ layoutControlItem12.Location = new Point(324, 72);
layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(352, 24);
+ layoutControlItem12.Size = new Size(325, 24);
layoutControlItem12.Text = "鍙惰疆澶栧緞(mm):";
layoutControlItem12.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem7
+ //
+ layoutControlItem7.AllowHtmlStringInCaption = true;
+ layoutControlItem7.Control = TextEditRatedHead;
+ layoutControlItem7.Location = new Point(324, 24);
+ layoutControlItem7.Name = "layoutControlItem7";
+ layoutControlItem7.Size = new Size(325, 24);
+ layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼(m):";
+ layoutControlItem7.TextSize = new Size(97, 14);
//
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
+ //
+ // txtTagName
+ //
+ txtTagName.Location = new Point(441, 104);
+ txtTagName.Name = "txtTagName";
+ txtTagName.Size = new Size(212, 20);
+ txtTagName.StyleController = layoutControl1;
+ txtTagName.TabIndex = 10;
+ //
+ // setFlagsEditCtrl1
+ //
+ setFlagsEditCtrl1.Location = new Point(117, 104);
+ setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
+ setFlagsEditCtrl1.Size = new Size(211, 20);
+ setFlagsEditCtrl1.TabIndex = 9;
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = setFlagsEditCtrl1;
+ layoutControlItem6.Location = new Point(0, 96);
+ layoutControlItem6.Name = "layoutControlItem6";
+ layoutControlItem6.Size = new Size(324, 24);
+ layoutControlItem6.Text = "鏍囩:";
+ layoutControlItem6.TextSize = new Size(97, 14);
+ //
+ // layoutControlItem13
+ //
+ layoutControlItem13.Control = txtTagName;
+ layoutControlItem13.Location = new Point(324, 96);
+ layoutControlItem13.Name = "layoutControlItem13";
+ layoutControlItem13.Size = new Size(325, 24);
+ layoutControlItem13.Text = "鏍囧織:";
+ layoutControlItem13.TextSize = new Size(97, 14);
//
// EditPumpProductMainDlg
//
@@ -367,7 +387,6 @@
((ISupportInitialize)TextEditRatedPower.Properties).EndInit();
((ISupportInitialize)TextEditRatedeffciency.Properties).EndInit();
((ISupportInitialize)TextEditD2.Properties).EndInit();
- ((ISupportInitialize)TextEditTagName.Properties).EndInit();
((ISupportInitialize)TextEditRatedHead.Properties).EndInit();
((ISupportInitialize)TextEditRatedFlow.Properties).EndInit();
((ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
@@ -379,13 +398,15 @@
((ISupportInitialize)layoutControlItem5).EndInit();
((ISupportInitialize)emptySpaceItem1).EndInit();
((ISupportInitialize)layoutControlItem8).EndInit();
- ((ISupportInitialize)layoutControlItem7).EndInit();
- ((ISupportInitialize)layoutControlItem6).EndInit();
- ((ISupportInitialize)layoutControlItem9).EndInit();
- ((ISupportInitialize)layoutControlItem10).EndInit();
((ISupportInitialize)layoutControlItem11).EndInit();
+ ((ISupportInitialize)layoutControlItem10).EndInit();
+ ((ISupportInitialize)layoutControlItem9).EndInit();
((ISupportInitialize)layoutControlItem12).EndInit();
+ ((ISupportInitialize)layoutControlItem7).EndInit();
((ISupportInitialize)dxErrorProvider1).EndInit();
+ ((ISupportInitialize)txtTagName.Properties).EndInit();
+ ((ISupportInitialize)layoutControlItem6).EndInit();
+ ((ISupportInitialize)layoutControlItem13).EndInit();
ResumeLayout(false);
}
@@ -409,8 +430,6 @@
private DevExpress.XtraEditors.SimpleButton simpleButton1;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraEditors.TextEdit TextEditTagName;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraEditors.TextEdit TextEditErosion;
private DevExpress.XtraEditors.TextEdit TextEditRatedPower;
private DevExpress.XtraEditors.TextEdit TextEditRatedeffciency;
@@ -419,5 +438,9 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraEditors.TextEdit txtTagName;
+ private SetFlagsEditCtrl setFlagsEditCtrl1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.cs
index 280c427..ab6df96 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/04-PumpMain/EditPumpProductMainDlg.cs
@@ -1,4 +1,6 @@
-锘縩amespace HStation.WinFrmUI.Xhs.PumpProduct
+锘縰sing Yw;
+
+namespace HStation.WinFrmUI.Xhs.PumpProduct
{
public partial class EditPumpProductMainDlg : DevExpress.XtraEditors.XtraForm
{
@@ -10,7 +12,7 @@
private Vmo.AssetsPumpMainVmo _Update = null;
- public void SetBindingData(Vmo.AssetsPumpMainVmo mainVmo)
+ public async void SetBindingData(Vmo.AssetsPumpMainVmo mainVmo)
{
_Update = mainVmo;
this.TextEditD2.Text = _Update.D2.ToString();
@@ -21,7 +23,9 @@
this.TextEditRatedHead.Text = _Update.RatedHead.ToString();
this.TextEditRatedPower.Text = _Update.RatedPower.ToString();
this.TextEditRatedSpeed.Text = _Update.RatedSpeed.ToString();
- this.TextEditTagName.Text = _Update.TagName.ToString();
+ this.txtTagName.Text = _Update.TagName.ToString();
+ var flags = await BLLFactory<Yw.BLL.SysFlag>.Instance.GetBySysType(HStation.Assets.DataType.PumpMain);
+ this.setFlagsEditCtrl1.SetBindingData(flags?.Select(x => x.Name).ToList(), mainVmo.Flags);
}
public event Func<Vmo.AssetsPumpMainVmo, Task<bool>> ReloadDataEvent = null;
@@ -64,8 +68,8 @@
if (!(Valid()))
return;
_Update.Name = TextEditName.Text.Trim();
- _Update.TagName = TextEditTagName.Text.Trim();
- //double ratedFlow;
+ _Update.Flags = this.setFlagsEditCtrl1.SelectedFlagList;
+ _Update.TagName = this.txtTagName.Text.Trim();
if (double.TryParse(TextEditRatedFlow.Text.Trim(), out double ratedFlow))
{
_Update.RatedFlow = ratedFlow;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.cs
index 7ce1a56..280d63f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/07-PumpChart/01-import/01-excel/ImportPumpPerform2dByExcelDlg.cs
@@ -62,6 +62,7 @@
return;
}
var diagram = this.pumpChartExcelImportCtrl1.Get();
+ diagram.Name = this.textEditName.Text.Trim();
var diagramId = await BLLFactory<Yw.BLL.PhartDiagramExtensions>.Instance.Insert(diagram);
if (diagramId < 1)
{
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.Designer.cs
index 0011211..8390758 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsValveMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsValveMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsValveMainMgrPage1.AuthTree = null;
assetsValveMainMgrPage1.Dock = DockStyle.Fill;
assetsValveMainMgrPage1.Location = new Point(200, 0);
assetsValveMainMgrPage1.Name = "assetsValveMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/AssetsValveMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.Designer.cs
index afa7ee6..e654ac2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsPipeMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsPipeMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsPipeMainMgrPage1.AuthTree = null;
assetsPipeMainMgrPage1.Dock = DockStyle.Fill;
assetsPipeMainMgrPage1.Location = new Point(200, 0);
assetsPipeMainMgrPage1.Name = "assetsPipeMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/AssetsPipeMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.Designer.cs
index 119cd02..76af713 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsElbowMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsElbowMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsElbowMainMgrPage1.AuthTree = null;
assetsElbowMainMgrPage1.Dock = DockStyle.Fill;
assetsElbowMainMgrPage1.Location = new Point(200, 0);
assetsElbowMainMgrPage1.Name = "assetsElbowMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/AssetsElbowMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.Designer.cs
index 42ee298..5033396 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsThreelinkMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsThreelinkMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsThreelinkMainMgrPage1.AuthTree = null;
assetsThreelinkMainMgrPage1.Dock = DockStyle.Fill;
assetsThreelinkMainMgrPage1.Location = new Point(200, 0);
assetsThreelinkMainMgrPage1.Name = "assetsThreelinkMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/AssetsThreelinkMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.Designer.cs
index 2bf9c89..95377c8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsFourlinkMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsFourlinkMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsFourlinkMainMgrPage1.AuthTree = null;
assetsFourlinkMainMgrPage1.Dock = DockStyle.Fill;
assetsFourlinkMainMgrPage1.Location = new Point(200, 0);
assetsFourlinkMainMgrPage1.Name = "assetsFourlinkMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/07-fourLink/AssetsFourlinkMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.Designer.cs
index ddeb7bf..d0437e7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsSprinklerMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsSprinklerMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsSprinklerMainMgrPage1.AuthTree = null;
assetsSprinklerMainMgrPage1.Dock = DockStyle.Fill;
assetsSprinklerMainMgrPage1.Location = new Point(200, 0);
assetsSprinklerMainMgrPage1.Name = "assetsSprinklerMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-sprinkler/AssetsSprinklerMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.Designer.cs
index c7a6fa5..a8c2b51 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsBluntheadMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsBluntheadMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsBluntheadMainMgrPage1.AuthTree = null;
assetsBluntheadMainMgrPage1.Dock = DockStyle.Fill;
assetsBluntheadMainMgrPage1.Location = new Point(200, 0);
assetsBluntheadMainMgrPage1.Name = "assetsBluntheadMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/13-blunthead/AssetsBluntheadMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.Designer.cs
index 2c6a538..c45b369 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsTankMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsTankMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsTankMainMgrPage1.AuthTree = null;
assetsTankMainMgrPage1.Dock = DockStyle.Fill;
assetsTankMainMgrPage1.Location = new Point(200, 0);
assetsTankMainMgrPage1.Name = "assetsTankMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/AssetsTankMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.Designer.cs
index 6c670ac..d1190ba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsMeterMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsMeterMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsMeterMainMgrPage1.AuthTree = null;
assetsMeterMainMgrPage1.Dock = DockStyle.Fill;
assetsMeterMainMgrPage1.Location = new Point(200, 0);
assetsMeterMainMgrPage1.Name = "assetsMeterMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/15-meter/AssetsMeterMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.Designer.cs
index 9efc044..b6037cb 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsFlowmeterMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsFlowmeterMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsFlowmeterMainMgrPage1.AuthTree = null;
assetsFlowmeterMainMgrPage1.Dock = DockStyle.Fill;
assetsFlowmeterMainMgrPage1.Location = new Point(200, 0);
assetsFlowmeterMainMgrPage1.Name = "assetsFlowmeterMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/16-flowmeter/AssetsFlowmeterMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.Designer.cs
similarity index 97%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.Designer.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.Designer.cs
index caa41d9..52caad8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsHydrantMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsHydrantMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsHydrantMainMgrPage1.AuthTree = null;
assetsHydrantMainMgrPage1.Dock = DockStyle.Fill;
assetsHydrantMainMgrPage1.Location = new Point(200, 0);
assetsHydrantMainMgrPage1.Name = "assetsHydrantMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.cs
similarity index 100%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.cs
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.resx
similarity index 99%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.resx
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsBluntheadMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/17-hydrant/AssetsHydrantMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.Designer.cs
index 1f54f4e..9e1547d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsPressmeterMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsPressmeterMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsPressmeterMainMgrPage1.AuthTree = null;
assetsPressmeterMainMgrPage1.Dock = DockStyle.Fill;
assetsPressmeterMainMgrPage1.Location = new Point(200, 0);
assetsPressmeterMainMgrPage1.Name = "assetsPressmeterMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/18-pressmeter/AssetsPressmeterMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/04-excelHelper/TranslationExcelHelper.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/04-excelHelper/TranslationExcelHelper.cs
index 35d4a70..f4e2f82 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/04-excelHelper/TranslationExcelHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/04-excelHelper/TranslationExcelHelper.cs
@@ -136,7 +136,7 @@
StartDiameter = start_diameter,
EndDiameter = end_diameter,
Roughness = 120,
- Description = row_temp.GetCell(col_index_descriptions)?.StringCellValue,
+ Description = row_temp.GetCell(col_index_descriptions).StringCellValue,//?.StringCellValue,
});
}
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.Designer.cs
index b1a243e..9fcc475 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsTranslationMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsTranslationMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsTranslationMainMgrPage1.AuthTree = null;
assetsTranslationMainMgrPage1.Dock = DockStyle.Fill;
assetsTranslationMainMgrPage1.Location = new Point(200, 0);
assetsTranslationMainMgrPage1.Name = "assetsTranslationMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/AssetsTranslationMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.Designer.cs
index 546d6f5..2814092 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsExchangerMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsExchangerMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsExchangerMainMgrPage1.AuthTree = null;
assetsExchangerMainMgrPage1.Dock = DockStyle.Fill;
assetsExchangerMainMgrPage1.Location = new Point(200, 0);
assetsExchangerMainMgrPage1.Name = "assetsExchangerMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/20-exchanger/AssetsExchangerMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.Designer.cs
index 6043d2c..9028859 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsCompressorMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsCompressorMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsCompressorMainMgrPage1.AuthTree = null;
assetsCompressorMainMgrPage1.Dock = DockStyle.Fill;
assetsCompressorMainMgrPage1.Location = new Point(200, 0);
assetsCompressorMainMgrPage1.Name = "assetsCompressorMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/21-compressor/AssetsCompressorMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.Designer.cs
index 614d27d..402b94c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.Designer.cs
@@ -54,6 +54,7 @@
dockPnlLeft.ID = new Guid("af70ba13-cbf2-4ab4-b38b-d7b6d71a8bd6");
dockPnlLeft.Location = new Point(0, 0);
dockPnlLeft.Name = "dockPnlLeft";
+ dockPnlLeft.Options.ShowAutoHideButton = false;
dockPnlLeft.Options.ShowCloseButton = false;
dockPnlLeft.OriginalSize = new Size(200, 200);
dockPnlLeft.Size = new Size(200, 592);
@@ -79,6 +80,7 @@
//
assetsCoolingMainMgrPage1.Appearance.BackColor = SystemColors.Control;
assetsCoolingMainMgrPage1.Appearance.Options.UseBackColor = true;
+ assetsCoolingMainMgrPage1.AuthTree = null;
assetsCoolingMainMgrPage1.Dock = DockStyle.Fill;
assetsCoolingMainMgrPage1.Location = new Point(200, 0);
assetsCoolingMainMgrPage1.Name = "assetsCoolingMainMgrPage1";
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.resx b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.resx
index 6331e59..fe3ad6f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/22-cooling/AssetsCoolingMgrPage.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
index e1b8fcd..1cad626 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user
@@ -617,7 +617,7 @@
<Compile Update="17-hydrant\03-factor\ViewAssetsHydrantFactorDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="17-hydrant\AssetsBluntheadMgrPage.cs">
+ <Compile Update="17-hydrant\AssetsHydrantMgrPage.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="18-pressmeter\01-series\AddAssetsPressmeterSeriesDlg.cs">
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/00-core/WechatBindingCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/00-core/WechatBindingCtrl.cs
index 3078cfb..eaae85b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/00-core/WechatBindingCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/00-core/WechatBindingCtrl.cs
@@ -30,22 +30,14 @@
/// </summary>
public event Action LoginCancelEvent;
- /// <summary>
-
private bool _isInitialized = false;//鍒濆鍖�
private const string _template = "hzkw_wx_template";//寰俊鐧诲綍妯℃澘
- private const string _software = "HStation_XHS_DESKTOP";//杞欢缂栫爜
/// <summary>
/// 鍒濆鍖�
/// </summary>
public async void Initial()
{
- if (_isInitialized)
- {
- return;
- }
- _isInitialized = true;
var loginUrl = await BLLFactory<Yw.BLL.ToolWechat>.Instance.GetLoginUrl(_template);
await this.webView21.EnsureCoreWebView2Async();
this.webView21.Source = new Uri(loginUrl);
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs
index 06b4b7c..264cd8f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.Designer.cs
@@ -28,6 +28,7 @@
/// </summary>
private void InitializeComponent()
{
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PersonalCenterDlg));
navigationPane1 = new DevExpress.XtraBars.Navigation.NavigationPane();
navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
@@ -104,6 +105,7 @@
navigationPane1.Dock = DockStyle.Fill;
navigationPane1.Location = new Point(0, 0);
navigationPane1.Name = "navigationPane1";
+ navigationPane1.PageProperties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
navigationPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { navigationPage1, navigationPage2, navigationPage3 });
navigationPane1.RegularSize = new Size(661, 375);
navigationPane1.SelectedPage = navigationPage1;
@@ -115,8 +117,10 @@
//
navigationPage1.Caption = "涓汉淇℃伅";
navigationPage1.Controls.Add(layoutControl1);
+ navigationPage1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navigationPage1.ImageOptions.SvgImage");
+ navigationPage1.ImageOptions.SvgImageSize = new Size(20, 20);
navigationPage1.Name = "navigationPage1";
- navigationPage1.Size = new Size(558, 302);
+ navigationPage1.Size = new Size(536, 302);
//
// layoutControl1
//
@@ -131,7 +135,7 @@
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1034, 149, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(558, 302);
+ layoutControl1.Size = new Size(536, 302);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
@@ -139,9 +143,9 @@
//
BtnSave.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
BtnSave.Appearance.Options.UseBackColor = true;
- BtnSave.Location = new Point(490, 108);
+ BtnSave.Location = new Point(473, 108);
BtnSave.Name = "BtnSave";
- BtnSave.Size = new Size(56, 22);
+ BtnSave.Size = new Size(51, 22);
BtnSave.StyleController = layoutControl1;
BtnSave.TabIndex = 6;
BtnSave.Text = "淇濆瓨";
@@ -150,7 +154,7 @@
//
BtnEditPwd.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
BtnEditPwd.Appearance.Options.UseBackColor = true;
- BtnEditPwd.Location = new Point(431, 108);
+ BtnEditPwd.Location = new Point(414, 108);
BtnEditPwd.Name = "BtnEditPwd";
BtnEditPwd.Size = new Size(55, 22);
BtnEditPwd.StyleController = layoutControl1;
@@ -162,9 +166,7 @@
//
txtEditUserName.Location = new Point(76, 12);
txtEditUserName.Name = "txtEditUserName";
- txtEditUserName.Properties.ReadOnly = true;
- txtEditUserName.Properties.UseReadOnlyAppearance = false;
- txtEditUserName.Size = new Size(470, 20);
+ txtEditUserName.Size = new Size(448, 20);
txtEditUserName.StyleController = layoutControl1;
txtEditUserName.TabIndex = 0;
//
@@ -174,7 +176,7 @@
txtAccountName.Name = "txtAccountName";
txtAccountName.Properties.ReadOnly = true;
txtAccountName.Properties.UseReadOnlyAppearance = false;
- txtAccountName.Size = new Size(470, 20);
+ txtAccountName.Size = new Size(448, 20);
txtAccountName.StyleController = layoutControl1;
txtAccountName.TabIndex = 3;
//
@@ -184,7 +186,7 @@
textAccountType.Name = "textAccountType";
textAccountType.Properties.ReadOnly = true;
textAccountType.Properties.UseReadOnlyAppearance = false;
- textAccountType.Size = new Size(470, 20);
+ textAccountType.Size = new Size(448, 20);
textAccountType.StyleController = layoutControl1;
textAccountType.TabIndex = 4;
//
@@ -194,7 +196,7 @@
txtEditAdminType.Name = "txtEditAdminType";
txtEditAdminType.Properties.ReadOnly = true;
txtEditAdminType.Properties.UseReadOnlyAppearance = false;
- txtEditAdminType.Size = new Size(470, 20);
+ txtEditAdminType.Size = new Size(448, 20);
txtEditAdminType.StyleController = layoutControl1;
txtEditAdminType.TabIndex = 2;
//
@@ -204,7 +206,7 @@
Root.GroupBordersVisible = false;
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, emptySpaceItem1, layoutControlItem4, layoutControlItem6, layoutControlItem5 });
Root.Name = "Root";
- Root.Size = new Size(558, 302);
+ Root.Size = new Size(536, 302);
Root.TextVisible = false;
//
// layoutControlItem1
@@ -212,7 +214,7 @@
layoutControlItem1.Control = txtEditUserName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(538, 24);
+ layoutControlItem1.Size = new Size(516, 24);
layoutControlItem1.Text = "鐢ㄦ埛鍚�:";
layoutControlItem1.TextSize = new Size(52, 14);
//
@@ -221,7 +223,7 @@
layoutControlItem2.Control = txtEditAdminType;
layoutControlItem2.Location = new Point(0, 24);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(538, 24);
+ layoutControlItem2.Size = new Size(516, 24);
layoutControlItem2.Text = "绠＄悊绫诲瀷:";
layoutControlItem2.TextSize = new Size(52, 14);
//
@@ -230,7 +232,7 @@
layoutControlItem3.Control = textAccountType;
layoutControlItem3.Location = new Point(0, 72);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(538, 24);
+ layoutControlItem3.Size = new Size(516, 24);
layoutControlItem3.Text = "璐︽埛绫诲瀷:";
layoutControlItem3.TextSize = new Size(52, 14);
//
@@ -239,7 +241,7 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 96);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(419, 186);
+ emptySpaceItem1.Size = new Size(402, 186);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem4
@@ -247,23 +249,23 @@
layoutControlItem4.Control = txtAccountName;
layoutControlItem4.Location = new Point(0, 48);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(538, 24);
+ layoutControlItem4.Size = new Size(516, 24);
layoutControlItem4.Text = "璐︽埛鍚�:";
layoutControlItem4.TextSize = new Size(52, 14);
//
// layoutControlItem6
//
layoutControlItem6.Control = BtnSave;
- layoutControlItem6.Location = new Point(478, 96);
+ layoutControlItem6.Location = new Point(461, 96);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(60, 186);
+ layoutControlItem6.Size = new Size(55, 186);
layoutControlItem6.TextSize = new Size(0, 0);
layoutControlItem6.TextVisible = false;
//
// layoutControlItem5
//
layoutControlItem5.Control = BtnEditPwd;
- layoutControlItem5.Location = new Point(419, 96);
+ layoutControlItem5.Location = new Point(402, 96);
layoutControlItem5.Name = "layoutControlItem5";
layoutControlItem5.Size = new Size(59, 186);
layoutControlItem5.TextSize = new Size(0, 0);
@@ -273,8 +275,10 @@
//
navigationPage2.Caption = "鎵嬫満缁戝畾";
navigationPage2.Controls.Add(layoutControl2);
+ navigationPage2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("navigationPage2.ImageOptions.SvgImage");
+ navigationPage2.ImageOptions.SvgImageSize = new Size(20, 20);
navigationPage2.Name = "navigationPage2";
- navigationPage2.Size = new Size(558, 302);
+ navigationPage2.Size = new Size(536, 302);
//
// layoutControl2
//
@@ -284,7 +288,7 @@
layoutControl2.Location = new Point(0, 0);
layoutControl2.Name = "layoutControl2";
layoutControl2.Root = layoutControlGroup1;
- layoutControl2.Size = new Size(558, 302);
+ layoutControl2.Size = new Size(536, 302);
layoutControl2.TabIndex = 0;
layoutControl2.Text = "layoutControl2";
//
@@ -292,9 +296,9 @@
//
btnPhoneBinding.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
btnPhoneBinding.Appearance.Options.UseBackColor = true;
- btnPhoneBinding.Location = new Point(488, 36);
+ btnPhoneBinding.Location = new Point(469, 36);
btnPhoneBinding.Name = "btnPhoneBinding";
- btnPhoneBinding.Size = new Size(58, 22);
+ btnPhoneBinding.Size = new Size(55, 22);
btnPhoneBinding.StyleController = layoutControl2;
btnPhoneBinding.TabIndex = 7;
btnPhoneBinding.Text = "缁戝畾";
@@ -304,7 +308,7 @@
//
txtMobileNumber.Location = new Point(64, 12);
txtMobileNumber.Name = "txtMobileNumber";
- txtMobileNumber.Size = new Size(482, 20);
+ txtMobileNumber.Size = new Size(460, 20);
txtMobileNumber.StyleController = layoutControl2;
txtMobileNumber.TabIndex = 14;
//
@@ -314,7 +318,7 @@
layoutControlGroup1.GroupBordersVisible = false;
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem7, layoutControlItem8, emptySpaceItem2 });
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(558, 302);
+ layoutControlGroup1.Size = new Size(536, 302);
layoutControlGroup1.TextVisible = false;
//
// layoutControlItem7
@@ -322,16 +326,16 @@
layoutControlItem7.Control = txtMobileNumber;
layoutControlItem7.Location = new Point(0, 0);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(538, 24);
+ layoutControlItem7.Size = new Size(516, 24);
layoutControlItem7.Text = "鎵嬫満鍙�:";
layoutControlItem7.TextSize = new Size(40, 14);
//
// layoutControlItem8
//
layoutControlItem8.Control = btnPhoneBinding;
- layoutControlItem8.Location = new Point(476, 24);
+ layoutControlItem8.Location = new Point(457, 24);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(62, 258);
+ layoutControlItem8.Size = new Size(59, 258);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -340,15 +344,16 @@
emptySpaceItem2.AllowHotTrack = false;
emptySpaceItem2.Location = new Point(0, 24);
emptySpaceItem2.Name = "emptySpaceItem2";
- emptySpaceItem2.Size = new Size(476, 258);
+ emptySpaceItem2.Size = new Size(457, 258);
emptySpaceItem2.TextSize = new Size(0, 0);
//
// navigationPage3
//
navigationPage3.Caption = "寰俊缁戝畾";
navigationPage3.Controls.Add(layoutControl3);
+ navigationPage3.ImageOptions.Image = (Image)resources.GetObject("navigationPage3.ImageOptions.Image");
navigationPage3.Name = "navigationPage3";
- navigationPage3.Size = new Size(558, 302);
+ navigationPage3.Size = new Size(536, 302);
//
// layoutControl3
//
@@ -358,7 +363,7 @@
layoutControl3.Location = new Point(0, 0);
layoutControl3.Name = "layoutControl3";
layoutControl3.Root = layoutControlGroup2;
- layoutControl3.Size = new Size(558, 302);
+ layoutControl3.Size = new Size(536, 302);
layoutControl3.TabIndex = 0;
layoutControl3.Text = "layoutControl3";
//
@@ -366,9 +371,9 @@
//
btnRefresh.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
btnRefresh.Appearance.Options.UseBackColor = true;
- btnRefresh.Location = new Point(482, 268);
+ btnRefresh.Location = new Point(463, 268);
btnRefresh.Name = "btnRefresh";
- btnRefresh.Size = new Size(64, 22);
+ btnRefresh.Size = new Size(61, 22);
btnRefresh.StyleController = layoutControl3;
btnRefresh.TabIndex = 8;
btnRefresh.Text = "鍒锋柊";
@@ -378,7 +383,7 @@
//
wechatBindingCtrl1.Location = new Point(12, 12);
wechatBindingCtrl1.Name = "wechatBindingCtrl1";
- wechatBindingCtrl1.Size = new Size(534, 252);
+ wechatBindingCtrl1.Size = new Size(512, 252);
wechatBindingCtrl1.TabIndex = 0;
//
// layoutControlGroup2
@@ -387,7 +392,7 @@
layoutControlGroup2.GroupBordersVisible = false;
layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem9, emptySpaceItem3, layoutControlItem10 });
layoutControlGroup2.Name = "layoutControlGroup2";
- layoutControlGroup2.Size = new Size(558, 302);
+ layoutControlGroup2.Size = new Size(536, 302);
layoutControlGroup2.TextVisible = false;
//
// layoutControlItem9
@@ -395,7 +400,7 @@
layoutControlItem9.Control = wechatBindingCtrl1;
layoutControlItem9.Location = new Point(0, 0);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(538, 256);
+ layoutControlItem9.Size = new Size(516, 256);
layoutControlItem9.TextSize = new Size(0, 0);
layoutControlItem9.TextVisible = false;
//
@@ -404,15 +409,15 @@
emptySpaceItem3.AllowHotTrack = false;
emptySpaceItem3.Location = new Point(0, 256);
emptySpaceItem3.Name = "emptySpaceItem3";
- emptySpaceItem3.Size = new Size(470, 26);
+ emptySpaceItem3.Size = new Size(451, 26);
emptySpaceItem3.TextSize = new Size(0, 0);
//
// layoutControlItem10
//
layoutControlItem10.Control = btnRefresh;
- layoutControlItem10.Location = new Point(470, 256);
+ layoutControlItem10.Location = new Point(451, 256);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(68, 26);
+ layoutControlItem10.Size = new Size(65, 26);
layoutControlItem10.TextSize = new Size(0, 0);
layoutControlItem10.TextVisible = false;
//
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs
index 12fbaed..14d2be1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.cs
@@ -145,5 +145,23 @@
{
this.wechatBindingCtrl1.Initial();
}
+
+ //涓汉淇℃伅淇濆瓨
+ private async void BtnSave_Click(object sender, EventArgs e)
+ {
+ var vmo = await BLLFactory<Yw.BLL.User>.Instance.GetByID(GlobalParas._GlobalParas.UserID);
+ vmo.Name = this.txtEditUserName.Text;
+ var bol = await BLLFactory<Yw.BLL.User>.Instance.Update(vmo);
+ if (!bol)
+ {
+ TipFormHelper.ShowError("鏇存柊澶辫触锛�");
+ return;
+ }
+ else
+ {
+ GlobalParas._GlobalParas.LoginName = this.txtEditUserName.Text;
+ TipFormHelper.ShowSucceed("鏇存柊鎴愬姛锛�");
+ }
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx
index 8b2ff64..c96f4a6 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/PersonalCenterDlg.resx
@@ -117,4 +117,79 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <data name="navigationPage1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALQEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+ aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+ c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+ O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+ ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+ c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJFbXBsb3llZV8xXyI+
+ DQogICAgPHBhdGggZD0iTTEwLjIsOS45Yy0wLjEsMC41LDAuMiwwLjksMC40LDEuNHMtMC4xLDEuNyww
+ LjksMS42YzAsMCwwLDAuMSwwLDAuMmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBzNC4yLTIuNiw0Ljct
+ NC45VjEzYzEsMC4xLDAuNi0xLjEsMC45LTEuNmMwLjItMC41LDAuNC0wLjksMC4zLTEuNGMtMC4xLTAu
+ NC0wLjQtMC40LTAuNS0wLjNDMjMuNCw0LjgsMjAuNSw1LDIwLjUsNVMyMC4yLDIsMTUsMiAgIGMtNC44
+ LDAtNS40LDQtNC4zLDcuNkMxMC42LDkuNiwxMC4zLDkuNywxMC4yLDkuOXogTTIwLjIsMThjLTAuOCwx
+ LjUtMi4xLDQtNCw0cy0zLjItMi41LTQtNGMtMi4zLDMuNS04LDEtOCw4LjVWMzBoMjR2LTMuNSAgIEMy
+ OC4yLDE5LjEsMjIuNSwyMS40LDIwLjIsMTh6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3Zn
+ Pgs=
+</value>
+ </data>
+ <data name="navigationPage2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAADAEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+ ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk
+ aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp
+ c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41
+ O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7
+ ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp
+ c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJQaG9uZSI+DQogICAg
+ PHBhdGggZD0iTTI3LjcsMjMuNmwtNS4zLTUuM2MtMC40LTAuNC0xLTAuNC0xLjQsMGwtMi44LDIuOGMt
+ My4yLTEuNS01LjgtNC4xLTcuMy03LjNsMi44LTIuOGMwLjQtMC40LDAuNC0xLDAtMS40ICAgTDguNCw0
+ LjNjLTAuNC0wLjQtMS0wLjQtMS41LDBMNC4zLDYuOUM0LjEsNy4yLDQsNy40LDQsNy43QzQsMTguOSwx
+ My4xLDI4LDI0LjMsMjhjMC4zLDAsMC41LTAuMSwwLjctMC4zbDIuNi0yLjYgICBDMjguMSwyNC42LDI4
+ LjEsMjQsMjcuNywyMy42eiIgY2xhc3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="navigationPage3.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ /9j/4AAQSkZJRgABAQEAYABgAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcUFhYa
+ HSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgoKCgoKCgo
+ KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCAAUABQDASIAAhEBAxEB/8QA
+ HwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIh
+ MUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVW
+ V1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXG
+ x8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQF
+ BgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAV
+ YnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOE
+ hYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq
+ 8vP09fb3+Pn6/9oADAMBAAIRAxEAPwDR8OeFtV8YSS6pf6mLW3mufJFxOWZpZW/hUf8A1wKp+MvCN74b
+ QXC3qX1iZmtzPESNkq9UYHoeD69K6/4WfELT/D2gzafrRdVSfdAYkLMQ2S2R6Age/wA3TivRdHvNI8S6
+ ctxDf2c6zrH5kUsaO4YEl1YNzyOMdgOK5IwjKOj1PkaGBw2KopRl+8er11v6XPCfDnivW9L0821jqE0c
+ O8sFzkDIHTNFVdU+wnWdS/sj/kH/AGl/I/3M8Y9vSisuZrS550a9amuRTenZjPGml2+k+KNRsrTf5EMz
+ Km85IFYyrgggkEcgg9KKKmW5yVklUkl3PZ/hb4F0bWfCqXt+k7zvKwOJMAAY4HFFFFdUIrlWh9Xg6FKV
+ CDcVt2P/2Q==
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml
index 38871cc..b592378 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/06-user-info/Window1.xaml
@@ -56,12 +56,7 @@
FontSize="14"
Text="蹇嵎閿�" />
</ListBoxItem>
- <ListBoxItem>
- <TextBlock
- Padding="10,8"
- FontSize="14"
- Text="鍏充簬寰俊" />
- </ListBoxItem>
+ <ListBoxItem />
</ListBox>
</Border>
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
index 5f2ccfd..050bf61 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj
@@ -50,6 +50,7 @@
</ItemGroup>
<ItemGroup>
+ <Compile Remove="06-user-info\Window1.xaml.cs" />
<Compile Remove="RoleMainPanel.cs" />
<Compile Remove="RoleMainPanel.Designer.cs" />
</ItemGroup>
@@ -59,6 +60,10 @@
</ItemGroup>
<ItemGroup>
+ <Page Remove="06-user-info\Window1.xaml" />
+ </ItemGroup>
+
+ <ItemGroup>
<Compile Update="00-core\WechatBindingCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
diff --git a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user
index d6d6604..4e3d35d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user
+++ b/WinFrmUI/HStation.WinFrmUI.Auth.Core/HStation.WinFrmUI.Auth.Core.csproj.user
@@ -57,9 +57,4 @@
<SubType>Form</SubType>
</Compile>
</ItemGroup>
- <ItemGroup>
- <Page Update="06-user-info\Window1.xaml">
- <SubType>Designer</SubType>
- </Page>
- </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index 3147988..04eddc2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -1841,6 +1841,7 @@
public static bool Matching(HydroPressmeterMatchingViewModel input, List<AssetsPressmeterMainVmo> pressmeterVmos)
{
//杈撳叆鍙傛暟楠岃瘉
+
if (input == null)
{
return false;
--
Gitblit v1.9.3