diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index ddb9e6f..b63097a 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -44,7 +44,7 @@ namespace SunlightCentralizedControlManagement_SCCM_ AsEnumerable().Select(rowdata => rowdata.Field("Name")).ToList(); } user_ = App.USER_Purview; - username.Text = user_; + username.Text = user_; } private void ButtonPopUpLogout_Click(object sender, RoutedEventArgs e) diff --git a/Properties/Resources.Designer.cs b/Properties/Resources.Designer.cs index 2ce3e76..26bff3c 100644 --- a/Properties/Resources.Designer.cs +++ b/Properties/Resources.Designer.cs @@ -1698,6 +1698,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.Properties { } } + /// + /// 查找类似 Pequest 的本地化字符串。 + /// + public static string Pequest { + get { + return ResourceManager.GetString("Pequest", resourceCulture); + } + } + /// /// 查找类似 Permit 的本地化字符串。 /// diff --git a/Properties/Resources.en-US.resx b/Properties/Resources.en-US.resx index 2f3681f..265f841 100644 --- a/Properties/Resources.en-US.resx +++ b/Properties/Resources.en-US.resx @@ -1068,4 +1068,7 @@ Vol + + Pequest + \ No newline at end of file diff --git a/Properties/Resources.resx b/Properties/Resources.resx index 4d8c3e5..6131d5b 100644 --- a/Properties/Resources.resx +++ b/Properties/Resources.resx @@ -1068,4 +1068,7 @@ Vol + + Pequest + \ No newline at end of file diff --git a/Properties/Resources.zh-CN.resx b/Properties/Resources.zh-CN.resx index b3d3a48..04c5222 100644 --- a/Properties/Resources.zh-CN.resx +++ b/Properties/Resources.zh-CN.resx @@ -1068,4 +1068,7 @@ 音量 + + 请求 + \ No newline at end of file diff --git a/Properties/Resources.zh-TW.resx b/Properties/Resources.zh-TW.resx index c564969..0380229 100644 --- a/Properties/Resources.zh-TW.resx +++ b/Properties/Resources.zh-TW.resx @@ -1068,4 +1068,7 @@ 音量 + + + \ No newline at end of file diff --git a/View/MonitorView.xaml.cs b/View/MonitorView.xaml.cs index 906b9e7..09d7c19 100644 --- a/View/MonitorView.xaml.cs +++ b/View/MonitorView.xaml.cs @@ -70,7 +70,9 @@ namespace SunlightCentralizedControlManagement_SCCM_.View DATA_view(); UserInformation userInformation = new UserInformation(); + userInformation.Topmost = true; userInformation.Show(); + userInformation.Activate(); } private string machine; diff --git a/ViewModel/MainWindowViewModel.cs b/ViewModel/MainWindowViewModel.cs index eb4a54d..5522a03 100644 --- a/ViewModel/MainWindowViewModel.cs +++ b/ViewModel/MainWindowViewModel.cs @@ -71,12 +71,12 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel private SQLiteHelper SQLiteHelpers = null; //定义数据库 private readonly string DBAddress = Environment.CurrentDirectory + "\\DataBase\\SCCM.db"; //数据库路径 public static DataTable Machines = new DataTable(); //设备表缓存 + public static DataTable InfData = new DataTable(); // public static DataRow MachinesROW; public static DataTable USER_data = new DataTable(); public static UserControls.info[] inf = new UserControls.info[999]; //定义总览信息卡 public static int ERR_c = 0;//错误计数器 public static bool[] USER_Capacity { set; get; } = new bool[99]; - // private SpeechSynthesizer synth = new SpeechSynthesizer();//语音 public MainWindowViewModel() { @@ -90,10 +90,6 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel SN_ID = Configini.IniReadvalue("SN", "SN2"); SN_KEY = Configini.IniReadvalue("SN", "SN1"); DyelotsDispenser = Convert.ToBoolean(Configini.IniReadvalue("SYS", "DyelotsDispenser")); - - // synth.Rate = int.Parse( Configini.IniReadvalue("VOICE", "V1")); - // synth.Volume = int.Parse( Configini.IniReadvalue("VOICE", "V2")); - } catch (Exception ex) { LogGing.ERRDATA(ex); } @@ -103,13 +99,17 @@ namespace SunlightCentralizedControlManagement_SCCM_.ViewModel USER_data = SQLiteHelpers.ExecuteDataSet("select * from USER order by Name desc", null).Tables[0]; SQLiteHelpers.Close(); - // MachinesROW = Machines.NewRow(); - USERCapacity(App.USER_Purview);//App.USER_Purview); CountDown(); TcpClientNEW(); SQL_LINK(); - + + /**添加提示信息栏**/ + InfData.Columns.Add("Machine", Type.GetType("System.String")); + InfData.Columns.Add("Information", Type.GetType("System.String")); + InfData.Columns.Add("Code", Type.GetType("System.String")); + InfData.Columns.Add("ID", Type.GetType("System.Int32")); + } public static void USERCapacity(string user) //权限 { diff --git a/WindowsView/UserInformation.xaml b/WindowsView/UserInformation.xaml index 7edf53a..8ba5bab 100644 --- a/WindowsView/UserInformation.xaml +++ b/WindowsView/UserInformation.xaml @@ -6,26 +6,20 @@ xmlns:local="clr-namespace:SunlightCentralizedControlManagement_SCCM_" xmlns:lang="clr-namespace:SunlightCentralizedControlManagement_SCCM_.Properties" mc:Ignorable="d" + Closing="Window_Closing" Title="UserInformation" Height="450" Width="800"> - + @@ -51,16 +45,16 @@ CanUserDeleteRows="False" SelectionMode="Single" FontSize="15" Focusable="True" -