diff --git a/Cyberpipe.suo b/Cyberpipe.suo index c93777d..848b0fa 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index c93777d..848b0fa 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 0434fdc..f127496 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -275,7 +275,7 @@ if (table.Rows.Count == 0) { - MessageBox.Show("没有找到任何数据！", "提示"); + MessageBox.Show("时间段内没有记录数据！", "提示"); } for (int i = 0; i < table.Rows.Count; i++) { diff --git a/Cyberpipe.suo b/Cyberpipe.suo index c93777d..848b0fa 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 0434fdc..f127496 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -275,7 +275,7 @@ if (table.Rows.Count == 0) { - MessageBox.Show("没有找到任何数据！", "提示"); + MessageBox.Show("时间段内没有记录数据！", "提示"); } for (int i = 0; i < table.Rows.Count; i++) { diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 78d8946..bb83fc0 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -28,10 +28,6 @@ InitializeComponent(); } - private ArrayList files =new ArrayList (); - private ArrayList modeltypes = new ArrayList(); //井的型号 - private ArrayList deeps = new ArrayList(); - private bool invalidate() { if (comboBoxLayer.SelectedItem.ToString().Trim() == "") diff --git a/Cyberpipe.suo b/Cyberpipe.suo index c93777d..848b0fa 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 0434fdc..f127496 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -275,7 +275,7 @@ if (table.Rows.Count == 0) { - MessageBox.Show("没有找到任何数据！", "提示"); + MessageBox.Show("时间段内没有记录数据！", "提示"); } for (int i = 0; i < table.Rows.Count; i++) { diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 78d8946..bb83fc0 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -28,10 +28,6 @@ InitializeComponent(); } - private ArrayList files =new ArrayList (); - private ArrayList modeltypes = new ArrayList(); //井的型号 - private ArrayList deeps = new ArrayList(); - private bool invalidate() { if (comboBoxLayer.SelectedItem.ToString().Trim() == "") diff --git a/MainFrm.cs b/MainFrm.cs index 12a14de..89d866e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -36,7 +36,6 @@ GSOBalloon featureTooltip; GSOBalloonEx balloonEx; - GSOBalloon featureTooltip2; GSOBalloonEx balloonEx2; @@ -1303,7 +1302,6 @@ layerTree.Nodes.Add(layerManagerNode); TreeUtils.InitLayerTree(globeControl1, layerTree, null); - } private void initMarkerTree() diff --git a/Cyberpipe.suo b/Cyberpipe.suo index c93777d..848b0fa 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 0434fdc..f127496 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -275,7 +275,7 @@ if (table.Rows.Count == 0) { - MessageBox.Show("没有找到任何数据！", "提示"); + MessageBox.Show("时间段内没有记录数据！", "提示"); } for (int i = 0; i < table.Rows.Count; i++) { diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 78d8946..bb83fc0 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -28,10 +28,6 @@ InitializeComponent(); } - private ArrayList files =new ArrayList (); - private ArrayList modeltypes = new ArrayList(); //井的型号 - private ArrayList deeps = new ArrayList(); - private bool invalidate() { if (comboBoxLayer.SelectedItem.ToString().Trim() == "") diff --git a/MainFrm.cs b/MainFrm.cs index 12a14de..89d866e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -36,7 +36,6 @@ GSOBalloon featureTooltip; GSOBalloonEx balloonEx; - GSOBalloon featureTooltip2; GSOBalloonEx balloonEx2; @@ -1303,7 +1302,6 @@ layerTree.Nodes.Add(layerManagerNode); TreeUtils.InitLayerTree(globeControl1, layerTree, null); - } private void initMarkerTree() diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 906b56f..b034ad3 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -244,6 +244,25 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -258,17 +277,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -285,14 +293,6 @@ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -529,13 +529,13 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -2149,9 +2149,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -2201,15 +2201,305 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + 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.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.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + // + // gxdw_ribbonbar + // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; + // + // + // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; + // + // + // + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // buttonItem10 + // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); + // + // buttonItem11 + // + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); + // + // buttonItem12 + // + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); + // + // buttonItem13 + // + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + // + // buttonItem14 + // + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); + // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar4); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -2248,7 +2538,7 @@ this.slider4ground}); this.ribbonBar4.Location = new System.Drawing.Point(3, 0); this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(634, 92); + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar4.TabIndex = 0; // @@ -2428,175 +2718,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - 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.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.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133, - 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // buttonItem132 - // - this.buttonItem132.Name = "buttonItem132"; - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2880,127 +3001,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3625,7 +3625,6 @@ // ribbonTabItem11 // this.ribbonTabItem11.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem11.Checked = true; this.ribbonTabItem11.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem11.HoverImage"))); this.ribbonTabItem11.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem11.Image"))); this.ribbonTabItem11.Name = "ribbonTabItem11"; @@ -3676,6 +3675,7 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -4458,7 +4458,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(32566, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(32863, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4552,7 +4552,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(32565, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(32862, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5792,13 +5792,13 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index c93777d..848b0fa 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 0434fdc..f127496 100644 --- a/EMS_Forms/Form_EventManager.cs +++ b/EMS_Forms/Form_EventManager.cs @@ -275,7 +275,7 @@ if (table.Rows.Count == 0) { - MessageBox.Show("没有找到任何数据！", "提示"); + MessageBox.Show("时间段内没有记录数据！", "提示"); } for (int i = 0; i < table.Rows.Count; i++) { diff --git a/FrmAddWellShp.cs b/FrmAddWellShp.cs index 78d8946..bb83fc0 100644 --- a/FrmAddWellShp.cs +++ b/FrmAddWellShp.cs @@ -28,10 +28,6 @@ InitializeComponent(); } - private ArrayList files =new ArrayList (); - private ArrayList modeltypes = new ArrayList(); //井的型号 - private ArrayList deeps = new ArrayList(); - private bool invalidate() { if (comboBoxLayer.SelectedItem.ToString().Trim() == "") diff --git a/MainFrm.cs b/MainFrm.cs index 12a14de..89d866e 100644 --- a/MainFrm.cs +++ b/MainFrm.cs @@ -36,7 +36,6 @@ GSOBalloon featureTooltip; GSOBalloonEx balloonEx; - GSOBalloon featureTooltip2; GSOBalloonEx balloonEx2; @@ -1303,7 +1302,6 @@ layerTree.Nodes.Add(layerManagerNode); TreeUtils.InitLayerTree(globeControl1, layerTree, null); - } private void initMarkerTree() diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index 906b56f..b034ad3 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -244,6 +244,25 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); + this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); + this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); + this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); + this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); + this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); + this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); + this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); @@ -258,17 +277,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem132 = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonBar13 = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem127 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem128 = new DevComponents.DotNetBar.ButtonItem(); - this.sliderItem1 = new DevComponents.DotNetBar.SliderItem(); - this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem(); - this.btn_check_history = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -285,14 +293,6 @@ this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar(); this.btn_document_info = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel7 = new DevComponents.DotNetBar.RibbonPanel(); - this.gxdw_ribbonbar = new DevComponents.DotNetBar.RibbonBar(); - this.buttonItem9 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem10 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem11 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem12 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem13 = new DevComponents.DotNetBar.ButtonItem(); - this.buttonItem14 = new DevComponents.DotNetBar.ButtonItem(); this.ribbonPanel15 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar20 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemSH = new DevComponents.DotNetBar.ButtonItem(); @@ -529,13 +529,13 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); + this.ribbonPanel12.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); this.ribbonPanel1.SuspendLayout(); - this.ribbonPanel12.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel4.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); this.panelOfTable.SuspendLayout(); @@ -720,7 +720,7 @@ this.toolStripDropDownButton1.Image = ((System.Drawing.Image)(resources.GetObject("toolStripDropDownButton1.Image"))); this.toolStripDropDownButton1.ImageTransparentColor = System.Drawing.Color.Magenta; this.toolStripDropDownButton1.Name = "toolStripDropDownButton1"; - this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 21); + this.toolStripDropDownButton1.Size = new System.Drawing.Size(45, 20); this.toolStripDropDownButton1.Text = "帮助"; this.toolStripDropDownButton1.Visible = false; // @@ -2149,9 +2149,9 @@ // this.ribbonControl1.BackgroundStyle.Class = ""; this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); @@ -2201,15 +2201,305 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // ribbonPanel12 + // + this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + 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.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.Style.Class = ""; + this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseDown.Class = ""; + this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel12.StyleMouseOver.Class = ""; + this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel12.TabIndex = 34; + this.ribbonPanel12.Visible = false; + // + // ribbonBar18 + // + this.ribbonBar18.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.BackgroundStyle.Class = ""; + this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.ContainerControlProcessDialogKey = true; + this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem133, + 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar18.TabIndex = 1; + // + // + // + this.ribbonBar18.TitleStyle.Class = ""; + this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar18.TitleStyleMouseOver.Class = ""; + this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar18.TitleVisible = false; + // + // buttonItem133 + // + this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); + this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem133.Name = "buttonItem133"; + this.buttonItem133.SubItemsExpandWidth = 14; + this.buttonItem133.Text = "审核入库"; + this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); + // + // buttonItem132 + // + this.buttonItem132.Name = "buttonItem132"; + // + // ribbonBar13 + // + this.ribbonBar13.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.BackgroundStyle.Class = ""; + this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.ContainerControlProcessDialogKey = true; + this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem127, + this.buttonItem128, + this.sliderItem1, + this.buttonItem134, + this.buttonItem130, + 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar13.TabIndex = 0; + // + // + // + this.ribbonBar13.TitleStyle.Class = ""; + this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar13.TitleStyleMouseOver.Class = ""; + this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar13.TitleVisible = false; + // + // buttonItem127 + // + this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); + this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem127.Name = "buttonItem127"; + this.buttonItem127.SubItemsExpandWidth = 14; + this.buttonItem127.Text = "打开数据"; + this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); + // + // buttonItem128 + // + this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); + this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem128.Name = "buttonItem128"; + this.buttonItem128.SubItemsExpandWidth = 14; + this.buttonItem128.Text = "一键审核"; + this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); + // + // sliderItem1 + // + this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.sliderItem1.LabelWidth = 50; + this.sliderItem1.Name = "sliderItem1"; + this.sliderItem1.Text = "地面透明度"; + this.sliderItem1.TextColor = System.Drawing.Color.Black; + this.sliderItem1.Value = 0; + this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); + // + // buttonItem134 + // + this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); + this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem134.Name = "buttonItem134"; + this.buttonItem134.SubItemsExpandWidth = 14; + this.buttonItem134.Text = "模拟设计修改"; + this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); + // + // buttonItem130 + // + this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); + this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem130.Name = "buttonItem130"; + this.buttonItem130.SubItemsExpandWidth = 14; + this.buttonItem130.Text = "导出审核图"; + this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); + // + // btn_check_history + // + this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); + this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_check_history.Name = "btn_check_history"; + this.btn_check_history.SubItemsExpandWidth = 14; + this.btn_check_history.Text = "审核历史"; + this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); + // + // ribbonPanel7 + // + this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); + this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; + this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); + this.ribbonPanel7.Name = "ribbonPanel7"; + this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); + this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); + // + // + // + this.ribbonPanel7.Style.Class = ""; + this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseDown.Class = ""; + this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel7.StyleMouseOver.Class = ""; + this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel7.TabIndex = 41; + // + // gxdw_ribbonbar + // + this.gxdw_ribbonbar.AutoOverflowEnabled = true; + // + // + // + this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gxdw_ribbonbar.BackgroundStyle.Class = ""; + this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; + this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; + this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.buttonItem9, + this.buttonItem10, + this.buttonItem11, + this.buttonItem12, + this.buttonItem13, + this.buttonItem14}); + this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); + this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; + this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); + this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.gxdw_ribbonbar.TabIndex = 0; + this.gxdw_ribbonbar.Text = "ribbonBar5"; + // + // + // + this.gxdw_ribbonbar.TitleStyle.Class = ""; + this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; + this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.gxdw_ribbonbar.TitleVisible = false; + // + // buttonItem9 + // + this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; + this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem9.Name = "buttonItem9"; + this.buttonItem9.SubItemsExpandWidth = 14; + this.buttonItem9.Text = "工单管理"; + this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); + // + // buttonItem10 + // + this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; + this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem10.Name = "buttonItem10"; + this.buttonItem10.SubItemsExpandWidth = 14; + this.buttonItem10.Text = "在线任务"; + this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); + // + // buttonItem11 + // + this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; + this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem11.Name = "buttonItem11"; + this.buttonItem11.SubItemsExpandWidth = 14; + this.buttonItem11.Text = "事件管理"; + this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); + // + // buttonItem12 + // + this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; + this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem12.Name = "buttonItem12"; + this.buttonItem12.SubItemsExpandWidth = 14; + this.buttonItem12.Text = "探测仪管理"; + this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); + // + // buttonItem13 + // + this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; + this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem13.Name = "buttonItem13"; + this.buttonItem13.SubItemsExpandWidth = 14; + this.buttonItem13.Text = "巡检人员维护"; + this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); + // + // buttonItem14 + // + this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; + this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.buttonItem14.Name = "buttonItem14"; + this.buttonItem14.SubItemsExpandWidth = 14; + this.buttonItem14.Text = "导出施工图"; + this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); + // // ribbonPanel3 // this.ribbonPanel3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonPanel3.Controls.Add(this.ribbonBar4); this.ribbonPanel3.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel3.Location = new System.Drawing.Point(0, 0); + this.ribbonPanel3.Location = new System.Drawing.Point(0, 33); this.ribbonPanel3.Name = "ribbonPanel3"; this.ribbonPanel3.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel3.Size = new System.Drawing.Size(1328, 95); + this.ribbonPanel3.Size = new System.Drawing.Size(1328, 62); // // // @@ -2248,7 +2538,7 @@ this.slider4ground}); this.ribbonBar4.Location = new System.Drawing.Point(3, 0); this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(634, 92); + this.ribbonBar4.Size = new System.Drawing.Size(634, 59); this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.ribbonBar4.TabIndex = 0; // @@ -2428,175 +2718,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_Click); // - // ribbonPanel12 - // - this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - 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.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.Style.Class = ""; - this.ribbonPanel12.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseDown.Class = ""; - this.ribbonPanel12.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel12.StyleMouseOver.Class = ""; - this.ribbonPanel12.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel12.TabIndex = 34; - // - // ribbonBar18 - // - this.ribbonBar18.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar18.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar18.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.BackgroundStyle.Class = ""; - this.ribbonBar18.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.ContainerControlProcessDialogKey = true; - this.ribbonBar18.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar18.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem133, - 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar18.TabIndex = 1; - // - // - // - this.ribbonBar18.TitleStyle.Class = ""; - this.ribbonBar18.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar18.TitleStyleMouseOver.Class = ""; - this.ribbonBar18.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar18.TitleVisible = false; - // - // buttonItem133 - // - this.buttonItem133.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem133.Image"))); - this.buttonItem133.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem133.Name = "buttonItem133"; - this.buttonItem133.SubItemsExpandWidth = 14; - this.buttonItem133.Text = "审核入库"; - this.buttonItem133.Click += new System.EventHandler(this.buttonItem133_Click_1); - // - // buttonItem132 - // - this.buttonItem132.Name = "buttonItem132"; - // - // ribbonBar13 - // - this.ribbonBar13.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar13.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar13.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.BackgroundStyle.Class = ""; - this.ribbonBar13.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.ContainerControlProcessDialogKey = true; - this.ribbonBar13.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar13.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem127, - this.buttonItem128, - this.sliderItem1, - this.buttonItem134, - this.buttonItem130, - 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.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar13.TabIndex = 0; - // - // - // - this.ribbonBar13.TitleStyle.Class = ""; - this.ribbonBar13.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar13.TitleStyleMouseOver.Class = ""; - this.ribbonBar13.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar13.TitleVisible = false; - // - // buttonItem127 - // - this.buttonItem127.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem127.Image"))); - this.buttonItem127.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem127.Name = "buttonItem127"; - this.buttonItem127.SubItemsExpandWidth = 14; - this.buttonItem127.Text = "打开数据"; - this.buttonItem127.Click += new System.EventHandler(this.buttonItem127_Click_2); - // - // buttonItem128 - // - this.buttonItem128.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem128.Image"))); - this.buttonItem128.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem128.Name = "buttonItem128"; - this.buttonItem128.SubItemsExpandWidth = 14; - this.buttonItem128.Text = "一键审核"; - this.buttonItem128.Click += new System.EventHandler(this.buttonItem128_Click); - // - // sliderItem1 - // - this.sliderItem1.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.sliderItem1.LabelWidth = 50; - this.sliderItem1.Name = "sliderItem1"; - this.sliderItem1.Text = "地面透明度"; - this.sliderItem1.TextColor = System.Drawing.Color.Black; - this.sliderItem1.Value = 0; - this.sliderItem1.ValueChanged += new System.EventHandler(this.sliderItem1_ValueChanged); - // - // buttonItem134 - // - this.buttonItem134.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem134.Image"))); - this.buttonItem134.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem134.Name = "buttonItem134"; - this.buttonItem134.SubItemsExpandWidth = 14; - this.buttonItem134.Text = "模拟设计修改"; - this.buttonItem134.Click += new System.EventHandler(this.buttonItem134_Click_1); - // - // buttonItem130 - // - this.buttonItem130.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem130.Image"))); - this.buttonItem130.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem130.Name = "buttonItem130"; - this.buttonItem130.SubItemsExpandWidth = 14; - this.buttonItem130.Text = "导出审核图"; - this.buttonItem130.Click += new System.EventHandler(this.buttonItem130_Click_1); - // - // btn_check_history - // - this.btn_check_history.Image = ((System.Drawing.Image)(resources.GetObject("btn_check_history.Image"))); - this.btn_check_history.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_check_history.Name = "btn_check_history"; - this.btn_check_history.SubItemsExpandWidth = 14; - this.btn_check_history.Text = "审核历史"; - this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -2880,127 +3001,6 @@ this.btn_document_info.Text = "文档管理"; this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click); // - // ribbonPanel7 - // - this.ribbonPanel7.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonPanel7.Controls.Add(this.gxdw_ribbonbar); - this.ribbonPanel7.Dock = System.Windows.Forms.DockStyle.Fill; - this.ribbonPanel7.Location = new System.Drawing.Point(0, 33); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 62); - // - // - // - this.ribbonPanel7.Style.Class = ""; - this.ribbonPanel7.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseDown.Class = ""; - this.ribbonPanel7.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel7.StyleMouseOver.Class = ""; - this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel7.TabIndex = 41; - this.ribbonPanel7.Visible = false; - // - // gxdw_ribbonbar - // - this.gxdw_ribbonbar.AutoOverflowEnabled = true; - // - // - // - this.gxdw_ribbonbar.BackgroundMouseOverStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.BackgroundStyle.Class = ""; - this.gxdw_ribbonbar.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.ContainerControlProcessDialogKey = true; - this.gxdw_ribbonbar.Dock = System.Windows.Forms.DockStyle.Left; - this.gxdw_ribbonbar.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.buttonItem9, - this.buttonItem10, - this.buttonItem11, - this.buttonItem12, - this.buttonItem13, - this.buttonItem14}); - this.gxdw_ribbonbar.Location = new System.Drawing.Point(3, 0); - this.gxdw_ribbonbar.Name = "gxdw_ribbonbar"; - this.gxdw_ribbonbar.Size = new System.Drawing.Size(564, 59); - this.gxdw_ribbonbar.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.gxdw_ribbonbar.TabIndex = 0; - this.gxdw_ribbonbar.Text = "ribbonBar5"; - // - // - // - this.gxdw_ribbonbar.TitleStyle.Class = ""; - this.gxdw_ribbonbar.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.gxdw_ribbonbar.TitleStyleMouseOver.Class = ""; - this.gxdw_ribbonbar.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.gxdw_ribbonbar.TitleVisible = false; - // - // buttonItem9 - // - this.buttonItem9.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__76; - this.buttonItem9.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem9.Name = "buttonItem9"; - this.buttonItem9.SubItemsExpandWidth = 14; - this.buttonItem9.Text = "工单管理"; - this.buttonItem9.Click += new System.EventHandler(this.buttonItem9_Click); - // - // buttonItem10 - // - this.buttonItem10.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__69; - this.buttonItem10.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem10.Name = "buttonItem10"; - this.buttonItem10.SubItemsExpandWidth = 14; - this.buttonItem10.Text = "在线任务"; - this.buttonItem10.Click += new System.EventHandler(this.buttonItem10_Click); - // - // buttonItem11 - // - this.buttonItem11.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__72; - this.buttonItem11.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem11.Name = "buttonItem11"; - this.buttonItem11.SubItemsExpandWidth = 14; - this.buttonItem11.Text = "事件管理"; - this.buttonItem11.Click += new System.EventHandler(this.buttonItem11_Click); - // - // buttonItem12 - // - this.buttonItem12.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__34; - this.buttonItem12.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem12.Name = "buttonItem12"; - this.buttonItem12.SubItemsExpandWidth = 14; - this.buttonItem12.Text = "探测仪管理"; - this.buttonItem12.Click += new System.EventHandler(this.buttonItem12_Click); - // - // buttonItem13 - // - this.buttonItem13.Image = global::Cyberpipe.Properties.Resources._24x24icon_13_hover; - this.buttonItem13.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem13.Name = "buttonItem13"; - this.buttonItem13.SubItemsExpandWidth = 14; - this.buttonItem13.Text = "巡检人员维护"; - this.buttonItem13.Click += new System.EventHandler(this.buttonItem13_Click); - // - // buttonItem14 - // - this.buttonItem14.Image = global::Cyberpipe.Properties.Resources._24x24icon__2__56; - this.buttonItem14.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.buttonItem14.Name = "buttonItem14"; - this.buttonItem14.SubItemsExpandWidth = 14; - this.buttonItem14.Text = "导出施工图"; - this.buttonItem14.Click += new System.EventHandler(this.buttonItem14_Click); - // // ribbonPanel15 // this.ribbonPanel15.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3625,7 +3625,6 @@ // ribbonTabItem11 // this.ribbonTabItem11.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; - this.ribbonTabItem11.Checked = true; this.ribbonTabItem11.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem11.HoverImage"))); this.ribbonTabItem11.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem11.Image"))); this.ribbonTabItem11.Name = "ribbonTabItem11"; @@ -3676,6 +3675,7 @@ // ribbonTabItem7 // this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText; + this.ribbonTabItem7.Checked = true; this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover; this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02; this.ribbonTabItem7.Name = "ribbonTabItem7"; @@ -4458,7 +4458,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(32566, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(32863, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4552,7 +4552,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(32565, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(32862, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5792,13 +5792,13 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); + this.ribbonPanel12.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); this.ribbonPanel1.ResumeLayout(false); - this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel4.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); this.panelOfTable.ResumeLayout(false); diff --git a/Utility.cs b/Utility.cs index fe13d93..6672086 100644 --- a/Utility.cs +++ b/Utility.cs @@ -18,7 +18,7 @@ public static string dbdatabase; public static string userID; -// public static Hashtable Pipe_QueryFields; +// public static Hashtable Pipe_QueryFields; public static string DBPassword; public static string DBServer; public static string DBBackUp;