diff --git a/View/EngineerSetView.xaml b/View/EngineerSetView.xaml index b70f7f5..cee8374 100644 --- a/View/EngineerSetView.xaml +++ b/View/EngineerSetView.xaml @@ -8,10 +8,10 @@ mc:Ignorable="d" d:DesignHeight="630" d:DesignWidth="1280" VerticalAlignment="Top"> - + - - + + diff --git a/View/EngineerSetView.xaml.cs b/View/EngineerSetView.xaml.cs index 659bab3..773f378 100644 --- a/View/EngineerSetView.xaml.cs +++ b/View/EngineerSetView.xaml.cs @@ -30,14 +30,15 @@ namespace SunlightCentralizedControlManagement_SCCM_.View InitializeComponent(); // 获取所有可用串口端口,并添加到comboBoxCOM string[] ports = System.IO.Ports.SerialPort.GetPortNames(); + ports.Append("COM"); comboBoxCOM0.ItemsSource = ports; - comboBoxCOM0.Text = Configini.IniReadvalue("SYS", "COM"); + comboBoxCOM0.Text = Configini.IniReadvalue("SYS", "COMP1"); comboBoxCOM1.ItemsSource = ports; - comboBoxCOM1.Text = Configini.IniReadvalue("SYS", "COM"); + comboBoxCOM1.Text = Configini.IniReadvalue("SYS", "COMP2"); comboBoxCOM2.ItemsSource = ports; - comboBoxCOM2.Text = Configini.IniReadvalue("SYS", "COM"); + comboBoxCOM2.Text = Configini.IniReadvalue("SYS", "COMP3"); string[] Language = {"en-US","zh-CN","zh-TW" }; string[] SQMOD = { "Windows Authentication", "SQL SERVER"}; @@ -61,13 +62,24 @@ namespace SunlightCentralizedControlManagement_SCCM_.View private UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "SCCM.ini"); private SpeechSynthesizer synth = new SpeechSynthesizer();//语音 - private void comboBoxCOM_SelectionChanged(object sender, SelectionChangedEventArgs e) + private void comboBoxCOM_SelectionChanged0(object sender, SelectionChangedEventArgs e) { - Configini.IniWritevalue("SYS", "COM0", comboBoxCOM0.SelectedValue.ToString()); - Configini.IniWritevalue("SYS", "COM1", comboBoxCOM1.SelectedValue.ToString()); - Configini.IniWritevalue("SYS", "COM2", comboBoxCOM2.SelectedValue.ToString()); + Configini.IniWritevalue("SYS", "COMP0", comboBoxCOM0.SelectedValue.ToString()); + // Configini.IniWritevalue("SYS", "COMP1", comboBoxCOM1.SelectedValue.ToString()); + // Configini.IniWritevalue("SYS", "COMP2", comboBoxCOM2.SelectedValue.ToString()); + } + private void comboBoxCOM_SelectionChanged1(object sender, SelectionChangedEventArgs e) + { + //Configini.IniWritevalue("SYS", "COMP0", comboBoxCOM0.SelectedValue.ToString()); + Configini.IniWritevalue("SYS", "COMP1", comboBoxCOM1.SelectedValue.ToString()); + // Configini.IniWritevalue("SYS", "COMP2", comboBoxCOM2.SelectedValue.ToString()); + } + private void comboBoxCOM_SelectionChanged2(object sender, SelectionChangedEventArgs e) + { + //Configini.IniWritevalue("SYS", "COMP0", comboBoxCOM0.SelectedValue.ToString()); + // Configini.IniWritevalue("SYS", "COMP1", comboBoxCOM1.SelectedValue.ToString()); + Configini.IniWritevalue("SYS", "COMP2", comboBoxCOM2.SelectedValue.ToString()); } - private void comboBoxLanguage_SelectionChanged(object sender, SelectionChangedEventArgs e) { Configini.IniWritevalue("SYS", "Language", comboBoxLanguage.SelectedValue.ToString()); diff --git a/View/MachinesSet.xaml b/View/MachinesSet.xaml index ec94259..524467e 100644 --- a/View/MachinesSet.xaml +++ b/View/MachinesSet.xaml @@ -63,7 +63,7 @@ - + @@ -81,7 +81,7 @@ - +