Commit d2bdff5d authored by wangwanxh@sina.com's avatar wangwanxh@sina.com

优化部分设置

parent 8bd53467
...@@ -14,11 +14,14 @@ namespace GcDevicePc.CK_UI ...@@ -14,11 +14,14 @@ namespace GcDevicePc.CK_UI
private string user = "admin"; private string user = "admin";
public static bool Island = false; public static bool Island = false;
CKVocAnalyzer.NumForm form; CKVocAnalyzer.NumForm form;
public LandIn() public LandIn(string userstr)
{ {
InitializeComponent(); InitializeComponent();
this.ControlBox = false; this.ControlBox = false;
this.user = userstr;
} }
private void button1_Click(object sender, EventArgs e) //登录系统 private void button1_Click(object sender, EventArgs e) //登录系统
{ {
......
...@@ -55,7 +55,7 @@ namespace GcDevicePc ...@@ -55,7 +55,7 @@ namespace GcDevicePc
} }
DialogResult dr = new CK_UI.LandIn().ShowDialog(); DialogResult dr = new CK_UI.LandIn("calibration").ShowDialog();
if (dr == DialogResult.OK) if (dr == DialogResult.OK)
{ {
...@@ -63,6 +63,7 @@ namespace GcDevicePc ...@@ -63,6 +63,7 @@ namespace GcDevicePc
{ {
CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust(); CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust();
auto.Show(); auto.Show();
Trace.WriteLine(string.Format("用户{0},进入自动校准模式", "calibration"), "sys");
}else }else
{ {
MessageBox.Show("无权限操作!!!!"); MessageBox.Show("无权限操作!!!!");
......
...@@ -1310,7 +1310,7 @@ namespace GcDevicePc ...@@ -1310,7 +1310,7 @@ namespace GcDevicePc
private void UserLoginMenu_Click(object sender, EventArgs e) private void UserLoginMenu_Click(object sender, EventArgs e)
{ {
DialogResult dr = new LandIn().ShowDialog(); DialogResult dr = new LandIn("admin").ShowDialog();
if (dr == DialogResult.OK) if (dr == DialogResult.OK)
{ {
...@@ -1322,6 +1322,7 @@ namespace GcDevicePc ...@@ -1322,6 +1322,7 @@ namespace GcDevicePc
_debugForm.Activate(); _debugForm.Activate();
} }
SetMenu(LandIn.Island); SetMenu(LandIn.Island);
Trace.WriteLine(string.Format("用户{0},进入调试模式","admin"),"sys");
} }
} }
...@@ -1343,6 +1344,7 @@ namespace GcDevicePc ...@@ -1343,6 +1344,7 @@ namespace GcDevicePc
Formstr = "用户窗口"; Formstr = "用户窗口";
_userForm.Activate(); _userForm.Activate();
//userForm.Show(); //userForm.Show();
Trace.WriteLine("注销登录,进入用户模式", "sys");
} }
LandIn.Island = false; LandIn.Island = false;
SetMenu(LandIn.Island); SetMenu(LandIn.Island);
......
No preview for this file type
No preview for this file type
No preview for this file type
...@@ -5,3 +5,5 @@ ...@@ -5,3 +5,5 @@
4.王工更新文件传输库,解决开机容易传文件崩的 4.王工更新文件传输库,解决开机容易传文件崩的
2.18-6-7 2.18-6-7
1.更新现有组件库 1.更新现有组件库
2018 6-14
1,调整目录
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment