统一数据结构

qin

2024-06-07 4d9a96db08678c2ee274e7ffd70580c71a1140c5

统一数据结构

 Hydraulic/Hydro.Core/Base/BaseModel.cs

@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -23,7 +24,12 @@

        public virtual StatusType Status { get; set; } = StatusType.OPEN;

        
        [Category("基本信息")]
        [Description("楼层")]
        [DisplayName("楼层")]
        public virtual string Floor { get; set; }



    }
}

 Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs

@@ -29,6 +29,7 @@
        bool Hovered { get; set; }



        [Category("其他参数")]
        [Description("选中")]
        [DisplayName("位置信息")]

 Hydraulic/Hydro.MapView/Hydro.MapView.csproj

@@ -136,8 +136,5 @@
    <None Include="app.config" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="Properties\licenses.licx" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

 Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs

@@ -363,7 +363,7 @@
        /// <returns></returns>
        public string ToDisplyName(string id)
        {
            if (id == null)
            if (string.IsNullOrEmpty(id))
                return null;
            var filePath = Path.Combine(Directory.GetCurrentDirectory(), "Data\\WaterEquivalent.Json");
            List<EquivalentTemplateModel> equivalentTemplateModels = new List<EquivalentTemplateModel>();

 Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs

@@ -10,6 +10,12 @@
    [Serializable]
    public class NozzleViewModel:NodeViewModel
    {

        [Category("基本信息")]
        [Description("房间")]
        [DisplayName("房间")]
        public string Room { get; set; }

        [Category("计算参数")]
        [Description("流量系数")]
        [DisplayName("流量系数K")]