14 Commits (7bbc44b7d53dd6f6308e7f272a81d5e71b412983)

Author	SHA1	Message	Date
lh	7204c54b07	Merge branch 'feature/ReservoirPropertiesDlg-Refactoring-20260813' into develop ... # Conflicts: # Bin/Config/Common/ModelParaDefinesNM_cn.dat resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version # Bin/Config/Common/ModelParaDefinesNM_en.dat resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version # Bin/Config/Common/UnitDefault_cn.dat resolved by feature/ReservoirPropertiesDlg-Refactoring-20260813 version # Bin/Config/Lang/cn/nmNum_cn.qm resolved by develop version # Bin/XmlFiles/ModelParaDefinesNM_cn.xml # Bin/XmlFiles/ModelParaDefinesNM_en.xml # Src/nmNum/nmData/nmDataAutomaticFitting.cpp # Src/nmNum/nmSubWxs/nmWxAutomaticFitting.cpp	3 days ago
lvjunjie	1d5c0bfdb6	Merge branch 'feature/MultiWellAutoFit-20260805' into develop ... # Conflicts: # Bin/Config/Lang/cn/nmNum_cn.qm resolved by feature/MultiWellAutoFit-20260805 version	3 days ago
lh	dbe5ac328f	feat(nmNum): 按求解模型优化储层参数编辑 ... - 根据求解器模型动态显示 PVT、压缩系数和饱和度参数 - 隐藏储层类型和 KxKy，清理无效的单值参数定义 - 补充油水饱和度之和校验及关联错误提示 - 优化对话框初始高度和参数分组名称 - 更新中英文参数 XML 及中文翻译资源	3 days ago
lh	c11454e4a7	fix(nmNum): 修复压裂井参数单位绑定 ... - 将排水角度和裂缝角度单位统一为 deg - 补充 mD.m 流动能力单位组 - 修复裂缝角度和导流能力数值显示为空的问题	6 days ago
lh	8eebf98ba2	refactor(nmNum): 统一渗透率基准单位为 mD ... - 统一储层、诊断、自动拟合及属性插值的渗透率单位 - 调整渗透率默认值、拟合范围和参数配置 - 在 PEBI 求解器入口将 mD 转换为 D - 移除储层参数面板对 D/d 单位歧义的特殊处理	6 days ago
lh	efc590edc6	feat(nmNum): 重构储层参数设置对话框 ... - 新增模块化参数页面、字段目录和编辑会话 - 通过数据源注入实现工作副本及统一提交 - 支持单位换算、参数校验和分类联动 - 无对应对象时禁用分类按钮 - 统一渗透率基准单位为 D	6 days ago
lvjunjie	f0d90f9513	更改渗透率的基准单位为Darcy	2 weeks ago
lvjunjie	5548533fdf	更新属性插值菜单图标	2 weeks ago
lvjunjie	19ed90ce86	新增网格属性插值功能入口 ... - 新增属性插值菜单及基础参数配置窗口 - 完成中英文界面配置与窗口生命周期管理	2 weeks ago
lvjunjie	0a1350b188	统一渗透率和井筒储集系数单位 ... - 将渗透率显示单位统一为 mD - 将井筒储集系数单位统一为 m^3/MPa - 更新中英文参数配置及加密数据文件	3 weeks ago
lvjunjie	34a82fe087	Merge branch 'feature/nm-para-property-20260615' into develop ... # Conflicts: # 3rd/Pebi/include/pch.h # Bin/Config/Common/MenuDefines_Ribbon_cn.dat resolved by feature/nm-para-property-20260615 version # Bin/Config/Common/ModelParaDefinesNM_cn.dat resolved by feature/nm-para-property-20260615 version # Bin/Config/Common/ModelParaDefinesNM_en.dat resolved by feature/nm-para-property-20260615 version # Src/nmNum/nmData/nmDataAnalyzeManager.cpp # Src/nmNum/nmPlot/nmGuiPlot.cpp # Src/nmNum/nmPlot/nmObjPointWell.cpp	3 weeks ago
lh	d7fa5676db	feat:合并框架其他目录文件及代码	4 weeks ago
lh	4e574b76d6	fix:合并框架代码，已修复获取不到PVT数据的问题	2 months ago
lh	34209bc128	feat:初始化仓库代码	3 months ago