lixiaojun
2024-12-05 59f2c4c04e06d77de7f10ab96d1a5c73ccd01262
分支
用户 lixiaojun <1287241240@qq.com>
星期四, 十二月 5, 2024 16:23 +0800
提交者 lixiaojun <1287241240@qq.com>
星期四, 十二月 5, 2024 16:23 +0800
提交59f2c4c04e06d77de7f10ab96d1a5c73ccd01262
目录 e94709d9a545443124f02b706b75bef9c0fa8f26 目录 | zip | gz
上一版本 fc818ac66ff6b30f40252fcc28b92970d62a765a 查看 | 对比
d14b23dfc213c131efcf76cee206cff79e261294 查看 | 对比
Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
已重命名8个文件
已修改52个文件
已添加38个文件
10247 ■■■■■ 文件已修改
Dto/HStation.Dto.Assets.Core/05-Elbow/02-ElbowMain/UpdateElbowMainInput.cs 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/EditExchangerPartPropDlg.Designer.cs 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/EditExchangerPartPropDlg.cs 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/EditExchangerPartPropDlg.resx 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/ExchangerPartViewModel.cs 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/ExchangerProductListBox.Designer.cs 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/ExchangerProductListBox.cs 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/ExchangerProductListBox.resx 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/02-main/01-EditExchangePartProp/PropGroupChoiceViewModel.cs 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerMainPhartMinorLossPanel.Designer.cs 247 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerMainPhartMinorLossPanel.cs 218 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerMainPhartMinorLossPanel.resx 286 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditChart.Designer.cs 249 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditChart.cs 513 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditChart.resx 244 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditCtrl.Designer.cs 307 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditCtrl.cs 202 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditCtrl.resx 204 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditDlg.Designer.cs 200 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditDlg.cs 66 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/04-chart-edit/ExchangerPerform2dEditDlg.resx 120 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportExchangerPerform2dByExcelCtrl.cs 258 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportExchangerPerform2dByExcelCtrl.designer.cs 280 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportExchangerPerform2dByExcelCtrl.en-US.resx 123 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportExchangerPerform2dByExcelCtrl.resx 144 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportTankPerform2dByExcelDlg.Designer.cs 207 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportTankPerform2dByExcelDlg.cs 43 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/05-import/01-excel/ImportTankPerform2dByExcelDlg.resx 123 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/ExchangerManageMainPage.Designer.cs 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/ExchangerManageMainPage.cs 31 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/10-exchanger/ExchangerManageMainPage.resx 31 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorMainPhartMinorLossPanel.Designer.cs 247 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorMainPhartMinorLossPanel.cs 216 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorMainPhartMinorLossPanel.resx 286 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditChart.Designer.cs 249 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditChart.cs 513 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditChart.resx 244 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditCtrl.Designer.cs 307 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditCtrl.cs 202 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditCtrl.resx 204 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditDlg.Designer.cs 200 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditDlg.cs 66 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/04-chart-edit/CompressorPerform2dEditDlg.resx 120 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportCompressorPerform2dByExcelCtrl.cs 258 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportCompressorPerform2dByExcelCtrl.designer.cs 280 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportCompressorPerform2dByExcelCtrl.en-US.resx 123 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportCompressorPerform2dByExcelCtrl.resx 144 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportTankPerform2dByExcelDlg.Designer.cs 207 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportTankPerform2dByExcelDlg.cs 43 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/05-import/01-excel/ImportTankPerform2dByExcelDlg.resx 123 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/ExchangerManageMainPage.Designer.cs 43 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/ExchangerManageMainPage.cs 32 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/11-compressor/ExchangerManageMainPage.resx 29 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/05-import/01-excel/ImportTankPerform2dByExcelCtrl.designer.cs 17 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/05-import/01-excel/ImportTankPerform2dByExcelCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.cs 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj 292 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Assets.Core/HStation.WinFrmUI.Assets.Core.csproj.user 265 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs 269 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs 163 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveChartShowDlg.cs 22 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/03-valve/01-valvesinglematching/ValveSingleMatchingCtrl.cs 42 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankChartShowDlg.cs 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs 9 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs 3 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.Designer.cs 6 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-Meter/MeterSingleMatchingViewModel.cs 31 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.Designer.cs 46 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/10-meter/MeterSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-Flowmeter/FlowmeterSingleMatchingViewModel.cs 30 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.Designer.cs 46 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/11-flowmeter/FlowmeterSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.Designer.cs 8 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/12-hydrant/HydrantSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-Pressmeter/PressmeterSingleMatchingViewModel.cs 30 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.Designer.cs 46 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/13-pressmeter/PressmeterSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/14-Blunthead/BluntheadSingleMatchingForm.Designer.cs 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-Translation/TranslationSingleMatchingViewModel.cs 44 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.Designer.cs 76 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/15-translation/TranslationSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/16-sprinkler/SprinklerSingleMatchingViewModel.cs 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorChartShowDlg.Designer.cs 4 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorChartShowDlg.cs 11 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingCtrl.Designer.cs 79 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingCtrl.cs 20 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingViewModel.cs 36 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.Designer.cs 6 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/SimulationCompressorSingleMatchingDlg.cs 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerChartShowDlg.cs 9 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.Designer.cs 36 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs 8 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.resx 2 ●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingViewModel.cs 10 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/SimulationExchangerSingleMatchingDlg.Designer.cs 6 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj 148 ●●●● 对比 | 查看 | 原始文档 | blame | 历史
WinFrmUI/HStation.WinFrmUI.Xhs.Core/HStation.WinFrmUI.Xhs.Core.csproj.user 131 ●●●●● 对比 | 查看 | 原始文档 | blame | 历史