冲突

duheng

2024-06-08 8c0d9657f6737dd56c5751c489a825b7838678d8

冲突

 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

@@ -59,7 +59,7 @@
                                    if (parts[-2] == "Meter")
                                    {
                                        var m = new MeterViewModel();
                                        m.DlTemplateID = parts.ToString(-4, "");
                                        m.DlTemplateID = ToDisplyName(parts.ToString(-4, ""));
                                        j = m;
                                    }
                                    else if (parts[-2] == "Nozzle")
@@ -354,6 +354,28 @@
                    return StatusType.DEFAULT;
                    break;
            }
        }

        /// <summary>
        /// 下拉文本框转换为显示内容
        /// </summary>
        /// <param name="id"></param>
        /// <returns></returns>
        public string ToDisplyName(string id)
        {
            if (string.IsNullOrEmpty(id))
                return null;
            var filePath = Path.Combine(Directory.GetCurrentDirectory(), "Data\\WaterEquivalent.Json");
            List<EquivalentTemplateModel> equivalentTemplateModels = new List<EquivalentTemplateModel>();
            if (File.Exists(filePath))
            {
                var json = File.ReadAllText(filePath);
                if (!string.IsNullOrEmpty(json))
                {
                    equivalentTemplateModels = JsonConvert.DeserializeObject<List<EquivalentTemplateModel>>(json);
                }
            }
            return equivalentTemplateModels.Where(x => x.ID == Convert.ToInt64(id)).FirstOrDefault().Name;
        }

        public void BuildRelation()
@@ -973,7 +995,7 @@
                if (o is JunctionViewModel j)
                    junctionStringBuilder.AppendLine(j.ToString() + $"{j.Level}\tJunction\t{o.Tags}");
                else if (o is MeterViewModel m)
                    junctionStringBuilder.AppendLine(m.ToString() + $"{o.Level}\tMeter\t{o.Tags}\t{m.DlTemplateID}");
                    junctionStringBuilder.AppendLine(m.ToString() + $"{o.Level}\tMeter\t{o.Tags}\t{m.GetTemplateID()}");
                else if (o is NozzleViewModel no)
                    junctionStringBuilder.AppendLine(no.ToString() + $"{o.Level}\tNozzle\t{o.Tags}\t{no.FlowCoefficient}");
            });

 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")]