diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.exe.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.exe.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.config b/bin/x86/Debug/Cyberpipe.vshost.exe.config
index 5753e1b..f4cbe66 100644
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.config
+++ b/bin/x86/Debug/Cyberpipe.vshost.exe.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.exe.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.config b/bin/x86/Debug/Cyberpipe.vshost.exe.config
index 5753e1b..f4cbe66 100644
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.config
+++ b/bin/x86/Debug/Cyberpipe.vshost.exe.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.exe.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.config b/bin/x86/Debug/Cyberpipe.vshost.exe.config
index 5753e1b..f4cbe66 100644
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.config
+++ b/bin/x86/Debug/Cyberpipe.vshost.exe.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt
index 3dc3245..1fc46d0 100644
--- a/bin/x86/Debug/glVersion.txt
+++ b/bin/x86/Debug/glVersion.txt
Binary files differ

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.exe.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.config b/bin/x86/Debug/Cyberpipe.vshost.exe.config
index 5753e1b..f4cbe66 100644
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.config
+++ b/bin/x86/Debug/Cyberpipe.vshost.exe.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt
index 3dc3245..1fc46d0 100644
--- a/bin/x86/Debug/glVersion.txt
+++ b/bin/x86/Debug/glVersion.txt
Binary files differ
diff --git a/log4net.config b/log4net.config
new file mode 100644
index 0000000..80f9b25
--- /dev/null
+++ b/log4net.config
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+  </configSections>
+  <log4net>
+    <!--定义输出到文件中-->
+    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <!--定义文件存放位置-->
+      <file value="log\\"/>
+      <appendToFile value="true"/>
+      <rollingStyle value="Date"/>
+      <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
+      <staticLogFileName value="false"/>
+      <param name="MaxSizeRollBackups" value="100"/>
+      <layout type="log4net.Layout.PatternLayout">
+        <!--每条日志末尾的文字说明-->
+        <!--输出格式-->
+        <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
+        <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger 
+
+property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
+      </layout>
+    </appender>
+    <root>
+      <level value="ERROR"/>
+      <!--文件形式记录日志-->
+      <appender-ref ref="RollingLogFileAppender"/>
+    </root>
+  </log4net>
+</configuration>

diff --git a/Cyberpipe.csproj b/Cyberpipe.csproj
index 1bd0c40..1ef4d0d 100644
--- a/Cyberpipe.csproj
+++ b/Cyberpipe.csproj
@@ -1727,6 +1727,7 @@
       <DependentUpon>SysRescInfoManager.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="app.config" />
+    <None Include="log4net.config" />
     <None Include="ClassDiagram1.cd" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -1786,6 +1787,7 @@
       <LastGenOutput>Reference.cs</LastGenOutput>
     </None>
     <None Include="Web References\udfiles\UpDownFile.wsdl" />
+    <None Include="副本 app.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="bin\x86\Debug\Resource\image\walk.png" />
diff --git a/Cyberpipe.suo b/Cyberpipe.suo
index 3847b33..5dffde4 100644
--- a/Cyberpipe.suo
+++ b/Cyberpipe.suo
Binary files differ
diff --git a/FrmLayerControl.cs b/FrmLayerControl.cs
index 052be3a..8586041 100644
--- a/FrmLayerControl.cs
+++ b/FrmLayerControl.cs
@@ -34,6 +34,36 @@
             treeNode.Text = strTreeNodeText;
         }
 
+//        private void initTreeView()
+//        {
+//            layerTree1.Nodes.Clear();
+//            layerTree2.Nodes.Clear();
+//
+//            //加载layertree2
+//            initLayerTree(out layerManagerNode1, "图层管理");
+//            layerTree1.Nodes.Add(layerManagerNode1);
+//            initLayerTree(out terrainManagerNode1, "地形管理");
+//            layerTree1.Nodes.Add(terrainManagerNode1);
+//
+//            initLayerTree(out layerManagerNode, "图层管理");
+//            layerTree2.Nodes.Add(layerManagerNode);
+//            initLayerTree(out terrainManagerNode, "地形管理");
+//            layerTree2.Nodes.Add(terrainManagerNode);
+//        }
+
+        #region wxl重构树形结构代码
+
+        private TreeNode treeNode(string strTreeNodeText)
+        {
+            TreeNode treeNode = new TreeNode();
+            treeNode.ImageIndex = 0;
+            treeNode.SelectedImageIndex = 0;
+            treeNode.Checked = false;
+            treeNode.Text = strTreeNodeText;
+            return treeNode;
+        }
+//        private void appendToParent(TreeNodeCollection treeNodeCollection, )
+        #endregion
         private void initTreeView()
         {
             layerTree1.Nodes.Clear();
@@ -293,14 +323,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl1.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl1.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
@@ -322,14 +349,11 @@
             foreach (TreeNode childNode in parentNode.Nodes)
             {
                 childNode.Checked = isChecked;
-                if (childNode.Tag is GSOLayer)
+                GSOLayer layer = childNode.Tag as GSOLayer;
+                if (layer != null)
                 {
-                    GSOLayer layer = childNode.Tag as GSOLayer;
-                    if (layer != null)
-                    {
-                        layer.Visible = isChecked;
-                        globeControl2.Globe.Refresh();
-                    }
+                    layer.Visible = isChecked;
+                    globeControl2.Globe.Refresh();
                 }
                 if (childNode.Tag is GSOTerrain)
                 {
diff --git a/LogHelper.cs b/LogHelper.cs
index 818cb88..d33199f 100644
--- a/LogHelper.cs
+++ b/LogHelper.cs
@@ -2,7 +2,7 @@
 using log4net;
 using log4net.Config;
 
-[assembly: XmlConfigurator(Watch = true)]
+[assembly: XmlConfigurator(ConfigFile = "log4net.config",Watch = true)]
 namespace Cyberpipe
 {
     public class LogHelper
diff --git a/MainFrm.designer.cs b/MainFrm.designer.cs
index fc09cee..a9b8c6f 100644
--- a/MainFrm.designer.cs
+++ b/MainFrm.designer.cs
@@ -244,6 +244,16 @@
             this.保存ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.定位ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
             this.ribbonControl1 = new DevComponents.DotNetBar.RibbonControl();
+            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
+            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
+            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
+            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
+            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
+            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
+            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
+            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel12 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar18 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem133 = new DevComponents.DotNetBar.ButtonItem();
@@ -255,13 +265,6 @@
             this.buttonItem134 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItem130 = new DevComponents.DotNetBar.ButtonItem();
             this.btn_check_history = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel6 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar6 = new DevComponents.DotNetBar.RibbonBar();
-            this.buttonItemSPSZ = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItem8 = new DevComponents.DotNetBar.ButtonItem();
-            this.buttonItemLocation = new DevComponents.DotNetBar.ButtonItem();
-            this.sliderItem2 = new DevComponents.DotNetBar.SliderItem();
-            this.buttonItemGBJC = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel5 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar2 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItemHX1 = new DevComponents.DotNetBar.ButtonItem();
@@ -445,9 +448,6 @@
             this.buttonItemBZ9 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ10 = new DevComponents.DotNetBar.ButtonItem();
             this.buttonItemBZ11 = new DevComponents.DotNetBar.ButtonItem();
-            this.ribbonPanel4 = new DevComponents.DotNetBar.RibbonPanel();
-            this.ribbonBar1 = new DevComponents.DotNetBar.RibbonBar();
-            this.btn_document_info = new DevComponents.DotNetBar.ButtonItem();
             this.ribbonPanel1 = new DevComponents.DotNetBar.RibbonPanel();
             this.ribbonBar21 = new DevComponents.DotNetBar.RibbonBar();
             this.buttonItem87 = new DevComponents.DotNetBar.ButtonItem();
@@ -652,12 +652,12 @@
             this.contextMenuStrip3.SuspendLayout();
             this.contextMenuStripDeleteLayerNode.SuspendLayout();
             this.ribbonControl1.SuspendLayout();
-            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel6.SuspendLayout();
+            this.ribbonPanel4.SuspendLayout();
+            this.ribbonPanel12.SuspendLayout();
             this.ribbonPanel5.SuspendLayout();
             this.ribbonPanel2.SuspendLayout();
             this.ribbonPanel15.SuspendLayout();
-            this.ribbonPanel4.SuspendLayout();
             this.ribbonPanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.panelOfTable.SuspendLayout();
@@ -2331,6 +2331,186 @@
             this.ribbonControl1.Text = "ribbonControl1";
             this.ribbonControl1.UseCustomizeDialog = false;
             // 
+            // ribbonPanel6
+            // 
+            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
+            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel6.Name = "ribbonPanel6";
+            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel6.Style.Class = "";
+            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseDown.Class = "";
+            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel6.StyleMouseOver.Class = "";
+            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel6.TabIndex = 38;
+            // 
+            // ribbonBar6
+            // 
+            this.ribbonBar6.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.BackgroundStyle.Class = "";
+            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.ContainerControlProcessDialogKey = true;
+            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.buttonItemSPSZ,
+            this.buttonItem8,
+            this.buttonItemLocation,
+            this.sliderItem2,
+            this.buttonItemGBJC});
+            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar6.Name = "ribbonBar6";
+            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
+            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar6.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyle.Class = "";
+            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar6.TitleStyleMouseOver.Class = "";
+            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar6.TitleVisible = false;
+            // 
+            // buttonItemSPSZ
+            // 
+            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
+            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
+            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
+            this.buttonItemSPSZ.Text = "双屏设置";
+            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
+            // 
+            // buttonItem8
+            // 
+            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
+            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItem8.Name = "buttonItem8";
+            this.buttonItem8.SubItemsExpandWidth = 14;
+            this.buttonItem8.Text = "双屏分析";
+            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
+            // 
+            // buttonItemLocation
+            // 
+            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
+            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemLocation.Name = "buttonItemLocation";
+            this.buttonItemLocation.SubItemsExpandWidth = 14;
+            this.buttonItemLocation.Text = "快速定位";
+            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
+            // 
+            // sliderItem2
+            // 
+            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
+            this.sliderItem2.LabelWidth = 50;
+            this.sliderItem2.Name = "sliderItem2";
+            this.sliderItem2.Text = "地面透明度";
+            this.sliderItem2.TextColor = System.Drawing.Color.Black;
+            this.sliderItem2.Value = 0;
+            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
+            // 
+            // buttonItemGBJC
+            // 
+            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
+            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.buttonItemGBJC.Name = "buttonItemGBJC";
+            this.buttonItemGBJC.SubItemsExpandWidth = 14;
+            this.buttonItemGBJC.Text = "国标检测";
+            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
+            // 
+            // ribbonPanel4
+            // 
+            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
+            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
+            this.ribbonPanel4.Name = "ribbonPanel4";
+            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
+            // 
+            // 
+            // 
+            this.ribbonPanel4.Style.Class = "";
+            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseDown.Class = "";
+            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonPanel4.StyleMouseOver.Class = "";
+            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonPanel4.TabIndex = 36;
+            this.ribbonPanel4.Visible = false;
+            // 
+            // ribbonBar1
+            // 
+            this.ribbonBar1.AutoOverflowEnabled = true;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
+            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.BackgroundStyle.Class = "";
+            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.ContainerControlProcessDialogKey = true;
+            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
+            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
+            this.btn_document_info});
+            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
+            this.ribbonBar1.Name = "ribbonBar1";
+            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
+            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.ribbonBar1.TabIndex = 0;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyle.Class = "";
+            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            // 
+            // 
+            // 
+            this.ribbonBar1.TitleStyleMouseOver.Class = "";
+            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
+            this.ribbonBar1.TitleVisible = false;
+            // 
+            // btn_document_info
+            // 
+            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
+            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
+            this.btn_document_info.Name = "btn_document_info";
+            this.btn_document_info.SubItemsExpandWidth = 14;
+            this.btn_document_info.Text = "文档管理";
+            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
+            // 
             // ribbonPanel12
             // 
             this.ribbonPanel12.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -2507,116 +2687,6 @@
             this.btn_check_history.Text = "审核历史";
             this.btn_check_history.Click += new System.EventHandler(this.btn_check_history_Click);
             // 
-            // ribbonPanel6
-            // 
-            this.ribbonPanel6.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel6.Controls.Add(this.ribbonBar6);
-            this.ribbonPanel6.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel6.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel6.Name = "ribbonPanel6";
-            this.ribbonPanel6.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel6.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel6.Style.Class = "";
-            this.ribbonPanel6.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseDown.Class = "";
-            this.ribbonPanel6.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel6.StyleMouseOver.Class = "";
-            this.ribbonPanel6.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel6.TabIndex = 38;
-            // 
-            // ribbonBar6
-            // 
-            this.ribbonBar6.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar6.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.BackgroundStyle.Class = "";
-            this.ribbonBar6.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.ContainerControlProcessDialogKey = true;
-            this.ribbonBar6.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar6.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.buttonItemSPSZ,
-            this.buttonItem8,
-            this.buttonItemLocation,
-            this.sliderItem2,
-            this.buttonItemGBJC});
-            this.ribbonBar6.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar6.Name = "ribbonBar6";
-            this.ribbonBar6.Size = new System.Drawing.Size(427, 59);
-            this.ribbonBar6.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar6.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyle.Class = "";
-            this.ribbonBar6.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar6.TitleStyleMouseOver.Class = "";
-            this.ribbonBar6.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar6.TitleVisible = false;
-            // 
-            // buttonItemSPSZ
-            // 
-            this.buttonItemSPSZ.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemSPSZ.Image")));
-            this.buttonItemSPSZ.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemSPSZ.Name = "buttonItemSPSZ";
-            this.buttonItemSPSZ.SubItemsExpandWidth = 14;
-            this.buttonItemSPSZ.Text = "双屏设置";
-            this.buttonItemSPSZ.Click += new System.EventHandler(this.buttonItemSPSZ_Click);
-            // 
-            // buttonItem8
-            // 
-            this.buttonItem8.Image = ((System.Drawing.Image)(resources.GetObject("buttonItem8.Image")));
-            this.buttonItem8.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItem8.Name = "buttonItem8";
-            this.buttonItem8.SubItemsExpandWidth = 14;
-            this.buttonItem8.Text = "双屏分析";
-            this.buttonItem8.Click += new System.EventHandler(this.buttonItem8_Click);
-            // 
-            // buttonItemLocation
-            // 
-            this.buttonItemLocation.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemLocation.Image")));
-            this.buttonItemLocation.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemLocation.Name = "buttonItemLocation";
-            this.buttonItemLocation.SubItemsExpandWidth = 14;
-            this.buttonItemLocation.Text = "快速定位";
-            this.buttonItemLocation.Click += new System.EventHandler(this.buttonItemLocation_Click);
-            // 
-            // sliderItem2
-            // 
-            this.sliderItem2.LabelPosition = DevComponents.DotNetBar.eSliderLabelPosition.Top;
-            this.sliderItem2.LabelWidth = 50;
-            this.sliderItem2.Name = "sliderItem2";
-            this.sliderItem2.Text = "地面透明度";
-            this.sliderItem2.TextColor = System.Drawing.Color.Black;
-            this.sliderItem2.Value = 0;
-            this.sliderItem2.ValueChanged += new System.EventHandler(this.sliderItem2_ValueChanged);
-            // 
-            // buttonItemGBJC
-            // 
-            this.buttonItemGBJC.Image = ((System.Drawing.Image)(resources.GetObject("buttonItemGBJC.Image")));
-            this.buttonItemGBJC.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.buttonItemGBJC.Name = "buttonItemGBJC";
-            this.buttonItemGBJC.SubItemsExpandWidth = 14;
-            this.buttonItemGBJC.Text = "国标检测";
-            this.buttonItemGBJC.Click += new System.EventHandler(this.buttonItemGBJC_Click);
-            // 
             // ribbonPanel5
             // 
             this.ribbonPanel5.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
@@ -4216,76 +4286,6 @@
             this.buttonItemBZ11.Text = "标注管理";
             this.buttonItemBZ11.Click += new System.EventHandler(this.buttonItemBZ11_Click);
             // 
-            // ribbonPanel4
-            // 
-            this.ribbonPanel4.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonPanel4.Controls.Add(this.ribbonBar1);
-            this.ribbonPanel4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.ribbonPanel4.Location = new System.Drawing.Point(0, 33);
-            this.ribbonPanel4.Name = "ribbonPanel4";
-            this.ribbonPanel4.Padding = new System.Windows.Forms.Padding(3, 0, 3, 3);
-            this.ribbonPanel4.Size = new System.Drawing.Size(1328, 62);
-            // 
-            // 
-            // 
-            this.ribbonPanel4.Style.Class = "";
-            this.ribbonPanel4.Style.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseDown.Class = "";
-            this.ribbonPanel4.StyleMouseDown.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonPanel4.StyleMouseOver.Class = "";
-            this.ribbonPanel4.StyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonPanel4.TabIndex = 36;
-            this.ribbonPanel4.Visible = false;
-            // 
-            // ribbonBar1
-            // 
-            this.ribbonBar1.AutoOverflowEnabled = true;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundMouseOverStyle.Class = "";
-            this.ribbonBar1.BackgroundMouseOverStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.BackgroundStyle.Class = "";
-            this.ribbonBar1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.ContainerControlProcessDialogKey = true;
-            this.ribbonBar1.Dock = System.Windows.Forms.DockStyle.Left;
-            this.ribbonBar1.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
-            this.btn_document_info});
-            this.ribbonBar1.Location = new System.Drawing.Point(3, 0);
-            this.ribbonBar1.Name = "ribbonBar1";
-            this.ribbonBar1.Size = new System.Drawing.Size(88, 59);
-            this.ribbonBar1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.ribbonBar1.TabIndex = 0;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyle.Class = "";
-            this.ribbonBar1.TitleStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            // 
-            // 
-            // 
-            this.ribbonBar1.TitleStyleMouseOver.Class = "";
-            this.ribbonBar1.TitleStyleMouseOver.CornerType = DevComponents.DotNetBar.eCornerType.Square;
-            this.ribbonBar1.TitleVisible = false;
-            // 
-            // btn_document_info
-            // 
-            this.btn_document_info.Image = ((System.Drawing.Image)(resources.GetObject("btn_document_info.Image")));
-            this.btn_document_info.ImagePosition = DevComponents.DotNetBar.eImagePosition.Top;
-            this.btn_document_info.Name = "btn_document_info";
-            this.btn_document_info.SubItemsExpandWidth = 14;
-            this.btn_document_info.Text = "文档管理";
-            this.btn_document_info.Click += new System.EventHandler(this.btn_document_info_Click);
-            // 
             // ribbonPanel1
             // 
             this.ribbonPanel1.AutoSize = true;
@@ -5480,7 +5480,7 @@
             this.dataGridViewX2.ReadOnly = true;
             this.dataGridViewX2.RowHeadersVisible = false;
             this.dataGridViewX2.RowTemplate.Height = 23;
-            this.dataGridViewX2.Size = new System.Drawing.Size(23062, 92);
+            this.dataGridViewX2.Size = new System.Drawing.Size(23359, 92);
             this.dataGridViewX2.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn10
@@ -5574,7 +5574,7 @@
             this.dataGridViewX3.ReadOnly = true;
             this.dataGridViewX3.RowHeadersVisible = false;
             this.dataGridViewX3.RowTemplate.Height = 23;
-            this.dataGridViewX3.Size = new System.Drawing.Size(23061, 127);
+            this.dataGridViewX3.Size = new System.Drawing.Size(23358, 127);
             this.dataGridViewX3.TabIndex = 5;
             this.dataGridViewX3.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX3_MouseDoubleClick);
             // 
@@ -5832,7 +5832,7 @@
             this.dataGridViewX8.ReadOnly = true;
             this.dataGridViewX8.RowHeadersVisible = false;
             this.dataGridViewX8.RowTemplate.Height = 23;
-            this.dataGridViewX8.Size = new System.Drawing.Size(150, 92);
+            this.dataGridViewX8.Size = new System.Drawing.Size(133, 92);
             this.dataGridViewX8.TabIndex = 11;
             // 
             // dataGridViewTextBoxColumn12
@@ -5927,7 +5927,7 @@
             this.dataGridViewX9.ReadOnly = true;
             this.dataGridViewX9.RowHeadersVisible = false;
             this.dataGridViewX9.RowTemplate.Height = 23;
-            this.dataGridViewX9.Size = new System.Drawing.Size(149, 127);
+            this.dataGridViewX9.Size = new System.Drawing.Size(132, 127);
             this.dataGridViewX9.TabIndex = 5;
             this.dataGridViewX9.MouseDoubleClick += new System.Windows.Forms.MouseEventHandler(this.dataGridViewX9_MouseDoubleClick);
             // 
@@ -6791,12 +6791,12 @@
             this.contextMenuStripDeleteLayerNode.ResumeLayout(false);
             this.ribbonControl1.ResumeLayout(false);
             this.ribbonControl1.PerformLayout();
-            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel6.ResumeLayout(false);
+            this.ribbonPanel4.ResumeLayout(false);
+            this.ribbonPanel12.ResumeLayout(false);
             this.ribbonPanel5.ResumeLayout(false);
             this.ribbonPanel2.ResumeLayout(false);
             this.ribbonPanel15.ResumeLayout(false);
-            this.ribbonPanel4.ResumeLayout(false);
             this.ribbonPanel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panelOfTable.ResumeLayout(false);
diff --git a/Utility.cs b/Utility.cs
index c34bf71..bcc0bd4 100644
--- a/Utility.cs
+++ b/Utility.cs
@@ -79,6 +79,7 @@
         public static string filenamePipelineType = Application.StartupPath + "\\PipelineType.xml";
         public static string filenameDbconfig = Application.StartupPath + "\\databaseConfig.xml";
         public static string filenameLocation = Application.StartupPath + "\\Location.xml";
+        public static string layerConfigFile = Application.StartupPath + "\\layerConfig.xml";
         #region wxl 从MainFrm重构来，读取一遍config.xml
         public static List<string> m_PipelineLayerNames = new List<string>();//线图层名称
         public static List<string> workwellLayerNames = new List<string>();//工井图层名称
@@ -420,7 +421,7 @@
 
             #region wxl 从layerconfig.xml中读取
 
-            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>("layerConfig.xml");
+            layerConfig = XmlTools.DeserializeFromXml<LayerConfig>(layerConfigFile);
             List<DataSrc> dataSrcs = layerConfig.datasrcs;
             
             foreach (var dataSrc in dataSrcs)
@@ -436,6 +437,7 @@
                         {
                             LayerNamesList.Add(layer.layer.Substring(0, layer.layer.Length - 2));
                         }
+                        if (layer.flag == null||layer.flag.Trim().Equals("")) continue;
                         if (!layer.layersrc.Equals("db")&&layer.flag.Equals("road"))
                         {
                             roadLayerName = layer.label;
diff --git a/app.config b/app.config
index 5753e1b..f4cbe66 100644
--- a/app.config
+++ b/app.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.exe.config b/bin/x86/Debug/Cyberpipe.exe.config
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ b/bin/x86/Debug/Cyberpipe.exe.config
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.config b/bin/x86/Debug/Cyberpipe.vshost.exe.config
index 5753e1b..f4cbe66 100644
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.config
+++ b/bin/x86/Debug/Cyberpipe.vshost.exe.config
@@ -29,30 +29,4 @@
       </providers>
     </roleManager>
   </system.web>
-  <configSections>
-     <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
-  </configSections>
-   <log4net>
-     <!--定义输出到文件中-->
-     <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
-     <!--定义文件存放位置-->
-     <file value="log\\"/>
-       <appendToFile value="true"/>
-       <rollingStyle value="Date"/>
-       <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
-       <staticLogFileName value="false"/>
-       <param name="MaxSizeRollBackups" value="100"/>
-       <layout type="log4net.Layout.PatternLayout">
-         <!--每条日志末尾的文字说明-->
-         <!--输出格式-->
-         <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
-         <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
-       </layout>
-      </appender>
-      <root>
-        <level value="ERROR"/>
-        <!--文件形式记录日志-->
-        <appender-ref ref="RollingLogFileAppender"/>
-       </root>
-   </log4net>
 </configuration>
diff --git a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest b/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
deleted file mode 100644
index 061c9ca..0000000
--- a/bin/x86/Debug/Cyberpipe.vshost.exe.manifest
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>
diff --git a/bin/x86/Debug/glVersion.txt b/bin/x86/Debug/glVersion.txt
index 3dc3245..1fc46d0 100644
--- a/bin/x86/Debug/glVersion.txt
+++ b/bin/x86/Debug/glVersion.txt
Binary files differ
diff --git a/log4net.config b/log4net.config
new file mode 100644
index 0000000..80f9b25
--- /dev/null
+++ b/log4net.config
@@ -0,0 +1,31 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <section name="log4net" type="log4net.Config.Log4NetConfigurationSectionHandler, log4net"/>
+  </configSections>
+  <log4net>
+    <!--定义输出到文件中-->
+    <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
+      <!--定义文件存放位置-->
+      <file value="log\\"/>
+      <appendToFile value="true"/>
+      <rollingStyle value="Date"/>
+      <datePattern value="yyyy\\yyyyMM\\yyyyMMdd'.txt'"/>
+      <staticLogFileName value="false"/>
+      <param name="MaxSizeRollBackups" value="100"/>
+      <layout type="log4net.Layout.PatternLayout">
+        <!--每条日志末尾的文字说明-->
+        <!--输出格式-->
+        <!--样例：2008-03-26 13:42:32,111 [10] INFO  Log4NetDemo.MainClass [(null)] - info-->
+        <conversionPattern value="%newline %n记录时间：%date %n线程ID:[%thread] %n日志级别：  %-5level %n出错类：%logger 
+
+property: [%property{NDC}] - %n错误描述：%message%newline %n"/>
+      </layout>
+    </appender>
+    <root>
+      <level value="ERROR"/>
+      <!--文件形式记录日志-->
+      <appender-ref ref="RollingLogFileAppender"/>
+    </root>
+  </log4net>
+</configuration>
diff --git "a/\345\211\257\346\234\254 app.config" "b/\345\211\257\346\234\254 app.config"
new file mode 100644
index 0000000..f4cbe66
--- /dev/null
+++ "b/\345\211\257\346\234\254 app.config"
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<configuration>
+  <configSections>
+    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+      <section name="Cyberpipe.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
+    </sectionGroup>
+  </configSections>
+  <appSettings>
+    <add key="upurl" value="http://127.0.0.1:8001/save.aspx"/>
+    <add key="downurl" value="http://127.0.0.1:8001/files"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
+  </appSettings>
+  <startup useLegacyV2RuntimeActivationPolicy="true">
+    
+  <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0"/></startup>
+  <system.serviceModel>
+    <bindings/>
+    <client/>
+  </system.serviceModel>
+  <system.web>
+    <membership defaultProvider="ClientAuthenticationMembershipProvider">
+      <providers>
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
+      </providers>
+    </membership>
+    <roleManager defaultProvider="ClientRoleProvider" enabled="true">
+      <providers>
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
+      </providers>
+    </roleManager>
+  </system.web>
+</configuration>