diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 0610f27..8f63625 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 0610f27..8f63625 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs
index f0b8f7d..23c721a 100644
--- a/EMS_Forms/Form_EventManager.cs
+++ b/EMS_Forms/Form_EventManager.cs
@@ -45,7 +45,7 @@
                 dateTimePicker_end.Value = DateTime.Now;
                 dateTimePicker_start.Value = DateTime.Now.AddDays(-6);
 
-                LoadData();
+//                LoadData();
 
                 conn = OledbHelper.sqlConnection();
                 string com = "select * from PATROLER";

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 0610f27..8f63625 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs
index f0b8f7d..23c721a 100644
--- a/EMS_Forms/Form_EventManager.cs
+++ b/EMS_Forms/Form_EventManager.cs
@@ -45,7 +45,7 @@
                 dateTimePicker_end.Value = DateTime.Now;
                 dateTimePicker_start.Value = DateTime.Now.AddDays(-6);
 
-                LoadData();
+//                LoadData();
 
                 conn = OledbHelper.sqlConnection();
                 string com = "select * from PATROLER";
diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs
index ace5067..6ed857d 100644
--- a/FrmFlagEdits.cs
+++ b/FrmFlagEdits.cs
@@ -43,8 +43,13 @@
         {
             try
             {
+                DialogResult dr = MessageBox.Show("请确定是否进行编辑操作", "确认", MessageBoxButtons.YesNo);
+                if (dr == DialogResult.No)
+                {
+                    Close();
+                    return;
+                }
                 double outer;
-               
                 if (!double.TryParse(txt_deep.Text.Trim(), out outer))
                 {
                     MessageBox.Show("埋深取值有误！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 0610f27..8f63625 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs
index f0b8f7d..23c721a 100644
--- a/EMS_Forms/Form_EventManager.cs
+++ b/EMS_Forms/Form_EventManager.cs
@@ -45,7 +45,7 @@
                 dateTimePicker_end.Value = DateTime.Now;
                 dateTimePicker_start.Value = DateTime.Now.AddDays(-6);
 
-                LoadData();
+//                LoadData();
 
                 conn = OledbHelper.sqlConnection();
                 string com = "select * from PATROLER";
diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs
index ace5067..6ed857d 100644
--- a/FrmFlagEdits.cs
+++ b/FrmFlagEdits.cs
@@ -43,8 +43,13 @@
         {
             try
             {
+                DialogResult dr = MessageBox.Show("请确定是否进行编辑操作", "确认", MessageBoxButtons.YesNo);
+                if (dr == DialogResult.No)
+                {
+                    Close();
+                    return;
+                }
                 double outer;
-               
                 if (!double.TryParse(txt_deep.Text.Trim(), out outer))
                 {
                     MessageBox.Show("埋深取值有误！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs
index e550c4a..002dd8b 100644
--- a/FrmFlagManagers.cs
+++ b/FrmFlagManagers.cs
@@ -23,50 +23,51 @@
 
         public FrmFlagManagers(GSOGlobeControl _globeControl1)
         {
-            this.globeControl1 = _globeControl1;
+            globeControl1 = _globeControl1;
             InitializeComponent();
-            winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged);
-            this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑
-            this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废
-
-            this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport);
+            winGridViewPager1.OnPageChanged += winGridViewPager1_OnPageChanged;
+            winGridViewPager1.OnEditSelected += winGridViewPager1_OnEditSelected;//属性编辑
+            winGridViewPager1.OnDeleteSelected += winGridViewPager1_OnDeleteSelected;//标识器报废
+            
+            winGridViewPager1.OnStartExport += pager1_OnStartExport;
             winGridViewPager1.dataGridView1.MultiSelect = false;
         }
 
+       
+
         void pager1_OnStartExport(object sender, EventArgs e)
         {
-            int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex;
             string where = GetSql();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, where).Tables[0];
-            this.winGridViewPager1.AllToExport = table;
+            winGridViewPager1.AllToExport = table;
         }
 
         /// <summary>
         /// 初始化分页表格
         /// </summary>
-        private void initlizeDatagrid()
+        private void InitlizeDatagrid()
         {
             //控制表格显示的列，以及每一列要显示的列名
-            this.winGridViewPager1.Dock = DockStyle.Fill;
-            this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill;
-            this.winGridViewPager1.AddColumnAlias("编号", "编号");
-            this.winGridViewPager1.AddColumnAlias("标识器ID号", "标识器ID号");
-            this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号");
-            this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程（米）");
-            this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深（米）");
-            this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路");
-            this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态");
-            this.winGridViewPager1.AddColumnAlias("权属单位", "权属单位");
-            this.winGridViewPager1.AddColumnAlias("设计单位", "设计单位");
-            this.winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名");
-            this.winGridViewPager1.AddColumnAlias("施工单位", "施工单位");
-            this.winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人");
-            this.winGridViewPager1.AddColumnAlias("施工监理", "施工监理");
-            this.winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人");
-            this.winGridViewPager1.AddColumnAlias("备注", "备注");
+            winGridViewPager1.Dock = DockStyle.Fill;
+            winGridViewPager1.dataGridView1.Dock = DockStyle.Fill;
+            winGridViewPager1.AddColumnAlias("编号", "编号");
+            winGridViewPager1.AddColumnAlias("标识器ID号", "标识器ID号");
+            winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号");
+            winGridViewPager1.AddColumnAlias("地面高程", "地面高程（米）");
+            winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深（米）");
+            winGridViewPager1.AddColumnAlias("所属道路", "所属道路");
+            winGridViewPager1.AddColumnAlias("使用状态", "使用状态");
+            winGridViewPager1.AddColumnAlias("权属单位", "权属单位");
+            winGridViewPager1.AddColumnAlias("设计单位", "设计单位");
+            winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名");
+            winGridViewPager1.AddColumnAlias("施工单位", "施工单位");
+            winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人");
+            winGridViewPager1.AddColumnAlias("施工监理", "施工监理");
+            winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人");
+            winGridViewPager1.AddColumnAlias("备注", "备注");
 
-            this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注";
-            this.winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
+            winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注";
+            winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
             
             winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色
 
@@ -78,7 +79,7 @@
             winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑";
             winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废";
 
-            winGridViewPager1.AppendedMenu = this.contextMenuStrip1;
+            winGridViewPager1.AppendedMenu = contextMenuStrip1;
 
             //右键菜单宽度
             winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false;
@@ -134,7 +135,7 @@
 
                 FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp,
                     designComp, designer, workComp, worker, monitorComp, monitor, remark);
-                frm.refresh += new FrmFlagEdits.Handle(LoadData); //改变值的事件
+                frm.refresh += LoadData; //改变值的事件
                 frm.ShowDialog();
                 winGridViewPager1.Refresh();
             }
@@ -190,7 +191,7 @@
         {
             int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex;
             string sqlData = GetSql(pageIndex);
-            initlizeDatagrid();
+            InitlizeDatagrid();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0];
             winGridViewPager1.DataSource = table.DefaultView;
             winGridViewPager1.Refresh();
@@ -199,7 +200,7 @@
         private void LoadData(int pageIndex)
         {
             string sqlData = GetSql(pageIndex);
-            initlizeDatagrid();
+            InitlizeDatagrid();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0];
             winGridViewPager1.DataSource = table.DefaultView;
             winGridViewPager1.Refresh();
@@ -329,7 +330,6 @@
         {
             if (layer != null)
             {
-                GSODataset dataset = layer.Dataset;
                 CheckDatasetGeoReference(layer.Dataset);
                 TreeNode node = new TreeNode();
                 node.Tag = layer;
@@ -358,7 +358,7 @@
                 DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0];
                 try
                 {
-                    this.Hide();
+                    Hide();
                     string id = row.Cells["编号"].Value.ToString();
                     FrmFlagDetail p = new FrmFlagDetail(globeControl1, id);
                     p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件  
@@ -373,7 +373,7 @@
 
         private void showThisForm()
         {
-            this.Show();
+            Show();
         }
 
         /// <summary>
@@ -389,7 +389,7 @@
             DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0];
             try
             {
-                this.WindowState = FormWindowState.Minimized;
+                WindowState = FormWindowState.Minimized;
                 string id = row.Cells[LSSYS_ID_VALUE].Value.ToString();
                 string flagno = row.Cells["编号"].Value.ToString();
                 string flagstreet = row.Cells["所属道路"].Value.ToString();
@@ -429,7 +429,7 @@
                 globeControl1.Globe.MemoryLayer.ObjectMinVisiblePixelSize=-1;
                 globeControl1.Globe.MemoryLayer.ObjectMaxVisibleDistance = -1;
                 globeControl1.Globe.JumpToFeature(newFeature, 20);
-                this.globeControl1.Refresh();
+                globeControl1.Refresh();
             }
             catch (Exception ex)
             {

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 0610f27..8f63625 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs
index f0b8f7d..23c721a 100644
--- a/EMS_Forms/Form_EventManager.cs
+++ b/EMS_Forms/Form_EventManager.cs
@@ -45,7 +45,7 @@
                 dateTimePicker_end.Value = DateTime.Now;
                 dateTimePicker_start.Value = DateTime.Now.AddDays(-6);
 
-                LoadData();
+//                LoadData();
 
                 conn = OledbHelper.sqlConnection();
                 string com = "select * from PATROLER";
diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs
index ace5067..6ed857d 100644
--- a/FrmFlagEdits.cs
+++ b/FrmFlagEdits.cs
@@ -43,8 +43,13 @@
         {
             try
             {
+                DialogResult dr = MessageBox.Show("请确定是否进行编辑操作", "确认", MessageBoxButtons.YesNo);
+                if (dr == DialogResult.No)
+                {
+                    Close();
+                    return;
+                }
                 double outer;
-               
                 if (!double.TryParse(txt_deep.Text.Trim(), out outer))
                 {
                     MessageBox.Show("埋深取值有误！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs
index e550c4a..002dd8b 100644
--- a/FrmFlagManagers.cs
+++ b/FrmFlagManagers.cs
@@ -23,50 +23,51 @@
 
         public FrmFlagManagers(GSOGlobeControl _globeControl1)
         {
-            this.globeControl1 = _globeControl1;
+            globeControl1 = _globeControl1;
             InitializeComponent();
-            winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged);
-            this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑
-            this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废
-
-            this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport);
+            winGridViewPager1.OnPageChanged += winGridViewPager1_OnPageChanged;
+            winGridViewPager1.OnEditSelected += winGridViewPager1_OnEditSelected;//属性编辑
+            winGridViewPager1.OnDeleteSelected += winGridViewPager1_OnDeleteSelected;//标识器报废
+            
+            winGridViewPager1.OnStartExport += pager1_OnStartExport;
             winGridViewPager1.dataGridView1.MultiSelect = false;
         }
 
+       
+
         void pager1_OnStartExport(object sender, EventArgs e)
         {
-            int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex;
             string where = GetSql();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, where).Tables[0];
-            this.winGridViewPager1.AllToExport = table;
+            winGridViewPager1.AllToExport = table;
         }
 
         /// <summary>
         /// 初始化分页表格
         /// </summary>
-        private void initlizeDatagrid()
+        private void InitlizeDatagrid()
         {
             //控制表格显示的列，以及每一列要显示的列名
-            this.winGridViewPager1.Dock = DockStyle.Fill;
-            this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill;
-            this.winGridViewPager1.AddColumnAlias("编号", "编号");
-            this.winGridViewPager1.AddColumnAlias("标识器ID号", "标识器ID号");
-            this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号");
-            this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程（米）");
-            this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深（米）");
-            this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路");
-            this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态");
-            this.winGridViewPager1.AddColumnAlias("权属单位", "权属单位");
-            this.winGridViewPager1.AddColumnAlias("设计单位", "设计单位");
-            this.winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名");
-            this.winGridViewPager1.AddColumnAlias("施工单位", "施工单位");
-            this.winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人");
-            this.winGridViewPager1.AddColumnAlias("施工监理", "施工监理");
-            this.winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人");
-            this.winGridViewPager1.AddColumnAlias("备注", "备注");
+            winGridViewPager1.Dock = DockStyle.Fill;
+            winGridViewPager1.dataGridView1.Dock = DockStyle.Fill;
+            winGridViewPager1.AddColumnAlias("编号", "编号");
+            winGridViewPager1.AddColumnAlias("标识器ID号", "标识器ID号");
+            winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号");
+            winGridViewPager1.AddColumnAlias("地面高程", "地面高程（米）");
+            winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深（米）");
+            winGridViewPager1.AddColumnAlias("所属道路", "所属道路");
+            winGridViewPager1.AddColumnAlias("使用状态", "使用状态");
+            winGridViewPager1.AddColumnAlias("权属单位", "权属单位");
+            winGridViewPager1.AddColumnAlias("设计单位", "设计单位");
+            winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名");
+            winGridViewPager1.AddColumnAlias("施工单位", "施工单位");
+            winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人");
+            winGridViewPager1.AddColumnAlias("施工监理", "施工监理");
+            winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人");
+            winGridViewPager1.AddColumnAlias("备注", "备注");
 
-            this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注";
-            this.winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
+            winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注";
+            winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
             
             winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色
 
@@ -78,7 +79,7 @@
             winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑";
             winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废";
 
-            winGridViewPager1.AppendedMenu = this.contextMenuStrip1;
+            winGridViewPager1.AppendedMenu = contextMenuStrip1;
 
             //右键菜单宽度
             winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false;
@@ -134,7 +135,7 @@
 
                 FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp,
                     designComp, designer, workComp, worker, monitorComp, monitor, remark);
-                frm.refresh += new FrmFlagEdits.Handle(LoadData); //改变值的事件
+                frm.refresh += LoadData; //改变值的事件
                 frm.ShowDialog();
                 winGridViewPager1.Refresh();
             }
@@ -190,7 +191,7 @@
         {
             int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex;
             string sqlData = GetSql(pageIndex);
-            initlizeDatagrid();
+            InitlizeDatagrid();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0];
             winGridViewPager1.DataSource = table.DefaultView;
             winGridViewPager1.Refresh();
@@ -199,7 +200,7 @@
         private void LoadData(int pageIndex)
         {
             string sqlData = GetSql(pageIndex);
-            initlizeDatagrid();
+            InitlizeDatagrid();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0];
             winGridViewPager1.DataSource = table.DefaultView;
             winGridViewPager1.Refresh();
@@ -329,7 +330,6 @@
         {
             if (layer != null)
             {
-                GSODataset dataset = layer.Dataset;
                 CheckDatasetGeoReference(layer.Dataset);
                 TreeNode node = new TreeNode();
                 node.Tag = layer;
@@ -358,7 +358,7 @@
                 DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0];
                 try
                 {
-                    this.Hide();
+                    Hide();
                     string id = row.Cells["编号"].Value.ToString();
                     FrmFlagDetail p = new FrmFlagDetail(globeControl1, id);
                     p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件  
@@ -373,7 +373,7 @@
 
         private void showThisForm()
         {
-            this.Show();
+            Show();
         }
 
         /// <summary>
@@ -389,7 +389,7 @@
             DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0];
             try
             {
-                this.WindowState = FormWindowState.Minimized;
+                WindowState = FormWindowState.Minimized;
                 string id = row.Cells[LSSYS_ID_VALUE].Value.ToString();
                 string flagno = row.Cells["编号"].Value.ToString();
                 string flagstreet = row.Cells["所属道路"].Value.ToString();
@@ -429,7 +429,7 @@
                 globeControl1.Globe.MemoryLayer.ObjectMinVisiblePixelSize=-1;
                 globeControl1.Globe.MemoryLayer.ObjectMaxVisibleDistance = -1;
                 globeControl1.Globe.JumpToFeature(newFeature, 20);
-                this.globeControl1.Refresh();
+                globeControl1.Refresh();
             }
             catch (Exception ex)
             {
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fbe0db5..1ce91a9 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -2113,9 +2113,9 @@
             // 
             this.ribbonControl1.BackgroundStyle.Class = "";
             this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonControl1.Controls.Add(this.ribbonPanel15);
             this.ribbonControl1.Controls.Add(this.ribbonPanel7);
             this.ribbonControl1.Controls.Add(this.ribbonPanel3);
+            this.ribbonControl1.Controls.Add(this.ribbonPanel15);
             this.ribbonControl1.Controls.Add(this.ribbonPanel1);
             this.ribbonControl1.Controls.Add(this.ribbonPanel12);
             this.ribbonControl1.Controls.Add(this.ribbonPanel5);
@@ -2190,6 +2190,7 @@
             this.ribbonPanel15.StyleMouseOver.Class = "";
             this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.ribbonPanel15.TabIndex = 35;
+            this.ribbonPanel15.Visible = false;
             // 
             // ribbonBar20
             // 
@@ -2661,7 +2662,6 @@
             this.ribbonPanel7.StyleMouseOver.Class = "";
             this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.ribbonPanel7.TabIndex = 41;
-            this.ribbonPanel7.Visible = false;
             // 
             // gxdw_ribbonbar
             // 
@@ -3590,7 +3590,6 @@
             // ribbonTabItem14
             // 
             this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
-            this.ribbonTabItem14.Checked = true;
             this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage")));
             this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image")));
             this.ribbonTabItem14.Name = "ribbonTabItem14";
@@ -3601,6 +3600,7 @@
             // ribbonTabItem7
             // 
             this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+            this.ribbonTabItem7.Checked = true;
             this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover;
             this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02;
             this.ribbonTabItem7.Name = "ribbonTabItem7";
@@ -4473,7 +4473,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(35239, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -4567,7 +4567,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(35238, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -4825,7 +4825,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(102, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(85, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -4920,7 +4920,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(176, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(159, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -5203,7 +5203,7 @@
             this.dataGridViewX4.ReadOnly = true;
             this.dataGridViewX4.RowHeadersVisible = false;
             this.dataGridViewX4.RowTemplate.Height = 23;
-            this.dataGridViewX4.Size = new System.Drawing.Size(113, 92);
+            this.dataGridViewX4.Size = new System.Drawing.Size(96, 92);
             this.dataGridViewX4.TabIndex = 3;
             // 
             // dataGridViewTextBoxColumn1
@@ -5288,7 +5288,7 @@
             this.dataGridViewX5.ReadOnly = true;
             this.dataGridViewX5.RowHeadersVisible = false;
             this.dataGridViewX5.RowTemplate.Height = 23;
-            this.dataGridViewX5.Size = new System.Drawing.Size(115, 127);
+            this.dataGridViewX5.Size = new System.Drawing.Size(98, 127);
             this.dataGridViewX5.TabIndex = 5;
             this.dataGridViewX5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX5_MouseDoubleClick);
             // 

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 0610f27..8f63625 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/EMS_Forms/Form_EventManager.cs b/EMS_Forms/Form_EventManager.cs
index f0b8f7d..23c721a 100644
--- a/EMS_Forms/Form_EventManager.cs
+++ b/EMS_Forms/Form_EventManager.cs
@@ -45,7 +45,7 @@
                 dateTimePicker_end.Value = DateTime.Now;
                 dateTimePicker_start.Value = DateTime.Now.AddDays(-6);
 
-                LoadData();
+//                LoadData();
 
                 conn = OledbHelper.sqlConnection();
                 string com = "select * from PATROLER";
diff --git a/FrmFlagEdits.cs b/FrmFlagEdits.cs
index ace5067..6ed857d 100644
--- a/FrmFlagEdits.cs
+++ b/FrmFlagEdits.cs
@@ -43,8 +43,13 @@
         {
             try
             {
+                DialogResult dr = MessageBox.Show("请确定是否进行编辑操作", "确认", MessageBoxButtons.YesNo);
+                if (dr == DialogResult.No)
+                {
+                    Close();
+                    return;
+                }
                 double outer;
-               
                 if (!double.TryParse(txt_deep.Text.Trim(), out outer))
                 {
                     MessageBox.Show("埋深取值有误！", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
diff --git a/FrmFlagManagers.cs b/FrmFlagManagers.cs
index e550c4a..002dd8b 100644
--- a/FrmFlagManagers.cs
+++ b/FrmFlagManagers.cs
@@ -23,50 +23,51 @@
 
         public FrmFlagManagers(GSOGlobeControl _globeControl1)
         {
-            this.globeControl1 = _globeControl1;
+            globeControl1 = _globeControl1;
             InitializeComponent();
-            winGridViewPager1.OnPageChanged += new EventHandler(winGridViewPager1_OnPageChanged);
-            this.winGridViewPager1.OnEditSelected += new EventHandler(winGridViewPager1_OnEditSelected);//属性编辑
-            this.winGridViewPager1.OnDeleteSelected += new EventHandler(winGridViewPager1_OnDeleteSelected);//标识器报废
-
-            this.winGridViewPager1.OnStartExport += new EventHandler(pager1_OnStartExport);
+            winGridViewPager1.OnPageChanged += winGridViewPager1_OnPageChanged;
+            winGridViewPager1.OnEditSelected += winGridViewPager1_OnEditSelected;//属性编辑
+            winGridViewPager1.OnDeleteSelected += winGridViewPager1_OnDeleteSelected;//标识器报废
+            
+            winGridViewPager1.OnStartExport += pager1_OnStartExport;
             winGridViewPager1.dataGridView1.MultiSelect = false;
         }
 
+       
+
         void pager1_OnStartExport(object sender, EventArgs e)
         {
-            int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex;
             string where = GetSql();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, where).Tables[0];
-            this.winGridViewPager1.AllToExport = table;
+            winGridViewPager1.AllToExport = table;
         }
 
         /// <summary>
         /// 初始化分页表格
         /// </summary>
-        private void initlizeDatagrid()
+        private void InitlizeDatagrid()
         {
             //控制表格显示的列，以及每一列要显示的列名
-            this.winGridViewPager1.Dock = DockStyle.Fill;
-            this.winGridViewPager1.dataGridView1.Dock = DockStyle.Fill;
-            this.winGridViewPager1.AddColumnAlias("编号", "编号");
-            this.winGridViewPager1.AddColumnAlias("标识器ID号", "标识器ID号");
-            this.winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号");
-            this.winGridViewPager1.AddColumnAlias("地面高程", "地面高程（米）");
-            this.winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深（米）");
-            this.winGridViewPager1.AddColumnAlias("所属道路", "所属道路");
-            this.winGridViewPager1.AddColumnAlias("使用状态", "使用状态");
-            this.winGridViewPager1.AddColumnAlias("权属单位", "权属单位");
-            this.winGridViewPager1.AddColumnAlias("设计单位", "设计单位");
-            this.winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名");
-            this.winGridViewPager1.AddColumnAlias("施工单位", "施工单位");
-            this.winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人");
-            this.winGridViewPager1.AddColumnAlias("施工监理", "施工监理");
-            this.winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人");
-            this.winGridViewPager1.AddColumnAlias("备注", "备注");
+            winGridViewPager1.Dock = DockStyle.Fill;
+            winGridViewPager1.dataGridView1.Dock = DockStyle.Fill;
+            winGridViewPager1.AddColumnAlias("编号", "编号");
+            winGridViewPager1.AddColumnAlias("标识器ID号", "标识器ID号");
+            winGridViewPager1.AddColumnAlias("标识器型号", "标识器型号");
+            winGridViewPager1.AddColumnAlias("地面高程", "地面高程（米）");
+            winGridViewPager1.AddColumnAlias("标识器埋深", "标识器埋深（米）");
+            winGridViewPager1.AddColumnAlias("所属道路", "所属道路");
+            winGridViewPager1.AddColumnAlias("使用状态", "使用状态");
+            winGridViewPager1.AddColumnAlias("权属单位", "权属单位");
+            winGridViewPager1.AddColumnAlias("设计单位", "设计单位");
+            winGridViewPager1.AddColumnAlias("设计人姓名", "设计人姓名");
+            winGridViewPager1.AddColumnAlias("施工单位", "施工单位");
+            winGridViewPager1.AddColumnAlias("施工责任人", "施工责任人");
+            winGridViewPager1.AddColumnAlias("施工监理", "施工监理");
+            winGridViewPager1.AddColumnAlias("监理责任人", "监理责任人");
+            winGridViewPager1.AddColumnAlias("备注", "备注");
 
-            this.winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注";
-            this.winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
+            winGridViewPager1.DisplayColumns = "编号,标识器ID号,标识器型号,地面高程,标识器埋深,所属道路,使用状态,权属单位,设计单位,设计人姓名,施工单位,施工责任人,施工监理,监理责任人,备注";
+            winGridViewPager1.dataGridView1.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.AllCells;
             
             winGridViewPager1.BackColor = Color.LightCyan;//间隔颜色
 
@@ -78,7 +79,7 @@
             winGridViewPager1.dataGridView1.ContextMenuStrip.Items[2].Text = "属性编辑";
             winGridViewPager1.dataGridView1.ContextMenuStrip.Items[3].Text = "标识器报废";
 
-            winGridViewPager1.AppendedMenu = this.contextMenuStrip1;
+            winGridViewPager1.AppendedMenu = contextMenuStrip1;
 
             //右键菜单宽度
             winGridViewPager1.dataGridView1.ContextMenuStrip.AutoSize = false;
@@ -134,7 +135,7 @@
 
                 FrmFlagEdits frm = new FrmFlagEdits(id, flagid, flagno, flagtype, deep, street, gc, belongComp,
                     designComp, designer, workComp, worker, monitorComp, monitor, remark);
-                frm.refresh += new FrmFlagEdits.Handle(LoadData); //改变值的事件
+                frm.refresh += LoadData; //改变值的事件
                 frm.ShowDialog();
                 winGridViewPager1.Refresh();
             }
@@ -190,7 +191,7 @@
         {
             int pageIndex = winGridViewPager1.PagerInfo.CurrenetPageIndex;
             string sqlData = GetSql(pageIndex);
-            initlizeDatagrid();
+            InitlizeDatagrid();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0];
             winGridViewPager1.DataSource = table.DefaultView;
             winGridViewPager1.Refresh();
@@ -199,7 +200,7 @@
         private void LoadData(int pageIndex)
         {
             string sqlData = GetSql(pageIndex);
-            initlizeDatagrid();
+            InitlizeDatagrid();
             DataTable table = OracleUtils.ExecuteDataset(OracleUtils.ConnectionString, CommandType.Text, sqlData).Tables[0];
             winGridViewPager1.DataSource = table.DefaultView;
             winGridViewPager1.Refresh();
@@ -329,7 +330,6 @@
         {
             if (layer != null)
             {
-                GSODataset dataset = layer.Dataset;
                 CheckDatasetGeoReference(layer.Dataset);
                 TreeNode node = new TreeNode();
                 node.Tag = layer;
@@ -358,7 +358,7 @@
                 DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0];
                 try
                 {
-                    this.Hide();
+                    Hide();
                     string id = row.Cells["编号"].Value.ToString();
                     FrmFlagDetail p = new FrmFlagDetail(globeControl1, id);
                     p.showParentForm += new FrmFlagDetail.Handle(showThisForm);//改变值的事件  
@@ -373,7 +373,7 @@
 
         private void showThisForm()
         {
-            this.Show();
+            Show();
         }
 
         /// <summary>
@@ -389,7 +389,7 @@
             DataGridViewRow row = winGridViewPager1.dataGridView1.SelectedRows[0];
             try
             {
-                this.WindowState = FormWindowState.Minimized;
+                WindowState = FormWindowState.Minimized;
                 string id = row.Cells[LSSYS_ID_VALUE].Value.ToString();
                 string flagno = row.Cells["编号"].Value.ToString();
                 string flagstreet = row.Cells["所属道路"].Value.ToString();
@@ -429,7 +429,7 @@
                 globeControl1.Globe.MemoryLayer.ObjectMinVisiblePixelSize=-1;
                 globeControl1.Globe.MemoryLayer.ObjectMaxVisibleDistance = -1;
                 globeControl1.Globe.JumpToFeature(newFeature, 20);
-                this.globeControl1.Refresh();
+                globeControl1.Refresh();
             }
             catch (Exception ex)
             {
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fbe0db5..1ce91a9 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -2113,9 +2113,9 @@
             // 
             this.ribbonControl1.BackgroundStyle.Class = "";
             this.ribbonControl1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonControl1.Controls.Add(this.ribbonPanel15);
             this.ribbonControl1.Controls.Add(this.ribbonPanel7);
             this.ribbonControl1.Controls.Add(this.ribbonPanel3);
+            this.ribbonControl1.Controls.Add(this.ribbonPanel15);
             this.ribbonControl1.Controls.Add(this.ribbonPanel1);
             this.ribbonControl1.Controls.Add(this.ribbonPanel12);
             this.ribbonControl1.Controls.Add(this.ribbonPanel5);
@@ -2190,6 +2190,7 @@
             this.ribbonPanel15.StyleMouseOver.Class = "";
             this.ribbonPanel15.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.ribbonPanel15.TabIndex = 35;
+            this.ribbonPanel15.Visible = false;
             // 
             // ribbonBar20
             // 
@@ -2661,7 +2662,6 @@
             this.ribbonPanel7.StyleMouseOver.Class = "";
             this.ribbonPanel7.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
             this.ribbonPanel7.TabIndex = 41;
-            this.ribbonPanel7.Visible = false;
             // 
             // gxdw_ribbonbar
             // 
@@ -3590,7 +3590,6 @@
             // ribbonTabItem14
             // 
             this.ribbonTabItem14.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
-            this.ribbonTabItem14.Checked = true;
             this.ribbonTabItem14.HoverImage = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.HoverImage")));
             this.ribbonTabItem14.Image = ((System.Drawing.Image)(resources.GetObject("ribbonTabItem14.Image")));
             this.ribbonTabItem14.Name = "ribbonTabItem14";
@@ -3601,6 +3600,7 @@
             // ribbonTabItem7
             // 
             this.ribbonTabItem7.ButtonStyle = DevComponents.DotNetBar.eButtonStyle.ImageAndText;
+            this.ribbonTabItem7.Checked = true;
             this.ribbonTabItem7.HoverImage = global::Cyberpipe.Properties.Resources._24x24icon_02_hover;
             this.ribbonTabItem7.Image = global::Cyberpipe.Properties.Resources._24x24icon_02;
             this.ribbonTabItem7.Name = "ribbonTabItem7";
@@ -4473,7 +4473,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(34942, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(35239, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -4567,7 +4567,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(34941, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(35238, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -4825,7 +4825,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(102, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(85, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -4920,7 +4920,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(176, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(159, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -5203,7 +5203,7 @@
             this.dataGridViewX4.ReadOnly = true;
             this.dataGridViewX4.RowHeadersVisible = false;
             this.dataGridViewX4.RowTemplate.Height = 23;
-            this.dataGridViewX4.Size = new System.Drawing.Size(113, 92);
+            this.dataGridViewX4.Size = new System.Drawing.Size(96, 92);
             this.dataGridViewX4.TabIndex = 3;
             // 
             // dataGridViewTextBoxColumn1
@@ -5288,7 +5288,7 @@
             this.dataGridViewX5.ReadOnly = true;
             this.dataGridViewX5.RowHeadersVisible = false;
             this.dataGridViewX5.RowTemplate.Height = 23;
-            this.dataGridViewX5.Size = new System.Drawing.Size(115, 127);
+            this.dataGridViewX5.Size = new System.Drawing.Size(98, 127);
             this.dataGridViewX5.TabIndex = 5;
             this.dataGridViewX5.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX5_MouseDoubleClick);
             // 
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
new file mode 100644
index 0000000..061c9ca
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+  <assemblyIdentity version="1.0.0.0" name="MyApplication.app"/>
+  <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
+    <security>
+      <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
+        <requestedExecutionLevel level="asInvoker" uiAccess="false"/>
+      </requestedPrivileges>
+    </security>
+  </trustInfo>
+</assembly>