From 2e8e85f65748ee5a5adf0dcda864aa4167cbf2ef Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 11 十二月 2024 10:32:35 +0800
Subject: [PATCH] 冲突
---
Service/HStation.Service.Revit.Core/04-service/01-json/00-core/RevitJsonProp.cs | 161 ++++++++++++++++++++++++++++++-----------------------
1 files changed, 91 insertions(+), 70 deletions(-)
diff --git a/Service/HStation.Service.Revit.Core/04-service/01-json/00-core/RevitJsonProp.cs b/Service/HStation.Service.Revit.Core/04-service/01-json/00-core/RevitJsonProp.cs
index cd0f8db..bdebdb0 100644
--- a/Service/HStation.Service.Revit.Core/04-service/01-json/00-core/RevitJsonProp.cs
+++ b/Service/HStation.Service.Revit.Core/04-service/01-json/00-core/RevitJsonProp.cs
@@ -7,37 +7,32 @@
{
/// <summary>
- /// 绫诲埆
+ /// 鏋勪欢绫诲瀷
/// </summary>
public const string Catalog = "鏋勪欢绫诲瀷";
/// <summary>
- /// Id
+ /// 鏋勪欢缂栫爜
/// </summary>
public const string Id = "鏋勪欢缂栫爜";
/// <summary>
- /// 缂栫爜
+ /// 鏋勪欢鍚嶇О
/// </summary>
- public const string Code = "缂栫爜";
+ public const string Name = "鏋勪欢鍚嶇О";
/// <summary>
- /// 鍚嶇О
- /// </summary>
- public const string Name = "鍚嶇О";
-
- /// <summary>
- /// 鍨嬪彿
+ /// 鍨嬪彿淇℃伅
/// </summary>
public const string ModelType = "鍨嬪彿淇℃伅";
/// <summary>
- /// 鏍囩
+ /// 鏍囩淇℃伅
/// </summary>
- public const string Flags = "鏍囩";
+ public const string Flags = "鏍囩淇℃伅";
/// <summary>
- /// 璇存槑
+ /// 璇存槑淇℃伅
/// </summary>
public const string Description = "璇存槑淇℃伅";
@@ -47,9 +42,29 @@
public const string Connects = "杩炴帴鍒楄〃";
/// <summary>
- /// 鍒濆姘磋川
+ /// 涓婃父鏋勪欢
/// </summary>
- public const string Quality = "鍒濆姘磋川";
+ public const string StartCode = "涓婃父鏋勪欢";
+
+ /// <summary>
+ /// 涓婃父鏋勪欢浣嶇疆
+ /// </summary>
+ public const string StartPosition = "涓婃父鏋勪欢浣嶇疆";
+
+ /// <summary>
+ /// 涓嬫父鏋勪欢
+ /// </summary>
+ public const string EndCode = "涓嬫父鏋勪欢";
+
+ /// <summary>
+ /// 涓嬫父鏋勪欢浣嶇疆
+ /// </summary>
+ public const string EndPosition = "涓嬫父鏋勪欢浣嶇疆";
+
+ /// <summary>
+ /// 浣嶇疆淇℃伅
+ /// </summary>
+ public const string Position = "浣嶇疆淇℃伅";
/// <summary>
/// 鏍囬珮淇℃伅
@@ -60,16 +75,6 @@
/// 鏍囬珮涓殑楂樼▼
/// </summary>
public const string ElevOfElevation = "鏍囬珮涓殑楂樼▼";
-
- /// <summary>
- /// 涓婃父鏍囬珮
- /// </summary>
- public const string StartElev = "涓婃父鏍囬珮";
-
- /// <summary>
- /// 涓嬫父鏍囬珮
- /// </summary>
- public const string EndElev = "涓嬫父鏍囬珮";
/// <summary>
/// 姹犲簳鏍囬珮
@@ -87,7 +92,7 @@
public const string DemandPattern = "闇�姘存ā寮�";
/// <summary>
- /// 娴侀噺/鍠峰皠绯绘暟
+ /// 鍠峰皠绯绘暟
/// </summary>
public const string CoefficientP = "鍠峰皠绯绘暟";
@@ -97,49 +102,54 @@
public const string CoefficientF = "娴侀噺绯绘暟";
/// <summary>
- /// 鏉愯川
+ /// 鏉愯川淇℃伅
/// </summary>
public const string Material = "鏉愯川淇℃伅";
/// <summary>
- /// 鎬绘按澶达紙姘村簱锛�
+ /// 鎬绘按澶�
/// </summary>
public const string Head = "鎬绘按澶�";
/// <summary>
- /// 姘村ご妯″紡锛堟按搴擄級
+ /// 姘村ご妯″紡
/// </summary>
public const string HeadPattern = "姘村ご妯″紡";
/// <summary>
- /// 鍒濆姘翠綅锛堟按姹狅級
+ /// 鍒濆姘翠綅
/// </summary>
public const string InitLevel = "鍒濆姘翠綅";
/// <summary>
- /// 鏈�浣庢按浣嶏紙姘存睜锛�
+ /// 鏈�浣庢按浣�
/// </summary>
public const string MinLevel = "鏈�浣庢按浣�";
/// <summary>
- /// 鏈�楂樻按浣嶏紙姘存睜锛�
+ /// 鏈�楂樻按浣�
/// </summary>
public const string MaxLevel = "鏈�楂樻按浣�";
/// <summary>
- /// 鏈�灏忓绉紙姘存睜锛�
+ /// 鏈�灏忓绉�
/// </summary>
public const string MinVol = "鏈�灏忓绉�";
/// <summary>
- /// 瀹圭Н鏇茬嚎锛堟按姹狅級
+ /// 瀹圭Н鏇茬嚎
/// </summary>
public const string VolCurve = "瀹圭Н鏇茬嚎";
/// <summary>
- /// 鐩村緞
+ /// 鍏佽婧㈡祦
/// </summary>
- public const string Diameter = "鐩村緞";
+ public const string OverFlow = "鍏佽婧㈡祦";
+
+ /// <summary>
+ /// 鐩村緞淇℃伅
+ /// </summary>
+ public const string Diameter = "鐩村緞淇℃伅";
/// <summary>
/// 鍏О鐩村緞
@@ -147,9 +157,9 @@
public const string DN = "鍏О鐩村緞";
/// <summary>
- /// 鍙ｅ緞
+ /// 鍙ｅ緞淇℃伅
/// </summary>
- public const string Caliber = "鍙ｅ緞";
+ public const string Caliber = "鍙ｅ緞淇℃伅";
/// <summary>
/// 鍐呭緞
@@ -157,24 +167,45 @@
public const string InternalDiameter = "鍐呭緞";
/// <summary>
- /// 绠℃鐘舵��/绠￠亾鐘舵��
+ /// 寮洸瑙掑害
+ /// </summary>
+ public const string BendingAngle = "寮洸瑙掑害";
+
+ /// <summary>
+ /// 寮ご绫诲瀷
+ /// </summary>
+ public const string ElbowType = "寮ご绫诲瀷";
+
+ /// <summary>
+ /// 绠℃鐘舵��
+ /// </summary>
+ public const string LinkStatus = "绠℃鐘舵��";
+
+ /// <summary>
+ /// 绠￠亾鐘舵��
/// </summary>
public const string LinkStatusPipe = "绠￠亾鐘舵��";
/// <summary>
- /// 涓婃父鍒濆姘磋川
+ /// 姘存车鐘舵��
/// </summary>
- public const string StartQuality = "涓婃父鍒濆姘磋川";
+ public const string LinkStatusPump = "姘存车鐘舵��";
/// <summary>
- /// 涓嬫父鍒濆姘磋川
+ /// 闃�闂ㄧ姸鎬�
/// </summary>
- public const string EndQuality = "涓嬫父鍒濆姘磋川";
+ public const string LinkStatusValve = "闃�闂ㄧ姸鎬�";
/// <summary>
- /// 闀垮害锛堢娈碉級
+ /// 寮�鍏崇姸鎬�
/// </summary>
- public const string Length = "闀垮害";
+ public const string LinkStatusSwitch = "寮�鍏崇姸鎬�";
+
+
+ /// <summary>
+ /// 闀垮害淇℃伅
+ /// </summary>
+ public const string Length = "闀垮害淇℃伅";
/// <summary>
/// 绮楃硻绯绘暟锛堢娈碉級
@@ -182,19 +213,19 @@
public const string Roughness = "绮楃硻绯绘暟";
/// <summary>
- /// 灞�閮ㄩ樆鍔涚郴鏁帮紙绠℃銆侀榾闂級
+ /// 灞�闃荤郴鏁�
/// </summary>
- public const string MinorLoss = "灞�閮ㄩ樆鍔涚郴鏁�";
+ public const string MinorLoss = "灞�闃荤郴鏁�";
/// <summary>
- /// 鎹熷けK绯绘暟
+ /// 杩愯鎹熷け绯绘暟
/// </summary>
- public const string MinorLossK = "鎹熷けK绯绘暟";
+ public const string RunningThroughLoss = "杩愯鎹熷け绯绘暟";
/// <summary>
- /// 姘存车鐘舵��
+ /// 鏀鎹熷け绯绘暟
/// </summary>
- public const string LinkStatusPump = "姘存车鐘舵��";
+ public const string BranchThroughLoss = "鏀鎹熷け绯绘暟";
/// <summary>
/// 棰濆畾鍔熺巼
@@ -237,6 +268,11 @@
public const string CurveQE = "娴侀噺鏁堢巼鏇茬嚎";
/// <summary>
+ /// 姘村ご鎹熷け鏇茬嚎
+ /// </summary>
+ public const string CurveQL = "姘村ご鎹熷け鏇茬嚎";
+
+ /// <summary>
/// 杞�熸瘮锛堟按娉碉級
/// </summary>
public const string SpeedRatio = "杞�熸瘮";
@@ -245,21 +281,6 @@
/// 杞�熸瘮妯″紡锛堟按娉碉級
/// </summary>
public const string SpeedRatioPattern = "杞�熸瘮妯″紡";
-
- /// <summary>
- /// 鑳借�椾环鏍硷紙姘存车锛�
- /// </summary>
- public const string Price = "鑳借�椾环鏍�";
-
- /// <summary>
- /// 浠锋牸妯″紡锛堟按娉碉級
- /// </summary>
- public const string PricePattern = "浠锋牸妯″紡";
-
- /// <summary>
- /// 闃�闂ㄧ姸鎬�
- /// </summary>
- public const string LinkStatusValve = "闃�闂ㄧ姸鎬�";
/// <summary>
/// 闃�闂ㄧ被鍨�
@@ -287,14 +308,14 @@
public const string ClanName = "鏃忓悕绉�";
/// <summary>
- /// 娴侀噺
+ /// 娴侀噺淇℃伅
/// </summary>
- public const string Flow = "娴侀噺";
+ public const string CurrentFlow = "娴侀噺淇℃伅";
/// <summary>
- /// 鍘嬪姏
+ /// 鍘嬪姏淇℃伅
/// </summary>
- public const string Press = "鍘嬪姏";
+ public const string CurrentPress = "鍘嬪姏淇℃伅";
--
Gitblit v1.9.3