[UI.Client]

1修改界面布局 2数据表中无配置属性时，不显示当前配置项 3查询到的数据排序
2023-12-14 16:53:43 +08:00 · 2023-12-14 16:53:43 +08:00 · 42cb3ae6d8
parent 2f48171e73
commit 42cb3ae6d8
5 changed files with 58 additions and 45 deletions
--- a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryInfMessageBoxView.xaml
+++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryInfMessageBoxView.xaml
@ -85,7 +85,7 @@
                Height="30"
                Margin="20,0"
                ItemsSource="{Binding StepModelList}"
-                SelectedItem="{Binding StepModel}"
+                SelectedItem="{Binding StepModel,UpdateSourceTrigger=PropertyChanged}"
                ToolTip="选择需要显示的Step，All表示：显示全部，*表示：筛选出Step名称中含有*" />


--- a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistorySqlHelp.cs
+++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistorySqlHelp.cs
@ -58,7 +58,7 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
        //**********************************************选中Recipe时，查询当时记录的总的步骤流程*************************************************
        public static ObservableCollection<ProcessHistoryData> QueryProcessHistoryData(string processGuid, string recipeName,string stepModel)
        {
-            string cmd = $"select * from recipe_step_data where process_data_guid='{processGuid}'";
+            string cmd = $"select * from recipe_step_data where process_data_guid='{processGuid}' order by step_begin_time asc ";
            return GetProcessHistoryDataList(cmd, recipeName, stepModel);
        }

@ -124,7 +124,7 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
                phd.DeviceName = item.Display;
                phd.DATASubscribeName = item.Property;
                phd.Unit = item.Unit;
-
+                phd.IsPropertyExists = item.IsPropertyExists;
                foreach (DataTable ds in dataTableList)
                {
                    for (int i = 0; i < ds.Rows.Count; i++)
@ -140,8 +140,12 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
                    }
                }

-                phd.CalculateData();
-                processHistoryDeviceDataList.Add(phd);
+                if (phd.IsPropertyExists)
+                {
+                    phd.CalculateData();
+                    processHistoryDeviceDataList.Add(phd);
+                }
+                
            }
            return processHistoryDeviceDataList;
        }
--- a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml
+++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestView.xaml
@ -21,17 +21,17 @@
        </Grid.RowDefinitions>

        <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="1350" />
+            <ColumnDefinition Width="550" />
            <ColumnDefinition />
        </Grid.ColumnDefinitions>

        <Border
-            Grid.ColumnSpan="3"
-            Margin="0,5"
+            Grid.ColumnSpan="2"
+            Margin="0,6"
            Padding="1"
-            HorizontalAlignment="Left"
-            Background="{StaticResource Table_BG_Content}"
-            BorderBrush="{StaticResource Table_BD}"
+            HorizontalAlignment="Stretch"
+            Background="{StaticResource Tab_BG}"
+            BorderBrush="{StaticResource Tab_BD}"
            BorderThickness="1,1,1,1">
            <StackPanel Orientation="Horizontal">
                <StackPanel.Resources>
@ -114,8 +114,11 @@



-        <StackPanel Grid.Row="1" Orientation="Horizontal">
-
+        <Grid Grid.Row="1">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto" MaxHeight="350"/>
+                <RowDefinition />
+            </Grid.RowDefinitions>
            <DataGrid
                HorizontalAlignment="Left"
                VerticalAlignment="Top"
@ -125,6 +128,7 @@
                FontSize="14"
                IsReadOnly="True"
                ItemsSource="{Binding ProcessHistoryDataList}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
                SelectedItem="{Binding SelectProcessHistoryData}">
                <DataGrid.CellStyle>
                    <Style TargetType="DataGridCell">
@ -143,17 +147,13 @@
                        Binding="{Binding StepBeginTime}"
                        Header="Step Start Time" />
                    <DataGridTextColumn
-                        Width="95"
+                        Width="90"
                        Binding="{Binding StepEndTimeDisp}"
                        Header="End Time" />
                    <DataGridTextColumn
-                        Width="95"
+                        Width="80"
                        Binding="{Binding StepTime}"
                        Header="Step Time" />
-                    <DataGridTextColumn
-                        Width="300"
-                        Binding="{Binding RecipeName}"
-                        Header="Recipe Name" />
                    <DataGridTextColumn
                        Width="80"
                        Binding="{Binding StepNumber}"
@ -162,24 +162,13 @@
                        Width="100"
                        Binding="{Binding StepName}"
                        Header="Step Name" />
-                    <!--<DataGridTemplateColumn Width="80" Header="Query">
-                    <DataGridTemplateColumn.CellTemplate>
-                        <DataTemplate>
-                            <Button Content="Statr" Margin="2">
-                                <i:Interaction.Triggers>
-                                    <i:EventTrigger EventName="Click">
-                                        <micro:ActionMessage MethodName="QuerDeviceData" />
-                                    </i:EventTrigger>
-                                </i:Interaction.Triggers>
-                            </Button>
-                        </DataTemplate>
-                    </DataGridTemplateColumn.CellTemplate>
-                </DataGridTemplateColumn>-->
                </DataGrid.Columns>

            </DataGrid>

            <DataGrid
+                Grid.Row="1"
+                Margin="0,8,0,0"
                HorizontalAlignment="Left"
                VerticalAlignment="Top"
                AlternationCount="2"
@ -188,6 +177,7 @@
                FontSize="14"
                IsReadOnly="True"
                ItemsSource="{Binding ProcessHistoryDeviceDataList}"
+                ScrollViewer.VerticalScrollBarVisibility="Visible"
                SelectedItem="{Binding SelectProcessHistoryDeviceData}">
                <DataGrid.CellStyle>
                    <Style TargetType="DataGridCell">
@ -196,34 +186,34 @@
                </DataGrid.CellStyle>
                <i:Interaction.Triggers>
                    <i:EventTrigger EventName="MouseDoubleClick">
-                        <micro:ActionMessage MethodName="GetDeviceCharting" />
+                        <micro:ActionMessage MethodName="DeviceCharting" />
                    </i:EventTrigger>
                </i:Interaction.Triggers>
                <DataGrid.Columns>
                    <DataGridTextColumn
-                        Width="150"
+                        Width="155"
                        Binding="{Binding DeviceName}"
                        Header="DeviceName" />
                    <DataGridTextColumn
-                        Width="50"
+                        Width="65"
                        Binding="{Binding Unit}"
                        Header="Unit" />
                    <DataGridTextColumn
-                        Width="90"
+                        Width="95"
                        Binding="{Binding Min, StringFormat=F1}"
                        Header="Min" />
                    <DataGridTextColumn
-                        Width="90"
+                        Width="95"
                        Binding="{Binding Max, StringFormat=F1}"
                        Header="Max" />
                    <DataGridTextColumn
-                        Width="90"
+                        Width="95"
                        Binding="{Binding Average, StringFormat=F1}"
                        Header="Average" />
                </DataGrid.Columns>

            </DataGrid>
-        </StackPanel>
+        </Grid>
        <userControls:DataViewChart
            x:Name="chart"
            Grid.Row="1"
--- a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestViewModel.cs
+++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/ProcessHistoryTestViewModel.cs
@ -1,4 +1,5 @@
-using Caliburn.Micro;
+using Aitex.Core.RT.SCCore;
+using Caliburn.Micro;
 using MECF.Framework.Common.Aitex.Core.Common.DeviceData;
 using MECF.Framework.Common.DataCenter;
 using MECF.Framework.UI.Client.CenterViews.Core;
@ -152,7 +153,7 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
            PmList = new List<string>();
            for (int i = 1; i <= 2; i++)
            {
-                if ((bool)QueryDataClient.Instance.Service.GetConfig($"PM.PM{i}.TMAEnable"))
+                if ((bool)QueryDataClient.Instance.Service.GetConfig($"System.SetUp.IsPM{i}Installed"))
                    PmList.Add($"PM{i}");
            }
            if (PmList.Count > 0)
@ -207,12 +208,14 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
        /// </summary>
        public void GetProcessHistory()
        {
-            Query(SelectProcessHistoryData);
+            if (SelectProcessHistoryData == null)
+                return;
+            QueryProcessHistory(SelectProcessHistoryData);

            Refresh();
        }

-        public void Query(ProcessHistoryData processHistoryData)
+        public void QueryProcessHistory(ProcessHistoryData processHistoryData)
        {
            var daySlices = DateRangeHelper.SplitInToHours(new DateRangeHelper(Convert.ToDateTime(processHistoryData.StepBeginTime), Convert.ToDateTime(processHistoryData.StepEndTime)), 12);
            List<List<GasFlowSum>> gasFlowRunVent = new List<List<GasFlowSum>>();
@ -224,8 +227,16 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
        /// <summary>
        /// 显示Charting历史数据记录
        /// </summary>
-        public void GetDeviceCharting()
+        public void DeviceCharting()
        {
+            if (SelectProcessHistoryDeviceData == null)
+                return;
+            GetDeviceCharting();
+        }
+
+        private void GetDeviceCharting()
+        {
+
            AppendedSeries = new ObservableCollection<IRenderableSeries> { SelectProcessHistoryDeviceData.GetLineSeries() };

            var dataSeries = AppendedSeries[0].DataSeries as XyDataSeries<DateTime, double>;
@ -249,5 +260,7 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory
            ChartAutoRange = AutoRange.Never;
            ((ProcessHistoryTestView)View).chart.ZoomExtents();
        }
+
+        
    }
 }
--- a/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/RecipeProcessHistoryData.cs
+++ b/MECF.Framework.UI.Client/CenterViews/DataLogs/ProcessHistory/RecipeProcessHistoryData.cs
@ -114,8 +114,14 @@ namespace MECF.Framework.UI.Client.CenterViews.DataLogs.ProcessHistory

        public float Max { get; set; }

-        
+        /// <summary>
+        /// 数据表中是否含有此属性
+        /// </summary>
+        public bool IsPropertyExists { get; set; }

+        /// <summary>
+        /// 根据查询的数据集合计算出对应的数据
+        /// </summary>
        public void CalculateData()
        {
            Min = DeviceValue.Count > 0 ? DeviceValue.Min(t => t) : 0;