From 9eb94e9eec2e2e164698e34d0481d66093c8655b Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 15 一月 2025 17:40:55 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user
index d2a078f..161736c 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/Yw.WinFrmUI.Hydro.Core.csproj.user
@@ -4,12 +4,6 @@
<Compile Update="01-scene\AddHydroSceneDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="04-viewmodel\07-curve\01-view\HydroCurveViewCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
- <Compile Update="04-viewmodel\07-curve\02-set\SetHydroCurveCtrl.cs">
- <SubType>UserControl</SubType>
- </Compile>
<Compile Update="05-property\HydroVisualPropertyDescriptionCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -25,7 +19,7 @@
<Compile Update="06-visual\10-nozzle\HydroNozzleListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="06-visual\16-pump\HydroPumpListCtrl.cs">
+ <Compile Update="06-visual\17-pump\HydroPumpListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="09-check\01-control\HydroCheckResultCtrl.cs">
@@ -40,13 +34,16 @@
<Compile Update="10-working\07-list\HydroWorkingListViewCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="10-working\08-checked\HydroWorkingCheckedListHorizCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="11-search\InputHydroVisualSearchListDlg.cs">
<SubType>Form</SubType>
</Compile>
- <Compile Update="12-monitor\01-set\SetHydroMonitorListCtrl.cs">
+ <Compile Update="12-monitor\01-value\HydroMonitorValueListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="12-monitor\02-value\HydroMonitorValueListCtrl.cs">
+ <Compile Update="12-monitor\05-analy\HydroWorkingMonitorAnalyListCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="16-evaluation\04-single\HydroSingleWorkingEvaluationCtrl.cs">
@@ -64,13 +61,25 @@
<Compile Update="18-loss\01-curve\HydroSingleWorkingLossCurveCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="18-loss\02-scale\HydroCatalogLossScaleChartCtrl.cs">
+ <Compile Update="18-loss\02-scale\01-catalog\HydroCatalogLossScaleChartCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="18-loss\03-statistics\HydroSingleWorkingLossStatisticsCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="19-pump\01-run\HydroPumpRunListCtrl.cs">
+ <Compile Update="19-pump\01-list\HydroPumpListViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="19-pump\05-state\01-view\HydroPumpListStateViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="19-pump\02-extend\HydroPumpListExtendGridCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="19-pump\03-query\HydroPumpQueryPointListGridCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="19-pump\05-state\02-edit\HydroPumpListStateEditCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="20-energy\01-statistics\HydroEnergyStatisticsBarCtrl.cs">
@@ -79,6 +88,12 @@
<Compile Update="20-energy\02-total\HydroEnergyTotalViewCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
+ <Compile Update="21-curve\HydroCurveEditCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Update="21-curve\HydroCurveViewCtrl.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
<Compile Update="99-view\01-q3d\HydroQ3dViewPage.cs">
<SubType>UserControl</SubType>
</Compile>
--
Gitblit v1.9.3