From 17a0baa0ef883689c73e3141d148a28a48d62cd6 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:31:04 +0800
Subject: [PATCH] 报告修改
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PropGroupChoiceViewModel.cs | 3
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/ReportViewModel.cs | 5
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs | 53 +++--
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs | 2
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs | 123 ++++++-------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs | 12
Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpPropContent.cs | 9
Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPropContentVmo.cs | 5
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs | 16
Service/HStation.Service.Assets.Core/00-core/PumpDataType.cs | 25 ++
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs | 16 +
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs | 2
Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpExInformation.cs | 21 ++
WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs | 7
Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/PumpPropContentDto.cs | 6
BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain.cs | 70 +++----
Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs | 7
BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain_Instance.cs | 85 +++++++++
BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/AssetsPumpPropContent.cs | 2
Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/AddPumpPropContentInput.cs | 5
Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/UpdatePumpPropContentInput.cs | 5
Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPartMainVmo.cs | 5
22 files changed, 333 insertions(+), 151 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/PumpMain.cs b/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain.cs
similarity index 72%
rename from BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/PumpMain.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain.cs
index 6d3f066..57d3d36 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/PumpMain.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain.cs
@@ -1,4 +1,5 @@
锘縰sing AutoMapper;
+using HStation.Vmo;
using System.Collections.Generic;
using Yw;
using Yw.Dto;
@@ -8,7 +9,7 @@
/// <summary>
///
/// </summary>
- public class AssetsPumpMain
+ public partial class AssetsPumpMain
{
private readonly HStation.CAL.IAssetsPumpMain _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsPumpMain>();
@@ -20,10 +21,7 @@
public async Task<List<Vmo.AssetsPumpMainVmo>> GetAll()
{
var DtoList = await _cal.GetAll();
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AssetsPumpMainDto, Vmo.AssetsPumpMainVmo>()
- ).CreateMapper();
- var vmoList = mapper.Map<List<Dto.Assets.AssetsPumpMainDto>, List<Vmo.AssetsPumpMainVmo>>(DtoList);
- return vmoList;
+ return Dto2Vmos(DtoList);
}
/// <summary>
@@ -32,9 +30,22 @@
public async Task<Vmo.AssetsPumpMainVmo> GetByID(long ID)
{
var Dto = await _cal.GetByID(ID);
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AssetsPumpMainDto, Vmo.AssetsPumpMainVmo>()
- ).CreateMapper();
- var vmo = mapper.Map<Dto.Assets.AssetsPumpMainDto, Vmo.AssetsPumpMainVmo>(Dto);
+ return Dto2Vmo(Dto);
+ }
+
+ /// <summary>
+ ///
+ /// </summary>
+ public async Task<Vmo.PumpExInformationVmo> GetByIDEx(long ID)
+ {
+ var Dto = await _cal.GetByID(ID);
+ var partList = await GetPartByID(ID);
+ var vmo = new PumpExInformationVmo();
+ if (partList.Count > 0 && partList != null)
+ {
+ var contentList = await new BLL.AssetsPumpPropContent().GetByPumpPartID(partList.First().ID);
+ vmo.PropContent = contentList;
+ }
return vmo;
}
@@ -44,11 +55,7 @@
public async Task<List<Vmo.AssetsPumpMainVmo>> GetByIds(List<long> Ids)
{
var DtoList = await _cal.GetByIds(Ids);
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AssetsPumpMainDto, Vmo.AssetsPumpMainVmo>()
- ).CreateMapper();
- var vmoList = mapper.Map<List<Dto.Assets.AssetsPumpMainDto>, List<Vmo.AssetsPumpMainVmo>>(DtoList);
-
- return vmoList;
+ return Dto2Vmos(DtoList);
}
/// <summary>
@@ -72,11 +79,9 @@
/// </summary>
public async Task<long> Insert(Vmo.AssetsPumpMainVmo model)
{
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AssetsPumpMainVmo, AddAssetsPumpMainInput>()
- ).CreateMapper();
- var vmo = mapper.Map<Vmo.AssetsPumpMainVmo, AddAssetsPumpMainInput>(model);
-
- return await _cal.Insert(vmo);
+ var dto = Vmo2AddDto(model);
+ var id = await _cal.Insert(dto);
+ return id;
}
/// <summary>
@@ -84,11 +89,9 @@
/// </summary>
public async Task<bool> Inserts(List<Vmo.AssetsPumpMainVmo> list)
{
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AssetsPumpMainVmo, AddAssetsPumpMainInput>()
- ).CreateMapper();
- var vmoList = mapper.Map<List<Vmo.AssetsPumpMainVmo>, List<AddAssetsPumpMainInput>>(list);
-
- return await _cal.Inserts(vmoList);
+ var dtoList = Vmo2AddDtos(list);
+ var bol = await _cal.Inserts(dtoList);
+ return bol;
}
/// <summary>
@@ -129,10 +132,9 @@
/// </summary>
public async Task<bool> Update(Vmo.AssetsPumpMainVmo model)
{
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AssetsPumpMainVmo, UpdateAssetsPumpMainInput>()
- ).CreateMapper();
- var Vmo = mapper.Map<Vmo.AssetsPumpMainVmo, UpdateAssetsPumpMainInput>(model);
- return await _cal.Update(Vmo);
+ var dto = Vmo2UpdateDto(model);
+ var bol = await _cal.Update(dto);
+ return bol;
}
/// <summary>
@@ -140,11 +142,9 @@
/// </summary>
public async Task<bool> Updates(List<Vmo.AssetsPumpMainVmo> list)
{
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Vmo.AssetsPumpMainVmo, UpdateAssetsPumpMainInput>()
- ).CreateMapper();
- var VmoList = mapper.Map<List<Vmo.AssetsPumpMainVmo>, List<UpdateAssetsPumpMainInput>>(list);
-
- return await _cal.Updates(VmoList);
+ var dtoList = Vmo2UpdateDtos(list);
+ var bol = await _cal.Updates(dtoList);
+ return bol;
}
/// <summary>
@@ -227,10 +227,8 @@
public async Task<List<Vmo.AssetsPumpMainVmo>> GetByPumpSeriesID(long ID)
{
var DtoList = await _cal.GetByPumpSeriesID(ID);
- var mapper = new MapperConfiguration(cfg => cfg.CreateMap<Dto.Assets.AssetsPumpMainDto, Vmo.AssetsPumpMainVmo>()
- ).CreateMapper();
- var vmoList = mapper.Map<List<Dto.Assets.AssetsPumpMainDto>, List<Vmo.AssetsPumpMainVmo>>(DtoList);
- return vmoList;
+ var dtoList = Dto2Vmos(DtoList);
+ return dtoList;
}
/// <summary>
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain_Instance.cs b/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain_Instance.cs
new file mode 100644
index 0000000..040649d
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/03-PumpMain/AssetsPumpMain_Instance.cs
@@ -0,0 +1,85 @@
+锘縰sing AutoMapper;
+
+namespace HStation.BLL
+{
+ public partial class AssetsPumpMain
+ {
+ //dto to vmo
+ internal static HStation.Vmo.AssetsPumpMainVmo Dto2Vmo(AssetsPumpMainDto dto)
+ {
+ if (dto == null)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Dto.Assets.AssetsPumpMainDto, HStation.Vmo.AssetsPumpMainVmo>()
+ ).CreateMapper();
+ var vmo = mapper.Map<AssetsPumpMainDto, HStation.Vmo.AssetsPumpMainVmo>(dto);
+ return vmo;
+ }
+
+ //dto to vmos
+ internal static List<HStation.Vmo.AssetsPumpMainVmo> Dto2Vmos(List<AssetsPumpMainDto> dtos)
+ {
+ if (dtos == null || dtos.Count < 1)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<AssetsPumpMainDto, HStation.Vmo.AssetsPumpMainVmo>()
+ ).CreateMapper();
+ var vmos = mapper.Map<List<AssetsPumpMainDto>, List<HStation.Vmo.AssetsPumpMainVmo>>(dtos);
+ return vmos;
+ }
+
+ //vmo to add dto
+ internal static HStation.Dto.Assets.AddAssetsPumpMainInput Vmo2AddDto(HStation.Vmo.AssetsPumpMainVmo vmo)
+ {
+ if (vmo == null)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsPumpMainVmo, HStation.Dto.Assets.AddAssetsPumpMainInput>()
+ ).CreateMapper();
+ var dto = mapper.Map<HStation.Vmo.AssetsPumpMainVmo, HStation.Dto.Assets.AddAssetsPumpMainInput>(vmo);
+ return dto;
+ }
+
+ //vmo to add dtos
+ internal static List<HStation.Dto.Assets.AddAssetsPumpMainInput> Vmo2AddDtos(List<HStation.Vmo.AssetsPumpMainVmo> vmoList)
+ {
+ if (vmoList == null || vmoList.Count < 1)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsPumpMainVmo, HStation.Dto.Assets.AddAssetsPumpMainInput>()
+ ).CreateMapper();
+ var dtoList = mapper.Map<List<HStation.Vmo.AssetsPumpMainVmo>, List<HStation.Dto.Assets.AddAssetsPumpMainInput>>(vmoList);
+ return dtoList;
+ }
+
+ //vmo to update dto
+ internal static HStation.Dto.Assets.UpdateAssetsPumpMainInput Vmo2UpdateDto(HStation.Vmo.AssetsPumpMainVmo vmo)
+ {
+ if (vmo == null)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsPumpMainVmo, HStation.Dto.Assets.UpdateAssetsPumpMainInput>()
+ ).CreateMapper();
+ var dto = mapper.Map<HStation.Vmo.AssetsPumpMainVmo, HStation.Dto.Assets.UpdateAssetsPumpMainInput>(vmo);
+ return dto;
+ }
+
+ //vmo to update dtos
+ internal static List<HStation.Dto.Assets.UpdateAssetsPumpMainInput> Vmo2UpdateDtos(List<HStation.Vmo.AssetsPumpMainVmo> vmoList)
+ {
+ if (vmoList == null || vmoList.Count < 1)
+ {
+ return default;
+ }
+ var mapper = new MapperConfiguration(cfg => cfg.CreateMap<HStation.Vmo.AssetsPumpMainVmo, HStation.Dto.Assets.UpdateAssetsPumpMainInput>()
+ ).CreateMapper();
+ var dtoList = mapper.Map<List<HStation.Vmo.AssetsPumpMainVmo>, List<HStation.Dto.Assets.UpdateAssetsPumpMainInput>>(vmoList);
+ return dtoList;
+ }
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/PumpPartPropContent.cs b/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/AssetsPumpPropContent.cs
similarity index 99%
rename from BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/PumpPartPropContent.cs
rename to BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/AssetsPumpPropContent.cs
index 28431de..41b48cf 100644
--- a/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/PumpPartPropContent.cs
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/01-Pump/06-PumpPropContent/AssetsPumpPropContent.cs
@@ -7,7 +7,7 @@
/// <summary>
///
/// </summary>
- public class PumpPartPropContent
+ public class AssetsPumpPropContent
{
private readonly HStation.CAL.IAssetsPumpPropContent _cal = CALCreateHelper.CreateCAL<HStation.CAL.IAssetsPumpPropContent>();
diff --git a/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/AddPumpPropContentInput.cs b/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/AddPumpPropContentInput.cs
index 9179099..7aedc6e 100644
--- a/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/AddPumpPropContentInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/AddPumpPropContentInput.cs
@@ -21,5 +21,10 @@
/// 灞炴�у��
/// </summary>
public string PropValue { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string TagName { get; set; }
}
}
\ No newline at end of file
diff --git a/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/PumpPropContentDto.cs b/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/PumpPropContentDto.cs
index ef26676..217cea5 100644
--- a/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/PumpPropContentDto.cs
+++ b/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/PumpPropContentDto.cs
@@ -13,6 +13,7 @@
this.PropID = rhs.PropID;
this.PartID = rhs.PartID;
this.PropValue = rhs.PropValue;
+ this.TagName = rhs.TagName;
}
/// <summary>
@@ -44,5 +45,10 @@
/// 灞炴�у��
/// </summary>
public string PropValue { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string TagName { get; set; }
}
}
\ No newline at end of file
diff --git a/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/UpdatePumpPropContentInput.cs b/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/UpdatePumpPropContentInput.cs
index 07b2aed..a90d510 100644
--- a/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/UpdatePumpPropContentInput.cs
+++ b/Dto/HStation.Dto.Assets.Core/00-Pump/06-PumpPropContent/UpdatePumpPropContentInput.cs
@@ -29,5 +29,10 @@
/// 灞炴�у��
/// </summary>
public string PropValue { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string TagName { get; set; }
}
}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/00-core/PumpDataType.cs b/Service/HStation.Service.Assets.Core/00-core/PumpDataType.cs
new file mode 100644
index 0000000..f613ac0
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/00-core/PumpDataType.cs
@@ -0,0 +1,25 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HStation.Assets
+{
+ public class PumpDataType
+ {
+ /// <summary>
+ /// 棰濆畾鐢靛帇
+ /// </summary>
+ public const string RatedVoltage = "RatedVoltage";
+
+ /// <summary>
+ /// 棰濆畾鐢垫祦
+ /// </summary>
+ public const string RatedCurrent = "RatedCurrent";
+ /// <summary>
+ /// 棰濆畾鍥犳暟
+ /// </summary>
+ public const string RatedFactor = "RatedFactor";
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs
index 3752e2f..b6232a4 100644
--- a/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs
+++ b/Service/HStation.Service.Assets.Core/01-entity/01-Pump/AssetsPumpPropContent.cs
@@ -7,7 +7,7 @@
/// </summary>
[SysType("assets_pump_part_prop_content")]
[SugarTable("assets_pump_part_prop_content")]
- public class AssetsPumpPropContent : BaseEntity, System.ICloneable
+ public class AssetsPumpPropContent : BaseEntity, ITagName, System.ICloneable
{
public AssetsPumpPropContent()
{ }
@@ -33,6 +33,11 @@
public string PropValue { get; set; }
/// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
///
/// </summary>
public AssetsPumpMain Clone()
diff --git a/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpPropContent.cs b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpPropContent.cs
index 08d26b5..78c6e73 100644
--- a/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpPropContent.cs
+++ b/Service/HStation.Service.Assets.Core/02-model/01-Pump/AssetsPumpPropContent.cs
@@ -6,7 +6,7 @@
/// 娉靛睘鎬у��
/// </summary>
[SysType("assets_pump_part_prop_content")]
- public class AssetsPumpPropContent : BaseModel, System.ICloneable
+ public class AssetsPumpPropContent : BaseModel, ITagName, System.ICloneable
{
public AssetsPumpPropContent()
{ }
@@ -18,6 +18,7 @@
this.ID = rhs.ID;
this.PartID = rhs.PartID;
this.PropValue = rhs.PropValue;
+ this.TagName = rhs.TagName;
}
public void Reset(AssetsPumpPropContent rhs)
@@ -27,6 +28,7 @@
this.ID = rhs.ID;
this.PartID = rhs.PartID;
this.PropValue = rhs.PropValue;
+ this.TagName = rhs.TagName;
}
/// <summary>
@@ -50,6 +52,11 @@
public string PropValue { get; set; }
/// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string TagName { get; set; }
+
+ /// <summary>
///
/// </summary>
public AssetsPumpMain Clone()
diff --git a/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpExInformation.cs b/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpExInformation.cs
new file mode 100644
index 0000000..d809183
--- /dev/null
+++ b/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpExInformation.cs
@@ -0,0 +1,21 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HStation.Vmo
+{
+ public class PumpExInformationVmo
+ {
+ /// <summary>
+ /// 鍨嬪彿
+ /// </summary>
+ public AssetsPumpMainVmo AssetsPumpMainVmo { get; set; }
+
+ /// <summary>
+ /// 灞炴�у��
+ /// </summary>
+ public List<AssetsPumpPropContentVmo> PropContent { get; set; }
+ }
+}
\ No newline at end of file
diff --git a/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPartMainVmo.cs b/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPartMainVmo.cs
index 1da9582..25663f1 100644
--- a/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPartMainVmo.cs
+++ b/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPartMainVmo.cs
@@ -8,11 +8,6 @@
public long ID { get; set; }
/// <summary>
- /// 娉佃澶嘔D
- /// </summary>
- public long PartID { get; set; }
-
- /// <summary>
/// 娉电郴鍒桰D
/// </summary>
public long SeriesID { get; set; }
diff --git a/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPropContentVmo.cs b/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPropContentVmo.cs
index 2c1cd0f..29383a3 100644
--- a/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPropContentVmo.cs
+++ b/Vmo/HStation.Vmo.Assets.Core/01-Pump/PumpPropContentVmo.cs
@@ -26,5 +26,10 @@
/// 灞炴�у��
/// </summary>
public string PropValue { get; set; }
+
+ /// <summary>
+ /// 鏍囩
+ /// </summary>
+ public string TagName { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs
index b2b0445..1ca9e59 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/CurrentPumpPartMainViewModel.cs
@@ -9,7 +9,6 @@
public CurrentPartMainViewModel(Vmo.AssetsPumpPartMainVmo rhs) : base()
{
this.ID = rhs.ID;
- this.PartID = rhs.PartID;
this.Name = rhs.Name;
this.NO = rhs.NO;
this.Code = rhs.Code;
@@ -22,7 +21,6 @@
this.Name = rhs.Name;
this.NO = rhs.NO;
this.Code = rhs.Code;
- this.PartID = rhs.PartID;
this.SeriesID = rhs.SeriesID;
}
@@ -31,11 +29,6 @@
/// </summary>
public long ID { get; set; }
-
- /// <summary>
- /// 娉佃澶嘔D
- /// </summary>
- public long PartID { get; set; }
/// <summary>
/// 娉电郴鍒桰D
/// </summary>
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PropGroupChoiceViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PropGroupChoiceViewModel.cs
index 2e1b8ed..b812f2a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PropGroupChoiceViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/00-ViewModel/PropGroupChoiceViewModel.cs
@@ -6,6 +6,7 @@
public string PropGroupName { get; set; }
public string PropName { get; set; }
public string Value { get; set; }
- public string KeyWorldType { get; set; }
+
+ public string TagName { get; set; }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs
index 9f6cb0f..59608a0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.Designer.cs
@@ -68,6 +68,7 @@
barDockControlRight = new DevExpress.XtraBars.BarDockControl();
popupPumpPartMenu = new DevExpress.XtraBars.PopupMenu(components);
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ colTagName = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
@@ -178,7 +179,7 @@
//
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colPropGroupName, colPropName, colValue });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colPropGroupName, colPropName, colValue, colTagName });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.AllowCellMerge = true;
@@ -446,6 +447,18 @@
//
dxErrorProvider1.ContainerControl = this;
//
+ // colTagName
+ //
+ colTagName.AppearanceCell.Options.UseTextOptions = true;
+ colTagName.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+ colTagName.Caption = "鏍囩";
+ colTagName.FieldName = "TagName";
+ colTagName.Name = "colTagName";
+ colTagName.OptionsColumn.AllowEdit = false;
+ colTagName.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+ colTagName.Visible = true;
+ colTagName.VisibleIndex = 3;
+ //
// EditPumpPartPropDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -536,5 +549,6 @@
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItemAddProp;
private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+ private DevExpress.XtraGrid.Columns.GridColumn colTagName;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
index 14114fe..813ef0a 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/01-pump/01-EditPumpPartProp/EditPumpPartPropDlg.cs
@@ -84,21 +84,20 @@
return;
}
_propList.Clear();
- _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "娴侀噺", Value = _pumpMain.RatedFlow.ToString(), KeyWorldType = "Basic_Flow" });
- _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "鎵▼", Value = _pumpMain.RatedHead.ToString(), KeyWorldType = "Basic_Head" });
- _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "鍔熺巼", Value = _pumpMain.RatedPower.ToString(), KeyWorldType = "Basic_Power" });
- _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "杞��", Value = _pumpMain.RatedSpeed.ToString(), KeyWorldType = "Basic_Speed" });
+ _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "娴侀噺", Value = _pumpMain.RatedFlow.ToString(), TagName = "Basic_Flow" });
+ _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "鎵▼", Value = _pumpMain.RatedHead.ToString(), TagName = "Basic_Head" });
+ _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "鍔熺巼", Value = _pumpMain.RatedPower.ToString(), TagName = "Basic_Power" });
+ _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = "閾墝鍙傛暟", PropName = "杞��", Value = _pumpMain.RatedSpeed.ToString(), TagName = "Basic_Speed" });
foreach (var item in catlog)
{
foreach (var prop in item.PropList)
{
- _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, KeyWorldType = "Prop" });
+ _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID,TagName= prop.Code });
}
}
- var propbll = new BLL.PumpPartPropContent();
- var alllist = await propbll.GetByPumpPartID(model.ID);
- _allPropList = alllist;
- foreach (var item in alllist)
+ var propbll = new BLL.AssetsPumpPropContent();
+ _allPropList = await propbll.GetByPumpPartID(model.ID);
+ foreach (var item in _allPropList)
{
var selectProp = _propList.Find(x => x.ID == item.PropID);
if (selectProp != null)
@@ -131,7 +130,7 @@
updatepart.NO = TextEditNo.Text;
updatepart.Code = TextEditProductCode.Text;
updatepart.SeriesID = _series.ID;
- var propList = _propList.Where(x => x.KeyWorldType == "Prop").ToList(); //鎵惧埌鎵�鏈夌殑棰濆灞炴��
+ var propList = _propList.Where(x => x.TagName == "Prop").ToList(); //鎵惧埌鎵�鏈夌殑棰濆灞炴��
foreach (var item in propList)
{
if (_allPropList != null)
@@ -142,17 +141,23 @@
if (prop != null)
{
prop.PropValue = item.Value;
- }
+ }
else
{
- _allPropList.Add(new Vmo.AssetsPumpPropContentVmo() { SeriesID = _allPropList.First().SeriesID, PartID = _allPropList.First().PartID, PropID = item.ID, PropValue = item.Value });
+ _allPropList.Add(new Vmo.AssetsPumpPropContentVmo() {
+ SeriesID = _allPropList.First().SeriesID,
+ PartID = _allPropList.First().PartID,
+ PropID = item.ID,
+ PropValue = item.Value,
+ TagName=item.TagName
+ });
}
}
}
- var basicFlow = _propList.Find(x => x.KeyWorldType == "Basic_Flow");
- var basicHead = _propList.Find(x => x.KeyWorldType == "Basic_Head");
- var basicSpeed = _propList.Find(x => x.KeyWorldType == "Basic_Speed");
- var basicPower = _propList.Find(x => x.KeyWorldType == "Basic_Power");
+ var basicFlow = _propList.Find(x => x.TagName == "Basic_Flow");
+ var basicHead = _propList.Find(x => x.TagName == "Basic_Head");
+ var basicSpeed = _propList.Find(x => x.TagName == "Basic_Speed");
+ var basicPower = _propList.Find(x => x.TagName == "Basic_Power");
if (double.TryParse(basicFlow.Value, out double flow))
{
_pumpMain.RatedFlow = flow;
@@ -217,7 +222,11 @@
var AssetsPumpPropContent = new List<Vmo.AssetsPumpPropContentVmo>();
foreach (var item in _propList)
{
- AssetsPumpPropContent.Add(new Vmo.AssetsPumpPropContentVmo { PropID = item.ID, PropValue = item.Value, SeriesID = _pumpPart.SeriesID });
+ AssetsPumpPropContent.Add(new Vmo.AssetsPumpPropContentVmo {
+ PropID = item.ID,
+ PropValue = item.Value,
+ SeriesID = _pumpPart.SeriesID ,
+ TagName=item.TagName});
}
var id = await _bll.InsertEx(_pumpPart, AssetsPumpPropContent, _partMapping);
if (id > 0)
@@ -258,7 +267,13 @@
{
foreach (var prop in item.PropList)
{
- _propList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, Value = prop.DefaultValue });
+ _propList.Add(new PropGroupChoiceViewModel() {
+ PropGroupName = item.Name,
+ PropName = prop.Name,
+ ID = prop.ID,
+ Value = prop.DefaultValue,
+ TagName = prop.Code,
+ });
}
}
this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
@@ -332,7 +347,7 @@
list.Add(new Yw.Vmo.SysPropMappingSetterVmo { PropID = id, UnitName = rhs.UnitName, IsNull = rhs.IsNull });
await _sysPropMapping.SetByCatalogID(_series.CatalogID, list);
var model = await bll.GetByID(id);
- var partMain = new PropGroupChoiceViewModel() { PropGroupName = groupName, PropName = model.Name, ID = model.ID, Value = propValue, KeyWorldType = "Prop" };
+ var partMain = new PropGroupChoiceViewModel() { PropGroupName = groupName, PropName = model.Name, ID = model.ID, Value = propValue, TagName = "Prop" };
_propList.Add(partMain);
this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
return true;
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
index 8028d54..77c15e7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.Designer.cs
@@ -134,7 +134,7 @@
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
ribbonControl1.ShowQatLocationSelector = false;
ribbonControl1.ShowToolbarCustomizeItem = false;
- ribbonControl1.Size = new Size(1464, 128);
+ ribbonControl1.Size = new Size(1464, 101);
ribbonControl1.Toolbar.ShowCustomizeItem = false;
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
@@ -658,12 +658,12 @@
tabPane1.Controls.Add(tabPageBimface);
tabPane1.Controls.Add(tabPageQ3d);
tabPane1.Dock = DockStyle.Fill;
- tabPane1.Location = new Point(0, 128);
+ tabPane1.Location = new Point(0, 101);
tabPane1.Name = "tabPane1";
tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabPageBimface, tabPageQ3d });
- tabPane1.RegularSize = new Size(1189, 407);
+ tabPane1.RegularSize = new Size(1189, 434);
tabPane1.SelectedPage = tabPageBimface;
- tabPane1.Size = new Size(1189, 407);
+ tabPane1.Size = new Size(1189, 434);
tabPane1.TabIndex = 1;
tabPane1.Text = "tabPane1";
//
@@ -691,19 +691,19 @@
docPnlRight.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.FloatVertical = true;
docPnlRight.ID = new Guid("cffe2560-3445-4488-83cf-b9e4b936ff18");
- docPnlRight.Location = new Point(1189, 128);
+ docPnlRight.Location = new Point(1189, 101);
docPnlRight.Name = "docPnlRight";
docPnlRight.OriginalSize = new Size(275, 200);
docPnlRight.SavedDock = DevExpress.XtraBars.Docking.DockingStyle.Right;
docPnlRight.SavedIndex = 0;
- docPnlRight.Size = new Size(275, 572);
+ docPnlRight.Size = new Size(275, 599);
docPnlRight.Text = "灞炴��";
//
// controlContainerRight
//
controlContainerRight.Location = new Point(4, 26);
controlContainerRight.Name = "controlContainerRight";
- controlContainerRight.Size = new Size(268, 543);
+ controlContainerRight.Size = new Size(268, 570);
controlContainerRight.TabIndex = 0;
//
// docPnlBottom
@@ -763,8 +763,8 @@
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(tabPane1);
- Controls.Add(docPnlBottom);
Controls.Add(docPnlRight);
+ Controls.Add(docPnlBottom);
Controls.Add(ribbonControl1);
Margin = new Padding(2);
Name = "XhsProjectSimulationCorePage";
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
index a868760..183d629 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/XhsProjectSimulationCorePage.cs
@@ -30,24 +30,26 @@
/// 鏂板宸ュ喌浜嬩欢
/// </summary>
public event Action<HydroWorkingVmo> AppendWorkingEvent;
+
/// <summary>
/// 淇濆瓨妯″瀷浜嬩欢
/// </summary>
public event Func<Yw.Model.HydroModelInfo, Task<Yw.Model.HydroModelInfo>> SaveModelEvent;
+
/// <summary>
/// 鍒锋柊妯″瀷浜嬩欢
/// </summary>
public event Func<Task<Yw.Model.HydroModelInfo>> RefreshModelEvent;
+
/// <summary>
/// 鏇存柊鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> UpdateSchemeEvent;
+
/// <summary>
/// 绉婚櫎鏂规浜嬩欢
/// </summary>
public event Action<XhsSchemeVmo> RemoveSchemeEvent;
-
-
private HStation.Vmo.XhsProjectVmo _project = null;//椤圭洰
private HStation.Vmo.XhsProjectSiteVmo _projectSite = null;//椤圭洰绔�
@@ -138,7 +140,7 @@
this.tabPageBimface.Controls.Add(bimfaceCtrl);
}
- #endregion
+ #endregion BIM鎺т欢
#region Q3d鎺т欢
@@ -175,7 +177,7 @@
this.tabPageQ3d.Controls.Add(q3dCtrl);
}
- #endregion
+ #endregion Q3d鎺т欢
#region 灞炴�ф帶浠�
@@ -266,7 +268,6 @@
var flowEffectHelper = await GetFlowEffectHelper();
flowEffectHelper.Set(visual);
};
-
}
return _propertyCtrl;
}
@@ -321,7 +322,7 @@
_propertyCtrl?.UpdateRows();
}
- #endregion
+ #endregion 灞炴�ф帶浠�
#region 閫夋嫨鏋勪欢
@@ -357,12 +358,14 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Bimface:
{
this.barBtnSetMonitor.Enabled = visual != null;
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Q3d:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -370,12 +373,14 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Property:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
this.barBtnSetMonitor.Enabled = visual != null;
}
break;
+
case eVisualSource.List:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -383,6 +388,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Set:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -390,6 +396,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Search:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -397,6 +404,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Monitor:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -404,6 +412,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Check:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -411,6 +420,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Calcu:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -418,6 +428,7 @@
SetPropertyCtrl(visual);
}
break;
+
case eVisualSource.Warning:
{
_bimfaceCtrl?.ZoomAndSelectComponent(visual?.Code);
@@ -425,6 +436,7 @@
SetPropertyCtrl(visual);
}
break;
+
default: break;
}
}
@@ -436,7 +448,7 @@
SelectVisual(visual, source);
}
- #endregion
+ #endregion 閫夋嫨鏋勪欢
#region 鏋勪欢鏄庣粏
@@ -485,7 +497,7 @@
return helper.GetSourceList();
}
- #endregion
+ #endregion 鍙鍒楄〃
#region 瑙嗗浘鍒楄〃
@@ -515,7 +527,7 @@
return helper.GetVisualList();
}
- #endregion
+ #endregion 瑙嗗浘鍒楄〃
#region 鏄庣粏鎺т欢
@@ -615,7 +627,7 @@
ShowVisualListCtrl();
}
- #endregion
+ #endregion 鏄庣粏鎺т欢
#region 鏋勪欢鏄剧ず
@@ -664,9 +676,9 @@
SetVisualVisible();
}
- #endregion
+ #endregion 鏋勪欢鏄剧ず
- #endregion
+ #endregion 鏋勪欢鏄庣粏
#region 涓�閿樉闅�
@@ -690,7 +702,9 @@
SetDecoratorVisible(this.barCkDecorator.Checked);
}
- #endregion
+ #endregion 涓�閿樉闅�
+
+
#region 淇濆瓨淇℃伅
@@ -715,16 +729,15 @@
TipFormHelper.ShowSucceed("淇濆瓨鎴愬姛锛�");
-
//Stopwatch sw = new Stopwatch();
//sw.Start();
- //鑰楁椂宸ㄥぇ鐨勪唬鐮�
+ //鑰楁椂宸ㄥぇ鐨勪唬鐮�
//sw.Stop();
//TimeSpan ts2 = sw.Elapsed;
//Console.WriteLine("Stopwatch鎬诲叡鑺辫垂{0}ms.", ts2.TotalMilliseconds);
}
- #endregion
+ #endregion 淇濆瓨淇℃伅
#region 鎵归噺閰嶇疆
@@ -1022,7 +1035,6 @@
};
}
-
//鏄剧ずRadialMenu
private void barBtnSetList_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
@@ -1226,11 +1238,9 @@
{
this.barBtnSetCompressorList.Visibility = DevExpress.XtraBars.BarItemVisibility.Always;
}
-
-
}
- #endregion
+ #endregion 鎵归噺閰嶇疆
#region 鏋勪欢鏌ヨ
@@ -1321,7 +1331,7 @@
ShowSearchDlg();
}
- #endregion
+ #endregion 鏋勪欢鏌ヨ
#region 妯″瀷鏍囨敞
@@ -1373,7 +1383,7 @@
markHelper.Set();
}
- #endregion
+ #endregion 妯″瀷鏍囨敞
#region 棰滆壊鍒嗙骇
@@ -1455,7 +1465,7 @@
gradingHelper.Set();
}
- #endregion
+ #endregion 棰滆壊鍒嗙骇
#region 浜哄伐鍒锋柊
@@ -1468,7 +1478,6 @@
}
if (XtraMessageBox.Show("鍒锋柊鍚庡皢涓㈠け褰撳墠姘村姏淇℃伅鏇存敼锛屾槸鍚︾户缁埛鏂帮紵", "璇㈤棶", MessageBoxButtons.YesNo) == DialogResult.Yes)
{
-
var hydroInfo = await this.RefreshModelEvent.Invoke();
if (hydroInfo == null)
{
@@ -1483,7 +1492,7 @@
}
}
- #endregion
+ #endregion 浜哄伐鍒锋柊
#region 姘存祦鍔ㄧ敾
@@ -1516,7 +1525,7 @@
flowEffectHelper.Set();
}
- #endregion
+ #endregion 姘存祦鍔ㄧ敾
#region 鐩戞祴鍒楄〃
@@ -1583,7 +1592,7 @@
SetMonitorList(_visual);
}
- #endregion
+ #endregion 鐩戞祴鐐�
#region 鐩戞祴鍊�
@@ -1612,10 +1621,9 @@
var helper = GetMonitorValueHelper();
helper.Reset(working.MonitorInfo);
}
-
}
- #endregion
+ #endregion 鐩戞祴鍊�
#region 鐩戞祴鍊兼帶浠�
@@ -1681,7 +1689,7 @@
ShowMonitorValueListCtrl();
}
- #endregion
+ #endregion 鐩戞祴鍊兼帶浠�
#region 鐩戞祴鐐规爣璁�
@@ -1708,9 +1716,9 @@
monitorMarkerHelper.Set();
}
- #endregion
+ #endregion 鐩戞祴鐐规爣璁�
- #endregion
+ #endregion 鐩戞祴鍒楄〃
#region 妯″瀷妫�鏌�
@@ -1794,7 +1802,7 @@
ShowCheckCtrl(checkResult);
}
- #endregion
+ #endregion 妯″瀷妫�鏌�
#region 妯″瀷璁＄畻
@@ -1814,7 +1822,7 @@
return _calcuResultHelper;
}
- #endregion
+ #endregion 璁＄畻缁撴灉
#region 璁＄畻澶辫触
@@ -1878,7 +1886,7 @@
calcuFailedCtrl.SetBindingData(calcuResult.FailedList);
}
- #endregion
+ #endregion 璁＄畻澶辫触
#region 璁＄畻璀﹀憡
@@ -1950,7 +1958,7 @@
calcuWaringCtrl.SetBindingData(calcuResult.WainingList, allVisualDict);
}
- #endregion
+ #endregion 璁＄畻璀﹀憡
#region 璁＄畻鏍囩
@@ -1977,9 +1985,9 @@
calcuResultLabelHelper.Set();
}
- #endregion
+ #endregion 璁＄畻鏍囩
- #endregion
+ #endregion 妯″瀷璁＄畻
#region 绠＄綉淇
@@ -2044,7 +2052,7 @@
Repair();
}
- #endregion
+ #endregion 绠＄綉淇
#region 瀵煎嚭INP
@@ -2066,7 +2074,7 @@
TipFormHelper.ShowSucceed("瀵煎嚭鎴愬姛");
}
- #endregion
+ #endregion 瀵煎嚭INP
#region 姘存车鍒楄〃
@@ -2141,11 +2149,10 @@
//骞惰仈妯℃嫙
private void barBtnPumpParallel_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
{
-
PumpParallel();
}
- #endregion
+ #endregion 姘存车鍒楄〃
#region 姘村姏璁＄畻
@@ -2218,38 +2225,36 @@
var visualVmListHelper = GetVisualVmListHelper();
visualVmListHelper.UpdateCalcuProperty(calcuResult);
- #endregion
+ #endregion 瑙嗗浘鍒楄〃
#region 褰撳墠鏋勪欢
SelectVisual(_visual, eVisualSource.Calcu);
- #endregion
+ #endregion 褰撳墠鏋勪欢
#region 鏋勪欢鏄庣粏
UpdateVisualListCtrl();
- #endregion
+ #endregion 鏋勪欢鏄庣粏
#region 棰滆壊鍒嗙骇
var gradingHelper = await GetGradingHelper();
gradingHelper.Set();
- #endregion
+ #endregion 棰滆壊鍒嗙骇
#region 璁＄畻鏍囩
var calcuResultLabelHelper = await GetCalcuResultLabelHelper();
calcuResultLabelHelper.Set();
- #endregion
-
+ #endregion 璁＄畻鏍囩
};
dlg.ShowDialog();
-
}
//姘村姏璁＄畻
@@ -2258,7 +2263,7 @@
Calcu();
}
- #endregion
+ #endregion 姘村姏璁＄畻
#region 瀵煎嚭鎶ュ憡
@@ -2273,7 +2278,7 @@
//word.Create(fileName);
}
- #endregion
+ #endregion 瀵煎嚭鎶ュ憡
#region 褰撳墠宸ュ喌
@@ -2338,7 +2343,7 @@
AddWorking();
}
- #endregion
+ #endregion 褰撳墠宸ュ喌
#region 閫夋嫨宸ュ喌
@@ -2385,8 +2390,7 @@
helper.Remove(working);
}
-
- #endregion
+ #endregion 閫夋嫨宸ュ喌
#region 宸ュ喌鍒嗘瀽
@@ -2484,7 +2488,6 @@
}
else
{
-
var dlg = new SimulationMultiWorkingEnergyDlg();
dlg.SetBindingData(_hydroInfo, allMonitorList, allCheckedWorkingList);
dlg.ShowDialog();
@@ -2612,14 +2615,6 @@
}
}
- #endregion
-
-
-
-
-
-
-
-
+ #endregion 宸ュ喌鍒嗘瀽
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/ReportViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/ReportViewModel.cs
index 696556e..0d8dd6e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/ReportViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/ReportViewModel.cs
@@ -16,6 +16,11 @@
public string Description { get; set; }
/// <summary>
+ /// 鎶ュ憡绫诲瀷
+ /// </summary>
+ public string ReportType { get; set; }
+
+ /// <summary>
/// 璁惧鍩烘湰閰嶇疆
/// </summary>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs
index b76fe97..810c383 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/SimulationWordReport.cs
@@ -87,25 +87,25 @@
return strem;
}
- protected void SetWordHander(Aspose.Words.Document doc, string title)
+ protected void SetWordHander(Aspose.Words.Document doc, string title,string reportType)
{
DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
builder.MoveToHeaderFooter(HeaderFooterType.HeaderPrimary);
SimulationWordReportHelper Text_center_10_Gray = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Right, fontsize = 10, fontcolor = Color.Gray };
- Text_center_10_Gray.structureText(string.Format("{0}{1}", title, "椤圭洰鑺傝兘鏂规鎶ュ憡"));
+ Text_center_10_Gray.structureText(string.Format("{0}{1}", title, reportType));
builder.InsertHorizontalRule();
// 绉诲姩鍒颁笅涓�琛岋紝浠ヤ究缁х画娣诲姞鍏朵粬鍐呭
builder.MoveToDocumentStart();
}
- protected void SetWordFooter(Aspose.Words.Document doc, string title)
+ protected void SetWordFooter(Aspose.Words.Document doc, string title,string reportType)
{
DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
builder.MoveToHeaderFooter(HeaderFooterType.FooterPrimary);
SimulationWordReportHelper Text_center_10_Gray = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Left, fontsize = 10, fontcolor = Color.Gray };
builder.InsertHorizontalRule();
- Text_center_10_Gray.structureText(string.Format("{0}{1}", title, "椤圭洰鑺傝兘鏂规鎶ュ憡"));
+ Text_center_10_Gray.structureText(string.Format("{0}{1}", title, reportType));
// 绉诲姩鍒颁笅涓�琛岋紝浠ヤ究缁х画娣诲姞鍏朵粬鍐呭
builder.MoveToDocumentStart();
}
@@ -120,8 +120,8 @@
SimulationWordReportHelper Text_left_15_black = new SimulationWordReportHelper(builder) { fontsize = 15, isblod = true };//涓�绾ф爣棰�
SimulationWordReportHelper Text_left_12_black = new SimulationWordReportHelper(builder) { fontsize = 12 };
SimulationWordReportHelper Text_reight_10_black = new SimulationWordReportHelper(builder) { fontalignment = ParagraphAlignment.Right, fontsize = 12 };
- SetWordHander(src, reportViewModel.ProjectName);
- SetWordFooter(src, reportViewModel.ProjectName);
+ SetWordHander(src, reportViewModel.ProjectName,reportViewModel.ReportType);
+ SetWordFooter(src, reportViewModel.ProjectName, reportViewModel.ReportType);
builder.ParagraphFormat.LineSpacingRule = LineSpacingRule.Multiple;
builder.ParagraphFormat.LineSpacing = 18; // 璁剧疆琛岃窛涓�1.5鍊嶉粯璁よ璺�
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs
index 8365a88..1c66131 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/12-report/test.cs
@@ -9,6 +9,8 @@
private void simpleButton1_Click(object sender, EventArgs e)
{
+ var bll = new BLL.AssetsPumpMain().GetByIDEx(1845041966958645248);
+
SimulationWordReport word = new SimulationWordReport();
var test1 = new ReportViewModel();
test1.ValveOpens = new List<ValveOpen>();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
index 8a5f05c..7383b4c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/01-Prop/PumpPropViewCtrl.cs
@@ -57,7 +57,7 @@
_allBindingList.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, KeyWorldType = "Prop" });
}
}
- var propbll = new BLL.PumpPartPropContent();
+ var propbll = new BLL.AssetsPumpPropContent();
var partList = await pumpBll.GetPartByID(pumpId);
if (partList.Count <= 0)
return;
--
Gitblit v1.9.3