From 7b072c0563be4c57325f44fbf6ac828756ae582e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期六, 08 六月 2024 11:07:26 +0800
Subject: [PATCH] 解决冲突
---
Hydraulic/Hydro.MapView/Model/MeterViewModel.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
index 6c3f8bf..1e26e91 100644
--- a/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
+++ b/Hydraulic/Hydro.MapView/Model/MeterViewModel.cs
@@ -1,18 +1,33 @@
锘縰sing System;
using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing.Design;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using static System.ComponentModel.TypeConverter;
namespace Hydro.MapView
{
[Serializable]
- public class MeterViewModel:NodeViewModel
+ public class MeterViewModel : NodeViewModel
{
public override string ToString()
{
if (string.IsNullOrEmpty(PatternID)) PatternID = "";
return $"{ID}\t{Elev}\t{Demand}\t{PatternID}\t;\t";
}
+
+ /*
+ public string GetTemplateID()
+ {
+ return Convert.ToString(DlTemplateEditor.ImageComboBoxEdit.EditValue);
+ }*/
+
+ [Category("鍩烘湰淇℃伅")]
+ [DisplayName("褰撻噺妯℃澘")]
+ [Editor(typeof(DlTemplateEditor), typeof(UITypeEditor))]
+ [Browsable(true)]
+ public string DlTemplateID { get; set; }
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3