diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !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 e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmUserRole.cs b/FrmUserRole.cs index e9f7c0d..69f163d 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,10 +19,12 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } + * */ } private void initCombox() diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmUserRole.cs b/FrmUserRole.cs index e9f7c0d..69f163d 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,10 +19,12 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } + * */ } private void initCombox() diff --git a/MainFrm.cs b/MainFrm.cs index a084c83..f70f872 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -270,21 +270,6 @@ { toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("缓冲区分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(缓冲区分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(附属物分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("无源淹没分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(无源淹没分析ToolStripMenuItem); - } - } #endregion @@ -294,21 +279,6 @@ { toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("通视分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(通视分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视域分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视域分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视包络分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视包络分析ToolStripMenuItem); - } - } #endregion @@ -318,35 +288,7 @@ { toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("多边形开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(多边形开挖ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("挖方量分析") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(挖方量分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("沿线开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(沿线开挖ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("创建隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(创建隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("隐藏隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(隐藏隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("删除隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(删除隧道ToolStripMenuItem); - } - * */ - } + #endregion @@ -356,37 +298,6 @@ { toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("创建拓扑") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(创建拓扑ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("上游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(上游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("下游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(下游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("流向分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(流向分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关阀分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(关阀分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连通分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(连通分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("爆管分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(爆管分析ToolStripMenuItem); - } - } #endregion @@ -396,27 +307,6 @@ { toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("横断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(横断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("纵断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(纵断面分析ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("道路断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(道路断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基线剖面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(基线剖面分析ToolStripMenuItem); - } - * */ - } #endregion @@ -426,46 +316,6 @@ { toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("绘制区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem1); - } - - } #endregion @@ -475,47 +325,6 @@ { toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("全区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem); - } - - } - #endregion #region 查询 @@ -524,45 +333,7 @@ { toolRightMenu.Items.Remove(查询ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("编号查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(编号查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(坐标查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(管径查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("材质查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(材质查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基本查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(基本查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("复合查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(复合查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关联查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关联查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关键字查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关键字查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(附属物查询ToolStripMenuItem); - } - } + #endregion @@ -572,49 +343,6 @@ { toolRightMenu.Items.Remove(标注ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("标高标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标高标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(管径标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("埋深标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(埋深标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坐标标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("距离标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(距离标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("自定义标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(自定义标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("扯旗标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(扯旗标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坡度标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坡度标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("属性标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(属性标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("标注管理") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标注管理ToolStripMenuItem); - } - } #endregion @@ -624,25 +352,6 @@ { toolRightMenu.Items.Remove(飞行ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("自定义飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(自定义飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("飞行到目标点") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(飞行到目标点ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕中心点飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕中心点飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕眼睛飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕眼睛飞行ToolStripMenuItem); - } - } #endregion @@ -652,37 +361,6 @@ { toolRightMenu.Items.Remove(编辑ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("平移对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(平移对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("升降对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(升降对象ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("旋转对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(旋转对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连接管段") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(连接管段ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("导出文件") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(导出文件ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("前进") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(前进ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("后退") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(后退ToolStripMenuItem); - } - } #endregion @@ -692,37 +370,6 @@ { toolRightMenu.Items.Remove(量算ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("水平距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("垂直距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(垂直距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("空间距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(空间距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("高度量算") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(高度量算ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("水平面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平面积ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表面积ToolStripMenuItem1); - } - } #endregion } @@ -774,50 +421,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem1); } - else - { - /* - if (Utility.userRole.IndexOf("地上模式") < 0) - { - buttonItem87.Visible = false; - } - if (Utility.userRole.IndexOf("地下模式") < 0) - { - buttonItem88.Visible = false; - } - if (Utility.userRole.IndexOf("行走模式") < 0) - { - buttonItem27.Visible = false; - } - * */ - - if (Utility.userRole.IndexOf("透明度设置") < 0) - { - sliderGroundTransSet1.Visible = false; - } - if (Utility.userRole.IndexOf("快速定位") < 0) - { - buttonItem91.Visible = false; - } - if (Utility.userRole.IndexOf("图层管理") < 0) - { - buttonItem1.Visible = false; - } - if (Utility.userRole.IndexOf("图例管理") < 0) - { - btnlegendSet.Visible = false; - } - if (Utility.userRole.IndexOf("全屏显示") < 0) - { - buttonItem89.Visible = false; - } - if (Utility.userRole.IndexOf("导出图片") < 0) - { - btnOutputJPG.Visible = false; - } - - } - #endregion #region 一键审核 @@ -862,21 +465,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem14); } - else - { - if (Utility.userRole.IndexOf("专题图审批") < 0) - { - buttonItemZTT3_2.Visible = false; - } - if (Utility.userRole.IndexOf("打印审批") < 0) - { - buttonItemZTT4_2.Visible = false; - } - if (Utility.userRole.IndexOf("拷贝审批") < 0) - { - buttonItemZTT5_2.Visible = false; - } - } #endregion @@ -885,33 +473,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem7); } - else - { - if (Utility.userRole.IndexOf("工单管理") < 0) - { - buttonItem9.Visible = false; - } - if (Utility.userRole.IndexOf("在线任务") < 0) - { - buttonItem10.Visible = false; - } - if (Utility.userRole.IndexOf("事件管理") < 0) - { - buttonItem11.Visible = false; - } - if (Utility.userRole.IndexOf("探测仪管理") < 0) - { - buttonItem12.Visible = false; - } - if (Utility.userRole.IndexOf("巡检人员维护") < 0) - { - buttonItem13.Visible = false; - } - if (Utility.userRole.IndexOf("导出施工图") < 0) - { - buttonItem14.Visible = false; - } - } #endregion #region 标识器管理 @@ -919,17 +480,7 @@ { ribbonControl1.Items.Remove(ribbonTabItem5); } - else - { - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - btn_flag.Visible = false; - } - if (Utility.userRole.IndexOf("地面透明度") < 0) - { - slider4ground.Visible = false; - } - } + #endregion if (ribbonControl1.Items.Count <= 0) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmUserRole.cs b/FrmUserRole.cs index e9f7c0d..69f163d 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,10 +19,12 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } + * */ } private void initCombox() diff --git a/MainFrm.cs b/MainFrm.cs index a084c83..f70f872 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -270,21 +270,6 @@ { toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("缓冲区分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(缓冲区分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(附属物分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("无源淹没分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(无源淹没分析ToolStripMenuItem); - } - } #endregion @@ -294,21 +279,6 @@ { toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("通视分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(通视分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视域分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视域分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视包络分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视包络分析ToolStripMenuItem); - } - } #endregion @@ -318,35 +288,7 @@ { toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("多边形开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(多边形开挖ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("挖方量分析") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(挖方量分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("沿线开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(沿线开挖ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("创建隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(创建隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("隐藏隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(隐藏隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("删除隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(删除隧道ToolStripMenuItem); - } - * */ - } + #endregion @@ -356,37 +298,6 @@ { toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("创建拓扑") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(创建拓扑ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("上游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(上游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("下游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(下游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("流向分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(流向分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关阀分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(关阀分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连通分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(连通分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("爆管分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(爆管分析ToolStripMenuItem); - } - } #endregion @@ -396,27 +307,6 @@ { toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("横断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(横断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("纵断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(纵断面分析ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("道路断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(道路断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基线剖面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(基线剖面分析ToolStripMenuItem); - } - * */ - } #endregion @@ -426,46 +316,6 @@ { toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("绘制区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem1); - } - - } #endregion @@ -475,47 +325,6 @@ { toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("全区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem); - } - - } - #endregion #region 查询 @@ -524,45 +333,7 @@ { toolRightMenu.Items.Remove(查询ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("编号查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(编号查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(坐标查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(管径查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("材质查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(材质查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基本查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(基本查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("复合查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(复合查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关联查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关联查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关键字查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关键字查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(附属物查询ToolStripMenuItem); - } - } + #endregion @@ -572,49 +343,6 @@ { toolRightMenu.Items.Remove(标注ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("标高标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标高标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(管径标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("埋深标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(埋深标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坐标标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("距离标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(距离标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("自定义标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(自定义标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("扯旗标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(扯旗标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坡度标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坡度标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("属性标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(属性标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("标注管理") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标注管理ToolStripMenuItem); - } - } #endregion @@ -624,25 +352,6 @@ { toolRightMenu.Items.Remove(飞行ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("自定义飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(自定义飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("飞行到目标点") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(飞行到目标点ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕中心点飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕中心点飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕眼睛飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕眼睛飞行ToolStripMenuItem); - } - } #endregion @@ -652,37 +361,6 @@ { toolRightMenu.Items.Remove(编辑ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("平移对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(平移对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("升降对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(升降对象ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("旋转对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(旋转对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连接管段") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(连接管段ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("导出文件") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(导出文件ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("前进") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(前进ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("后退") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(后退ToolStripMenuItem); - } - } #endregion @@ -692,37 +370,6 @@ { toolRightMenu.Items.Remove(量算ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("水平距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("垂直距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(垂直距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("空间距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(空间距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("高度量算") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(高度量算ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("水平面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平面积ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表面积ToolStripMenuItem1); - } - } #endregion } @@ -774,50 +421,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem1); } - else - { - /* - if (Utility.userRole.IndexOf("地上模式") < 0) - { - buttonItem87.Visible = false; - } - if (Utility.userRole.IndexOf("地下模式") < 0) - { - buttonItem88.Visible = false; - } - if (Utility.userRole.IndexOf("行走模式") < 0) - { - buttonItem27.Visible = false; - } - * */ - - if (Utility.userRole.IndexOf("透明度设置") < 0) - { - sliderGroundTransSet1.Visible = false; - } - if (Utility.userRole.IndexOf("快速定位") < 0) - { - buttonItem91.Visible = false; - } - if (Utility.userRole.IndexOf("图层管理") < 0) - { - buttonItem1.Visible = false; - } - if (Utility.userRole.IndexOf("图例管理") < 0) - { - btnlegendSet.Visible = false; - } - if (Utility.userRole.IndexOf("全屏显示") < 0) - { - buttonItem89.Visible = false; - } - if (Utility.userRole.IndexOf("导出图片") < 0) - { - btnOutputJPG.Visible = false; - } - - } - #endregion #region 一键审核 @@ -862,21 +465,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem14); } - else - { - if (Utility.userRole.IndexOf("专题图审批") < 0) - { - buttonItemZTT3_2.Visible = false; - } - if (Utility.userRole.IndexOf("打印审批") < 0) - { - buttonItemZTT4_2.Visible = false; - } - if (Utility.userRole.IndexOf("拷贝审批") < 0) - { - buttonItemZTT5_2.Visible = false; - } - } #endregion @@ -885,33 +473,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem7); } - else - { - if (Utility.userRole.IndexOf("工单管理") < 0) - { - buttonItem9.Visible = false; - } - if (Utility.userRole.IndexOf("在线任务") < 0) - { - buttonItem10.Visible = false; - } - if (Utility.userRole.IndexOf("事件管理") < 0) - { - buttonItem11.Visible = false; - } - if (Utility.userRole.IndexOf("探测仪管理") < 0) - { - buttonItem12.Visible = false; - } - if (Utility.userRole.IndexOf("巡检人员维护") < 0) - { - buttonItem13.Visible = false; - } - if (Utility.userRole.IndexOf("导出施工图") < 0) - { - buttonItem14.Visible = false; - } - } #endregion #region 标识器管理 @@ -919,17 +480,7 @@ { ribbonControl1.Items.Remove(ribbonTabItem5); } - else - { - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - btn_flag.Visible = false; - } - if (Utility.userRole.IndexOf("地面透明度") < 0) - { - slider4ground.Visible = false; - } - } + #endregion if (ribbonControl1.Items.Count <= 0) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 95050bc..77f8b11 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -112,7 +112,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -261,6 +260,13 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -315,13 +321,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); @@ -541,6 +540,7 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -551,8 +551,8 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -979,18 +979,6 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2135,15 +2123,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2187,15 +2175,132 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); // // // @@ -2236,7 +2341,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(427, 59); + this.ribbonBar20.Size = new System.Drawing.Size(427, 92); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -2664,122 +2769,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2926,7 +2915,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar4 // @@ -3117,10 +3105,10 @@ this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel5.Controls.Add(this.ribbonBar2); this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); this.ribbonPanel5.Name = "ribbonPanel5"; this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); // // // @@ -3161,7 +3149,7 @@ this.sliderItem3}); this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar2.TabIndex = 0; // @@ -3220,10 +3208,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); // // // @@ -3262,7 +3250,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Size = new System.Drawing.Size(75, 92); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -3314,7 +3302,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Size = new System.Drawing.Size(505, 92); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -3389,10 +3377,10 @@ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel4.Controls.Add(this.ribbonBar1); this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); this.ribbonPanel4.Name = "ribbonPanel4"; this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); // // // @@ -3430,7 +3418,7 @@ this.btn_document_info}); this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Size = new System.Drawing.Size(200, 92); this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar1.TabIndex = 0; // @@ -3459,10 +3447,10 @@ this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel6.Controls.Add(this.ribbonBar6); this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); this.ribbonPanel6.Name = "ribbonPanel6"; this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); // // // @@ -3504,7 +3492,7 @@ this.buttonItemGBJC}); this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar6.TabIndex = 0; // @@ -3568,7 +3556,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -3639,6 +3626,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4565,7 +4553,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(51871, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(52168, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4675,7 +4663,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(51870, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(52167, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5677,7 +5665,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5777,7 +5765,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5957,6 +5945,18 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5999,8 +5999,8 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmUserRole.cs b/FrmUserRole.cs index e9f7c0d..69f163d 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,10 +19,12 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } + * */ } private void initCombox() diff --git a/MainFrm.cs b/MainFrm.cs index a084c83..f70f872 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -270,21 +270,6 @@ { toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("缓冲区分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(缓冲区分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(附属物分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("无源淹没分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(无源淹没分析ToolStripMenuItem); - } - } #endregion @@ -294,21 +279,6 @@ { toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("通视分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(通视分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视域分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视域分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视包络分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视包络分析ToolStripMenuItem); - } - } #endregion @@ -318,35 +288,7 @@ { toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("多边形开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(多边形开挖ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("挖方量分析") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(挖方量分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("沿线开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(沿线开挖ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("创建隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(创建隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("隐藏隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(隐藏隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("删除隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(删除隧道ToolStripMenuItem); - } - * */ - } + #endregion @@ -356,37 +298,6 @@ { toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("创建拓扑") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(创建拓扑ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("上游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(上游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("下游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(下游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("流向分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(流向分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关阀分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(关阀分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连通分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(连通分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("爆管分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(爆管分析ToolStripMenuItem); - } - } #endregion @@ -396,27 +307,6 @@ { toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("横断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(横断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("纵断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(纵断面分析ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("道路断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(道路断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基线剖面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(基线剖面分析ToolStripMenuItem); - } - * */ - } #endregion @@ -426,46 +316,6 @@ { toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("绘制区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem1); - } - - } #endregion @@ -475,47 +325,6 @@ { toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("全区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem); - } - - } - #endregion #region 查询 @@ -524,45 +333,7 @@ { toolRightMenu.Items.Remove(查询ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("编号查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(编号查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(坐标查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(管径查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("材质查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(材质查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基本查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(基本查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("复合查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(复合查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关联查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关联查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关键字查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关键字查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(附属物查询ToolStripMenuItem); - } - } + #endregion @@ -572,49 +343,6 @@ { toolRightMenu.Items.Remove(标注ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("标高标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标高标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(管径标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("埋深标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(埋深标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坐标标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("距离标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(距离标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("自定义标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(自定义标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("扯旗标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(扯旗标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坡度标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坡度标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("属性标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(属性标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("标注管理") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标注管理ToolStripMenuItem); - } - } #endregion @@ -624,25 +352,6 @@ { toolRightMenu.Items.Remove(飞行ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("自定义飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(自定义飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("飞行到目标点") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(飞行到目标点ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕中心点飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕中心点飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕眼睛飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕眼睛飞行ToolStripMenuItem); - } - } #endregion @@ -652,37 +361,6 @@ { toolRightMenu.Items.Remove(编辑ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("平移对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(平移对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("升降对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(升降对象ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("旋转对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(旋转对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连接管段") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(连接管段ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("导出文件") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(导出文件ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("前进") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(前进ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("后退") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(后退ToolStripMenuItem); - } - } #endregion @@ -692,37 +370,6 @@ { toolRightMenu.Items.Remove(量算ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("水平距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("垂直距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(垂直距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("空间距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(空间距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("高度量算") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(高度量算ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("水平面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平面积ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表面积ToolStripMenuItem1); - } - } #endregion } @@ -774,50 +421,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem1); } - else - { - /* - if (Utility.userRole.IndexOf("地上模式") < 0) - { - buttonItem87.Visible = false; - } - if (Utility.userRole.IndexOf("地下模式") < 0) - { - buttonItem88.Visible = false; - } - if (Utility.userRole.IndexOf("行走模式") < 0) - { - buttonItem27.Visible = false; - } - * */ - - if (Utility.userRole.IndexOf("透明度设置") < 0) - { - sliderGroundTransSet1.Visible = false; - } - if (Utility.userRole.IndexOf("快速定位") < 0) - { - buttonItem91.Visible = false; - } - if (Utility.userRole.IndexOf("图层管理") < 0) - { - buttonItem1.Visible = false; - } - if (Utility.userRole.IndexOf("图例管理") < 0) - { - btnlegendSet.Visible = false; - } - if (Utility.userRole.IndexOf("全屏显示") < 0) - { - buttonItem89.Visible = false; - } - if (Utility.userRole.IndexOf("导出图片") < 0) - { - btnOutputJPG.Visible = false; - } - - } - #endregion #region 一键审核 @@ -862,21 +465,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem14); } - else - { - if (Utility.userRole.IndexOf("专题图审批") < 0) - { - buttonItemZTT3_2.Visible = false; - } - if (Utility.userRole.IndexOf("打印审批") < 0) - { - buttonItemZTT4_2.Visible = false; - } - if (Utility.userRole.IndexOf("拷贝审批") < 0) - { - buttonItemZTT5_2.Visible = false; - } - } #endregion @@ -885,33 +473,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem7); } - else - { - if (Utility.userRole.IndexOf("工单管理") < 0) - { - buttonItem9.Visible = false; - } - if (Utility.userRole.IndexOf("在线任务") < 0) - { - buttonItem10.Visible = false; - } - if (Utility.userRole.IndexOf("事件管理") < 0) - { - buttonItem11.Visible = false; - } - if (Utility.userRole.IndexOf("探测仪管理") < 0) - { - buttonItem12.Visible = false; - } - if (Utility.userRole.IndexOf("巡检人员维护") < 0) - { - buttonItem13.Visible = false; - } - if (Utility.userRole.IndexOf("导出施工图") < 0) - { - buttonItem14.Visible = false; - } - } #endregion #region 标识器管理 @@ -919,17 +480,7 @@ { ribbonControl1.Items.Remove(ribbonTabItem5); } - else - { - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - btn_flag.Visible = false; - } - if (Utility.userRole.IndexOf("地面透明度") < 0) - { - slider4ground.Visible = false; - } - } + #endregion if (ribbonControl1.Items.Count <= 0) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 95050bc..77f8b11 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -112,7 +112,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -261,6 +260,13 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -315,13 +321,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); @@ -541,6 +540,7 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -551,8 +551,8 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -979,18 +979,6 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2135,15 +2123,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2187,15 +2175,132 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); // // // @@ -2236,7 +2341,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(427, 59); + this.ribbonBar20.Size = new System.Drawing.Size(427, 92); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -2664,122 +2769,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2926,7 +2915,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar4 // @@ -3117,10 +3105,10 @@ this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel5.Controls.Add(this.ribbonBar2); this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); this.ribbonPanel5.Name = "ribbonPanel5"; this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); // // // @@ -3161,7 +3149,7 @@ this.sliderItem3}); this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar2.TabIndex = 0; // @@ -3220,10 +3208,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); // // // @@ -3262,7 +3250,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Size = new System.Drawing.Size(75, 92); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -3314,7 +3302,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Size = new System.Drawing.Size(505, 92); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -3389,10 +3377,10 @@ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel4.Controls.Add(this.ribbonBar1); this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); this.ribbonPanel4.Name = "ribbonPanel4"; this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); // // // @@ -3430,7 +3418,7 @@ this.btn_document_info}); this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Size = new System.Drawing.Size(200, 92); this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar1.TabIndex = 0; // @@ -3459,10 +3447,10 @@ this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel6.Controls.Add(this.ribbonBar6); this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); this.ribbonPanel6.Name = "ribbonPanel6"; this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); // // // @@ -3504,7 +3492,7 @@ this.buttonItemGBJC}); this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar6.TabIndex = 0; // @@ -3568,7 +3556,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -3639,6 +3626,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4565,7 +4553,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(51871, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(52168, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4675,7 +4663,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(51870, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(52167, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5677,7 +5665,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5777,7 +5765,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5957,6 +5945,18 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5999,8 +5999,8 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/MainFrm.resx b/MainFrm.resx index abbbdd3..09b886d 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -522,6 +522,505 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL + ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH + s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW + uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx + xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd + iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ + qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW + GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE + NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n + KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw + qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI + HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq + wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q + 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n + W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 + eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv + 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP + I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f + n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV + x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et + V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD + D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u + 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n + z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V + rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ + 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm + oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 + ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H + 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC + RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo + KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O + 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd + rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o + 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C + s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI + jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs + FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm + LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml + CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV + hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q + bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX + YCSg/AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL + SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 + 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P + zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 + 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj + L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 + RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf + nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P + 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj + ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G + xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H + dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 + LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob + gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 + ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi + UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd + XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 + 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN + jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF + Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn + ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2024,505 +2523,6 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL - ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH - s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW - uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx - xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd - iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ - qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW - GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE - NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n - KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw - qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI - HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq - wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q - 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n - W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 - eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv - 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP - I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f - n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV - x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et - V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD - D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u - 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n - z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V - rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ - 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm - oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 - ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H - 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC - RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo - KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O - 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd - rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o - 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C - s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI - jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs - FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm - LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml - CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV - hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q - bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX - YCSg/AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL - SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 - 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P - zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 - 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj - L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 - RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf - nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P - 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj - ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G - xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H - dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 - LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob - gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 - ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi - UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd - XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 - 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN - jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF - Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn - ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmUserRole.cs b/FrmUserRole.cs index e9f7c0d..69f163d 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,10 +19,12 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } + * */ } private void initCombox() diff --git a/MainFrm.cs b/MainFrm.cs index a084c83..f70f872 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -270,21 +270,6 @@ { toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("缓冲区分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(缓冲区分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(附属物分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("无源淹没分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(无源淹没分析ToolStripMenuItem); - } - } #endregion @@ -294,21 +279,6 @@ { toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("通视分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(通视分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视域分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视域分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视包络分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视包络分析ToolStripMenuItem); - } - } #endregion @@ -318,35 +288,7 @@ { toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("多边形开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(多边形开挖ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("挖方量分析") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(挖方量分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("沿线开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(沿线开挖ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("创建隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(创建隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("隐藏隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(隐藏隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("删除隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(删除隧道ToolStripMenuItem); - } - * */ - } + #endregion @@ -356,37 +298,6 @@ { toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("创建拓扑") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(创建拓扑ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("上游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(上游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("下游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(下游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("流向分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(流向分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关阀分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(关阀分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连通分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(连通分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("爆管分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(爆管分析ToolStripMenuItem); - } - } #endregion @@ -396,27 +307,6 @@ { toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("横断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(横断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("纵断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(纵断面分析ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("道路断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(道路断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基线剖面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(基线剖面分析ToolStripMenuItem); - } - * */ - } #endregion @@ -426,46 +316,6 @@ { toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("绘制区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem1); - } - - } #endregion @@ -475,47 +325,6 @@ { toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("全区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem); - } - - } - #endregion #region 查询 @@ -524,45 +333,7 @@ { toolRightMenu.Items.Remove(查询ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("编号查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(编号查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(坐标查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(管径查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("材质查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(材质查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基本查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(基本查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("复合查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(复合查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关联查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关联查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关键字查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关键字查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(附属物查询ToolStripMenuItem); - } - } + #endregion @@ -572,49 +343,6 @@ { toolRightMenu.Items.Remove(标注ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("标高标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标高标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(管径标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("埋深标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(埋深标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坐标标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("距离标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(距离标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("自定义标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(自定义标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("扯旗标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(扯旗标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坡度标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坡度标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("属性标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(属性标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("标注管理") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标注管理ToolStripMenuItem); - } - } #endregion @@ -624,25 +352,6 @@ { toolRightMenu.Items.Remove(飞行ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("自定义飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(自定义飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("飞行到目标点") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(飞行到目标点ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕中心点飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕中心点飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕眼睛飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕眼睛飞行ToolStripMenuItem); - } - } #endregion @@ -652,37 +361,6 @@ { toolRightMenu.Items.Remove(编辑ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("平移对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(平移对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("升降对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(升降对象ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("旋转对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(旋转对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连接管段") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(连接管段ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("导出文件") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(导出文件ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("前进") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(前进ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("后退") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(后退ToolStripMenuItem); - } - } #endregion @@ -692,37 +370,6 @@ { toolRightMenu.Items.Remove(量算ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("水平距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("垂直距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(垂直距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("空间距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(空间距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("高度量算") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(高度量算ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("水平面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平面积ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表面积ToolStripMenuItem1); - } - } #endregion } @@ -774,50 +421,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem1); } - else - { - /* - if (Utility.userRole.IndexOf("地上模式") < 0) - { - buttonItem87.Visible = false; - } - if (Utility.userRole.IndexOf("地下模式") < 0) - { - buttonItem88.Visible = false; - } - if (Utility.userRole.IndexOf("行走模式") < 0) - { - buttonItem27.Visible = false; - } - * */ - - if (Utility.userRole.IndexOf("透明度设置") < 0) - { - sliderGroundTransSet1.Visible = false; - } - if (Utility.userRole.IndexOf("快速定位") < 0) - { - buttonItem91.Visible = false; - } - if (Utility.userRole.IndexOf("图层管理") < 0) - { - buttonItem1.Visible = false; - } - if (Utility.userRole.IndexOf("图例管理") < 0) - { - btnlegendSet.Visible = false; - } - if (Utility.userRole.IndexOf("全屏显示") < 0) - { - buttonItem89.Visible = false; - } - if (Utility.userRole.IndexOf("导出图片") < 0) - { - btnOutputJPG.Visible = false; - } - - } - #endregion #region 一键审核 @@ -862,21 +465,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem14); } - else - { - if (Utility.userRole.IndexOf("专题图审批") < 0) - { - buttonItemZTT3_2.Visible = false; - } - if (Utility.userRole.IndexOf("打印审批") < 0) - { - buttonItemZTT4_2.Visible = false; - } - if (Utility.userRole.IndexOf("拷贝审批") < 0) - { - buttonItemZTT5_2.Visible = false; - } - } #endregion @@ -885,33 +473,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem7); } - else - { - if (Utility.userRole.IndexOf("工单管理") < 0) - { - buttonItem9.Visible = false; - } - if (Utility.userRole.IndexOf("在线任务") < 0) - { - buttonItem10.Visible = false; - } - if (Utility.userRole.IndexOf("事件管理") < 0) - { - buttonItem11.Visible = false; - } - if (Utility.userRole.IndexOf("探测仪管理") < 0) - { - buttonItem12.Visible = false; - } - if (Utility.userRole.IndexOf("巡检人员维护") < 0) - { - buttonItem13.Visible = false; - } - if (Utility.userRole.IndexOf("导出施工图") < 0) - { - buttonItem14.Visible = false; - } - } #endregion #region 标识器管理 @@ -919,17 +480,7 @@ { ribbonControl1.Items.Remove(ribbonTabItem5); } - else - { - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - btn_flag.Visible = false; - } - if (Utility.userRole.IndexOf("地面透明度") < 0) - { - slider4ground.Visible = false; - } - } + #endregion if (ribbonControl1.Items.Count <= 0) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 95050bc..77f8b11 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -112,7 +112,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -261,6 +260,13 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -315,13 +321,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); @@ -541,6 +540,7 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -551,8 +551,8 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -979,18 +979,6 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2135,15 +2123,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2187,15 +2175,132 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); // // // @@ -2236,7 +2341,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(427, 59); + this.ribbonBar20.Size = new System.Drawing.Size(427, 92); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -2664,122 +2769,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2926,7 +2915,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar4 // @@ -3117,10 +3105,10 @@ this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel5.Controls.Add(this.ribbonBar2); this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); this.ribbonPanel5.Name = "ribbonPanel5"; this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); // // // @@ -3161,7 +3149,7 @@ this.sliderItem3}); this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar2.TabIndex = 0; // @@ -3220,10 +3208,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); // // // @@ -3262,7 +3250,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Size = new System.Drawing.Size(75, 92); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -3314,7 +3302,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Size = new System.Drawing.Size(505, 92); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -3389,10 +3377,10 @@ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel4.Controls.Add(this.ribbonBar1); this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); this.ribbonPanel4.Name = "ribbonPanel4"; this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); // // // @@ -3430,7 +3418,7 @@ this.btn_document_info}); this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Size = new System.Drawing.Size(200, 92); this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar1.TabIndex = 0; // @@ -3459,10 +3447,10 @@ this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel6.Controls.Add(this.ribbonBar6); this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); this.ribbonPanel6.Name = "ribbonPanel6"; this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); // // // @@ -3504,7 +3492,7 @@ this.buttonItemGBJC}); this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar6.TabIndex = 0; // @@ -3568,7 +3556,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -3639,6 +3626,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4565,7 +4553,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(51871, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(52168, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4675,7 +4663,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(51870, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(52167, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5677,7 +5665,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5777,7 +5765,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5957,6 +5945,18 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5999,8 +5999,8 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/MainFrm.resx b/MainFrm.resx index abbbdd3..09b886d 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -522,6 +522,505 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL + ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH + s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW + uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx + xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd + iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ + qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW + GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE + NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n + KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw + qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI + HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq + wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q + 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n + W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 + eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv + 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP + I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f + n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV + x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et + V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD + D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u + 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n + z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V + rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ + 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm + oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 + ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H + 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC + RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo + KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O + 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd + rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o + 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C + s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI + jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs + FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm + LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml + CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV + hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q + bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX + YCSg/AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL + SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 + 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P + zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 + 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj + L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 + RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf + nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P + 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj + ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G + xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H + dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 + LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob + gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 + ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi + UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd + XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 + 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN + jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF + Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn + ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2024,505 +2523,6 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL - ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH - s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW - uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx - xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd - iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ - qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW - GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE - NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n - KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw - qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI - HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq - wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q - 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n - W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 - eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv - 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP - I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f - n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV - x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et - V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD - D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u - 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n - z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V - rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ - 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm - oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 - ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H - 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC - RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo - KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O - 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd - rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o - 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C - s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI - jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs - FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm - LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml - CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV - hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q - bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX - YCSg/AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL - SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 - 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P - zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 - 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj - L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 - RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf - nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P - 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj - ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G - xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H - dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 - LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob - gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 - ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi - UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd - XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 - 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN - jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF - Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn - ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 5bb9699..1813065 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -19,6 +19,7 @@ { IS_OPEN = true; reloadGrid(); + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("资源新增")) { btn_add.Visible = false; @@ -27,6 +28,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void SysRescInfoManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index e743932..63d50d0 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 23c721a..d68c589 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -59,12 +59,12 @@ } conn.Close(); - + /* if (Utility.isNeedLogin && !Utility.userRole.Equals("事件编辑")) { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } - + */ IS_OPEN = true; } diff --git a/EMS_Forms/Form_TaskManager.cs b/EMS_Forms/Form_TaskManager.cs index c5c43b5..d6b130d 100644 --- a/EMS_Forms/Form_TaskManager.cs +++ b/EMS_Forms/Form_TaskManager.cs @@ -76,12 +76,12 @@ comboBox_state.Items.Add("开始任务"); comboBox_state.Items.Add("任务执行中"); comboBox_state.Items.Add("结束任务"); - + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("工单创建")) { button_new.Visible = false; } - + */ IsOpen = true; } diff --git a/FrmEquipmentManage.cs b/FrmEquipmentManage.cs index c970e85..f0df429 100644 --- a/FrmEquipmentManage.cs +++ b/FrmEquipmentManage.cs @@ -44,6 +44,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪新增")) { btnAddDev.Visible = false; @@ -56,6 +57,7 @@ { winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Visible = false; } + * */ } /// @@ -129,7 +131,7 @@ /// private void winGridViewPager1_OnEditSelected(object sender, EventArgs e) { - if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; + //if (Utility.isNeedLogin && !Utility.userRole.Contains("探测仪编辑")) return; DataGridView grid = sender as DataGridView; if (grid != null && grid.SelectedRows.Count > 0) diff --git a/FrmFlagEdits.Designer.cs b/FrmFlagEdits.Designer.cs index 205dd3b..80001d2 100644 --- a/FrmFlagEdits.Designer.cs +++ b/FrmFlagEdits.Designer.cs @@ -42,18 +42,6 @@ this.groupPanel1 = new DevComponents.DotNetBar.Controls.GroupPanel(); this.textBoxbz = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX15 = new DevComponents.DotNetBar.LabelX(); - this.textBoxjlzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX14 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgjl = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX13 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgzrr = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX12 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsgdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX10 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjrxm = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX8 = new DevComponents.DotNetBar.LabelX(); - this.textBoxsjdw = new DevComponents.DotNetBar.Controls.TextBoxX(); - this.labelX7 = new DevComponents.DotNetBar.LabelX(); this.textBoxqsdw = new DevComponents.DotNetBar.Controls.TextBoxX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); this.textBoxXgc = new DevComponents.DotNetBar.Controls.TextBoxX(); @@ -65,7 +53,7 @@ // this.btn_ok.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; this.btn_ok.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btn_ok.Location = new System.Drawing.Point(602, 307); + this.btn_ok.Location = new System.Drawing.Point(603, 208); this.btn_ok.Name = "btn_ok"; this.btn_ok.Size = new System.Drawing.Size(75, 23); this.btn_ok.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -211,18 +199,6 @@ this.groupPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.Office2007; this.groupPanel1.Controls.Add(this.textBoxbz); this.groupPanel1.Controls.Add(this.labelX15); - this.groupPanel1.Controls.Add(this.textBoxjlzrr); - this.groupPanel1.Controls.Add(this.labelX14); - this.groupPanel1.Controls.Add(this.textBoxsgjl); - this.groupPanel1.Controls.Add(this.labelX13); - this.groupPanel1.Controls.Add(this.textBoxsgzrr); - this.groupPanel1.Controls.Add(this.labelX12); - this.groupPanel1.Controls.Add(this.textBoxsgdw); - this.groupPanel1.Controls.Add(this.labelX10); - this.groupPanel1.Controls.Add(this.textBoxsjrxm); - this.groupPanel1.Controls.Add(this.labelX8); - this.groupPanel1.Controls.Add(this.textBoxsjdw); - this.groupPanel1.Controls.Add(this.labelX7); this.groupPanel1.Controls.Add(this.textBoxqsdw); this.groupPanel1.Controls.Add(this.labelX5); this.groupPanel1.Controls.Add(this.textBoxXgc); @@ -240,7 +216,7 @@ this.groupPanel1.Dock = System.Windows.Forms.DockStyle.Top; this.groupPanel1.Location = new System.Drawing.Point(0, 0); this.groupPanel1.Name = "groupPanel1"; - this.groupPanel1.Size = new System.Drawing.Size(733, 290); + this.groupPanel1.Size = new System.Drawing.Size(708, 190); // // // @@ -282,7 +258,7 @@ // this.textBoxbz.Border.Class = "TextBoxBorder"; this.textBoxbz.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxbz.Location = new System.Drawing.Point(326, 216); + this.textBoxbz.Location = new System.Drawing.Point(326, 120); this.textBoxbz.Name = "textBoxbz"; this.textBoxbz.Size = new System.Drawing.Size(128, 21); this.textBoxbz.TabIndex = 32; @@ -295,168 +271,12 @@ // this.labelX15.BackgroundStyle.Class = ""; this.labelX15.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX15.Location = new System.Drawing.Point(245, 216); + this.labelX15.Location = new System.Drawing.Point(245, 120); this.labelX15.Name = "labelX15"; this.labelX15.Size = new System.Drawing.Size(75, 23); this.labelX15.TabIndex = 31; this.labelX15.Text = "备注"; // - // textBoxjlzrr - // - // - // - // - this.textBoxjlzrr.Border.Class = "TextBoxBorder"; - this.textBoxjlzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxjlzrr.Location = new System.Drawing.Point(102, 216); - this.textBoxjlzrr.Name = "textBoxjlzrr"; - this.textBoxjlzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxjlzrr.TabIndex = 30; - // - // labelX14 - // - this.labelX14.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX14.BackgroundStyle.Class = ""; - this.labelX14.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX14.Location = new System.Drawing.Point(18, 216); - this.labelX14.Name = "labelX14"; - this.labelX14.Size = new System.Drawing.Size(75, 23); - this.labelX14.TabIndex = 29; - this.labelX14.Text = "监理责任人"; - // - // textBoxsgjl - // - // - // - // - this.textBoxsgjl.Border.Class = "TextBoxBorder"; - this.textBoxsgjl.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgjl.Location = new System.Drawing.Point(547, 167); - this.textBoxsgjl.Name = "textBoxsgjl"; - this.textBoxsgjl.Size = new System.Drawing.Size(128, 21); - this.textBoxsgjl.TabIndex = 28; - // - // labelX13 - // - this.labelX13.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX13.BackgroundStyle.Class = ""; - this.labelX13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX13.Location = new System.Drawing.Point(466, 167); - this.labelX13.Name = "labelX13"; - this.labelX13.Size = new System.Drawing.Size(75, 23); - this.labelX13.TabIndex = 27; - this.labelX13.Text = "施工监理"; - // - // textBoxsgzrr - // - // - // - // - this.textBoxsgzrr.Border.Class = "TextBoxBorder"; - this.textBoxsgzrr.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgzrr.Location = new System.Drawing.Point(326, 167); - this.textBoxsgzrr.Name = "textBoxsgzrr"; - this.textBoxsgzrr.Size = new System.Drawing.Size(128, 21); - this.textBoxsgzrr.TabIndex = 26; - // - // labelX12 - // - this.labelX12.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX12.BackgroundStyle.Class = ""; - this.labelX12.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX12.Location = new System.Drawing.Point(245, 167); - this.labelX12.Name = "labelX12"; - this.labelX12.Size = new System.Drawing.Size(75, 23); - this.labelX12.TabIndex = 25; - this.labelX12.Text = "施工责任人"; - // - // textBoxsgdw - // - // - // - // - this.textBoxsgdw.Border.Class = "TextBoxBorder"; - this.textBoxsgdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsgdw.Location = new System.Drawing.Point(103, 167); - this.textBoxsgdw.Name = "textBoxsgdw"; - this.textBoxsgdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsgdw.TabIndex = 24; - // - // labelX10 - // - this.labelX10.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX10.BackgroundStyle.Class = ""; - this.labelX10.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX10.Location = new System.Drawing.Point(18, 167); - this.labelX10.Name = "labelX10"; - this.labelX10.Size = new System.Drawing.Size(75, 23); - this.labelX10.TabIndex = 23; - this.labelX10.Text = "施工单位"; - // - // textBoxsjrxm - // - // - // - // - this.textBoxsjrxm.Border.Class = "TextBoxBorder"; - this.textBoxsjrxm.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjrxm.Location = new System.Drawing.Point(547, 120); - this.textBoxsjrxm.Name = "textBoxsjrxm"; - this.textBoxsjrxm.Size = new System.Drawing.Size(128, 21); - this.textBoxsjrxm.TabIndex = 20; - // - // labelX8 - // - this.labelX8.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX8.BackgroundStyle.Class = ""; - this.labelX8.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX8.Location = new System.Drawing.Point(466, 120); - this.labelX8.Name = "labelX8"; - this.labelX8.Size = new System.Drawing.Size(75, 23); - this.labelX8.TabIndex = 19; - this.labelX8.Text = "设计人姓名"; - // - // textBoxsjdw - // - // - // - // - this.textBoxsjdw.Border.Class = "TextBoxBorder"; - this.textBoxsjdw.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.textBoxsjdw.Location = new System.Drawing.Point(326, 120); - this.textBoxsjdw.Name = "textBoxsjdw"; - this.textBoxsjdw.Size = new System.Drawing.Size(128, 21); - this.textBoxsjdw.TabIndex = 18; - // - // labelX7 - // - this.labelX7.BackColor = System.Drawing.Color.Transparent; - // - // - // - this.labelX7.BackgroundStyle.Class = ""; - this.labelX7.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.labelX7.Location = new System.Drawing.Point(251, 120); - this.labelX7.Name = "labelX7"; - this.labelX7.Size = new System.Drawing.Size(75, 23); - this.labelX7.TabIndex = 17; - this.labelX7.Text = "设计单位"; - // // textBoxqsdw // // @@ -513,7 +333,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(733, 356); + this.ClientSize = new System.Drawing.Size(708, 242); this.Controls.Add(this.btn_ok); this.Controls.Add(this.groupPanel1); this.DoubleBuffered = true; @@ -543,22 +363,10 @@ private DevComponents.DotNetBar.Controls.GroupPanel groupPanel1; private DevComponents.DotNetBar.Controls.TextBoxX textBoxXgc; private DevComponents.DotNetBar.LabelX labelX4; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjdw; - private DevComponents.DotNetBar.LabelX labelX7; private DevComponents.DotNetBar.Controls.TextBoxX textBoxqsdw; private DevComponents.DotNetBar.LabelX labelX5; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgzrr; - private DevComponents.DotNetBar.LabelX labelX12; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgdw; - private DevComponents.DotNetBar.LabelX labelX10; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsjrxm; - private DevComponents.DotNetBar.LabelX labelX8; private DevComponents.DotNetBar.Controls.TextBoxX textBoxbz; private DevComponents.DotNetBar.LabelX labelX15; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxjlzrr; - private DevComponents.DotNetBar.LabelX labelX14; - private DevComponents.DotNetBar.Controls.TextBoxX textBoxsgjl; - private DevComponents.DotNetBar.LabelX labelX13; } } \ No newline at end of file diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs index 6ed857d..5fee016 100644 --- a/FrmFlagEdits.cs +++ b/FrmFlagEdits.cs @@ -18,8 +18,7 @@ public event Handle refresh; public FrmFlagEdits(string id, string flagid, string flagno, string flagtype, - string deep, string street, string gc, string belongComp, string designComp, - string designer, string workComp, string worker, string monitorComp, string monitor, string remark) + string deep, string street, string gc, string belongComp, string remark) { InitializeComponent(); this.id = id; @@ -30,12 +29,14 @@ txt_deep.Text = deep;//埋深 txt_street.Text = street;//所属道路 textBoxqsdw.Text = belongComp;//权属单位 + /* textBoxsjdw.Text = designComp;//设计单位 textBoxsjrxm.Text = designer; textBoxsgdw.Text = workComp; textBoxsgzrr.Text = worker; textBoxsgjl.Text = monitorComp; textBoxjlzrr.Text = monitor; + * */ textBoxbz.Text = remark; } @@ -64,12 +65,14 @@ "t.标识器埋深 =" + txt_deep.Text.Trim() + "," + "t.所属道路 = '" + txt_street.Text.Trim() + "'," + "t.权属单位 = '" + textBoxqsdw.Text.Trim() + "'," + + /* "t.设计单位 = '" + textBoxsjdw.Text.Trim() + "'," + "t.设计人姓名 = '" + textBoxsjrxm.Text.Trim() + "'," + "t.施工单位 = '" + textBoxsgdw.Text.Trim() + "'," + "t.施工责任人 = '" + textBoxsgzrr.Text.Trim() + "'," + "t.施工监理 = '" + textBoxsgjl.Text.Trim() + "'," + "t.监理责任人 = '" + textBoxjlzrr.Text.Trim() + "'," + + * */ "t.备注 = '" + textBoxbz.Text.Trim() + "'" + "where t.LSSYS_ID =" + id; OracleUtils.ExecuteNonQuery(OracleUtils.ConnectionString, CommandType.Text, sql); diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 363b3f5..d791759 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -56,16 +56,19 @@ winGridViewPager1.AddColumnAlias("所属道路", "所属道路"); winGridViewPager1.AddColumnAlias("使用状态", "使用状态"); winGridViewPager1.AddColumnAlias("权属单位", "权属单位"); + /* winGridViewPager1.AddColumnAlias("设计单位", "设计单位"); winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名"); winGridViewPager1.AddColumnAlias("施工单位", "施工单位"); winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人"); winGridViewPager1.AddColumnAlias("施工监理", "施工监理"); winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人"); + * */ winGridViewPager1.AddColumnAlias("备注", "备注"); - winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; - winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells; + //winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注"; + winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,备注"; + winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill; winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色 @@ -123,16 +126,22 @@ string deep = row.Cells["标识器埋深"].Value.ToString(); string street = row.Cells["所属道路"].Value.ToString(); string belongComp = row.Cells["权属单位"].Value.ToString(); + /* string designComp = row.Cells["设计单位"].Value.ToString(); string designer = row.Cells["设计人姓名"].Value.ToString(); string workComp = row.Cells["施工单位"].Value.ToString(); string worker = row.Cells["施工责任人"].Value.ToString(); string monitorComp = row.Cells["施工监理"].Value.ToString(); string monitor = row.Cells["监理责任人"].Value.ToString(); + * */ string remark = row.Cells["备注"].Value.ToString(); + /* FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, designComp, designer, workComp, worker, monitorComp, monitor, remark); + */ + FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp, remark); + frm.refresh += LoadData; //改变值的事件 frm.ShowDialog(); winGridViewPager1.Refresh(); @@ -209,7 +218,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中' order by 编号)b " + " where 1=1"; rows = int.Parse(OracleUtils.ExecuteScalar(OracleUtils.ConnectionString, CommandType.Text, sqlCount).ToString()); @@ -224,7 +233,7 @@ string sqlCount = "select count(1) from 标识器 where 使用状态 = '使用中'"; string sqlData = "select 编号,标识器ID号,标识器型号,round(地面高程,2) as 地面高程,round(标识器埋深,2) as 标识器埋深,所属道路,LSSYS_ID as " + - LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注 " + + LSSYS_ID_VALUE + ",X坐标,Y坐标,使用状态,权属单位,备注 " + "from (select t.*,rownum row_num from 标识器 t where 使用状态 = '使用中'"; if (!String.IsNullOrEmpty(txt_no.Text.Trim())) @@ -393,7 +402,7 @@ string flagstreet = row.Cells["所属道路"].Value.ToString(); double x = Convert.ToDouble(row.Cells["X坐标"].Value); double y = Convert.ToDouble(row.Cells["Y坐标"].Value); - GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(int.Parse(id)); + GSOFeature flagFeature = globeControl1.Globe.Layers.GetLayerByCaption("标识器").GetFeatureByID(Convert.ToInt32(id)); string type = ""; string pipe = ""; diff --git a/FrmPatrolerManager.cs b/FrmPatrolerManager.cs index 7134bc7..4620996 100644 --- a/FrmPatrolerManager.cs +++ b/FrmPatrolerManager.cs @@ -177,6 +177,7 @@ private void initForm() { + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("巡检员新增")) { btn_add_person.Visible = false; @@ -189,6 +190,7 @@ { 注销ToolStripMenuItem.Visible = false; } + * */ } private void btn_query_person_Click(object sender, EventArgs e) diff --git a/FrmRoleInfoManager.cs b/FrmRoleInfoManager.cs index 55348ce..d8abd4d 100644 --- a/FrmRoleInfoManager.cs +++ b/FrmRoleInfoManager.cs @@ -16,6 +16,7 @@ private void FrmRoleInfoManager_Load(object sender, EventArgs e) { reloadGrid(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色新增")) { btn_add.Visible = false; @@ -24,6 +25,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ IS_OPEN = true; } diff --git a/FrmRoleRescManager.cs b/FrmRoleRescManager.cs index 3e30a2d..ef97707 100644 --- a/FrmRoleRescManager.cs +++ b/FrmRoleRescManager.cs @@ -20,10 +20,12 @@ IS_OPEN = true; initForm(""); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("角色授权")) { btn_ok.Visible = false; } + * */ } private void FrmRoleRescManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmSysUserInfoManger.cs b/FrmSysUserInfoManger.cs index d9492a9..78741e7 100644 --- a/FrmSysUserInfoManger.cs +++ b/FrmSysUserInfoManger.cs @@ -22,6 +22,7 @@ { IS_OPEN = true; reloadGrid(currentpage); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户新增")) { btn_add.Visible = false; @@ -30,6 +31,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void FrmSysUserInfoManger_FormClosing(object sender, FormClosingEventArgs e) diff --git a/FrmUserRole.cs b/FrmUserRole.cs index e9f7c0d..69f163d 100644 --- a/FrmUserRole.cs +++ b/FrmUserRole.cs @@ -19,10 +19,12 @@ IS_OPEN = true; reloadGrid(-1); initCombox(); + /* if (Utility.isNeedLogin && !Utility.userRole.Contains("用户授权")) { btn_ok.Visible = false; } + * */ } private void initCombox() diff --git a/MainFrm.cs b/MainFrm.cs index a084c83..f70f872 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -270,21 +270,6 @@ { toolRightMenu.Items.Remove(区域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("缓冲区分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(缓冲区分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(附属物分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("无源淹没分析") < 0) - { - 区域分析ToolStripMenuItem.DropDownItems.Remove(无源淹没分析ToolStripMenuItem); - } - } #endregion @@ -294,21 +279,6 @@ { toolRightMenu.Items.Remove(视域分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("通视分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(通视分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视域分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视域分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("可视包络分析") < 0) - { - 视域分析ToolStripMenuItem.DropDownItems.Remove(可视包络分析ToolStripMenuItem); - } - } #endregion @@ -318,35 +288,7 @@ { toolRightMenu.Items.Remove(开挖分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("多边形开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(多边形开挖ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("挖方量分析") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(挖方量分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("沿线开挖") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(沿线开挖ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("创建隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(创建隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("隐藏隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(隐藏隧道ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("删除隧道") < 0) - { - 开挖分析ToolStripMenuItem.DropDownItems.Remove(删除隧道ToolStripMenuItem); - } - * */ - } + #endregion @@ -356,37 +298,6 @@ { toolRightMenu.Items.Remove(拓扑分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("创建拓扑") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(创建拓扑ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("上游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(上游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("下游分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(下游分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("流向分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(流向分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关阀分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(关阀分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连通分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(连通分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("爆管分析") < 0) - { - 拓扑分析ToolStripMenuItem.DropDownItems.Remove(爆管分析ToolStripMenuItem); - } - } #endregion @@ -396,27 +307,6 @@ { toolRightMenu.Items.Remove(断面分析ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("横断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(横断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("纵断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(纵断面分析ToolStripMenuItem); - } - /* - if (Utility.userRole.IndexOf("道路断面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(道路断面分析ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基线剖面分析") < 0) - { - 断面分析ToolStripMenuItem.DropDownItems.Remove(基线剖面分析ToolStripMenuItem); - } - * */ - } #endregion @@ -426,46 +316,6 @@ { toolRightMenu.Items.Remove(绘制区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("绘制区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("绘制区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem1); - } - - } #endregion @@ -475,47 +325,6 @@ { toolRightMenu.Items.Remove(全区域统计ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("全区域管线长度统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管线长度统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域阀门数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(阀门数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域井盖数量统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(井盖数量统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域埋深分段统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(埋深分段统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域管径分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(管径分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域材质分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(材质分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域附属物分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(附属物分类统计ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("全区域标识器分类统计") < 0) - { - 绘制区域统计ToolStripMenuItem.DropDownItems.Remove(标识器分类统计ToolStripMenuItem); - } - - } - #endregion #region 查询 @@ -524,45 +333,7 @@ { toolRightMenu.Items.Remove(查询ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("编号查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(编号查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(坐标查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(管径查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("材质查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(材质查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("基本查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(基本查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("复合查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(复合查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关联查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关联查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("关键字查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(关键字查询ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("附属物查询") < 0) - { - 查询ToolStripMenuItem.DropDownItems.Remove(附属物查询ToolStripMenuItem); - } - } + #endregion @@ -572,49 +343,6 @@ { toolRightMenu.Items.Remove(标注ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("标高标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标高标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("管径标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(管径标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("埋深标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(埋深标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坐标标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坐标标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("距离标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(距离标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("自定义标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(自定义标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("扯旗标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(扯旗标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("坡度标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(坡度标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("属性标注") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(属性标注ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("标注管理") < 0) - { - 标注ToolStripMenuItem.DropDownItems.Remove(标注管理ToolStripMenuItem); - } - } #endregion @@ -624,25 +352,6 @@ { toolRightMenu.Items.Remove(飞行ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("自定义飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(自定义飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("飞行到目标点") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(飞行到目标点ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕中心点飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕中心点飞行ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("绕眼睛飞行") < 0) - { - 飞行ToolStripMenuItem.DropDownItems.Remove(绕眼睛飞行ToolStripMenuItem); - } - } #endregion @@ -652,37 +361,6 @@ { toolRightMenu.Items.Remove(编辑ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("平移对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(平移对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("升降对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(升降对象ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("旋转对象") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(旋转对象ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("连接管段") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(连接管段ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("导出文件") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(导出文件ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("前进") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(前进ToolStripMenuItem); - } - if (Utility.userRole.IndexOf("后退") < 0) - { - 编辑ToolStripMenuItem.DropDownItems.Remove(后退ToolStripMenuItem); - } - } #endregion @@ -692,37 +370,6 @@ { toolRightMenu.Items.Remove(量算ToolStripMenuItem); } - else - { - if (Utility.userRole.IndexOf("水平距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("垂直距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(垂直距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("空间距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(空间距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表距离") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表距离ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("高度量算") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(高度量算ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("水平面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(水平面积ToolStripMenuItem1); - } - if (Utility.userRole.IndexOf("地表面积") < 0) - { - 量算ToolStripMenuItem.DropDownItems.Remove(地表面积ToolStripMenuItem1); - } - } #endregion } @@ -774,50 +421,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem1); } - else - { - /* - if (Utility.userRole.IndexOf("地上模式") < 0) - { - buttonItem87.Visible = false; - } - if (Utility.userRole.IndexOf("地下模式") < 0) - { - buttonItem88.Visible = false; - } - if (Utility.userRole.IndexOf("行走模式") < 0) - { - buttonItem27.Visible = false; - } - * */ - - if (Utility.userRole.IndexOf("透明度设置") < 0) - { - sliderGroundTransSet1.Visible = false; - } - if (Utility.userRole.IndexOf("快速定位") < 0) - { - buttonItem91.Visible = false; - } - if (Utility.userRole.IndexOf("图层管理") < 0) - { - buttonItem1.Visible = false; - } - if (Utility.userRole.IndexOf("图例管理") < 0) - { - btnlegendSet.Visible = false; - } - if (Utility.userRole.IndexOf("全屏显示") < 0) - { - buttonItem89.Visible = false; - } - if (Utility.userRole.IndexOf("导出图片") < 0) - { - btnOutputJPG.Visible = false; - } - - } - #endregion #region 一键审核 @@ -862,21 +465,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem14); } - else - { - if (Utility.userRole.IndexOf("专题图审批") < 0) - { - buttonItemZTT3_2.Visible = false; - } - if (Utility.userRole.IndexOf("打印审批") < 0) - { - buttonItemZTT4_2.Visible = false; - } - if (Utility.userRole.IndexOf("拷贝审批") < 0) - { - buttonItemZTT5_2.Visible = false; - } - } #endregion @@ -885,33 +473,6 @@ { ribbonControl1.Items.Remove(ribbonTabItem7); } - else - { - if (Utility.userRole.IndexOf("工单管理") < 0) - { - buttonItem9.Visible = false; - } - if (Utility.userRole.IndexOf("在线任务") < 0) - { - buttonItem10.Visible = false; - } - if (Utility.userRole.IndexOf("事件管理") < 0) - { - buttonItem11.Visible = false; - } - if (Utility.userRole.IndexOf("探测仪管理") < 0) - { - buttonItem12.Visible = false; - } - if (Utility.userRole.IndexOf("巡检人员维护") < 0) - { - buttonItem13.Visible = false; - } - if (Utility.userRole.IndexOf("导出施工图") < 0) - { - buttonItem14.Visible = false; - } - } #endregion #region 标识器管理 @@ -919,17 +480,7 @@ { ribbonControl1.Items.Remove(ribbonTabItem5); } - else - { - if (Utility.userRole.IndexOf("标识器管理") < 0) - { - btn_flag.Visible = false; - } - if (Utility.userRole.IndexOf("地面透明度") < 0) - { - slider4ground.Visible = false; - } - } + #endregion if (ribbonControl1.Items.Count <= 0) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 95050bc..77f8b11 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -112,7 +112,6 @@ this.sideBar1 = new DevComponents.DotNetBar.SideBar(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.layerSensorTree = new System.Windows.Forms.TreeView(); - this.layerTree = new Cyberpipe.MyTreeView(); this.sideBarPanelItem3 = new DevComponents.DotNetBar.SideBarPanelItem(); this.controlContainerItem3 = new DevComponents.DotNetBar.ControlContainerItem(); this.sideBarPanelItem4 = new DevComponents.DotNetBar.SideBarPanelItem(); @@ -261,6 +260,13 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); + this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); + this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -315,13 +321,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem91 = new DevComponents.DotNetBar.ButtonItem(); - this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); - this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); @@ -541,6 +540,7 @@ this.labelX17 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.layerTree = new Cyberpipe.MyTreeView(); this.statusStrip1.SuspendLayout(); this.sideBar1.SuspendLayout(); this.panelEx3.SuspendLayout(); @@ -551,8 +551,8 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel15.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); + this.ribbonPanel15.SuspendLayout(); this.ribbonPanel7.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -979,18 +979,6 @@ this.layerSensorTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerMarkerTree_NodeMouseClick); this.layerSensorTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); // - // layerTree - // - this.layerTree.CheckBoxes = true; - this.layerTree.ItemHeight = 18; - this.layerTree.Location = new System.Drawing.Point(30, 78); - this.layerTree.Name = "layerTree"; - this.layerTree.Size = new System.Drawing.Size(121, 97); - this.layerTree.TabIndex = 1; - this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); - this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); - this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); - // // sideBarPanelItem3 // this.sideBarPanelItem3.FontBold = true; @@ -2135,15 +2123,15 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel1); - this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel3); - this.ribbonControl1.Controls.Add(this.ribbonPanel2); - this.ribbonControl1.Controls.Add(this.ribbonPanel5); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); + this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel12); - this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); + this.ribbonControl1.Controls.Add(this.ribbonPanel4); + this.ribbonControl1.Controls.Add(this.ribbonPanel15); + this.ribbonControl1.Controls.Add(this.ribbonPanel2); this.ribbonControl1.Dock = System.Windows.Forms.DockStyle.Top; this.ribbonControl1.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.ribbonControl1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { @@ -2187,15 +2175,132 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel1 + // + this.ribbonPanel1.AutoSize = true; + this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; + this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel1.Controls.Add(this.ribbonBar21); + this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel1.Name = "ribbonPanel1"; + this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel1.Style.Class = ""; + this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseDown.Class = ""; + this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel1.StyleMouseOver.Class = ""; + this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel1.TabIndex = 1; + this.ribbonPanel1.Visible = false; + // + // ribbonBar21 + // + this.ribbonBar21.AutoOverflowEnabled = true; + this.ribbonBar21.BackColor = System.Drawing.Color.White; + // + // + // + this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.BackgroundStyle.Class = ""; + this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.ContainerControlProcessDialogKey = true; + this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem1, + this.sliderGroundTransSet1, + this.buttonItem91, + this.btnlegendSet, + this.buttonItem89, + this.btnOutputJPG}); + this.ribbonBar21.Location = new System.Drawing.Point(3, 0); + this.ribbonBar21.Name = "ribbonBar21"; + this.ribbonBar21.Size = new System.Drawing.Size(514, 59); + this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar21.TabIndex = 2; + this.ribbonBar21.Text = "浏览模式"; + // + // + // + this.ribbonBar21.TitleStyle.Class = ""; + this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar21.TitleStyleMouseOver.Class = ""; + this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar21.TitleVisible = false; + this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); + // + // buttonItem1 + // + this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); + this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem1.Name = "buttonItem1"; + this.buttonItem1.SubItemsExpandWidth = 14; + this.buttonItem1.Text = "图层管理"; + this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); + // + // buttonItem91 + // + this.buttonItem91.ForeColor = System.Drawing.Color.Black; + this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); + this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem91.Name = "buttonItem91"; + this.buttonItem91.SubItemsExpandWidth = 14; + this.buttonItem91.Text = "快速定位"; + this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); + // + // btnlegendSet + // + this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); + this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnlegendSet.Name = "btnlegendSet"; + this.btnlegendSet.SubItemsExpandWidth = 14; + this.btnlegendSet.Text = "图例"; + this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); + // + // buttonItem89 + // + this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); + this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem89.Name = "buttonItem89"; + this.buttonItem89.SubItemsExpandWidth = 14; + this.buttonItem89.Text = "全屏显示"; + this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); + // + // btnOutputJPG + // + this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); + this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btnOutputJPG.Name = "btnOutputJPG"; + this.btnOutputJPG.SubItemsExpandWidth = 14; + this.btnOutputJPG.Text = "导出图片"; + this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); + // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel15.Controls.Add(this.ribbonBar20); this.ribbonPanel15.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel15.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel15.Location = new System.Drawing.Point(0, 0); this.ribbonPanel15.Name = "ribbonPanel15"; this.ribbonPanel15.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel15.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel15.Size = new System.Drawing.Size(1328, 95); // // // @@ -2236,7 +2341,7 @@ this.buttonItemXTGL}); this.ribbonBar20.Location = new System.Drawing.Point(3, 0); this.ribbonBar20.Name = "ribbonBar20"; - this.ribbonBar20.Size = new System.Drawing.Size(427, 59); + this.ribbonBar20.Size = new System.Drawing.Size(427, 92); this.ribbonBar20.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar20.TabIndex = 0; // @@ -2664,122 +2769,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_Click); // - // ribbonPanel1 - // - this.ribbonPanel1.AutoSize = true; - this.ribbonPanel1.CanvasColor = System.Drawing.Color.Gray; - this.ribbonPanel1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel1.Controls.Add(this.ribbonBar21); - this.ribbonPanel1.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel1.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel1.Name = "ribbonPanel1"; - this.ribbonPanel1.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel1.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel1.Style.Class = ""; - this.ribbonPanel1.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseDown.Class = ""; - this.ribbonPanel1.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel1.StyleMouseOver.Class = ""; - this.ribbonPanel1.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel1.TabIndex = 1; - // - // ribbonBar21 - // - this.ribbonBar21.AutoOverflowEnabled = true; - this.ribbonBar21.BackColor = System.Drawing.Color.White; - // - // - // - this.ribbonBar21.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar21.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.BackgroundStyle.Class = ""; - this.ribbonBar21.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.ContainerControlProcessDialogKey = true; - this.ribbonBar21.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar21.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem1, - this.sliderGroundTransSet1, - this.buttonItem91, - this.btnlegendSet, - this.buttonItem89, - this.btnOutputJPG}); - this.ribbonBar21.Location = new System.Drawing.Point(3, 0); - this.ribbonBar21.Name = "ribbonBar21"; - this.ribbonBar21.Size = new System.Drawing.Size(514, 59); - this.ribbonBar21.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar21.TabIndex = 2; - this.ribbonBar21.Text = "浏览模式"; - // - // - // - this.ribbonBar21.TitleStyle.Class = ""; - this.ribbonBar21.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar21.TitleStyleMouseOver.Class = ""; - this.ribbonBar21.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar21.TitleVisible = false; - this.ribbonBar21.ItemClick += new System.EventHandler(this.ribbonBar21_ItemClick); - // - // buttonItem1 - // - this.buttonItem1.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem1.Image"))); - this.buttonItem1.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem1.Name = "buttonItem1"; - this.buttonItem1.SubItemsExpandWidth = 14; - this.buttonItem1.Text = "图层管理"; - this.buttonItem1.Click += new System.EventHandler(this.buttonItem1_Click); - // - // buttonItem91 - // - this.buttonItem91.ForeColor = System.Drawing.Color.Black; - this.buttonItem91.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem91.Image"))); - this.buttonItem91.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem91.Name = "buttonItem91"; - this.buttonItem91.SubItemsExpandWidth = 14; - this.buttonItem91.Text = "快速定位"; - this.buttonItem91.Click += new System.EventHandler(this.buttonItem91_Click); - // - // btnlegendSet - // - this.btnlegendSet.Image = ((System.Drawing.Image)(resources.GetObject("btnlegendSet.Image"))); - this.btnlegendSet.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnlegendSet.Name = "btnlegendSet"; - this.btnlegendSet.SubItemsExpandWidth = 14; - this.btnlegendSet.Text = "图例"; - this.btnlegendSet.Click += new System.EventHandler(this.btnlegendSet_Click); - // - // buttonItem89 - // - this.buttonItem89.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem89.Image"))); - this.buttonItem89.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem89.Name = "buttonItem89"; - this.buttonItem89.SubItemsExpandWidth = 14; - this.buttonItem89.Text = "全屏显示"; - this.buttonItem89.Click += new System.EventHandler(this.buttonItem89_Click); - // - // btnOutputJPG - // - this.btnOutputJPG.Image = ((System.Drawing.Image)(resources.GetObject("btnOutputJPG.Image"))); - this.btnOutputJPG.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btnOutputJPG.Name = "btnOutputJPG"; - this.btnOutputJPG.SubItemsExpandWidth = 14; - this.btnOutputJPG.Text = "导出图片"; - this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); - // // ribbonPanel7 // this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2926,7 +2915,6 @@ this.ribbonPanel3.StyleMouseOver.Class = ""; this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; // // ribbonBar4 // @@ -3117,10 +3105,10 @@ this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel5.Controls.Add(this.ribbonBar2); this.ribbonPanel5.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel5.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel5.Location = new System.Drawing.Point(0, 0); this.ribbonPanel5.Name = "ribbonPanel5"; this.ribbonPanel5.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel5.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel5.Size = new System.Drawing.Size(1328, 95); // // // @@ -3161,7 +3149,7 @@ this.sliderItem3}); this.ribbonBar2.Location = new System.Drawing.Point(3, 0); this.ribbonBar2.Name = "ribbonBar2"; - this.ribbonBar2.Size = new System.Drawing.Size(350, 59); + this.ribbonBar2.Size = new System.Drawing.Size(350, 92); this.ribbonBar2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar2.TabIndex = 0; // @@ -3220,10 +3208,10 @@ this.ribbonPanel12.Controls.Add(this.ribbonBar18); this.ribbonPanel12.Controls.Add(this.ribbonBar13); this.ribbonPanel12.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel12.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel12.Location = new System.Drawing.Point(0, 0); this.ribbonPanel12.Name = "ribbonPanel12"; this.ribbonPanel12.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel12.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel12.Size = new System.Drawing.Size(1328, 95); // // // @@ -3262,7 +3250,7 @@ this.buttonItem132}); this.ribbonBar18.Location = new System.Drawing.Point(508, 0); this.ribbonBar18.Name = "ribbonBar18"; - this.ribbonBar18.Size = new System.Drawing.Size(75, 59); + this.ribbonBar18.Size = new System.Drawing.Size(75, 92); this.ribbonBar18.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar18.TabIndex = 1; // @@ -3314,7 +3302,7 @@ this.btn_check_history}); this.ribbonBar13.Location = new System.Drawing.Point(3, 0); this.ribbonBar13.Name = "ribbonBar13"; - this.ribbonBar13.Size = new System.Drawing.Size(505, 59); + this.ribbonBar13.Size = new System.Drawing.Size(505, 92); this.ribbonBar13.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar13.TabIndex = 0; // @@ -3389,10 +3377,10 @@ this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel4.Controls.Add(this.ribbonBar1); this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel4.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel4.Location = new System.Drawing.Point(0, 0); this.ribbonPanel4.Name = "ribbonPanel4"; this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel4.Size = new System.Drawing.Size(1328, 95); // // // @@ -3430,7 +3418,7 @@ this.btn_document_info}); this.ribbonBar1.Location = new System.Drawing.Point(3, 0); this.ribbonBar1.Name = "ribbonBar1"; - this.ribbonBar1.Size = new System.Drawing.Size(200, 59); + this.ribbonBar1.Size = new System.Drawing.Size(200, 92); this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar1.TabIndex = 0; // @@ -3459,10 +3447,10 @@ this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel6.Controls.Add(this.ribbonBar6); this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel6.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel6.Location = new System.Drawing.Point(0, 0); this.ribbonPanel6.Name = "ribbonPanel6"; this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62); + this.ribbonPanel6.Size = new System.Drawing.Size(1328, 95); // // // @@ -3504,7 +3492,7 @@ this.buttonItemGBJC}); this.ribbonBar6.Location = new System.Drawing.Point(3, 0); this.ribbonBar6.Name = "ribbonBar6"; - this.ribbonBar6.Size = new System.Drawing.Size(427, 59); + this.ribbonBar6.Size = new System.Drawing.Size(427, 92); this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar6.TabIndex = 0; // @@ -3568,7 +3556,6 @@ // ribbonTabItem1 // this.ribbonTabItem1.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem1.Checked = true; this.ribbonTabItem1.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.HoverImage"))); this.ribbonTabItem1.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem1.Image"))); this.ribbonTabItem1.Name = "ribbonTabItem1"; @@ -3639,6 +3626,7 @@ // ribbonTabItem5 // this.ribbonTabItem5.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem5.Checked = true; this.ribbonTabItem5.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_04_hover__2_; this.ribbonTabItem5.Image = global::Cyberpipe.Properties.Resources._24x24icon_04__2_; this.ribbonTabItem5.Name = "ribbonTabItem5"; @@ -4565,7 +4553,7 @@ this.dataGridViewX2.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(51871, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(52168, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4675,7 +4663,7 @@ this.dataGridViewX3.RowHeadersDefaultCellStyle = dataGridViewCellStyle15; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(51870, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(52167, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5677,7 +5665,7 @@ this.dataGridViewX6.RowHeadersDefaultCellStyle = dataGridViewCellStyle30; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(62, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5777,7 +5765,7 @@ this.dataGridViewX7.RowHeadersDefaultCellStyle = dataGridViewCellStyle33; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(61, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5957,6 +5945,18 @@ this.pictureBox1.TabStop = false; this.pictureBox1.Paint += new System.Windows.Forms.PaintEventHandler(this.pictureBox1_Paint); // + // layerTree + // + this.layerTree.CheckBoxes = true; + this.layerTree.ItemHeight = 18; + this.layerTree.Location = new System.Drawing.Point(30, 78); + this.layerTree.Name = "layerTree"; + this.layerTree.Size = new System.Drawing.Size(121, 97); + this.layerTree.TabIndex = 1; + this.layerTree.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.layerTree_AfterCheck); + this.layerTree.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseClick); + this.layerTree.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.layerTree_NodeMouseDoubleClick); + // // MainFrm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit; @@ -5999,8 +5999,8 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); + this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/MainFrm.resx b/MainFrm.resx index abbbdd3..09b886d 100644 --- a/MainFrm.resx +++ b/MainFrm.resx @@ -522,6 +522,505 @@ R2K5fxKLWbbp/7Dc0CBY8Q+pPmOq0VkzzQAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 + RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC + MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL + ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH + s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW + uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx + xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd + iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ + qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW + GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE + NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n + KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw + qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI + HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq + wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q + 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF + MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n + W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 + eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv + 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP + I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f + n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV + x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et + V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD + D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u + 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n + z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V + rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ + 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm + oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 + ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H + 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 + REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC + RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo + KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O + 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd + rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o + 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C + s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 + MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI + jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs + FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm + LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml + CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV + hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q + bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX + YCSg/AAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + 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 + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw + RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL + SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 + 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P + zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 + 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj + L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 + RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf + nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P + 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj + ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G + xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H + dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 + LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob + gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 + ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi + UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd + XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 + 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN + jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF + Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn + ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A + AAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 + RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG + UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe + 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 + wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm + RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm + pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH + oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ + ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU + jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm + 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 + RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT + 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 + VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn + KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 + A2MdqQeVc5pWAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF + MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN + yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc + c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg + 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 + cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 + ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw + O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD + nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz + 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn + k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I + 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df + WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs + T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda + SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy + NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6npMy1AAAGEUlEQVRIS7WVeVDUZRjHf7Ase8ECu+wl4LIXcqyyHC783AWW + 5QaRFTHkMi9SQvE+UhLzwk0BUcQSgQBBgcYDzStMSzOPcpqcmo5pmqk/+rOapqb+iG/PbzfFcSz/6pn5 + zPN739/7fp/nvZn/3TSLjj+XJy2/RaItPCT5vaBd8m1+q2Qku1lcrcvki+iXr7fFU6ZZeOx5KDU1b7jU + 1Z2bVPMPWNMbRXrXkWAc+ywVLbcS8fKwFjlu8VdpW0XzSc6f8PEIPzJ19dFnU3WEJdHL9P3X9O1nkdB8 + CQrX7i3mKn9zfqsUq29ZsPfjRBx5aMO2cTMy94gm7FuF7XyJTwDJTo5GVdHxNALVgsPd5Ceye+9g8b0f + UXbjB8RtH4Msd+MeXS7f6twjxbILZiy7pEHDtTBsvG7BqivTUXpsClLWCbtJNpDwBlGVH3ySIFV520eW + nedRcf0HVJGwbeRrOHs/h2n1CGRZDe7wND/W1hiI8sEYlJ4KRcVpJcrfVqByNBILhqLh3KeA+UXBOpL2 + jkRZduARPGXZ/vH4pnMou/gd7INfIPn4QyQc/RSOzk9hrBtEiKPerUn1Y5PXBaDojWlwdgUjr0+G/H4Z + cnpCUNJrQNZ+LeLrBD/LYnixFEDAKFz7vJQ0r49dO4zikS8x8/ADxLd9jIT2B5ix/z7SX78Pw+K3EJy2 + wq1M4rEz6sRwthgw82Ag2KNS2I5JPZ4rZx00ImGNHIZSfisFkDGhxbs5AkKLd/3kaLkDlgTjXrsNc/Md + mPfeQeyOD2HbcRu6yi4E2Wrd8ngeG71IBPtePWa4JUhsD0DykQAkHQqApUWCFLcGyZvDoZ/P/5oCTGXk + hU2MvGB7rbGmG47dd2Fa+x6iX/kAMa/eQvS2m4jaeAPspvcROb8TQexid3CcL2usFCJjnwE5nQYU9RhR + PGDC7D4TCrqMyDqkR9oePbRz/SZEKh8rI8vdyshyXhmzLD8DS/1VGOquwtgw7glkXH0Nhvp3kbL2GrSl + hyC11ril03xZfbkQKZuVsDeq4NihRtYuDbJ2auBoUsO2TQXrJiWMlWIExflWMiHOjRzfJy0bg776HCKX + vANd7WXol1/xeN3Si7A2XIXW1YbAxAq3UO0zPTSd1yG38bplLK//vxBrffKY4PQ1HH9aKk8jonQUUyvO + Qlt9HtqaCx4/tXIMyXWXMXXOAQTEv+D2zCvDhBBTCN1zCGOCZq3k+DXO1YcpRYOY4hpF2LzTCCs74/VE + 3IvnEVd1EhGFblBbWot6BKXWQZq64tlYa2+TuJwQM9KU5cRL35hyOxCe2w913hA0hcPQFI16KRzxEFtO + a1Q9htSVN5C+5S5x7x/uIm3DR7CvuomUReOImt1FU7nwEolHECImMGkJE5i46EJkejNM+X1QOPqhzBqC + KvskVDmnJuHKT/K4bgjKzBMItXcjJv84NOwWiKPndJK40TOCgPgaRmIur1dZ1yM6txvyWT0ITR+AImOQ + gg39N1ybDBJP60PorC5My3oTwQm18FdNryBxbq0EJL6AEUTYZBTkF0NGKyKdvZDb3qJOAxSIOqcP/jtp + JyC3D1BSvYgp6EN4aiNlP/cTEk4gFASPEUeXkWd8RaY5jcrEBkTn9UCT4Q3gzfBfRvJE9rrsfpicHSRe + NsFXmJeSXhTBXXY+jMjk8uArVkpExuKb6pkbYJ7L7Ria37xTUBeMeCkcncRTN0z/TyLKNYy4khNQJq2G + IMLBXdUWQkXwCYYR6md7IPP1k8WEC3UFDzSpG2BZeAZJtXQWFpyls3HOC50JzkdQnbFqDInLLiC2rBcq + 6xoSzzzP+NDVwDBaQkx4XzahNv8xZH48sVotCHeOUnnCWNJG18Q4UjddB7vlfbBbPwC7+YannLTyIrS5 + OyHU5v3hr07poL7JBHe4Jh8bzgQROY8h46IKCAVfbi73D3PcpfoJlX0VtEVN0JXsQlj2ZoRaaynj7N/8 + NfZLPLFmHrXnpiWSCCL8iMl32T/M6YGMq+R+covD7QADwfoIgqt4QVGtfvIZJ4lRv5CY4zypbjfjy+eE + M4l4gtuSwYSQ4DS4EZAew/wNiCYQJlvQU3cAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 + NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 + iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z + zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s + hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa + BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n + WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ + BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY + s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn + ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg + 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef + rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q + qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK + Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 + RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO + RK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE + NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM + 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t + lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl + DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q + rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th + pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S + T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt + SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ + oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND + MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD + QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 + l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg + S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj + CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X + 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF + 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu + F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee + SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 + 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY + VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 + 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 + edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA + S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw + p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if + SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES + 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U + IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL + 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze + r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq + nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 + Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R + Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 + nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA + AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 + OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy + BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F + mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd + v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul + AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj + dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg + 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 + OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl + LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi + Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv + cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE + RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 + cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv + bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw + ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w + TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC + MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw + Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N + OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE + NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC + NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ + eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo + cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 + p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D + frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua + BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO + Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O + eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e + x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa + mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM + FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF + 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH + 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn + DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH + ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= + + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 @@ -2024,505 +2523,6 @@ 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkUzNzJDMjE3NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkUzNzJDMjE2NEFENjExRTRCNjE0OEVEQzI4MEM0 - RTZDIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI3NUQ0QkNENDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6PyaLfAAADMElEQVRIS6VUXUiTYRT+vi3Tzd+ps23+3KRigtiPkolEQReG - UYTkhWatpWlWGkRdddfdSPImqUAJjSIT00oxLJIk0cR+tFSyzDJtgaMkDEPkdM7ZPvm2vS6jBx6es3Pe - 8zzvtm+TohLS/ov+AACStLgEQuJyLRJWYK1yzh/+FgCoQrpnfM4fOGBhcUlIMkEVkma4H4i1y2kFcMD8 - wqKQZILKZqTqmlTAWrfvMjhgbv63Dwm0hLWQohn1eNEbzrlfPiTQAtZCKjP1GXdAIC+r4XD+9CGBFrDm - RVJ1re6pZ0GyHHMvIawauYVNCFPfvvuQQAtYC6meKXU0amNsaGN/ZR60xIf9aIgN3cpGE9OzZCZ85nEm - pGiWlLABmuJCnUOXrNB7chdct4TUo32ANDbp4NuielDpqWfePdaPX6GrohSK4uLhlCEo96YlZLbOFHzH - oJXjMSBcGn4/zQGovEDqXXtzeTb+BTrKj0J3+Q54djYP7EZdTU2MPjFSK8eieQR9QtLg6GcOQPWgqKeQ - ZyOfoK30CDw+lg2Ot3Z4VLoNqo269mCNHIa2WjYn9A1PcAAqU6m9VV3TF9psOwwPS3JgZugCdNoyocwU - jU+RlImWBpezGz0vxzkA1YOiHvPFO7Ca1kGHLQtmXp2HdutmqN+/F6JiU+h3kOpyVeHJwBgHoLIpqajm - 189HoaG4CNqsGTA1UAWth9Lg6r490PygGyLjUikgzuWqQlffCAegelDdUwLqigqhpXgjTPYeh+bCFCg2 - RkEk3vxuVz/P0c43oLP3DQegLhspNalSFxiNcLswHT48LYNbBUlQk7ebzenmyhm08w1o7xmiAP6hRZiT - 70eYkzpctUuJWdHmwWs74+F1Uz7cyE+E4ohQB5mHm9a3GywpTXzektyKduIAIsKI3ISkL4rIdYle05C9 - VrZVBmvtl7eboUyv7V4jSQdwRn8FdI72iErtCUxnIuifkJ5hUqUOq9Jr7OeCNU6bTpNVqtMcDJSldOwn - KnOk+jypJ5QANRWc0cs5SEelXr54QidfwVYAMoiHq4W/gNM6OaNCJ+diaUIqN/43+Atwg27t+9ZXBUn6 - A2MdqQeVc5pWAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAIAAABvFaqvAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjUzQzNGNDI5NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjUzQzNGNDI4NEQyQzExRTQ4QkE1QUNCMEVDRDZF - MDVEIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6RkI1NUY4OTYyQTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6IsaOmAAADF0lEQVQ4T62U/UuTURTH+0nICqRI1ERMMyNQe8N0ChqBwQhN - yvwhEgJjVCqJ/qCibZo6tzQ339h6Nre5prapUzc1XzItX1ilzuWMLLVAen+xf6DTuTxjdxsFVj58ebjc - c+7nnud7z3228DbpIaDFH/CfoqCn72DIDvNfPDM2KAqyr8PcJxqY+QBTb8kkjocXQTsKigGwfqYJHqIg - 1OxHGHvlWPx4hXB1YyA3g4CBhqst+piEnrDA3rA95vBAY1x8d7lq/DVZwm5PQZNvoKYdypSgHgbVEIh1 - cLOZzOCbSSsyRQRba6uWtcpVLbPcwlglInNUCJNWWKqABqMLCGvGlfpJELaQ/V1Vd1lujAhe0chtUrH5 - ZExnmJ85MdomEa+qZMbIEF2BHGunILSjdZwYgTt4gJqjjj0Rltml1Zq9AeL0Mn71Wn2mtDU80MIvsFTw - O+KPIoWC8BNYRIUaqrRQroJKjQOk9N+xLBF2pXJFKfnsDGYa8gS6xOO2whyMuoHaHpGzZ/pBM0IMrtXD - nT4HqNHXe0lYoogMFeQP4jbSDkCPTUyXmnNoPutSo+9WN5DEQDyeWCWnhqm4p7Oimt3b54rzmmKPVHKz - 0Xg0AU1pz87VJp+yXOfd9t3mBmLXsGrsJhSsDtF4iOWxKdpzyQNnuRW7vEUp13obFG05OVUBPtO5V1Sn - k5q4SX8ENfWA6C7xHsP981Bb2sf38ZKd4JhSuXUJHPHhg/WJnAeZFw0Xzt/w8erRtLmBnB/CSmaC599I - 2PYVRl+CXigu3R9SfCC0Pf1MZ1oqvqvjogX7gtRFJfb1n24g7GblfQcFP2fkBYm5anxqQcbLKgzyK/Df - WRTkV5+RMTg84ZrgAOHo4ZIDVNdJw67CpsVLZ5gifj97Typlq2ZFQXj8LKh5EHpnaIar8N+Al5l9Y9Vs - T7OiIAzjqaMsa6QJnBkeWvgOHdPkAuIV67PSeQpCYYZplsZ+KyyWLRyFF8D553EDbURY770J0rrYJbda - SYE4iWb9NcgpRKDrOMAWwYP6d5BTaC52zyaAWDlAm/DweL8AX9zXukfxHsIAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOkVGN0NDMDNDRTA0QUU0MTE5NzRBQ0FBRUI0QjM1 - RDZFIiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjFFRUUzNDdFNEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjFFRUUzNDdENEFGMTExRTQ5M0I5QzUwRjVCODdC - MERFIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkI0NEVFQkRFRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6RUY3Q0MwM0NFMDRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Ym8PVAAAC+UlEQVRIS6WVbUhTYRTHr5tuc073YoSmmyuwNPWLKdaHEgpL - ISg/VB8Ugj5oRi9C9iEDe8UKMzDKKRVIRfRCaR8Ko8xEK6PMbDInmqlroKit+YYiejrnaa47dreye+DH - s+f8z/M/57lw77jPV3Wi8BcAwHFtFdqlgqe4IERCe3/BGrwv1y4VIPC8CpEwJx/BGrRc1PwrAYjsTZkW - uh6vBPz91yaswatzal8oXp5R72k4q65FBnEPjaUasNTFgfNrGpjvxQDl0MdnE9ag/mSYF89KwnbiOvCx - xgj9zSkwZk2HKXsWTH7PhElbBoyZY+GHJQU+3dID1vm/yZPiUA/qjocewHWhr2kdTroZbO9SoeNBLDRd - iYCnpzTQdjsGRtqTofVmNGAdaFesAV30WgjXJ0K4IanSZfsnHhap3Nw/qsrFdWEQTTtr46G+dBncLVRZ - qvJDTBuSjdDd1QG1xWpoMUUB1oG1uwcGbHZwOCdgdm6eGtBtPOPO4ZBFopDxL48SANf5qjxl3aEseTaW - GDSRq2t00fFsUtQYGpxcGxUHOn0CM3ajT6z+7eyKG/uVjOv5StPrKiNU5ym78zPkO1EyIMuRMB1e/+fE - NIxPzQDWQu+3AcbwqAMmpmdhambOjdctru0LJpTIeMXe4IYkgzQO05GIGpHjRCb+hNSMbuI1OR/+LS7n - KrhLOYrs8hxFe5JeasQUTR2CSEmjA2POaTcjjkkYGnWylZ/nQ2fIm8WF3XLu/C552ZGtsjTc0sdFiUiw - qNI90f9TyZ3OlnElO2QFaEpTk7mUclRgG3aIgjy4E9tlXFGmLBWNFUgg7QkS++yjomANjm0L4vI2BWrI - HJHQniDR2j8kCtagcEsgt36VhF7zAIL2BInmXrsoWIOD6VJBSGzrGhQFa1CwUSoIia3mPg8o5w+henwq - wkFic3uPB0K5RXzVu+y8g8TGD1YPKOcPoXqXnXeQ+KLV4gHfTAihepedd5BY/7ZTFKwB/a3xWQwURX8q - 1BGxz38BvCwLsyQ3iHgAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJBREU3RDk2NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJBREU3RDk1NEFCMDExRTQ4OUM5QjZFOENGQzJF - MDk1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MEM5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz52g1XsAAADeUlEQVRIS62Va0hTYRiAXzVNoQs6oUCttJu3aqatrLxr2k0n - W6bLLlLSxTKCKLoQQUg3IbLMflSgBRGRP7JSSzGnWalYdpnV1MQu1tBWWklqvr3fp2dsOytSfOFh3/l2 - eJ7tnDMGkkmzGCqigsARhPlUQqCi8nEd9v7GEYP5mFcI4K/e/hGHeQ2B7p4+1HV8Nf6Kw4a5GGxtCHzv - 7sU2nR4lbr4/AUBFKIeD4GKYBL79+IX6rm622U8nSgnX4SC4GCaBL50/OXwTwIUY1ohcQkCn/84ZDLBP - I5p16TBl7XYIoaXVwI54RC4h8LG9k/OvQPIOmEZUJW2F+XRoPbBrOiKXEGj9rOdYCqi2gxXhnLQNIo6f - n9tEa7ViI79PoojIJQSaP3RwjAOJaSAjjhL3N+9zrD+W499UVJnSeeVmWDvtlcWlgCedZnK5RC4h8KZV - x2FryQSYmrAVjh/MnP46/57yS7VmZ9+zxr1Yr92NtQ1pWFmfiBevL9QpUqE0JhHcyWuImLsMAU1zG4et - V6yHC1l5oe+evNmD1ZoteL9OgaW1K7GkRoF3H8ZigTocb5bFY8bZWbpoFVwh7yiCR8xdhsAz7XuOh9QD - D2R6twyIEzG/JApz88N7z+T5d+VcDezKL43Ea4UxeCjTqyNUDpUBYeBFXjvjgOAyCdS9asXDJ3NQFj3u - 7eWCyG/FjxR45OyMr6s3S1qCYqE8RA654Uq4dOiUV/v+E9P0i1ZA9Zwg8COnA2HyDZiLYRw4dyAjC50n - z8awBBvNbbWyZ+8x10+By+GONARCbe1gDBPJloCvfKODluQ10mD+qDK5LWFyD6pfvOUYBzydXL0v2I+V - rI9Mhud5BQE9i+RQPt2P30BBYrM4HmYSNf5REGS0b5CzYdKq+iaOITA44wmPiLXwaFfGhDbZMkinYxNJ - 8CpwXxgHobQcPbhv8XegrtNyzAPsOtqHJUPeml1jm/1jYDkdM5G5hB3bDL6KhknLal9xzAN8gpMgVZHm - oKUAuwx29H420c9O/l9KHms4bC0KLFCAY6CSHr+VoHJy88lWbEjHoqoXWPzw5ZCxGKCxkslBLo22L1+6 - ahPeUj/FwgfPh8zpSzfQ0cWrwVKAjfXcWFjjPm9isWSSbx/7JEPF0cWzcYzE7dTfAmysfSLB2z0Awm1H - 8ycnjrD4N/kX4gEg8A9sAFSe4VuPvgAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkEzN0Y5NjgxNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkEzN0Y5NjgwNEE5MDExRTRBMzU1RUM1MkVEQTU3 - REQxIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MUU1QUVCQUI4RjRBRTQxMUI2QTlC - RjEwMkVGQzEyNEEiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4Oz1B+AAABO0lEQVRIS7WUP0sDQRDFt0snIcEiklhGJLH3k6bNp0ifYCUo - KWwMIRCx0EYxEEL+IOPO4SxzczN7d7gGfuzd7Hszd9nHOQD4V9RiStRiStQi0b68GXkgwkjzcdQigU1O - 32CC+9IjUYsENvjY7EySDHhev5skGXA3X5r8aYA3lx0wET1otYgmNMcOku+jXtMg4QJFJMb1a7uPmjUd - rVzHDfDy9pmJaZViCe5rPq7hYpgvXjPw2hNtTqBOevk+F8L0YRGQQosyHxfSf0jUegPLZwkrNedYfi6o - 9Y2RWP6cACPHYnf4XauQablfHYAxo6jt9sfwRGWgVvrVASKmdd7g2OoN4P5pVYhqbgCPmnPuzHPtua1C - s9OHyeyxEFU+IJcCb2p4zj3dKjQvrsat3jD4CwNCIcEv14/fpAfcDwXsled4Tu6+AAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlGMEQ1RDBCNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlGMEQ1RDBBNEFENzExRTRBNTYzOUQ5RUQ0RTQ0 - MzBCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzFDMDRERTRENjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6zemTaAAABh0lEQVRIS7WUvUoDQRSFEwiBKPEHsRAkb+ArWIsv4CNYCSKI - jRD8a1S0m9QhdTobG5uARZogBJSkiLASFJJChQiRcJ2z2bnMZtbxCnrhY3YO556z1aSI6F9JFP+SRBEs - FFaUhoSopAyQKGIBi58jEuErcQSAhY/hyP5DL8Y7mQMcAcD8Phh+u2Tzk9cRAMz914G4wOd1BABzt/cm - LvB5HQHA3On2xQU+ryMAmB8en8UFPq8jAJjvWk/iAp/XEQDM9WZHXODzOgKAudZoiwt8XkcAMN/U78Ml - CcY7mQMcAWhz+FRc3zZFREXypwKYEiG/e+ykc1WYVRrCGUk8nGUHsyic6nKeetUK4dTESjjLDjZUlqaV - hiS8lEsh0Z1LTFYs2FBazFFwcUzB+YE+T8bffD+i4LRIwSV0jdZaO5vhHXtRPmfFgg1n81mlIQnt/W1q - bKyH34dz2XKUz1mxYBaFU5zJUG1tlXDu5TMcjuEsO5hF4exOpZWGtnLpWDiGs+xgFv9gxlmU+gIVyyIX - YCSg/AAAAABJRU5ErkJggg== - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVENUYwQThBNEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVENUYwQTg5NEQyOTExRTQ5QzUzQzdFMkFGQkQy - NTA1IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MkRGNkEzOUYyOTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - 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 - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOkVGNUQ0RjNENEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOkVGNUQ0RjNDNEQyRDExRTRBQ0ZFOEVGNkU4Rjcw - RkEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QzUxNUY0MjEyRDRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz7jldwbAAAEyklEQVRIS6WWDUzUdRjHoeXWVktIc74MLREMUxBQV4RYkBmL - SBwSoZIFCgULlOJFDJDxqkiAqGgoiIQ6jaFLB1EqUaC8iMgdL8cJB3fHwR13HO8Hh3x7fn+pwN01nM/2 - 2X77Pb/n+33+v/3/95zBbGOVnZM58QHhRKwgnp9KPXuQ2CtJ6ScOjGo0fcMjI93llVX55us3rqbUc49P - zDLyw9auL4iw5l+IsMY//BRujcygdcg+ug83rpzCsVhf3C6+hHg/W+R++985BtU3pey1cCCpOYQhJzo9 - 8kPX1tZcDoS0Jp2jrCgWmakhOJMVA4GwBd1KNSQ9veiUdeNifjqyMsJxveD7f8+z2rPBlg0kNZ9gJjMj - L8RqQlSegIbLX6CuYAcOBm9FHe8B2rt70SZTgNfehTphJ+paCaEYjSIJkmP24PaPnrhfsBP8okCcCbZ8 - RFLmxIuc6PTICV5Dh4IxNqSEemAA6adzwBdJ8VeDEL/XNqGkmo/iKh4HW5fWNCL7QiEqq2sw3N+Dijwf - nPx6FUjKkpjLiU6P7MDVqL/gj8nJSY4bpbcQnZyK8EOJCI2Ox3dRcY+JjkNYTAIi4w4j7+JlKBQKjI+P - 42qqJ9J832AGawkjTnR6ZPm/iXvn9+ARiWsnJjCu1YLeGshJQCKVolMs5hBLJOiSydAjl0OpUmFweBhj - ZJAfuxVJ3ub6DTJ9LVCd40Pij6AZ01IRoWVGumE5dmZEM45RjRbnolwR72Wm3yDt85W4e2o3FVLnGg1G - xsYwSvDEdxB03gEa6vJwSopOhkZHkRPhgkPbTfUbpOwwR+XxXdT9OM79EQ/lgBLNkjpsz1iMP5t/oU7H - dIoz+oeGcTbUGVHblus3SPJYgfI0LxLSIPmaL4LyHOB5bClK6gswNDLKoUucoezvx+n9W3Dg49f0G8S5 - LUfZEU8MkpC8T43YQi8UVp3kutOFenAIvep+dClUkClVOPXNZoQ6L9NvEE3uN+PdMUBvRXevCgqVmjob - gGpgEH1PwPZYTq7soy9bDolcgRNfOWL/ZhP9BpEfLsVvMW70kQ1C2qMgEyVnUiUoQ2CuPZTUra7rYYi6 - ZDi+910EvbdEv0GYkwlKIj+BijrL+jUKbdJO1LZWwD19EUrrr0Cu6tMpzhCKJcj40gEB9ov1G4RsWoLi - UBe6V7r/n70RkPMOPDJMcLXqLPc0DF3ijBaRCOneG+H31kL9BkF2i3B9nzN1qoagQ4yDlzxQUE6/lHRd - XfLeGbA9cbccwk4JHggegi8UIc3LDj7rFug3CNiwENcCt6CH3ojm9g7qqoN79HZpF9rpjjumYGu2x3I8 - 4UNU85pwv0WAox5vY7f1/xj42SxAkf/7kCmUuNfUiho+FTa3gtfaRh22o6lNxMHWbI/lKut5uFVdh7sN - jTiybQN2rpmv18DQ1+rViUJfRwia+bjXLEB1YxNqyai+VUiditDY1sHB1myP5e408FFR34Cb5WVIdLXF - Zxbz2DywJYw51WkxZ9eqebxUFyvk7rDHD24bkOhig4RZEM/4yAZhm1Ziq6lRG2mxscmm2owwdF72suOn - ZkZCTzNjuJsaYdtT4vr63E4L4xcCSYv9IXiJU30i2BxlzmzkWRHsLp8GVsNqp2aygcHfZtZtYIryU78A - AAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERjY3MEZENEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERjY3MEZDNEQyMzExRTRCNDlGQUMwMzk0OTAw - Qzc4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjhGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6GKmpFAAAC+UlEQVRIS63T20vTYRzH8Yforj/Ei24UiSgKIygKi8oyxZQo - cvNYeXaesmzqPGu2POd0ulSsnIdaurTSTJ3O6UxTPGya5vCQx5AuPn39RbHop7nZxQt+z3ie93e/Z4w1 - p7nsCoBt8R6yBF/UHPv+Wb0rfFFzm99CRIwEW1gnqXzxTXxRc0ydctm4OlID2sxrw6iCtiwItC+A2P/D - frLnjwGNSZdMq6N1WOvLwFpP4l/WdRlY6Jaio9Ab7QXba8sVoDHZGdT8PYS9THDqMGnLsKpNw0qXGCua - BO55VZdNQ6U/DRRibVCGb+N1pH5bukoRqHmDHOIG1N8/X2F4I8WyNhtf2+9hqSsZxqZ4upbb6HsSZLHO - Im90ym6hNVcIaktYTexZyUelGEvaHMy/jcFiZxo0xX5Y7ivGcn8JkVmA9uvlWBmqwpJeAWovs+poR99O - eRgWtQWYVUdgrj0FH+i+F3XF3NoappZYGJrEoLaOVYpOOTY/FGJB+xjTqnDMtMTTAC/Ma/Ix/TLUKl9e - x0JfFQpql7PykBP7lWIXzPeUYLIhHCPKCLr/AMy2ZsKoDLTKdNNdvM8TgNpRTBZwfJ885CTmaIChPhwa - mS+GnkdhqjEWY9X+VplqvIMXEhdQ24mZeuSs0N/BNNWWj4k6EdSZHhhXxWH0aSCGFd4c4Tk7zk7XBlUM - FKLToK4Nm+0qYnneRzqGGiSYaIiiyZdhVCdgqFSIwRJPjucZW85O1pvnRmvDkO9zFNTdy2Y6HjGp4HCF - 5kk4xhoiURd/EROv4tBfeM0qAyUC9Mp9QM0+7o829T6LZV0/mNycS6+nFKFWfAGj9ZHozfGwil7miZYH - 7qCmghsw+S6VpV894KuUuKFbfhNNqa749CwY3dm0toK+VABl3HlQM5obYHybwFLc7W1y/Y5BlX6FfgNn - DNcEY0DhZZX+MiGKbh0DNR24AYYWMSfJzc6GZBApwS5skIzNODcg0dV2V36FtsJ7yBJ8UXO8hyzBFzXH - ++H/A/YDv9/V87iOlrYAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjlDMzFEOUI4NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjlDMzFEOUI3NEFBRjExRTQ4OTA5OUYwQ0QzM0Q2 - NEI4IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6MDk5Mzk2NTZBRjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz73sIMwAAADIElEQVRIS7WVa0iTYRTH56Uiysvm3TkvpLl5DRIvQYWVWl+6 - iNEVg0yhQqloQZHkLT+Y0YdAs75IpEUhzERZoZhsRpZlS7soblotsRwoxhqWeTrnYZtv+u7NsB74cZ5z - zv89/z17HzYRAPxXeIv/EpFXcOyi4BvKhfehv4FvKBfeh+ayqIUDlIgBgT8whpRYoT2fhgvNVJKBQT9s - hB8/QZDPpnEIjEhg0J5Pw4Vm0mwygG9T06BSqQQhTUhUMoRGpyxYT7OZwfhXC6jVakFIYzNYqN5uMGKa - BI1GIwhpghXJaJJi13d0dEB2bj74hsWzSDlXbzfQG02g0+kEIU2wIomdovzKdVifngnFFytBeb4cLN+n - WaSc6hfKKqB/eHTWoHfwExgMBkFII5MnQUD4WlAWloO26wVs35MDmifPmQFFyqlO/aKKqlmDp31DYDKZ - BCGNTJ4IPqHx8LJvACbNUw7p6e2HuJQMNIhhBuaHj3vBYrEI0tb1BoIiE9kJ9h7Oh7EJM+g/jEJuwVlY - s24ri5RTnfo5BedAIoueIYPumvomuHzjzm9cq2uCq7UNUH2rEarr7kNd0yP26Y+eKoSWtk4wfpmAg7kn - ITY5DUorq1g8cOQEqze3aplOEhRtJoMcL1mMTixV9IgD5a/tSBVDYql8AKOBQLEJtTP08gY/jjFiktKg - 5FIV21Ok3NazvmR2AvrFkCAJyGYk1comZAuHDM/AyLvHThfBveZ26NOPwI59eey7LsbhFCmnOvVJ5+Ef - rrYZLEU8EZ85+HLwW7ZCLMVTFWdkHoLut+/hgbYHaE9XN31XNsupTrWV3jKVs+uS3cyAD0cLe331jW3Q - qRt0CPUlQVHDKI+fN9iGo4W90uNnyuA2vvRtWTlQgxeg/dk7FimnOvU9/CNqUe47b7ANRwt7AfjpKvAK - Gt18Qur35ymhRfsKKLr5hN7EyzDq7humWrrcfSfKxbz/QlwcLDck1snZJdUzYHUDmk57+K1qdXJyzsL6 - RmQD9ZmObygXB8sVIRO6fXQB4hC6eRQppzr1XXmHclnAckFomLc1Um5dItEvhZ97MQXP9N0AAAAASUVO - RK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjhDMTdBQjRENEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjhDMTdBQjRDNEFBRTExRTQ4QjQyODY0MDNBNTJE - NzNCIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NUQyMjc4QTlBQjRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz4eHsDfAAAB00lEQVRIS7XVWytEURQH8HniTTNHLs0NCXNcXjTN5dH9g/gM - 3jx590QhFDJS0gyTGmpqaqJIMW4hzlAoOaWISS7LWifntI3ddnTGrl92e/57/We/DBsA/CvuYSHZSr0t - lvCGsriX/oI3lMW9lM/SwgF9SEHwizs08IX2vAyLZvZRgXJ+cQWv7yB0q96Ds86voT0vw6KZNJsK4Pnl - DWKxmBBlqhpDUN0UNp2n2VrB/WMOEomEEGX0ArN5o+BGfYB0Oi1EGa8cwpKw6bxRcH6lQiaTEaKMVw5q - rzCbNwr2z65BURQhynh8Qe0VZvNGwdZBFlRVFaKMxxfQXmE2rxc8rW3sQy6XE0puHoG7IaC9YnV9j5th - pbZPqOCDCrbH5uIwOD7/zWgkDkNTizAyuwQjkWWIxFNQWduqmVxI/MiPz6/A8HTUuDMTTYLkbrqhgt5S - T3PG4ZJ3HE7focElZx0u3yn+VQiG1ZLymmm7s74f88f42S6bl9zyJZ6d6Xckd+Mt5ieogH4xJORHHajt - SzvqZPSgECpHZSiA2DztuxBlad+NgnpBEbIjusiiYboKRF+kGFHegUR5ImkFv7G0eAPzWVq8gfksLd5/ - oULiHhYS97BwwPYJlSCUgVubViQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJEMDQyOEZBNEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJEMDQyOEY5NEFEMjExRTRBN0MxRDBCNzJGRUND - MDEzIiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6QkRDRkI1RDVEMTRBRTQxMTk3NEFD - QUFFQjRCMzVENkUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz59jfe3AAAEbUlEQVRIS8WTeUybZRzHF48/pnFOuQRajkFLgQFb5iRLNJr4 - l/EPgsniUI4xZDAY1zyxwApsMJyIME61rByl3DfoYGBrgbWUY06FcZSCha4rQ8jYxkqPr2/fvkv8o2Sg - S/wkT970eb6/T5/39z7Prv8dt/Oql4mR4HZJ3ccoXFxhVCzB9DT9JueJdSq6c1wzVZFupepVzxu34XVj - CaEDi1jX6hF8ZQoeokl4iBVwzV9YdU1XRlIl28eVo8phCdXwGltEeOUsro6psaHVwcSDh5volc4iOO8X - 7KuVwb1hEi7J8myq9PEQO//I85oafr0KtEpUpNSETm+AwWDAvfv3YTQaybnm/t/AyO6Ga+UonJOnIijF - 1hA9tWI2qle9RxcI+RIpmZpTIfBULhIyyqHVahHPKcN70TmYnFFCp9OhqXcc9KwW0DOHVl3YU1aUyjJu - F1SpfhO3EM6bMMsVt+D8Zhz2HIpC4oU6bG5uIu4cD3tfTwAjIBNypQYbGxsISquBU34PaDHiVEplGXee - SuIjVaBv3Lz7gJg8vHg4FlZvc+ATVoLipiHsD8qCXWAO7IPK8MG5FjLXKboOeoYADkldUkplGWb7vOb4 - 4BzxIXXQE/1m59WDXdgBvxPfwz6UC4eQUth/WIBDZ2qQXj+K7IYRImeE5s5fOFrcDPvPapcJzVNmmwVY - VxWG9U09uau1tTVymPpc0iYFLew7OEUJ4BwtALfvJpl5xMrKCu6s3cUrn5YbCM1us80CrJZZVWjXr7j3 - 4CE0y8v4IrcaH+cK4Bv+DRyPl8ApphYuia3wZ3eCUzOA1PIfcVuzjHnlIgK/vgy7mHzTG+w12yzA5E53 - edYPo1c2i/X1dQTEfwvbwDQ4hhXg8OcN4P48Df+UTrgkNIAeW4Hg3Hbo9Xq0iGSgs4ls5CUhoXnObLOA - S8pkhG/bdZzgDZJnffT3GXieLAA9XgB2/RjZjuQqMWhxfBw824H55XWyhcfy+HDNqoB1SH4Codn6G7iw - p3d78EaVPlXX0CaZgkqlgly1gpCiK0htHCH/IL6oFcEF3ZjT3CUvXqv0DzDSS0FPq1a/8EbYS5Rqa+if - SAJ8KoeNR7gitEsnoVQqSbGOkJmYX1ggxaY70SabwIGMUrjn8I3WIXnBRPnWu/8nDnE9Sd7cAaP/ZSES - 6/rRKJRArpiHXC7HzekZNIukiCyrhW9mGZgXa4w2kUVnibJnzdXbxP5URzyDO4QjxGl5i9uNpMZeKP5U - IrywAq9yCnGAOGGMonbYxpVnEPGdyR9BO/MTj8kfgXeNFPt5IngVtoF1kQ9WcTs8qgfgmNreQMS21xZL - 0E6Ln6ef75tg8sfgXT8O77oReAkkYNXJ4PRV/4ztyfo9VPTf4xjdf9CpQKzdxxuGe6UMbhXEmc8V6mze - r3qNivx3HGN7UmglQ6CVDMIxXwybo5UcaunJQD8te9rhyx4JrWwItlGNUut3y5+hlp4cDhFCpl14k9jq - nR+Y1NTjIe7NlmMnWKoHsOtvjWYcKpheqFQAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAADZmlUWHRYTUw6Y29tLmFkb2Jl - LnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQi - Pz4gPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iQWRvYmUgWE1QIENv - cmUgNS4zLWMwMTEgNjYuMTQ1NjYxLCAyMDEyLzAyLzA2LTE0OjU2OjI3ICAgICAgICAiPiA8cmRmOlJE - RiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPiA8 - cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNv - bS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlw - ZS9SZXNvdXJjZVJlZiMiIHhtbG5zOnhtcD0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wLyIgeG1w - TU06T3JpZ2luYWxEb2N1bWVudElEPSJ4bXAuZGlkOjJGQzkyMzc0Rjk0OUU0MTE5NjNCQjRENDMzQjlC - MUM4IiB4bXBNTTpEb2N1bWVudElEPSJ4bXAuZGlkOjJERTg4QTFENEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXBNTTpJbnN0YW5jZUlEPSJ4bXAuaWlkOjJERTg4QTFDNEQyMjExRTRBODEyODk0M0RBMTc5 - Qjg3IiB4bXA6Q3JlYXRvclRvb2w9IkFkb2JlIFBob3Rvc2hvcCBDUzYgKFdpbmRvd3MpIj4gPHhtcE1N - OkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NjJGOUEyRDEyMTRERTQxMUIzNkJE - NUVDQjU5MzE1NjIiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6MkZDOTIzNzRGOTQ5RTQxMTk2M0JC - NEQ0MzNCOUIxQzgiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/ - eHBhY2tldCBlbmQ9InIiPz6wJF34AAACl0lEQVRIS62Vy08TURSH73/QhQtXVnBhxEcMiUkhbEg0hB1R - Q1i68C8wIW5cEqMLN7ho2Ji4YiEhWq0prYUhfULbadN3obTaChobtZEUsFY9nnPS6WM6HYowyZf87j33 - nG/amaai9geOBYA+4pTxihmBE8DcTQB4J8em/9IwSQyagmrtL+z9rMFmvnhkKvtV7tcVHPz6DVsftulA - AckdhUg8zf19eoLKAd597iMLMItewfOxUDTN/bqCH3tVSG8VWIBZ9AoJApEk9+sKvu/uQ2IjzwJkGtH8 - OrTwy3Hu77vIAnV9mgWlcgWiqRwLjAMmkOMbPbNTKnN/JJntqJGEBZ++7oKcyLLgLN4JrU8Cms2C4pcy - BKKZumCI18temQ/8DzSLZlBmQX7nG/jCKdpgAa0driCtY5iFHuqHSjNoFtaags1iCdzBBG+QgNY2aZ0F - mIUe6osENAtrTUEq/7kDq9PHAszU5yYoq9f1i9cUSCD5ozxDEeTsrhAoONwyxLLb8MrhYQFmZYCHsnpd - v3hNgQROb5hnKIK29944MAThTBEWbS4WYBZ6qC/sKSy5ZJ6BGUQg8b4Bbhjod4AZXlhXWdBa10LrIVul - AM9ggS+aa6AIMMO8ZYUO0KeyIOMtZyaQpXpNi4LFucYzMINwhbMNcMNw5oIJMMNKIA0LNg88mZuH/ssj - dPgBMnN+cBRmny1wrRtSMMMzWCCFMg0UAeY2Fh0+GL5xG8Zu3oHXUrCj3g0WONdTbeBm21/o1N17gPtg - 98Xh3VoS3qzKMDI22agfglnY/Uld8NDc/ZlZwAwvl4Ngun6LGh8rdfVDViNs3rguOOzq6XOD8PDpc7g2 - OkHDH7XWtYa2It66Y4eCQ8cRfpvUNa2hTUD8A6JMaBvCyTdJAAAAAElFTkSuQmCC - - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/SysRescInfoManager.cs b/SysRescInfoManager.cs index 5bb9699..1813065 100644 --- a/SysRescInfoManager.cs +++ b/SysRescInfoManager.cs @@ -19,6 +19,7 @@ { IS_OPEN = true; reloadGrid(); + /* if (Utility.isNeedLogin&&!Utility.userRole.Contains("资源新增")) { btn_add.Visible = false; @@ -27,6 +28,7 @@ { dataGridViewX1.Columns["btndel"].Visible = false; } + * */ } private void SysRescInfoManager_FormClosing(object sender, FormClosingEventArgs e) diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe index 0cb70b2..0970ba1 100644 --- a/bin/x86/Debug/Cyberpipe.exe +++ b/bin/x86/Debug/Cyberpipe.exe Binary files differ