diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index b447563..1e4112e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,7 +90,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(); @@ -239,6 +238,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -246,10 +257,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -315,14 +322,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = 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.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -519,6 +518,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(); @@ -529,11 +529,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -957,18 +957,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; @@ -2115,9 +2103,9 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel2); @@ -2165,6 +2153,208 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // 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, 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, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // 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); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -2280,87 +2470,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_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, 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, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3003,127 +3112,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_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, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - 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, 92); - 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); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4473,7 +4461,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(40288, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(40882, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4567,7 +4555,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(40287, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(40881, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5489,7 +5477,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(113, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5573,7 +5561,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(112, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5753,6 +5741,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; @@ -5795,11 +5795,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index b447563..1e4112e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,7 +90,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(); @@ -239,6 +238,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -246,10 +257,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -315,14 +322,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = 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.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -519,6 +518,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(); @@ -529,11 +529,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -957,18 +957,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; @@ -2115,9 +2103,9 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel2); @@ -2165,6 +2153,208 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // 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, 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, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // 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); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -2280,87 +2470,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_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, 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, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3003,127 +3112,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_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, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - 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, 92); - 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); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4473,7 +4461,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(40288, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(40882, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4567,7 +4555,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(40287, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(40881, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5489,7 +5477,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(113, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5573,7 +5561,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(112, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5753,6 +5741,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; @@ -5795,11 +5795,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Utility.cs b/Utility.cs index 26cdcec..750b62e 100644 --- a/Utility.cs +++ b/Utility.cs @@ -41,7 +41,7 @@ public static string projectStr; public static string userRole; - public static Boolean isNeedLogin = false;//设定是否需要登录的开关 + public static Boolean isNeedLogin = true;//设定是否需要登录的开关 //数据配置 public static List listDb; diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index b447563..1e4112e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,7 +90,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(); @@ -239,6 +238,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -246,10 +257,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -315,14 +322,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = 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.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -519,6 +518,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(); @@ -529,11 +529,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -957,18 +957,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; @@ -2115,9 +2103,9 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel2); @@ -2165,6 +2153,208 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // 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, 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, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // 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); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -2280,87 +2470,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_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, 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, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3003,127 +3112,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_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, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - 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, 92); - 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); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4473,7 +4461,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(40288, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(40882, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4567,7 +4555,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(40287, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(40881, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5489,7 +5477,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(113, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5573,7 +5561,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(112, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5753,6 +5741,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; @@ -5795,11 +5795,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Utility.cs b/Utility.cs index 26cdcec..750b62e 100644 --- a/Utility.cs +++ b/Utility.cs @@ -41,7 +41,7 @@ public static string projectStr; public static string userRole; - public static Boolean isNeedLogin = false;//设定是否需要登录的开关 + public static Boolean isNeedLogin = true;//设定是否需要登录的开关 //数据配置 public static List listDb; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 66f3d81..5751541 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -24,12 +24,12 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml - /Resource/登录页.png + /Resource/登录页.jpg http://192.168.0.102:8080/ctrl 21 /Resource/title.jpg /Resource/图例P.jpg - 地下管线规划分析系统 + 民晟热电热力管线综合管理系统 航天二院智慧管网工程研究与发展中心 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index b447563..1e4112e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,7 +90,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(); @@ -239,6 +238,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -246,10 +257,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -315,14 +322,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = 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.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -519,6 +518,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(); @@ -529,11 +529,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -957,18 +957,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; @@ -2115,9 +2103,9 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel2); @@ -2165,6 +2153,208 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // 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, 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, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // 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); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -2280,87 +2470,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_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, 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, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3003,127 +3112,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_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, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - 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, 92); - 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); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4473,7 +4461,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(40288, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(40882, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4567,7 +4555,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(40287, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(40881, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5489,7 +5477,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(113, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5573,7 +5561,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(112, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5753,6 +5741,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; @@ -5795,11 +5795,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Utility.cs b/Utility.cs index 26cdcec..750b62e 100644 --- a/Utility.cs +++ b/Utility.cs @@ -41,7 +41,7 @@ public static string projectStr; public static string userRole; - public static Boolean isNeedLogin = false;//设定是否需要登录的开关 + public static Boolean isNeedLogin = true;//设定是否需要登录的开关 //数据配置 public static List listDb; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 66f3d81..5751541 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -24,12 +24,12 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml - /Resource/登录页.png + /Resource/登录页.jpg http://192.168.0.102:8080/ctrl 21 /Resource/title.jpg /Resource/图例P.jpg - 地下管线规划分析系统 + 民晟热电热力管线综合管理系统 航天二院智慧管网工程研究与发展中心 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/FieldValidate.xml b/bin/x86/Debug/FieldValidate.xml index 730c16d..fcb44ca 100644 --- a/bin/x86/Debug/FieldValidate.xml +++ b/bin/x86/Debug/FieldValidate.xml @@ -104,7 +104,7 @@ - + diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index b447563..1e4112e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,7 +90,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(); @@ -239,6 +238,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -246,10 +257,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -315,14 +322,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = 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.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -519,6 +518,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(); @@ -529,11 +529,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -957,18 +957,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; @@ -2115,9 +2103,9 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel2); @@ -2165,6 +2153,208 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // 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, 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, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // 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); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -2280,87 +2470,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_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, 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, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3003,127 +3112,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_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, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - 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, 92); - 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); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4473,7 +4461,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(40288, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(40882, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4567,7 +4555,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(40287, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(40881, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5489,7 +5477,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(113, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5573,7 +5561,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(112, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5753,6 +5741,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; @@ -5795,11 +5795,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Utility.cs b/Utility.cs index 26cdcec..750b62e 100644 --- a/Utility.cs +++ b/Utility.cs @@ -41,7 +41,7 @@ public static string projectStr; public static string userRole; - public static Boolean isNeedLogin = false;//设定是否需要登录的开关 + public static Boolean isNeedLogin = true;//设定是否需要登录的开关 //数据配置 public static List listDb; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 66f3d81..5751541 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -24,12 +24,12 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml - /Resource/登录页.png + /Resource/登录页.jpg http://192.168.0.102:8080/ctrl 21 /Resource/title.jpg /Resource/图例P.jpg - 地下管线规划分析系统 + 民晟热电热力管线综合管理系统 航天二院智慧管网工程研究与发展中心 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/FieldValidate.xml b/bin/x86/Debug/FieldValidate.xml index 730c16d..fcb44ca 100644 --- a/bin/x86/Debug/FieldValidate.xml +++ b/bin/x86/Debug/FieldValidate.xml @@ -104,7 +104,7 @@ - + diff --git a/bin/x86/Debug/Resource/title.jpg b/bin/x86/Debug/Resource/title.jpg index d5615ee..2dc550c 100644 --- a/bin/x86/Debug/Resource/title.jpg +++ b/bin/x86/Debug/Resource/title.jpg Binary files differ diff --git a/Cyberpipe.suo b/Cyberpipe.suo index 561679b..9c39c2a 100644 --- a/Cyberpipe.suo +++ b/Cyberpipe.suo Binary files differ diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs index 380c116..32c53e8 100644 --- a/FrmFlagManagers.cs +++ b/FrmFlagManagers.cs @@ -218,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()); @@ -233,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())) diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs index b447563..1e4112e 100644 --- a/MainFrm.designer.cs +++ b/MainFrm.designer.cs @@ -90,7 +90,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(); @@ -239,6 +238,18 @@ this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl(); + this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); + this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); + this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); + this.slider4ground = new DevComponents.DotNetBar.SliderItem(); + 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.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem1 = new DevComponents.DotNetBar.ButtonItem(); @@ -246,10 +257,6 @@ this.btnlegendSet = new DevComponents.DotNetBar.ButtonItem(); this.buttonItem89 = new DevComponents.DotNetBar.ButtonItem(); this.btnOutputJPG = new DevComponents.DotNetBar.ButtonItem(); - this.ribbonPanel3 = new DevComponents.DotNetBar.RibbonPanel(); - this.ribbonBar4 = new DevComponents.DotNetBar.RibbonBar(); - this.btn_flag = new DevComponents.DotNetBar.ButtonItem(); - this.slider4ground = new DevComponents.DotNetBar.SliderItem(); this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem(); @@ -315,14 +322,6 @@ this.buttonItemXT4 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_1 = new DevComponents.DotNetBar.ButtonItem(); this.buttonItemXT4_2 = 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.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel(); this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar(); this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem(); @@ -519,6 +518,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(); @@ -529,11 +529,11 @@ this.contextMenuStrip3.SuspendLayout(); this.contextMenuStripDeleteLayerNode.SuspendLayout(); this.ribbonControl1.SuspendLayout(); - this.ribbonPanel1.SuspendLayout(); this.ribbonPanel3.SuspendLayout(); + this.ribbonPanel7.SuspendLayout(); + this.ribbonPanel1.SuspendLayout(); this.ribbonPanel12.SuspendLayout(); this.ribbonPanel15.SuspendLayout(); - this.ribbonPanel7.SuspendLayout(); this.ribbonPanel5.SuspendLayout(); this.ribbonPanel6.SuspendLayout(); this.ribbonPanel2.SuspendLayout(); @@ -957,18 +957,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; @@ -2115,9 +2103,9 @@ this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; this.ribbonControl1.Controls.Add(this.ribbonPanel1); this.ribbonControl1.Controls.Add(this.ribbonPanel3); + this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel12); this.ribbonControl1.Controls.Add(this.ribbonPanel15); - this.ribbonControl1.Controls.Add(this.ribbonPanel7); this.ribbonControl1.Controls.Add(this.ribbonPanel5); this.ribbonControl1.Controls.Add(this.ribbonPanel6); this.ribbonControl1.Controls.Add(this.ribbonPanel2); @@ -2165,6 +2153,208 @@ this.ribbonControl1.Text = "ribbonControl1"; this.ribbonControl1.UseCustomizeDialog = false; // + // 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, 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, 62); + // + // + // + this.ribbonPanel3.Style.Class = ""; + this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseDown.Class = ""; + this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonPanel3.StyleMouseOver.Class = ""; + this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonPanel3.TabIndex = 40; + this.ribbonPanel3.Visible = false; + // + // ribbonBar4 + // + this.ribbonBar4.AutoOverflowEnabled = true; + // + // + // + this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; + this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.BackgroundStyle.Class = ""; + this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.ContainerControlProcessDialogKey = true; + this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; + this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { + this.btn_flag, + this.slider4ground}); + this.ribbonBar4.Location = new System.Drawing.Point(3, 0); + this.ribbonBar4.Name = "ribbonBar4"; + this.ribbonBar4.Size = new System.Drawing.Size(470, 59); + this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.ribbonBar4.TabIndex = 0; + // + // + // + this.ribbonBar4.TitleStyle.Class = ""; + this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + // + // + // + this.ribbonBar4.TitleStyleMouseOver.Class = ""; + this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.ribbonBar4.TitleVisible = false; + // + // btn_flag + // + this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; + this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; + this.btn_flag.Name = "btn_flag"; + this.btn_flag.SubItemsExpandWidth = 14; + this.btn_flag.Text = "标识器管理"; + this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); + // + // slider4ground + // + this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; + this.slider4ground.LabelWidth = 50; + this.slider4ground.Name = "slider4ground"; + this.slider4ground.Text = "地面透明度"; + this.slider4ground.TextColor = System.Drawing.Color.Black; + this.slider4ground.Value = 0; + this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); + // + // 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); + // // ribbonPanel1 // this.ribbonPanel1.AutoSize = true; @@ -2280,87 +2470,6 @@ this.btnOutputJPG.Text = "导出图片"; this.btnOutputJPG.Click += new System.EventHandler(this.btnOutputJPG_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, 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, 62); - // - // - // - this.ribbonPanel3.Style.Class = ""; - this.ribbonPanel3.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseDown.Class = ""; - this.ribbonPanel3.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonPanel3.StyleMouseOver.Class = ""; - this.ribbonPanel3.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonPanel3.TabIndex = 40; - this.ribbonPanel3.Visible = false; - // - // ribbonBar4 - // - this.ribbonBar4.AutoOverflowEnabled = true; - // - // - // - this.ribbonBar4.BackgroundMouseOverStyle.Class = ""; - this.ribbonBar4.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.BackgroundStyle.Class = ""; - this.ribbonBar4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.ContainerControlProcessDialogKey = true; - this.ribbonBar4.Dock = System.Windows.Forms.DockStyle.Left; - this.ribbonBar4.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] { - this.btn_flag, - this.slider4ground}); - this.ribbonBar4.Location = new System.Drawing.Point(3, 0); - this.ribbonBar4.Name = "ribbonBar4"; - this.ribbonBar4.Size = new System.Drawing.Size(470, 59); - this.ribbonBar4.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.ribbonBar4.TabIndex = 0; - // - // - // - this.ribbonBar4.TitleStyle.Class = ""; - this.ribbonBar4.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; - // - // - // - this.ribbonBar4.TitleStyleMouseOver.Class = ""; - this.ribbonBar4.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square; - this.ribbonBar4.TitleVisible = false; - // - // btn_flag - // - this.btn_flag.Image = global::Cyberpipe.Properties.Resources._24x24icon_03_hover; - this.btn_flag.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top; - this.btn_flag.Name = "btn_flag"; - this.btn_flag.SubItemsExpandWidth = 14; - this.btn_flag.Text = "标识器管理"; - this.btn_flag.Click += new System.EventHandler(this.btn_flag_Click); - // - // slider4ground - // - this.slider4ground.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top; - this.slider4ground.LabelWidth = 50; - this.slider4ground.Name = "slider4ground"; - this.slider4ground.Text = "地面透明度"; - this.slider4ground.TextColor = System.Drawing.Color.Black; - this.slider4ground.Value = 0; - this.slider4ground.ValueChanged += new System.EventHandler(this.slider4ground_ValueChanged); - // // ribbonPanel12 // this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -3003,127 +3112,6 @@ this.buttonItemXT4_2.Text = "人员修改"; this.buttonItemXT4_2.Click += new System.EventHandler(this.buttonItemXT4_2_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, 0); - this.ribbonPanel7.Name = "ribbonPanel7"; - this.ribbonPanel7.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3); - this.ribbonPanel7.Size = new System.Drawing.Size(1328, 95); - // - // - // - 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, 92); - 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); - // // ribbonPanel5 // this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; @@ -4473,7 +4461,7 @@ this.dataGridViewX2.ReadOnly = true; this.dataGridViewX2.RowHeadersVisible = false; this.dataGridViewX2.RowTemplate.Height = 23; - this.dataGridViewX2.Size = new System.Drawing.Size(40288, 92); + this.dataGridViewX2.Size = new System.Drawing.Size(40882, 92); this.dataGridViewX2.TabIndex = 11; // // dataGridViewTextBoxColumn10 @@ -4567,7 +4555,7 @@ this.dataGridViewX3.ReadOnly = true; this.dataGridViewX3.RowHeadersVisible = false; this.dataGridViewX3.RowTemplate.Height = 23; - this.dataGridViewX3.Size = new System.Drawing.Size(40287, 127); + this.dataGridViewX3.Size = new System.Drawing.Size(40881, 127); this.dataGridViewX3.TabIndex = 5; this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick); // @@ -5489,7 +5477,7 @@ this.dataGridViewX6.ReadOnly = true; this.dataGridViewX6.RowHeadersVisible = false; this.dataGridViewX6.RowTemplate.Height = 23; - this.dataGridViewX6.Size = new System.Drawing.Size(113, 92); + this.dataGridViewX6.Size = new System.Drawing.Size(79, 92); this.dataGridViewX6.TabIndex = 3; // // dataGridViewTextBoxColumn5 @@ -5573,7 +5561,7 @@ this.dataGridViewX7.ReadOnly = true; this.dataGridViewX7.RowHeadersVisible = false; this.dataGridViewX7.RowTemplate.Height = 23; - this.dataGridViewX7.Size = new System.Drawing.Size(112, 127); + this.dataGridViewX7.Size = new System.Drawing.Size(78, 127); this.dataGridViewX7.TabIndex = 5; this.dataGridViewX7.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX7_MouseDoubleClick); // @@ -5753,6 +5741,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; @@ -5795,11 +5795,11 @@ this.contextMenuStripDeleteLayerNode.ResumeLayout(false); this.ribbonControl1.ResumeLayout(false); this.ribbonControl1.PerformLayout(); - this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel3.ResumeLayout(false); + this.ribbonPanel7.ResumeLayout(false); + this.ribbonPanel1.ResumeLayout(false); this.ribbonPanel12.ResumeLayout(false); this.ribbonPanel15.ResumeLayout(false); - this.ribbonPanel7.ResumeLayout(false); this.ribbonPanel5.ResumeLayout(false); this.ribbonPanel6.ResumeLayout(false); this.ribbonPanel2.ResumeLayout(false); diff --git a/Utility.cs b/Utility.cs index 26cdcec..750b62e 100644 --- a/Utility.cs +++ b/Utility.cs @@ -41,7 +41,7 @@ public static string projectStr; public static string userRole; - public static Boolean isNeedLogin = false;//设定是否需要登录的开关 + public static Boolean isNeedLogin = true;//设定是否需要登录的开关 //数据配置 public static List listDb; diff --git a/bin/x86/Debug/Config.xml b/bin/x86/Debug/Config.xml index 66f3d81..5751541 100644 --- a/bin/x86/Debug/Config.xml +++ b/bin/x86/Debug/Config.xml @@ -24,12 +24,12 @@ http://127.0.0.1/Cyberpipe.msi http://127.0.0.1/Config.xml - /Resource/登录页.png + /Resource/登录页.jpg http://192.168.0.102:8080/ctrl 21 /Resource/title.jpg /Resource/图例P.jpg - 地下管线规划分析系统 + 民晟热电热力管线综合管理系统 航天二院智慧管网工程研究与发展中心 版权所有 编号,管线编码,管径_毫米,材质,埋设方式,起始地面高程,起始埋深,终止地面高程,终止埋深,建设年代,使用年限,权属单位,设计单位,设计负责人,施工单位,施工负责人,监理单位,监理负责人,业务负责人,备注 diff --git a/bin/x86/Debug/FieldValidate.xml b/bin/x86/Debug/FieldValidate.xml index 730c16d..fcb44ca 100644 --- a/bin/x86/Debug/FieldValidate.xml +++ b/bin/x86/Debug/FieldValidate.xml @@ -104,7 +104,7 @@ - + diff --git a/bin/x86/Debug/Resource/title.jpg b/bin/x86/Debug/Resource/title.jpg index d5615ee..2dc550c 100644 --- a/bin/x86/Debug/Resource/title.jpg +++ b/bin/x86/Debug/Resource/title.jpg Binary files differ diff --git "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.jpg" "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.jpg" index 52d9b3c..c9c7d31 100644 --- "a/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.jpg" +++ "b/bin/x86/Debug/Resource/\347\231\273\345\275\225\351\241\265.jpg" Binary files differ