diff --git a/MECF.Framework.UI.Client/CenterViews/Core/UserControls/DataViewDataGrid.xaml b/MECF.Framework.UI.Client/CenterViews/Core/UserControls/DataViewDataGrid.xaml index da3a2a6..dcb57d5 100644 --- a/MECF.Framework.UI.Client/CenterViews/Core/UserControls/DataViewDataGrid.xaml +++ b/MECF.Framework.UI.Client/CenterViews/Core/UserControls/DataViewDataGrid.xaml @@ -6,13 +6,13 @@ xmlns:converter="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Converter" xmlns:converters="clr-namespace:Aitex.Core.UI.Converters;assembly=MECF.Framework.UI.Core" xmlns:converters1="clr-namespace:Sicentury.Core.Converters;assembly=Sicentury.Core" + xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:extendedControls="clr-namespace:MECF.Framework.UI.Core.ExtendedControls;assembly=MECF.Framework.UI.Core" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:local="clr-namespace:MECF.Framework.UI.Client.CenterViews.Core.UserControls" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:micro="clr-namespace:Caliburn.Micro" - xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" d:DesignHeight="450" d:DesignWidth="2000" mc:Ignorable="d"> diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/DataHistory/DataView.xaml b/MECF.Framework.UI.Client/CenterViews/DataLogs/DataHistory/DataView.xaml index 7ae8e5b..8477e45 100644 --- a/MECF.Framework.UI.Client/CenterViews/DataLogs/DataHistory/DataView.xaml +++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/DataHistory/DataView.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:converter="clr-namespace:MECF.Framework.UI.Client.Ctrlib.Converter" + xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:forms="clr-namespace:System.Windows.Forms;assembly=System.Windows.Forms" xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" @@ -12,13 +13,12 @@ xmlns:userControls="clr-namespace:MECF.Framework.UI.Client.CenterViews.Core.UserControls" xmlns:userControls1="clr-namespace:Sicentury.Core.UserControls;assembly=Sicentury.Core" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" - xmlns:cv="clr-namespace:MECF.Framework.UI.Core.Converters;assembly=MECF.Framework.UI.Core" d:DesignHeight="450" d:DesignWidth="1500" mc:Ignorable="d"> - - + + True False diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml new file mode 100644 index 0000000..3a2427a --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + MP1 + MP2 + + + + + + + + + diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml.cs b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml.cs new file mode 100644 index 0000000..e079e4c --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows; +using System.Windows.Controls; +using System.Windows.Data; +using System.Windows.Documents; +using System.Windows.Input; +using System.Windows.Media; +using System.Windows.Media.Imaging; +using System.Windows.Navigation; +using System.Windows.Shapes; + +namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory +{ + /// + /// ProcessHistoryTestView.xaml 的交互逻辑 + /// + public partial class ProcessHistoryTestView : UserControl + { + public ProcessHistoryTestView() + { + InitializeComponent(); + } + } +} diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestViewModel.cs b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestViewModel.cs new file mode 100644 index 0000000..5cbdc9f --- /dev/null +++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestViewModel.cs @@ -0,0 +1,13 @@ +using MECF.Framework.UI.Client.ClientBase; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory +{ + public class ProcessHistoryTestViewModel : UiViewModelBase + { + } +} diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ChartParameter.cs b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ChartParameter.cs similarity index 100% rename from MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ChartParameter.cs rename to MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ChartParameter.cs diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryProvider.cs b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryProvider.cs similarity index 100% rename from MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryProvider.cs rename to MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryProvider.cs diff --git a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryView.xaml b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryView.xaml similarity index 54% rename from MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryView.xaml rename to MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryView.xaml index 49abddc..ce7b1ab 100644 --- a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryView.xaml +++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory123/ProcessHistoryView.xaml @@ -1,39 +1,46 @@ - + - + - - - + + + - - + + - + - +