From 1a5ef6b2bf25de50b685b44299d9a049a2feac80 Mon Sep 17 00:00:00 2001
From: cloudflight <cloudflight@126.com>
Date: 星期六, 02 十二月 2023 12:24:02 +0800
Subject: [PATCH] 2023年12月2日
---
Hydro.MapView/Model/PumpViewModel.cs | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/Hydro.MapView/Model/PumpViewModel.cs b/Hydro.MapView/Model/PumpViewModel.cs
index 50258a1..4680ef8 100644
--- a/Hydro.MapView/Model/PumpViewModel.cs
+++ b/Hydro.MapView/Model/PumpViewModel.cs
@@ -1,4 +1,4 @@
-锘縰sing Hydro.CommonBase;
+锘縰sing CommonBase;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -13,13 +13,17 @@
namespace Hydro.MapView
{
- public class PumpViewModel:LinkViewModel
+ public class PumpViewModel : LinkViewModel
{
[Browsable(false)]
- public override string Name { get; set; }
+ public new string Name
+ {
+ get { return base.Name; }
+ set { base.Name = value; }
+ }
[Category("1銆佸熀鏈俊鎭�")]
[DisplayName("姘存车绫诲瀷")]
- public PumpType Type { get; set; }
+ public new PumpType Type { get; set; }
[Browsable(false)]
public Dictionary<string, Dataset> Datasets { get; set; } = new Dictionary<string, Dataset>();
@@ -73,7 +77,7 @@
[Browsable(false)]
public string factoryName
{
- set;get;
+ set; get;
//get
//{
// if (factory != null)
@@ -568,10 +572,10 @@
[Category("3銆佽绠楃粨鏋�")]
[DisplayName("2)鎵▼")]
[Browsable(true)]
- public float EN_HEADLOSS { get { return -base.EN_HEADLOSS; } }
+ public new float EN_HEADLOSS { get { return -base.EN_HEADLOSS; } }
[Browsable(false)]
- public float EN_VELOCITY { get { return base.EN_VELOCITY; } }
+ public new float EN_VELOCITY { get { return base.EN_VELOCITY; } }
public override string ToString()
--
Gitblit v1.9.3