From 4d9a96db08678c2ee274e7ffd70580c71a1140c5 Mon Sep 17 00:00:00 2001
From: qin <a@163.com>
Date: 星期五, 07 六月 2024 15:08:21 +0800
Subject: [PATCH] 统一数据结构
---
Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs | 1 +
Hydraulic/Hydro.MapView/Hydro.MapView.csproj | 3 ---
Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs | 6 ++++++
Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs | 2 +-
Hydraulic/Hydro.Core/Base/BaseModel.cs | 8 +++++++-
5 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/Hydraulic/Hydro.Core/Base/BaseModel.cs b/Hydraulic/Hydro.Core/Base/BaseModel.cs
index 17bd474..01c98e0 100644
--- a/Hydraulic/Hydro.Core/Base/BaseModel.cs
+++ b/Hydraulic/Hydro.Core/Base/BaseModel.cs
@@ -1,5 +1,6 @@
锘縰sing 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; }
+
+
}
}
diff --git a/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs b/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs
index 4752c72..d6278e8 100644
--- a/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Base/IBaseViewModel.cs
@@ -29,6 +29,7 @@
bool Hovered { get; set; }
+
[Category("鍏朵粬鍙傛暟")]
[Description("閫変腑")]
[DisplayName("浣嶇疆淇℃伅")]
diff --git a/Hydraulic/Hydro.MapView/Hydro.MapView.csproj b/Hydraulic/Hydro.MapView/Hydro.MapView.csproj
index 56becef..b433d9a 100644
--- a/Hydraulic/Hydro.MapView/Hydro.MapView.csproj
+++ b/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>
\ No newline at end of file
diff --git a/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs b/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
index ac9df45..2ba8a4b 100644
--- a/Hydraulic/Hydro.MapView/MapViewNetWork2Inp.cs
+++ b/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>();
diff --git a/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs b/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs
index 06b6715..293ae57 100644
--- a/Hydraulic/Hydro.MapView/Model/NozzleViewModel.cs
+++ b/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")]
--
Gitblit v1.9.3