lixiaojun
2024-10-25 1e18310601b076d26329bb0a0e070afeb61d12f4
新模型
已修改3个文件
58 ■■■■■ 文件已修改
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/01-import/00-core/ImportXhsProjectHelper.cs
@@ -312,7 +312,7 @@
            }
            //var bimfaceId = await Yw.WinFrmUI.BimfaceHelper.UploadFile(rvtFileInfo.FullName);//上传
            var bimfaceId = 10000884702464; //测试用例 10000878572231 10000882826621  10000884283372 10000884362886 10000884702464
            var bimfaceId = 10000884893369; //测试用例 10000878572231 10000882826621  10000884283372 10000884362886 10000884702464 10000884893369
            if (bimfaceId < 1)
            {
                feedBackMsg?.Invoke("Revit模型文件上传失败!!!", Color.Red);
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroFlowmeterPropertyViewModel.cs
@@ -1,4 +1,6 @@
namespace Yw.WinFrmUI
using Yw.Model;
namespace Yw.WinFrmUI
{
    /// <summary>
    /// 流量计属性视图
@@ -15,10 +17,33 @@
        /// </summary>
        public HydroFlowmeterPropertyViewModel(Yw.Model.HydroFlowmeterInfo rhs) : base(rhs)
        {
            this.CurrentFlow = rhs.CurrentFlow;
            this.UpdatePropStatus(nameof(this.CurrentFlow), rhs, nameof(rhs.CurrentFlow));
        }
        /// <summary>
        /// 流量
        /// </summary>
        [Category("数据")]
        [DisplayName("流量")]
        [PropertyOrder(1001)]
        [Browsable(true)]
        public double? CurrentFlow { get; set; }
        /// <summary>
        /// 更新属性
        /// </summary>
        public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
        {
            base.UpdateProperty(rhs, allParterList);
            if (rhs is Yw.Model.HydroFlowmeterInfo hydroFlowmeterInfo)
            {
                this.CurrentFlow = hydroFlowmeterInfo.CurrentFlow;
                this.UpdatePropStatus(nameof(this.CurrentFlow), hydroFlowmeterInfo, nameof(hydroFlowmeterInfo.CurrentFlow));
            }
        }
    }
}
WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/02-node/03-junction/04-other/HydroPressmeterPropertyViewModel.cs
@@ -1,4 +1,6 @@
namespace Yw.WinFrmUI
using Yw.Model;
namespace Yw.WinFrmUI
{
    /// <summary>
    /// 压力表属性视图
@@ -15,10 +17,31 @@
        /// </summary>
        public HydroPressmeterPropertyViewModel(Yw.Model.HydroPressmeterInfo rhs) : base(rhs)
        {
            this.CurrentPress = rhs.CurrentPress;
            this.UpdatePropStatus(nameof(this.CurrentPress), rhs, nameof(rhs.CurrentPress));
        }
        /// <summary>
        /// 压力
        /// </summary>
        [Category("数据")]
        [DisplayName("压力")]
        [PropertyOrder(1001)]
        [Browsable(true)]
        public double? CurrentPress { get; set; }
        /// <summary>
        /// 更新属性
        /// </summary>
        public override void UpdateProperty(HydroParterInfo rhs, List<HydroParterInfo> allParterList)
        {
            base.UpdateProperty(rhs, allParterList);
            if (rhs is Yw.Model.HydroPressmeterInfo hydroPressmeterInfo)
            {
                this.CurrentPress = hydroPressmeterInfo.CurrentPress;
                this.UpdatePropStatus(nameof(this.CurrentPress), hydroPressmeterInfo, nameof(hydroPressmeterInfo.CurrentPress));
            }
        }
    }
}