diff --git a/Aucma.Scada.UI/MainWindow.xaml b/Aucma.Scada.UI/MainWindow.xaml
index 87b39fcd..f38de87d 100644
--- a/Aucma.Scada.UI/MainWindow.xaml
+++ b/Aucma.Scada.UI/MainWindow.xaml
@@ -4,13 +4,14 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI"
- mc:Ignorable="d"
+ mc:Ignorable="d" FontFamily="Microsoft YaHei"
+ WindowStartupLocation="CenterScreen"
Title="SCADA" Height="1080" Width="1920" Icon="Icon.png"
WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize">
-
+
@@ -20,10 +21,11 @@
-
-
+
+
+
-
+
@@ -31,8 +33,10 @@
+
+
-
+
@@ -64,12 +68,12 @@
-
+
-
+
@@ -78,17 +82,16 @@
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
@@ -185,7 +188,7 @@
-
+
@@ -247,7 +250,7 @@
-
+
@@ -282,10 +285,10 @@
-
-
+
+
-
+
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
index 4064285f..9c687dae 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/AssemblyPlanControl.xaml
@@ -6,11 +6,74 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
- mc:Ignorable="d"
- d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-
+ mc:Ignorable="d"
+ d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" >
+
+
-
+
+
+
+
+
+
+
+
@@ -54,28 +117,28 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -178,10 +241,20 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -210,24 +283,24 @@
-
+
-
+
-
-
-
-
-
+
+
+
+
+
@@ -249,13 +322,13 @@
-
+
-
-
+
+
@@ -284,10 +357,20 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
index 7d7bb181..0cee6b13 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/PlanInfoEditWindow.xaml
@@ -6,7 +6,7 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.AssemblyPlan"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.AssemblyPlan"
mc:Ignorable="d"
- Title="MES生产计划" Height="650" Width="900" Name="window" Background="White"
+ Title="MES生产计划" Height="650" Width="900" Name="window" Background="#1152AC"
ResizeMode="NoResize" >
@@ -26,12 +26,12 @@
-
-
+
+
-
-
-
+
+
+
@@ -43,7 +43,7 @@
-
+
@@ -57,7 +57,7 @@
Command="{Binding DataContext.RadioButtonCommand, RelativeSource={RelativeSource AncestorType=ItemsControl}}"
CommandParameter="{Binding}"
GroupName="MaterialTypeRadioButton"
- Margin="20,10" FontSize="15" Foreground="#FFFFFF"/>
+ Margin="20,10" FontSize="20" Foreground="#FFFFFF"/>
@@ -74,7 +74,7 @@
diff --git a/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml b/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
index ae8d86bc..37ef81e1 100644
--- a/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
+++ b/Aucma.Scada.UI/Page/AssemblyPlan/QuantityIssuedWindow.xaml
@@ -33,25 +33,25 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
@@ -68,7 +68,7 @@
-
+
@@ -95,14 +95,14 @@
-
-
+
+
-
-
+
+
diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
index ce014b5c..b307658d 100644
--- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
@@ -6,11 +6,74 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InStoreInfo"
xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
- mc:Ignorable="d"
- d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-
+ mc:Ignorable="d" Background="#1152AC"
+ d:DesignHeight="750" d:DesignWidth="1920" >
+
+
-
+
+
+
+
+
+
+
+
@@ -57,18 +120,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -84,18 +147,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -126,10 +189,20 @@
-
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -144,40 +217,40 @@
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
+
@@ -196,7 +269,7 @@
-
+
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
index d4ae26c9..a9b2f4ca 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/InventoryInfoControl.xaml
@@ -4,16 +4,16 @@
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
- mc:Ignorable="d"
- d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
+ mc:Ignorable="d" Background="#1152AC"
+ d:DesignHeight="750" d:DesignWidth="1920" >
-
-
+
+
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
index a59179de..08170b31 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/LinerInventory.xaml
@@ -5,11 +5,74 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.LinerInventory"
- mc:Ignorable="d"
+ mc:Ignorable="d" Background="#1152AC"
d:DesignHeight="450" d:DesignWidth="800">
-
+
+
-
+
+
+
+
+
+
+
+
@@ -177,20 +240,20 @@
-
+
-
-
-
+
+
+
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
index f4ec0e56..29fbdbd2 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/MaterialStatisticsWindow.xaml
@@ -4,8 +4,8 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
- mc:Ignorable="d"
- Title="物料库存统计" Height="650" Width="1000" Name="window" Background="White"
+ mc:Ignorable="d" Background="#1152AC"
+ Title="物料库存统计" Height="650" Width="1000" Name="window"
ResizeMode="NoResize" >
@@ -32,11 +32,11 @@
-
+
-
+
-
+
-
+
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
index 18ee2811..66d578a7 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/ShellInventory.xaml
@@ -6,10 +6,73 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.ShellInventory"
mc:Ignorable="d"
- d:DesignHeight="450" d:DesignWidth="800" Background="Transparent">
-
+ d:DesignHeight="450" d:DesignWidth="800" Background="#1152AC" >
+
+
-
+
+
+
+
+
+
+
+
@@ -178,20 +241,20 @@
-
+
-
-
-
+
+
+
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
index d5875c15..e4b280bd 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceDetailWindow.xaml
@@ -4,9 +4,9 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.InventoryInfo"
- mc:Ignorable="d"
+ mc:Ignorable="d" Background="#1152AC"
Title="{Binding TitleName}" Height="450" Width="800" Name="window" ResizeMode="NoResize" >
-
+
@@ -18,21 +18,21 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
+
diff --git a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
index 08850257..5673d726 100644
--- a/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InventoryInfo/SpaceInfoControl.xaml
@@ -57,7 +57,7 @@
-
+
diff --git a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
index 5fbff062..c20bf021 100644
--- a/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/OutStoreInfo/OutStoreInfoControl.xaml
@@ -6,10 +6,72 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.OutStoreInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d"
- d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-
+ d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" >
+
-
+
+
+
+
+
+
+
+
@@ -57,18 +119,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -84,18 +146,18 @@
-
-
+
+
-
-
+
+
-
-
+
+
@@ -121,7 +183,7 @@
-
+
@@ -137,7 +199,7 @@
-
+
@@ -146,14 +208,14 @@
-
-
+
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
diff --git a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
index b5908209..3d56926f 100644
--- a/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/TaskInfo/TaskInfoControl.xaml
@@ -6,19 +6,82 @@
xmlns:local="clr-namespace:Aucma.Scada.UI.Page.TaskInfo"
xmlns:local1="clr-namespace:Aucma.Scada.UI.Converter.TaskInfo"
mc:Ignorable="d"
- d:DesignHeight="750" d:DesignWidth="1920" Background="Transparent">
-
+ d:DesignHeight="750" d:DesignWidth="1920" Background="#1152AC" >
+
+
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
@@ -33,23 +96,23 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -59,7 +122,7 @@
();
List info = inStoreBusiness.GetMaterialStock();
-
App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
if (info != null)
@@ -319,11 +319,12 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
shellColumn.DataLabels = true;
shellColumn.Title = "箱壳";
shellColumn.Values = shellAchievement;
-
+ shellColumn.Foreground = Brushes.White;
var linerColumn = new ColumnSeries();
linerColumn.DataLabels = true;
linerColumn.Title = "内胆";
linerColumn.Values = linerAchievement;
+ linerColumn.Foreground = Brushes.White;
linerColumn.Fill = new SolidColorBrush(Color.FromRgb(15, 209, 226));
Achievement.Add(shellColumn);
Achievement.Add(linerColumn);
diff --git a/Aucma.Scada.UI/viewModel/MainViewModel.cs b/Aucma.Scada.UI/viewModel/MainViewModel.cs
index 94b536be..81c21dff 100644
--- a/Aucma.Scada.UI/viewModel/MainViewModel.cs
+++ b/Aucma.Scada.UI/viewModel/MainViewModel.cs
@@ -8,6 +8,7 @@ using GalaSoft.MvvmLight.Command;
using HighWayIot.Log4net;
using System;
using System.Diagnostics;
+using System.IO;
using System.Windows;
namespace Aucma.Scada.UI.viewModel
@@ -139,11 +140,23 @@ namespace Aucma.Scada.UI.viewModel
{
try
{
- Process proc = new Process();
- proc.StartInfo.FileName = @"C:\Windows\System32\osk.exe";
- proc.StartInfo.UseShellExecute = true;
- proc.StartInfo.Verb = "runas";
- proc.Start();
+ var commonFilesPath = Environment.GetFolderPath(Environment.SpecialFolder.CommonProgramFiles);
+ //程序集目标平台为X86时,获取到的是x86的Program Files,但TabTip.exe始终在Program Files目录下
+ if (commonFilesPath.Contains("Program Files (x86)"))
+ {
+ commonFilesPath = commonFilesPath.Replace("Program Files (x86)", "Program Files");
+ }
+ string tabTipPath = Path.Combine(commonFilesPath, @"microsoft shared\ink\TabTip.exe");
+ if (File.Exists(tabTipPath))
+ {
+ ProcessStartInfo psi = new ProcessStartInfo
+ {
+ FileName = tabTipPath,
+ UseShellExecute = true,
+ CreateNoWindow = true
+ };
+ Process.Start(psi);
+ }
}