diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/MainFrm.cs b/MainFrm.cs index 732a3ac..b16d9d3 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -152,8 +152,12 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - //RigthMenuSet(); - //MenuSet(); + if (Utility.isLoginNeeded) + { + RigthMenuSet(); + MenuSet(); + } + } /// diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/MainFrm.cs b/MainFrm.cs index 732a3ac..b16d9d3 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -152,8 +152,12 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - //RigthMenuSet(); - //MenuSet(); + if (Utility.isLoginNeeded) + { + RigthMenuSet(); + MenuSet(); + } + } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fa30208..8b0b199 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -1714,49 +1714,49 @@ // 创建拓扑ToolStripMenuItem // this.创建拓扑ToolStripMenuItem.Name = "创建拓扑ToolStripMenuItem"; - this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.创建拓扑ToolStripMenuItem.Text = "创建拓扑"; this.创建拓扑ToolStripMenuItem.Click += new System.EventHandler(this.创建拓扑ToolStripMenuItem_Click); // // 上游分析ToolStripMenuItem // this.上游分析ToolStripMenuItem.Name = "上游分析ToolStripMenuItem"; - this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.上游分析ToolStripMenuItem.Text = "上游分析"; this.上游分析ToolStripMenuItem.Click += new System.EventHandler(this.上游分析ToolStripMenuItem_Click); // // 下游分析ToolStripMenuItem // this.下游分析ToolStripMenuItem.Name = "下游分析ToolStripMenuItem"; - this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.下游分析ToolStripMenuItem.Text = "下游分析"; this.下游分析ToolStripMenuItem.Click += new System.EventHandler(this.下游分析ToolStripMenuItem_Click); // // 流向分析ToolStripMenuItem // this.流向分析ToolStripMenuItem.Name = "流向分析ToolStripMenuItem"; - this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.流向分析ToolStripMenuItem.Text = "流向分析"; this.流向分析ToolStripMenuItem.Click += new System.EventHandler(this.流向分析ToolStripMenuItem_Click); // // 关阀分析ToolStripMenuItem // this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem"; - this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.关阀分析ToolStripMenuItem.Text = "关阀分析"; this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀分析ToolStripMenuItem_Click); // // 连通分析ToolStripMenuItem // this.连通分析ToolStripMenuItem.Name = "连通分析ToolStripMenuItem"; - this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.连通分析ToolStripMenuItem.Text = "连通分析"; this.连通分析ToolStripMenuItem.Click += new System.EventHandler(this.连通分析ToolStripMenuItem_Click); // // 爆管分析ToolStripMenuItem // this.爆管分析ToolStripMenuItem.Name = "爆管分析ToolStripMenuItem"; - this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.爆管分析ToolStripMenuItem.Text = "爆管分析"; this.爆管分析ToolStripMenuItem.Click += new System.EventHandler(this.爆管分析ToolStripMenuItem_Click); // @@ -4469,7 +4469,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(35536, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4563,7 +4563,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(35535, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/MainFrm.cs b/MainFrm.cs index 732a3ac..b16d9d3 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -152,8 +152,12 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - //RigthMenuSet(); - //MenuSet(); + if (Utility.isLoginNeeded) + { + RigthMenuSet(); + MenuSet(); + } + } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fa30208..8b0b199 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -1714,49 +1714,49 @@ // 创建拓扑ToolStripMenuItem // this.创建拓扑ToolStripMenuItem.Name = "创建拓扑ToolStripMenuItem"; - this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.创建拓扑ToolStripMenuItem.Text = "创建拓扑"; this.创建拓扑ToolStripMenuItem.Click += new System.EventHandler(this.创建拓扑ToolStripMenuItem_Click); // // 上游分析ToolStripMenuItem // this.上游分析ToolStripMenuItem.Name = "上游分析ToolStripMenuItem"; - this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.上游分析ToolStripMenuItem.Text = "上游分析"; this.上游分析ToolStripMenuItem.Click += new System.EventHandler(this.上游分析ToolStripMenuItem_Click); // // 下游分析ToolStripMenuItem // this.下游分析ToolStripMenuItem.Name = "下游分析ToolStripMenuItem"; - this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.下游分析ToolStripMenuItem.Text = "下游分析"; this.下游分析ToolStripMenuItem.Click += new System.EventHandler(this.下游分析ToolStripMenuItem_Click); // // 流向分析ToolStripMenuItem // this.流向分析ToolStripMenuItem.Name = "流向分析ToolStripMenuItem"; - this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.流向分析ToolStripMenuItem.Text = "流向分析"; this.流向分析ToolStripMenuItem.Click += new System.EventHandler(this.流向分析ToolStripMenuItem_Click); // // 关阀分析ToolStripMenuItem // this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem"; - this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.关阀分析ToolStripMenuItem.Text = "关阀分析"; this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀分析ToolStripMenuItem_Click); // // 连通分析ToolStripMenuItem // this.连通分析ToolStripMenuItem.Name = "连通分析ToolStripMenuItem"; - this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.连通分析ToolStripMenuItem.Text = "连通分析"; this.连通分析ToolStripMenuItem.Click += new System.EventHandler(this.连通分析ToolStripMenuItem_Click); // // 爆管分析ToolStripMenuItem // this.爆管分析ToolStripMenuItem.Name = "爆管分析ToolStripMenuItem"; - this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.爆管分析ToolStripMenuItem.Text = "爆管分析"; this.爆管分析ToolStripMenuItem.Click += new System.EventHandler(this.爆管分析ToolStripMenuItem_Click); // @@ -4469,7 +4469,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(35536, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4563,7 +4563,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(35535, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Program.cs b/Program.cs index a76d0d4..ef61a3e 100644 --- a/Program.cs +++ b/Program.cs @@ -48,18 +48,21 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - FrmLogin frm = new FrmLogin(); - if (frm.ShowDialog() == DialogResult.OK) - { - if (Utility.userRole != null) - { - Application.Run(new MainFrm()); - } - else - { - MessageBox.Show("该用户没有分配任何角色！"); - } - } + Utility.SetParams(); + Application.Run(new MainFrm()); + +// FrmLogin frm = new FrmLogin(); +// if (frm.ShowDialog() == DialogResult.OK) +// { +// if (Utility.userRole != null) +// { +// Application.Run(new MainFrm()); +// } +// else +// { +// MessageBox.Show("该用户没有分配任何角色！"); +// } +// } } private static void remoteUpDate() diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/MainFrm.cs b/MainFrm.cs index 732a3ac..b16d9d3 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -152,8 +152,12 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - //RigthMenuSet(); - //MenuSet(); + if (Utility.isLoginNeeded) + { + RigthMenuSet(); + MenuSet(); + } + } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fa30208..8b0b199 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -1714,49 +1714,49 @@ // 创建拓扑ToolStripMenuItem // this.创建拓扑ToolStripMenuItem.Name = "创建拓扑ToolStripMenuItem"; - this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.创建拓扑ToolStripMenuItem.Text = "创建拓扑"; this.创建拓扑ToolStripMenuItem.Click += new System.EventHandler(this.创建拓扑ToolStripMenuItem_Click); // // 上游分析ToolStripMenuItem // this.上游分析ToolStripMenuItem.Name = "上游分析ToolStripMenuItem"; - this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.上游分析ToolStripMenuItem.Text = "上游分析"; this.上游分析ToolStripMenuItem.Click += new System.EventHandler(this.上游分析ToolStripMenuItem_Click); // // 下游分析ToolStripMenuItem // this.下游分析ToolStripMenuItem.Name = "下游分析ToolStripMenuItem"; - this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.下游分析ToolStripMenuItem.Text = "下游分析"; this.下游分析ToolStripMenuItem.Click += new System.EventHandler(this.下游分析ToolStripMenuItem_Click); // // 流向分析ToolStripMenuItem // this.流向分析ToolStripMenuItem.Name = "流向分析ToolStripMenuItem"; - this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.流向分析ToolStripMenuItem.Text = "流向分析"; this.流向分析ToolStripMenuItem.Click += new System.EventHandler(this.流向分析ToolStripMenuItem_Click); // // 关阀分析ToolStripMenuItem // this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem"; - this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.关阀分析ToolStripMenuItem.Text = "关阀分析"; this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀分析ToolStripMenuItem_Click); // // 连通分析ToolStripMenuItem // this.连通分析ToolStripMenuItem.Name = "连通分析ToolStripMenuItem"; - this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.连通分析ToolStripMenuItem.Text = "连通分析"; this.连通分析ToolStripMenuItem.Click += new System.EventHandler(this.连通分析ToolStripMenuItem_Click); // // 爆管分析ToolStripMenuItem // this.爆管分析ToolStripMenuItem.Name = "爆管分析ToolStripMenuItem"; - this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.爆管分析ToolStripMenuItem.Text = "爆管分析"; this.爆管分析ToolStripMenuItem.Click += new System.EventHandler(this.爆管分析ToolStripMenuItem_Click); // @@ -4469,7 +4469,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(35536, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4563,7 +4563,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(35535, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Program.cs b/Program.cs index a76d0d4..ef61a3e 100644 --- a/Program.cs +++ b/Program.cs @@ -48,18 +48,21 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - FrmLogin frm = new FrmLogin(); - if (frm.ShowDialog() == DialogResult.OK) - { - if (Utility.userRole != null) - { - Application.Run(new MainFrm()); - } - else - { - MessageBox.Show("该用户没有分配任何角色！"); - } - } + Utility.SetParams(); + Application.Run(new MainFrm()); + +// FrmLogin frm = new FrmLogin(); +// if (frm.ShowDialog() == DialogResult.OK) +// { +// if (Utility.userRole != null) +// { +// Application.Run(new MainFrm()); +// } +// else +// { +// MessageBox.Show("该用户没有分配任何角色！"); +// } +// } } private static void remoteUpDate() diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 7e643a0..c31ec68 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -19,11 +19,11 @@ { IS_OPEN = true; reloadGrid(); - if (Utility.userRole.IndexOf("资源新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("资源新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("资源删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("资源删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/MainFrm.cs b/MainFrm.cs index 732a3ac..b16d9d3 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -152,8 +152,12 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - //RigthMenuSet(); - //MenuSet(); + if (Utility.isLoginNeeded) + { + RigthMenuSet(); + MenuSet(); + } + } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fa30208..8b0b199 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -1714,49 +1714,49 @@ // 创建拓扑ToolStripMenuItem // this.创建拓扑ToolStripMenuItem.Name = "创建拓扑ToolStripMenuItem"; - this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.创建拓扑ToolStripMenuItem.Text = "创建拓扑"; this.创建拓扑ToolStripMenuItem.Click += new System.EventHandler(this.创建拓扑ToolStripMenuItem_Click); // // 上游分析ToolStripMenuItem // this.上游分析ToolStripMenuItem.Name = "上游分析ToolStripMenuItem"; - this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.上游分析ToolStripMenuItem.Text = "上游分析"; this.上游分析ToolStripMenuItem.Click += new System.EventHandler(this.上游分析ToolStripMenuItem_Click); // // 下游分析ToolStripMenuItem // this.下游分析ToolStripMenuItem.Name = "下游分析ToolStripMenuItem"; - this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.下游分析ToolStripMenuItem.Text = "下游分析"; this.下游分析ToolStripMenuItem.Click += new System.EventHandler(this.下游分析ToolStripMenuItem_Click); // // 流向分析ToolStripMenuItem // this.流向分析ToolStripMenuItem.Name = "流向分析ToolStripMenuItem"; - this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.流向分析ToolStripMenuItem.Text = "流向分析"; this.流向分析ToolStripMenuItem.Click += new System.EventHandler(this.流向分析ToolStripMenuItem_Click); // // 关阀分析ToolStripMenuItem // this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem"; - this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.关阀分析ToolStripMenuItem.Text = "关阀分析"; this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀分析ToolStripMenuItem_Click); // // 连通分析ToolStripMenuItem // this.连通分析ToolStripMenuItem.Name = "连通分析ToolStripMenuItem"; - this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.连通分析ToolStripMenuItem.Text = "连通分析"; this.连通分析ToolStripMenuItem.Click += new System.EventHandler(this.连通分析ToolStripMenuItem_Click); // // 爆管分析ToolStripMenuItem // this.爆管分析ToolStripMenuItem.Name = "爆管分析ToolStripMenuItem"; - this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.爆管分析ToolStripMenuItem.Text = "爆管分析"; this.爆管分析ToolStripMenuItem.Click += new System.EventHandler(this.爆管分析ToolStripMenuItem_Click); // @@ -4469,7 +4469,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(35536, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4563,7 +4563,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(35535, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Program.cs b/Program.cs index a76d0d4..ef61a3e 100644 --- a/Program.cs +++ b/Program.cs @@ -48,18 +48,21 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - FrmLogin frm = new FrmLogin(); - if (frm.ShowDialog() == DialogResult.OK) - { - if (Utility.userRole != null) - { - Application.Run(new MainFrm()); - } - else - { - MessageBox.Show("该用户没有分配任何角色！"); - } - } + Utility.SetParams(); + Application.Run(new MainFrm()); + +// FrmLogin frm = new FrmLogin(); +// if (frm.ShowDialog() == DialogResult.OK) +// { +// if (Utility.userRole != null) +// { +// Application.Run(new MainFrm()); +// } +// else +// { +// MessageBox.Show("该用户没有分配任何角色！"); +// } +// } } private static void remoteUpDate() diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 7e643a0..c31ec68 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -19,11 +19,11 @@ { IS_OPEN = true; reloadGrid(); - if (Utility.userRole.IndexOf("资源新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("资源新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("资源删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("资源删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/TreeUtils.cs b/TreeUtils.cs index 37878fc..1d382a6 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -154,7 +154,8 @@ /// /// public static void RemoveNode(TreeNode treeNode,string nodeText) - { + { + if (treeNode == null) return; if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); else if (treeNode.Nodes.Count > 0) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 2ccc843..42a9b2e 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs index f127496..e6f0f39 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -60,7 +60,7 @@ } conn.Close(); - if (!Utility.userRole.Equals("事件编辑")) + if (Utility.isLoginNeeded&&!Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index e4c3928..ddbb31e 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -77,7 +77,7 @@ comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - if (!Utility.userRole.Contains("工单创建")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index 3acd653..07336ee 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,15 +44,15 @@ private void initForm() { - if (!Utility.userRole.Contains("探测仪新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; } - if (!Utility.userRole.Contains("探测仪删除")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪删除")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Visible = false; } - if (!Utility.userRole.Contains("探测仪编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } @@ -129,7 +129,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (!Utility.userRole.Contains("探测仪编辑")) return; + if (Utility.isLoginNeeded && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmLogin.cs b/FrmLogin.cs index 294cf14..cd7db6f 100644 --- a/FrmLogin.cs +++ b/FrmLogin.cs @@ -117,7 +117,7 @@ private void FrmLogin_Load(object sender, EventArgs e) {//global::Cyberpipe.Properties.Resources.登录页3; this.pictureBox1.BackgroundImage = Image.FromFile(Application.StartupPath + Utility.LoginImgPath); ; - Utility.SetParams(); + StartPosition = FormStartPosition.CenterScreen; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index b802788..11421f2 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,15 +177,15 @@ private void initForm() { - if (!Utility.userRole.Contains("巡检员新增")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; } - if (!Utility.userRole.Contains("巡检员编辑")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员编辑")) { 编辑ToolStripMenuItem.Visible = false; } - if (!Utility.userRole.Contains("巡检员注销")) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("巡检员注销")) { 注销ToolStripMenuItem.Visible = false; } diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index c02635d..268888c 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,11 +16,11 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); - if (Utility.userRole.IndexOf("角色新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("角色删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("角色删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 13640ce..644f644 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,7 +20,7 @@ IS_OPEN = true; initForm(""); initCombox(); - if (Utility.userRole.IndexOf("角色授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index 4d1b7da..28c1f6d 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,11 +22,11 @@ { IS_OPEN = true; reloadGrid(currentpage); - if (Utility.userRole.IndexOf("用户新增") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("用户删除") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户删除")) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/FrmUserRole.cs b/FrmUserRole.cs index b5feef0..376da46 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,7 +19,7 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); - if (Utility.userRole.IndexOf("用户授权") == -1) + if (Utility.isLoginNeeded && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } diff --git a/MainFrm.cs b/MainFrm.cs index 732a3ac..b16d9d3 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -152,8 +152,12 @@ balloonEx2 = new GSOBalloonEx(globeControl2.Handle); Utility.SetBallons(featureTooltip, balloonEx); panelOfTable.Height = 200; - //RigthMenuSet(); - //MenuSet(); + if (Utility.isLoginNeeded) + { + RigthMenuSet(); + MenuSet(); + } + } /// diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index fa30208..8b0b199 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -1714,49 +1714,49 @@ // 创建拓扑ToolStripMenuItem // this.创建拓扑ToolStripMenuItem.Name = "创建拓扑ToolStripMenuItem"; - this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.创建拓扑ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.创建拓扑ToolStripMenuItem.Text = "创建拓扑"; this.创建拓扑ToolStripMenuItem.Click += new System.EventHandler(this.创建拓扑ToolStripMenuItem_Click); // // 上游分析ToolStripMenuItem // this.上游分析ToolStripMenuItem.Name = "上游分析ToolStripMenuItem"; - this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.上游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.上游分析ToolStripMenuItem.Text = "上游分析"; this.上游分析ToolStripMenuItem.Click += new System.EventHandler(this.上游分析ToolStripMenuItem_Click); // // 下游分析ToolStripMenuItem // this.下游分析ToolStripMenuItem.Name = "下游分析ToolStripMenuItem"; - this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.下游分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.下游分析ToolStripMenuItem.Text = "下游分析"; this.下游分析ToolStripMenuItem.Click += new System.EventHandler(this.下游分析ToolStripMenuItem_Click); // // 流向分析ToolStripMenuItem // this.流向分析ToolStripMenuItem.Name = "流向分析ToolStripMenuItem"; - this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.流向分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.流向分析ToolStripMenuItem.Text = "流向分析"; this.流向分析ToolStripMenuItem.Click += new System.EventHandler(this.流向分析ToolStripMenuItem_Click); // // 关阀分析ToolStripMenuItem // this.关阀分析ToolStripMenuItem.Name = "关阀分析ToolStripMenuItem"; - this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.关阀分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.关阀分析ToolStripMenuItem.Text = "关阀分析"; this.关阀分析ToolStripMenuItem.Click += new System.EventHandler(this.关阀分析ToolStripMenuItem_Click); // // 连通分析ToolStripMenuItem // this.连通分析ToolStripMenuItem.Name = "连通分析ToolStripMenuItem"; - this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.连通分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.连通分析ToolStripMenuItem.Text = "连通分析"; this.连通分析ToolStripMenuItem.Click += new System.EventHandler(this.连通分析ToolStripMenuItem_Click); // // 爆管分析ToolStripMenuItem // this.爆管分析ToolStripMenuItem.Name = "爆管分析ToolStripMenuItem"; - this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(152, 22); + this.爆管分析ToolStripMenuItem.Size = new System.Drawing.Size(124, 22); this.爆管分析ToolStripMenuItem.Text = "爆管分析"; this.爆管分析ToolStripMenuItem.Click += new System.EventHandler(this.爆管分析ToolStripMenuItem_Click); // @@ -4469,7 +4469,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(35536, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4563,7 +4563,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(35535, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // diff --git a/Program.cs b/Program.cs index a76d0d4..ef61a3e 100644 --- a/Program.cs +++ b/Program.cs @@ -48,18 +48,21 @@ Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - FrmLogin frm = new FrmLogin(); - if (frm.ShowDialog() == DialogResult.OK) - { - if (Utility.userRole != null) - { - Application.Run(new MainFrm()); - } - else - { - MessageBox.Show("该用户没有分配任何角色！"); - } - } + Utility.SetParams(); + Application.Run(new MainFrm()); + +// FrmLogin frm = new FrmLogin(); +// if (frm.ShowDialog() == DialogResult.OK) +// { +// if (Utility.userRole != null) +// { +// Application.Run(new MainFrm()); +// } +// else +// { +// MessageBox.Show("该用户没有分配任何角色！"); +// } +// } } private static void remoteUpDate() diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 7e643a0..c31ec68 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -19,11 +19,11 @@ { IS_OPEN = true; reloadGrid(); - if (Utility.userRole.IndexOf("资源新增") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("资源新增") == -1) { btn_add.Visible = false; } - if (Utility.userRole.IndexOf("资源删除") == -1) + if (Utility.isLoginNeeded && Utility.userRole.IndexOf("资源删除") == -1) { dataGridViewX1.Columns["btndel"].Visible = false; } diff --git a/TreeUtils.cs b/TreeUtils.cs index 37878fc..1d382a6 100644 --- a/TreeUtils.cs +++ b/TreeUtils.cs @@ -154,7 +154,8 @@ /// /// public static void RemoveNode(TreeNode treeNode,string nodeText) - { + { + if (treeNode == null) return; if(treeNode.Text.Equals(nodeText)) treeNode.Remove(); else if (treeNode.Nodes.Count > 0) { diff --git a/Utility.cs b/Utility.cs index 6672086..5662bb2 100644 --- a/Utility.cs +++ b/Utility.cs @@ -37,7 +37,7 @@ public static string PicRootURL; public static string PicDefaultURL; // public static double dFlyAboveLine = 2; - public static string userName; + public static string userName = "游客"; public static string projectStr; public static string userRole; @@ -68,6 +68,8 @@ public static string ghdbpwd; public static List locationList; + public static Boolean isLoginNeeded = false; + public static string filename = Application.StartupPath + "\\Config.xml"; public static string filenameSensor = Application.StartupPath + "\\sensorConfig.xml"; public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";