diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index a881555..5658f3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index a881555..5658f3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index 04afa33..90e7786 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5400,7 +5400,7 @@
                 }
             }
         }
-        /// <smary>
+        /// <summary>
         /// 一键审核功能
         /// </summary>
         /// <param name="sender"></param>
@@ -5408,8 +5408,8 @@
         private void buttonItem128_Click(object sender, EventArgs e)
         {
             LogManager.saveLog(Utility.userName, buttonItem128.Text);
-            frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
 
+            frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
             if (frmSh.ShowDialog() == DialogResult.OK)
             {
                 frmWait = new FrmWait("一键审核……");
@@ -5421,87 +5421,85 @@
                 thread.Start();
             }
         }
-        
+
         void doWork()
         {
-            FrmShResult frmShResult = null;
+            FrmShResult frmShResult;
 
-            double dVerticalJingJuBiaoZhun = 1, dHorizontalJingJuBiaoZhun = 1;
             if (frmSh.rukuLayer != null)
             {
-                #region
-                Invoke((EventHandler) delegate
+                try
                 {
-                    try
+                    this.Invoke((EventHandler)delegate
                     {
-                        List<string> managerLayerList = new List<string>();
-                        for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
-                        {
-                            managerLayerList.Add(layerManagerNode.Nodes[i].Text);
-                        }
-                        if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
-                        {
-                            TreeNode node = new TreeNode();
-                            node.Tag = frmSh.rukuLayer;
-                            node.Text = frmSh.rukuLayer.Dataset.Caption;
-                            node.ImageIndex = 0;
-                            node.SelectedImageIndex = 0;
-                            node.Checked = frmSh.rukuLayer.Visible;
-                            layerManagerNode.Nodes.Insert(0, node);
-                            layerManagerNode.Expand();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message, "提示");
-                    }
-                });
-                #endregion
+                        addNodeToManagerNode(frmSh.rukuLayer);
+                    });
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "提示");
+                }
 
                 shlayername = frmSh.rukuLayer.Name;
                 globeControl1.Refresh();
             }
-            frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
-                Utility.m_PipelineLayerNames);
 
+            frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames);
             if (boolfrmShResult) return;
-
             frmShResult.Location = new Point(Width - frmShResult.Width - 10, Height - frmShResult.Height - 50);
             frmShResult.Owner = this;
-            //一键审核实际计算步骤
             frmShResult.analysis();
 
-            //MainFrm窗体显示控制，回到一键审核Tab
-            Invoke((EventHandler) delegate
+            try
             {
-                frmShResult.Show();
-                frmWait.Close();
-                //将tab页恢复到一键审核
-                ribbonTabItem11.Checked = true;
-                try
+                this.Invoke((EventHandler)delegate
                 {
-                    globeControl1.Globe.Action = EnumAction3D.ActionNull;
-                    splitContainer1.Panel2Collapsed = true;
-
-                    panelOfTable.Visible = false;
-                    legendSC.Visible = false;
-                    legendSG.Visible = false;
-
-                    GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线");
-                    if (redLayer != null)
-                    {
-                        redLayer.Visible = false;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-
-            });
-
+                    frmShResult.Show();
+                    returnShTap();
+                });
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
             boolfrmShResult = true;
         }
+
+        private void addNodeToManagerNode(GSOLayer layer)
+        {
+            List<string> managerLayerList = new List<string>();
+            for (int i = 0; i < layerManagerNode.Nodes.Count; i++)//layerManagerNode 临时图层
+            {
+                managerLayerList.Add(layerManagerNode.Nodes[i].Text);
+            }
+            if (!managerLayerList.Contains(layer.Dataset.Caption))
+            {
+                TreeNode node = new TreeNode();
+                node.Tag = layer;
+                node.Text = layer.Dataset.Caption;
+                node.ImageIndex = 0;
+                node.SelectedImageIndex = 0;
+                node.Checked = layer.Visible;
+                layerManagerNode.Nodes.Insert(0, node);
+                layerManagerNode.Expand();
+            }
+        }
+
+        void returnShTap()
+        {
+            frmWait.Close();
+            ribbonTabItem11.Checked = true;
+            globeControl1.Globe.Action = EnumAction3D.ActionNull;
+            splitContainer1.Panel2Collapsed = true;
+
+            panelOfTable.Visible = false;
+            legendSC.Visible = false;
+            legendSG.Visible = false;
+
+            GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线");
+            if (redLayer != null)
+                redLayer.Visible = false;
+        }
         /// <summary>
         /// 清除渲染结果
         /// </summary>
@@ -5520,34 +5518,6 @@
             globeControl1.Refresh();
         }
         /// <summary>
-        /// 已审核的图层
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonItem132_Click_1(object sender, EventArgs e)
-        {
-            //保存日志
-            LogManager.saveLog(Utility.userName, buttonItem132.Text);
-
-            if (shds == null)
-            {
-                //没连的话，直接连接审核库； //审核库配置读配置文件
-                string dbIp = Utility.sgdbip;
-                string database = Utility.sgdbname;
-                string user = Utility.sgdbuser;
-                string pass = Utility.sgdbpwd;
-
-                shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass);
-                if (shds == null)
-                {
-                    MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-            }
-            FrmShLayers frm = new FrmShLayers(globeControl1, shds);
-            frm.Show();
-
-        }
-        /// <summary>
         /// 审核入库
         /// </summary>
         /// <param name="sender"></param>
@@ -7151,14 +7121,14 @@
         private void buttonItemSJGL2_Click(object sender, EventArgs e)
         {
             //日志记录 
-            /*
             LogManager.saveLog(Utility.userName, buttonItemSJGL2.Text);
             FrmValiData frm = new FrmValiData(globeControl1);
             frm.ShowDialog();
-             * **/
+             
+            /*
             ValidateInfo validateInfo = ValidateConfig.LoadConfig();
             String ss = "";
-
+            */
         }
         /// <summary>
         /// 数据预处理

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index a881555..5658f3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index 04afa33..90e7786 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5400,7 +5400,7 @@
                 }
             }
         }
-        /// <smary>
+        /// <summary>
         /// 一键审核功能
         /// </summary>
         /// <param name="sender"></param>
@@ -5408,8 +5408,8 @@
         private void buttonItem128_Click(object sender, EventArgs e)
         {
             LogManager.saveLog(Utility.userName, buttonItem128.Text);
-            frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
 
+            frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
             if (frmSh.ShowDialog() == DialogResult.OK)
             {
                 frmWait = new FrmWait("一键审核……");
@@ -5421,87 +5421,85 @@
                 thread.Start();
             }
         }
-        
+
         void doWork()
         {
-            FrmShResult frmShResult = null;
+            FrmShResult frmShResult;
 
-            double dVerticalJingJuBiaoZhun = 1, dHorizontalJingJuBiaoZhun = 1;
             if (frmSh.rukuLayer != null)
             {
-                #region
-                Invoke((EventHandler) delegate
+                try
                 {
-                    try
+                    this.Invoke((EventHandler)delegate
                     {
-                        List<string> managerLayerList = new List<string>();
-                        for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
-                        {
-                            managerLayerList.Add(layerManagerNode.Nodes[i].Text);
-                        }
-                        if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
-                        {
-                            TreeNode node = new TreeNode();
-                            node.Tag = frmSh.rukuLayer;
-                            node.Text = frmSh.rukuLayer.Dataset.Caption;
-                            node.ImageIndex = 0;
-                            node.SelectedImageIndex = 0;
-                            node.Checked = frmSh.rukuLayer.Visible;
-                            layerManagerNode.Nodes.Insert(0, node);
-                            layerManagerNode.Expand();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message, "提示");
-                    }
-                });
-                #endregion
+                        addNodeToManagerNode(frmSh.rukuLayer);
+                    });
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "提示");
+                }
 
                 shlayername = frmSh.rukuLayer.Name;
                 globeControl1.Refresh();
             }
-            frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
-                Utility.m_PipelineLayerNames);
 
+            frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames);
             if (boolfrmShResult) return;
-
             frmShResult.Location = new Point(Width - frmShResult.Width - 10, Height - frmShResult.Height - 50);
             frmShResult.Owner = this;
-            //一键审核实际计算步骤
             frmShResult.analysis();
 
-            //MainFrm窗体显示控制，回到一键审核Tab
-            Invoke((EventHandler) delegate
+            try
             {
-                frmShResult.Show();
-                frmWait.Close();
-                //将tab页恢复到一键审核
-                ribbonTabItem11.Checked = true;
-                try
+                this.Invoke((EventHandler)delegate
                 {
-                    globeControl1.Globe.Action = EnumAction3D.ActionNull;
-                    splitContainer1.Panel2Collapsed = true;
-
-                    panelOfTable.Visible = false;
-                    legendSC.Visible = false;
-                    legendSG.Visible = false;
-
-                    GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线");
-                    if (redLayer != null)
-                    {
-                        redLayer.Visible = false;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-
-            });
-
+                    frmShResult.Show();
+                    returnShTap();
+                });
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
             boolfrmShResult = true;
         }
+
+        private void addNodeToManagerNode(GSOLayer layer)
+        {
+            List<string> managerLayerList = new List<string>();
+            for (int i = 0; i < layerManagerNode.Nodes.Count; i++)//layerManagerNode 临时图层
+            {
+                managerLayerList.Add(layerManagerNode.Nodes[i].Text);
+            }
+            if (!managerLayerList.Contains(layer.Dataset.Caption))
+            {
+                TreeNode node = new TreeNode();
+                node.Tag = layer;
+                node.Text = layer.Dataset.Caption;
+                node.ImageIndex = 0;
+                node.SelectedImageIndex = 0;
+                node.Checked = layer.Visible;
+                layerManagerNode.Nodes.Insert(0, node);
+                layerManagerNode.Expand();
+            }
+        }
+
+        void returnShTap()
+        {
+            frmWait.Close();
+            ribbonTabItem11.Checked = true;
+            globeControl1.Globe.Action = EnumAction3D.ActionNull;
+            splitContainer1.Panel2Collapsed = true;
+
+            panelOfTable.Visible = false;
+            legendSC.Visible = false;
+            legendSG.Visible = false;
+
+            GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线");
+            if (redLayer != null)
+                redLayer.Visible = false;
+        }
         /// <summary>
         /// 清除渲染结果
         /// </summary>
@@ -5520,34 +5518,6 @@
             globeControl1.Refresh();
         }
         /// <summary>
-        /// 已审核的图层
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonItem132_Click_1(object sender, EventArgs e)
-        {
-            //保存日志
-            LogManager.saveLog(Utility.userName, buttonItem132.Text);
-
-            if (shds == null)
-            {
-                //没连的话，直接连接审核库； //审核库配置读配置文件
-                string dbIp = Utility.sgdbip;
-                string database = Utility.sgdbname;
-                string user = Utility.sgdbuser;
-                string pass = Utility.sgdbpwd;
-
-                shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass);
-                if (shds == null)
-                {
-                    MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-            }
-            FrmShLayers frm = new FrmShLayers(globeControl1, shds);
-            frm.Show();
-
-        }
-        /// <summary>
         /// 审核入库
         /// </summary>
         /// <param name="sender"></param>
@@ -7151,14 +7121,14 @@
         private void buttonItemSJGL2_Click(object sender, EventArgs e)
         {
             //日志记录 
-            /*
             LogManager.saveLog(Utility.userName, buttonItemSJGL2.Text);
             FrmValiData frm = new FrmValiData(globeControl1);
             frm.ShowDialog();
-             * **/
+             
+            /*
             ValidateInfo validateInfo = ValidateConfig.LoadConfig();
             String ss = "";
-
+            */
         }
         /// <summary>
         /// 数据预处理
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index 0209821..53109f7 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ

diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index a881555..5658f3c 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/MainFrm.cs b/MainFrm.cs
index 04afa33..90e7786 100644
--- a/MainFrm.cs
+++ b/MainFrm.cs
@@ -5400,7 +5400,7 @@
                 }
             }
         }
-        /// <smary>
+        /// <summary>
         /// 一键审核功能
         /// </summary>
         /// <param name="sender"></param>
@@ -5408,8 +5408,8 @@
         private void buttonItem128_Click(object sender, EventArgs e)
         {
             LogManager.saveLog(Utility.userName, buttonItem128.Text);
-            frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
 
+            frmSh = new FrmYJSHTC(globeControl1, globeControl2, layerTree);
             if (frmSh.ShowDialog() == DialogResult.OK)
             {
                 frmWait = new FrmWait("一键审核……");
@@ -5421,87 +5421,85 @@
                 thread.Start();
             }
         }
-        
+
         void doWork()
         {
-            FrmShResult frmShResult = null;
+            FrmShResult frmShResult;
 
-            double dVerticalJingJuBiaoZhun = 1, dHorizontalJingJuBiaoZhun = 1;
             if (frmSh.rukuLayer != null)
             {
-                #region
-                Invoke((EventHandler) delegate
+                try
                 {
-                    try
+                    this.Invoke((EventHandler)delegate
                     {
-                        List<string> managerLayerList = new List<string>();
-                        for (int i = 0; i < layerManagerNode.Nodes.Count; i++)
-                        {
-                            managerLayerList.Add(layerManagerNode.Nodes[i].Text);
-                        }
-                        if (!managerLayerList.Contains(frmSh.rukuLayer.Caption))
-                        {
-                            TreeNode node = new TreeNode();
-                            node.Tag = frmSh.rukuLayer;
-                            node.Text = frmSh.rukuLayer.Dataset.Caption;
-                            node.ImageIndex = 0;
-                            node.SelectedImageIndex = 0;
-                            node.Checked = frmSh.rukuLayer.Visible;
-                            layerManagerNode.Nodes.Insert(0, node);
-                            layerManagerNode.Expand();
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        MessageBox.Show(ex.Message, "提示");
-                    }
-                });
-                #endregion
+                        addNodeToManagerNode(frmSh.rukuLayer);
+                    });
+                }
+                catch (Exception ex)
+                {
+                    MessageBox.Show(ex.Message, "提示");
+                }
 
                 shlayername = frmSh.rukuLayer.Name;
                 globeControl1.Refresh();
             }
-            frmShResult = new FrmShResult(dVerticalJingJuBiaoZhun, dHorizontalJingJuBiaoZhun, shlayername, globeControl1,
-                Utility.m_PipelineLayerNames);
 
+            frmShResult = new FrmShResult(shlayername, globeControl1, Utility.m_PipelineLayerNames);
             if (boolfrmShResult) return;
-
             frmShResult.Location = new Point(Width - frmShResult.Width - 10, Height - frmShResult.Height - 50);
             frmShResult.Owner = this;
-            //一键审核实际计算步骤
             frmShResult.analysis();
 
-            //MainFrm窗体显示控制，回到一键审核Tab
-            Invoke((EventHandler) delegate
+            try
             {
-                frmShResult.Show();
-                frmWait.Close();
-                //将tab页恢复到一键审核
-                ribbonTabItem11.Checked = true;
-                try
+                this.Invoke((EventHandler)delegate
                 {
-                    globeControl1.Globe.Action = EnumAction3D.ActionNull;
-                    splitContainer1.Panel2Collapsed = true;
-
-                    panelOfTable.Visible = false;
-                    legendSC.Visible = false;
-                    legendSG.Visible = false;
-
-                    GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线");
-                    if (redLayer != null)
-                    {
-                        redLayer.Visible = false;
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-
-            });
-
+                    frmShResult.Show();
+                    returnShTap();
+                });
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show("系统运行错误:" + ex, "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
             boolfrmShResult = true;
         }
+
+        private void addNodeToManagerNode(GSOLayer layer)
+        {
+            List<string> managerLayerList = new List<string>();
+            for (int i = 0; i < layerManagerNode.Nodes.Count; i++)//layerManagerNode 临时图层
+            {
+                managerLayerList.Add(layerManagerNode.Nodes[i].Text);
+            }
+            if (!managerLayerList.Contains(layer.Dataset.Caption))
+            {
+                TreeNode node = new TreeNode();
+                node.Tag = layer;
+                node.Text = layer.Dataset.Caption;
+                node.ImageIndex = 0;
+                node.SelectedImageIndex = 0;
+                node.Checked = layer.Visible;
+                layerManagerNode.Nodes.Insert(0, node);
+                layerManagerNode.Expand();
+            }
+        }
+
+        void returnShTap()
+        {
+            frmWait.Close();
+            ribbonTabItem11.Checked = true;
+            globeControl1.Globe.Action = EnumAction3D.ActionNull;
+            splitContainer1.Panel2Collapsed = true;
+
+            panelOfTable.Visible = false;
+            legendSC.Visible = false;
+            legendSG.Visible = false;
+
+            GSOLayer redLayer = globeControl1.Globe.Layers.GetLayerByCaption("红线");
+            if (redLayer != null)
+                redLayer.Visible = false;
+        }
         /// <summary>
         /// 清除渲染结果
         /// </summary>
@@ -5520,34 +5518,6 @@
             globeControl1.Refresh();
         }
         /// <summary>
-        /// 已审核的图层
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void buttonItem132_Click_1(object sender, EventArgs e)
-        {
-            //保存日志
-            LogManager.saveLog(Utility.userName, buttonItem132.Text);
-
-            if (shds == null)
-            {
-                //没连的话，直接连接审核库； //审核库配置读配置文件
-                string dbIp = Utility.sgdbip;
-                string database = Utility.sgdbname;
-                string user = Utility.sgdbuser;
-                string pass = Utility.sgdbpwd;
-
-                shds = globeControl1.Globe.DataManager.OpenOracleDataSource(dbIp + "/" + database, "", "", user, pass);
-                if (shds == null)
-                {
-                    MessageBox.Show("数据库连接失败！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                }
-            }
-            FrmShLayers frm = new FrmShLayers(globeControl1, shds);
-            frm.Show();
-
-        }
-        /// <summary>
         /// 审核入库
         /// </summary>
         /// <param name="sender"></param>
@@ -7151,14 +7121,14 @@
         private void buttonItemSJGL2_Click(object sender, EventArgs e)
         {
             //日志记录 
-            /*
             LogManager.saveLog(Utility.userName, buttonItemSJGL2.Text);
             FrmValiData frm = new FrmValiData(globeControl1);
             frm.ShowDialog();
-             * **/
+             
+            /*
             ValidateInfo validateInfo = ValidateConfig.LoadConfig();
             String ss = "";
-
+            */
         }
         /// <summary>
         /// 数据预处理
diff --git a/bin/x86/Debug/Cyberpipe.exe b/bin/x86/Debug/Cyberpipe.exe
index 0209821..53109f7 100644
--- a/bin/x86/Debug/Cyberpipe.exe
+++ b/bin/x86/Debug/Cyberpipe.exe
Binary files differ
diff --git a/bin/x86/Debug/Cyberpipe.pdb b/bin/x86/Debug/Cyberpipe.pdb
index ee55722..7dc881c 100644
--- a/bin/x86/Debug/Cyberpipe.pdb
+++ b/bin/x86/Debug/Cyberpipe.pdb
Binary files differ