diff --git a/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db-wal b/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db-wal
index e2245557..4a503767 100644
Binary files a/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db-wal and b/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/CodeChunks.db-wal differ
diff --git a/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal b/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal
index 53204266..a422960b 100644
Binary files a/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal and b/newFront/c#前端/.vs/SWS.CAD/CopilotIndices/17.13.444.19527/SemanticSymbols.db-wal differ
diff --git a/newFront/c#前端/SWS.WPF/Views/DialogSignalManagements/DialogSignalManagement.xaml b/newFront/c#前端/SWS.WPF/Views/DialogSignalManagements/DialogSignalManagement.xaml
index 8fb1b78e..65cd63d4 100644
--- a/newFront/c#前端/SWS.WPF/Views/DialogSignalManagements/DialogSignalManagement.xaml
+++ b/newFront/c#前端/SWS.WPF/Views/DialogSignalManagements/DialogSignalManagement.xaml
@@ -30,13 +30,13 @@
-
+
-
+
@@ -49,7 +49,7 @@
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
- ItemsSource="{Binding DataContext.WHCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
+ ItemsSource="{Binding DataContext.WHCPUs, RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedItems="{Binding WHCPUs}"
SelectedValuePath="DataItemCode" />
@@ -66,7 +66,7 @@
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
- ItemsSource="{Binding DataContext.ECRCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
+ ItemsSource="{Binding DataContext.ECRCPUs, RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedItems="{Binding ECRCPUs}"
SelectedValuePath="DataItemCode" />
@@ -84,7 +84,7 @@
Delimiter="|"
DisplayMemberPath="DataItemName"
IsSelectAllActive="True"
- ItemsSource="{Binding DataContext.ShipOfficeCPUs, RelativeSource={RelativeSource AncestorType=telerik:RadTreeListView}}"
+ ItemsSource="{Binding DataContext.ShipOfficeCPUs, RelativeSource={RelativeSource AncestorType={x:Type telerik:RadTreeListView}}}"
SelectedItems="{Binding ShipOfficeCPUs}"
SelectedValuePath="DataItemCode" />
@@ -97,7 +97,7 @@
-
+
-
+
@@ -198,183 +198,6 @@
-
-
-
-
@@ -399,7 +222,7 @@
Foreground="White"
Style="{StaticResource sysLabel}"
Text="{Binding pojectName}" />
-
+
@@ -417,7 +240,7 @@
-
+
@@ -489,9 +312,9 @@
IconData="M12,3 L12,9 M12,21 L12,15 M15,18 L21,12 L15,6 M9,6 L3,12 L9,18"
IconPlacement="Left"
IconSize="16" />
-
+
@@ -508,27 +331,25 @@
VerticalAlignment="Center"
Style="{StaticResource sysLabel}"
Text="开始时间:" />
-
+ SelectedDate="{Binding statDate}" />
-
-
+ SelectedDate="{Binding endDate}">
+
-
+
-
-
-
-
+
-
-
-
-
-
+
-
-
+
+
@@ -988,11 +789,11 @@
CommandParameter="信号转虚拟点">
+
-
+
@@ -1174,6 +977,7 @@
+
-
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources
index 71c8dd2b..c6f8dd51 100644
Binary files a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources and b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources differ
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.cs b/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.cs
index 4ace025c..8a20f6bc 100644
--- a/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.cs
+++ b/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7FC1349645A243539D743597373104AD804F32213988FBF5ECA2A7D538B5FA48"
+#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BBBAAC2D30DDCBE426FDE8827BDBF7527EEDC8C0F823DBAF3EBE2D35FF1D1F8"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -78,7 +78,7 @@ namespace SWS.WPF.Views {
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 390 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 213 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
@@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 409 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtReviewCountdown;
@@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 427 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
@@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 483 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton PopupButton;
@@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 493 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.Popup CustomPopup;
@@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 544 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton myButton;
@@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 577 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs b/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs
index 4ace025c..8a20f6bc 100644
--- a/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs
+++ b/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7FC1349645A243539D743597373104AD804F32213988FBF5ECA2A7D538B5FA48"
+#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "7BBBAAC2D30DDCBE426FDE8827BDBF7527EEDC8C0F823DBAF3EBE2D35FF1D1F8"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -78,7 +78,7 @@ namespace SWS.WPF.Views {
public partial class DialogSignalManagement : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 390 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 213 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
@@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 409 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 232 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtReviewCountdown;
@@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 427 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.TextBlock txtConstructionCountdown;
@@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 483 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton PopupButton;
@@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 493 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 316 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal System.Windows.Controls.Primitives.Popup CustomPopup;
@@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 544 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 365 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.IconButton myButton;
@@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
#line hidden
- #line 577 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+ #line 398 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal Telerik.Windows.Controls.RadTreeListView RadGridView1;