From 6e1306ab578ed1ad79fc33b0bb7e496b897bf4a4 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 20 一月 2025 10:48:03 +0800
Subject: [PATCH] 冲突处理
---
WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
index 998d508..57df3a5 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Q3d.Core/MapView/Base/AreaViewModel.cs
@@ -1,5 +1,4 @@
-锘縰sing Yw.WinFrmUI.Q3D;
-using Newtonsoft.Json;
+锘縰sing Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@@ -8,9 +7,10 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
-using static Yw.WinFrmUI.Q3D.MapViewEnum;
+using Yw.WinFrmUI.Q3d;
+using static Yw.WinFrmUI.Q3d.MapViewEnum;
-namespace Yw.WinFrmUI.Q3D
+namespace Yw.WinFrmUI.Q3d
{
[Serializable]
public class Area : Q3DBaseModel, IBaseViewModel
@@ -121,7 +121,7 @@
//[Editor(typeof(MyEditor), typeof(UITypeEditor))]
//public TagList Tags { get; set; } = null;
-
+
public MapObjectType GetTypeString()
{
@@ -130,13 +130,13 @@
if (this is TankViewModel) return MapObjectType.姘存睜;
if (this is MeterViewModel) return MapObjectType.姘磋〃;
if (this is NozzleViewModel) return MapObjectType.鍠峰ご;
-
+
if (this is PipeViewModel) return MapObjectType.绠＄嚎;
if (this is ValveViewModel) return MapObjectType.闃�闂�;
-
+
if (this is PumpViewModel) return MapObjectType.姘存车;
-
+
return MapObjectType.鑺傜偣;
}
--
Gitblit v1.9.3