gongqiuhong 5 ماه پیش
والد
کامیت
141ea5227f

+ 1 - 0
DW5S.App/MainForm.cs

@@ -77,6 +77,7 @@ namespace DW5S
             ctrlTypes.Add("信号仿真", typeof(SignalEmulation));
             ctrlTypes.Add("服务状态", typeof(CtrlSvrs));
             ctrlTypes.Add("服务日志", typeof(CtrlSvrLog));
+            ctrlTypes.Add("采集结果", typeof(CtrlSvrLog));
             DxHelper.WaitHelper.UpdateSplashMessage("正在检查数据库环境...");
 
         }

+ 169 - 0
DW5S.App/UserControl/CtrlAdRes.Designer.cs

@@ -0,0 +1,169 @@
+namespace DW5S.App.UserControl
+{
+    partial class CtrlAdRes
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            gridAdRes = new DevExpress.XtraGrid.GridControl();
+            gridView = new DevExpress.XtraGrid.Views.Grid.GridView();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            btnQuery = new DevExpress.XtraEditors.SimpleButton();
+            dateEdit1 = new DevExpress.XtraEditors.DateEdit();
+            Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)gridAdRes).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)gridView).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)dateEdit1.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)dateEdit1.Properties.CalendarTimeProperties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+            SuspendLayout();
+            // 
+            // gridAdRes
+            // 
+            gridAdRes.Location = new System.Drawing.Point(12, 38);
+            gridAdRes.MainView = gridView;
+            gridAdRes.Name = "gridAdRes";
+            gridAdRes.Size = new System.Drawing.Size(625, 292);
+            gridAdRes.TabIndex = 4;
+            gridAdRes.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView });
+            // 
+            // gridView
+            // 
+            gridView.GridControl = gridAdRes;
+            gridView.Name = "gridView";
+            // 
+            // layoutControl1
+            // 
+            layoutControl1.Controls.Add(btnQuery);
+            layoutControl1.Controls.Add(dateEdit1);
+            layoutControl1.Controls.Add(gridAdRes);
+            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            layoutControl1.Location = new System.Drawing.Point(0, 0);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.Root = Root;
+            layoutControl1.Size = new System.Drawing.Size(649, 342);
+            layoutControl1.TabIndex = 5;
+            layoutControl1.Text = "layoutControl1";
+            // 
+            // btnQuery
+            // 
+            btnQuery.Location = new System.Drawing.Point(585, 12);
+            btnQuery.Name = "btnQuery";
+            btnQuery.Size = new System.Drawing.Size(52, 22);
+            btnQuery.StyleController = layoutControl1;
+            btnQuery.TabIndex = 6;
+            btnQuery.Text = "查询";
+            btnQuery.Click += btnQuery_Click;
+            // 
+            // dateEdit1
+            // 
+            dateEdit1.EditValue = null;
+            dateEdit1.Location = new System.Drawing.Point(72, 12);
+            dateEdit1.Name = "dateEdit1";
+            dateEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            dateEdit1.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            dateEdit1.Size = new System.Drawing.Size(509, 20);
+            dateEdit1.StyleController = layoutControl1;
+            dateEdit1.TabIndex = 5;
+            // 
+            // Root
+            // 
+            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            Root.GroupBordersVisible = false;
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3 });
+            Root.Name = "Root";
+            Root.Size = new System.Drawing.Size(649, 342);
+            Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            layoutControlItem1.Control = gridAdRes;
+            layoutControlItem1.Location = new System.Drawing.Point(0, 26);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Size = new System.Drawing.Size(629, 296);
+            layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem1.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            layoutControlItem2.Control = dateEdit1;
+            layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new System.Drawing.Size(573, 26);
+            layoutControlItem2.Text = "信号时间";
+            layoutControlItem2.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem3
+            // 
+            layoutControlItem3.Control = btnQuery;
+            layoutControlItem3.Location = new System.Drawing.Point(573, 0);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Size = new System.Drawing.Size(56, 26);
+            layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem3.TextVisible = false;
+            // 
+            // CtrlAdRes
+            // 
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(layoutControl1);
+            Name = "CtrlAdRes";
+            Size = new System.Drawing.Size(649, 342);
+            Load += CtrlAdRes_Load;
+            ((System.ComponentModel.ISupportInitialize)gridAdRes).EndInit();
+            ((System.ComponentModel.ISupportInitialize)gridView).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)dateEdit1.Properties.CalendarTimeProperties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)dateEdit1.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+            ResumeLayout(false);
+        }
+
+        #endregion
+
+        private DevExpress.XtraGrid.GridControl gridAdRes;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraEditors.DateEdit dateEdit1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraEditors.SimpleButton btnQuery;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+    }
+}

+ 49 - 0
DW5S.App/UserControl/CtrlAdRes.cs

@@ -0,0 +1,49 @@
+using DW5S.DTO;
+using DW5S.Entity;
+using DW5S.Repostory;
+using DW5S.ViewModel;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace DW5S.App.UserControl
+{
+    public partial class CtrlAdRes : DevExpress.XtraEditors.XtraUserControl
+    {
+        List<ADResViewModel> list = new List<ADResViewModel>();
+        public CtrlAdRes()
+        {
+            InitializeComponent();
+        }
+
+        private void CtrlAdRes_Load(object sender, EventArgs e)
+        {
+            try
+            {
+                gridAdRes.UseDefault(list).UseEmptyText("无结果").UseRowNumber().UseDeleteAsync<ADResViewModel>(async data =>
+                {
+                var delItems = data.Select(t => new LogDeleteDto(t.Id));
+                var rsp = await HttpHelper.PostRequestAsync(SysConfig.GetUrl("Log/Delete"), delItems);
+                return rsp.code == 200;
+                });
+            }
+            catch (Exception ex)
+            {
+                string msg = "查询采集结果异常";
+                IocContainer.Logger.Error(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
+            }
+        }
+
+        private void btnQuery_Click(object sender, EventArgs e)
+        {
+
+        }
+    }
+}

+ 120 - 0
DW5S.App/UserControl/CtrlAdRes.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema 
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 25 - 17
DW5S.App/UserControl/CtrlSvrLog.cs

@@ -41,27 +41,35 @@ namespace DW5S.App.UserControl
 
         private async void CtrlSvrs_Load(object sender, EventArgs e)
         {
-           
-            gridLog.UseDefault(list).UseEmptyText("无结果").UseRowNumber().UseDeleteAsync<LogResViewModel>(async data =>
+            try
             {
-                var delItems = data.Select(t => new LogDeleteDto(t.Id));
-                var rsp = await HttpHelper.PostRequestAsync(SysConfig.GetUrl("Log/Delete"), delItems);
-                return rsp.code == 200;
+                gridLog.UseDefault(list).UseEmptyText("无结果").UseRowNumber().UseDeleteAsync<LogResViewModel>(async data =>
+                {
+                    var delItems = data.Select(t => new LogDeleteDto(t.Id));
+                    var rsp = await HttpHelper.PostRequestAsync(SysConfig.GetUrl("Log/Delete"), delItems);
+                    return rsp.code == 200;
 
-            }).UseExportCsv().SetLogImageColumn(nameof(LogResViewModel.LogType), typeof(EnumLogType));
-            gridView1.Columns[nameof(LogResViewModel.LogType)].MaxWidth = 100;
-            gridView1.Columns[nameof(LogResViewModel.LogTime)].MaxWidth = 160;
-            gridView1.Columns[nameof(LogResViewModel.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
-            this.txtLogModules.Properties.Items.Add("全部", "全部", -1);
-            var res = await HttpHelper.PostRequestAsync<List<LogModulesResDto>>(SysConfig.GetUrl("Log/GetModules"), null);
-            if (res.data != null && res.data.Any())
-            {
-                foreach (var item in res.data)
+                }).UseExportCsv().SetLogImageColumn(nameof(LogResViewModel.LogType), typeof(EnumLogType));
+                gridView1.Columns[nameof(LogResViewModel.LogType)].MaxWidth = 100;
+                gridView1.Columns[nameof(LogResViewModel.LogTime)].MaxWidth = 160;
+                gridView1.Columns[nameof(LogResViewModel.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
+                this.txtLogModules.Properties.Items.Add("全部", "全部", -1);
+                var res = await HttpHelper.PostRequestAsync<List<LogModulesResDto>>(SysConfig.GetUrl("Log/GetModules"), null);
+                if (res.data != null && res.data.Any())
                 {
-                    this.txtLogModules.Properties.Items.Add(item.Module, item.Module, -1);
+                    foreach (var item in res.data)
+                    {
+                        this.txtLogModules.Properties.Items.Add(item.Module, item.Module, -1);
+                    }
                 }
+                this.txtLogModules.SelectedIndex = 0;
+            }
+            catch (Exception ex)
+            {
+                string msg = "查询日志异常";
+                IocContainer.Logger.Error(ex, msg);
+                DxHelper.MsgBoxHelper.ShowError(msg);
             }
-            this.txtLogModules.SelectedIndex = 0;
         }
 
         private async void btnQuery_Click(object sender, EventArgs e)
@@ -105,7 +113,7 @@ namespace DW5S.App.UserControl
             }
             catch (Exception ex)
             {
-                IocContainer.Logger.Error(ex,"查询日志出错");
+                IocContainer.Logger.Error(ex, "查询日志出错");
                 MsgBoxHelper.ShowError("查询日志出错");
             }
             btnQuery.Enabled = true;

+ 317 - 338
DW5S.App/UserControl/CtrlSysSettings.Designer.cs

@@ -29,416 +29,395 @@ namespace DW5S.App.UserControl
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtTimeZone = new DevExpress.XtraScheduler.UI.TimeZoneEdit();
-            this.txtLayer = new DevExpress.XtraEditors.CheckedListBoxControl();
-            this.txtMapType = new DevExpress.XtraEditors.RadioGroup();
-            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
-            this.txtHttpPort = new DevExpress.XtraEditors.TextEdit();
-            this.txtXLDirectory = new DevExpress.XtraEditors.TextEdit();
-            this.txtYDPZThreshold = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtWmtsSource = new DevExpress.XtraEditors.RadioGroup();
-            this.toolTipController1 = new DevExpress.Utils.ToolTipController(this.components);
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.itemWmtsSource = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemMapLayer = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txtSampleDire = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
-            this.tablePanel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTimeZone.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMapType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtHttpPort.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtXLDirectory.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYDPZThreshold.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWmtsSource.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemWmtsSource)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSampleDire.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            this.SuspendLayout();
+            components = new System.ComponentModel.Container();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            txtTimeZone = new DevExpress.XtraScheduler.UI.TimeZoneEdit();
+            txtLayer = new DevExpress.XtraEditors.CheckedListBoxControl();
+            txtMapType = new DevExpress.XtraEditors.RadioGroup();
+            btnSave = new DevExpress.XtraEditors.SimpleButton();
+            txtHttpPort = new DevExpress.XtraEditors.TextEdit();
+            txtXLDirectory = new DevExpress.XtraEditors.TextEdit();
+            txtYDPZThreshold = new DevExpress.XtraEditors.ButtonEdit();
+            txtWmtsSource = new DevExpress.XtraEditors.RadioGroup();
+            toolTipController1 = new DevExpress.Utils.ToolTipController(components);
+            txtSampleDire = new DevExpress.XtraEditors.TextEdit();
+            Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            itemWmtsSource = new DevExpress.XtraLayout.LayoutControlItem();
+            itemMapLayer = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)tablePanel1).BeginInit();
+            tablePanel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)txtTimeZone.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtLayer).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtMapType.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtHttpPort.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtXLDirectory.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtYDPZThreshold.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtWmtsSource.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtSampleDire.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)itemWmtsSource).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)itemMapLayer).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            SuspendLayout();
             // 
             // tablePanel1
             // 
-            this.tablePanel1.Columns.AddRange(new DevExpress.Utils.Layout.TablePanelColumn[] {
-            new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F),
-            new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 405F),
-            new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F)});
-            this.tablePanel1.Controls.Add(this.layoutControl1);
-            this.tablePanel1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tablePanel1.Location = new System.Drawing.Point(0, 0);
-            this.tablePanel1.Name = "tablePanel1";
-            this.tablePanel1.Rows.AddRange(new DevExpress.Utils.Layout.TablePanelRow[] {
-            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F),
-            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 469F),
-            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F)});
-            this.tablePanel1.Size = new System.Drawing.Size(619, 557);
-            this.tablePanel1.TabIndex = 0;
-            this.tablePanel1.UseSkinIndents = true;
+            tablePanel1.Columns.AddRange(new DevExpress.Utils.Layout.TablePanelColumn[] { new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F), new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 405F), new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F) });
+            tablePanel1.Controls.Add(layoutControl1);
+            tablePanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            tablePanel1.Location = new System.Drawing.Point(0, 0);
+            tablePanel1.Name = "tablePanel1";
+            tablePanel1.Rows.AddRange(new DevExpress.Utils.Layout.TablePanelRow[] { new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F), new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 469F), new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F) });
+            tablePanel1.Size = new System.Drawing.Size(619, 557);
+            tablePanel1.TabIndex = 0;
+            tablePanel1.UseSkinIndents = true;
             // 
             // layoutControl1
             // 
-            this.tablePanel1.SetColumn(this.layoutControl1, 1);
-            this.layoutControl1.Controls.Add(this.txtTimeZone);
-            this.layoutControl1.Controls.Add(this.txtLayer);
-            this.layoutControl1.Controls.Add(this.txtMapType);
-            this.layoutControl1.Controls.Add(this.btnSave);
-            this.layoutControl1.Controls.Add(this.txtHttpPort);
-            this.layoutControl1.Controls.Add(this.txtXLDirectory);
-            this.layoutControl1.Controls.Add(this.txtYDPZThreshold);
-            this.layoutControl1.Controls.Add(this.txtWmtsSource);
-            this.layoutControl1.Controls.Add(this.txtSampleDire);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(109, 46);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(941, 140, 650, 400);
-            this.layoutControl1.Root = this.Root;
-            this.tablePanel1.SetRow(this.layoutControl1, 1);
-            this.layoutControl1.Size = new System.Drawing.Size(401, 465);
-            this.layoutControl1.TabIndex = 0;
-            this.layoutControl1.Text = "layoutControl1";
+            tablePanel1.SetColumn(layoutControl1, 1);
+            layoutControl1.Controls.Add(txtTimeZone);
+            layoutControl1.Controls.Add(txtLayer);
+            layoutControl1.Controls.Add(txtMapType);
+            layoutControl1.Controls.Add(btnSave);
+            layoutControl1.Controls.Add(txtHttpPort);
+            layoutControl1.Controls.Add(txtXLDirectory);
+            layoutControl1.Controls.Add(txtYDPZThreshold);
+            layoutControl1.Controls.Add(txtWmtsSource);
+            layoutControl1.Controls.Add(txtSampleDire);
+            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            layoutControl1.Location = new System.Drawing.Point(109, 46);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(941, 140, 650, 400);
+            layoutControl1.Root = Root;
+            tablePanel1.SetRow(layoutControl1, 1);
+            layoutControl1.Size = new System.Drawing.Size(401, 465);
+            layoutControl1.TabIndex = 0;
+            layoutControl1.Text = "layoutControl1";
             // 
             // txtTimeZone
             // 
-            this.txtTimeZone.Location = new System.Drawing.Point(12, 29);
-            this.txtTimeZone.Name = "txtTimeZone";
-            this.txtTimeZone.Properties.AutoHeight = false;
-            this.txtTimeZone.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTimeZone.Size = new System.Drawing.Size(377, 22);
-            this.txtTimeZone.StyleController = this.layoutControl1;
-            this.txtTimeZone.TabIndex = 13;
+            txtTimeZone.Location = new System.Drawing.Point(12, 29);
+            txtTimeZone.Name = "txtTimeZone";
+            txtTimeZone.Properties.AutoHeight = false;
+            txtTimeZone.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtTimeZone.Size = new System.Drawing.Size(377, 22);
+            txtTimeZone.StyleController = layoutControl1;
+            txtTimeZone.TabIndex = 13;
             // 
             // txtLayer
             // 
-            this.txtLayer.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
-            this.txtLayer.CheckOnClick = true;
-            this.txtLayer.Location = new System.Drawing.Point(12, 387);
-            this.txtLayer.MultiColumn = true;
-            this.txtLayer.Name = "txtLayer";
-            this.txtLayer.SelectionMode = System.Windows.Forms.SelectionMode.None;
-            this.txtLayer.Size = new System.Drawing.Size(377, 25);
-            this.txtLayer.StyleController = this.layoutControl1;
-            this.txtLayer.TabIndex = 12;
+            txtLayer.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+            txtLayer.CheckOnClick = true;
+            txtLayer.Location = new System.Drawing.Point(12, 387);
+            txtLayer.MultiColumn = true;
+            txtLayer.Name = "txtLayer";
+            txtLayer.SelectionMode = System.Windows.Forms.SelectionMode.None;
+            txtLayer.Size = new System.Drawing.Size(377, 25);
+            txtLayer.StyleController = layoutControl1;
+            txtLayer.TabIndex = 12;
             // 
             // txtMapType
             // 
-            this.txtMapType.EditValue = 0;
-            this.txtMapType.Location = new System.Drawing.Point(12, 279);
-            this.txtMapType.Name = "txtMapType";
-            this.txtMapType.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
-            this.txtMapType.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(0, "本地地图"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(1, "WMTS")});
-            this.txtMapType.Size = new System.Drawing.Size(377, 25);
-            this.txtMapType.StyleController = this.layoutControl1;
-            this.txtMapType.TabIndex = 9;
-            this.txtMapType.SelectedIndexChanged += new System.EventHandler(this.txtMapType_SelectedIndexChanged);
+            txtMapType.EditValue = 0;
+            txtMapType.Location = new System.Drawing.Point(12, 279);
+            txtMapType.Name = "txtMapType";
+            txtMapType.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+            txtMapType.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] { new DevExpress.XtraEditors.Controls.RadioGroupItem(0, "本地地图"), new DevExpress.XtraEditors.Controls.RadioGroupItem(1, "WMTS") });
+            txtMapType.Size = new System.Drawing.Size(377, 25);
+            txtMapType.StyleController = layoutControl1;
+            txtMapType.TabIndex = 9;
+            txtMapType.SelectedIndexChanged += txtMapType_SelectedIndexChanged;
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(138, 424);
-            this.btnSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.btnSave.MaximumSize = new System.Drawing.Size(0, 22);
-            this.btnSave.MinimumSize = new System.Drawing.Size(0, 22);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(123, 22);
-            this.btnSave.StyleController = this.layoutControl1;
-            this.btnSave.TabIndex = 4;
-            this.btnSave.Text = "保存";
-            this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+            btnSave.Location = new System.Drawing.Point(138, 424);
+            btnSave.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            btnSave.MaximumSize = new System.Drawing.Size(0, 22);
+            btnSave.MinimumSize = new System.Drawing.Size(0, 22);
+            btnSave.Name = "btnSave";
+            btnSave.Size = new System.Drawing.Size(123, 22);
+            btnSave.StyleController = layoutControl1;
+            btnSave.TabIndex = 4;
+            btnSave.Text = "保存";
+            btnSave.Click += btnSave_Click;
             // 
             // txtHttpPort
             // 
-            this.txtHttpPort.EditValue = "";
-            this.txtHttpPort.Location = new System.Drawing.Point(12, 79);
-            this.txtHttpPort.Name = "txtHttpPort";
-            this.txtHttpPort.Properties.AutoHeight = false;
-            this.txtHttpPort.Size = new System.Drawing.Size(377, 22);
-            this.txtHttpPort.StyleController = this.layoutControl1;
-            this.txtHttpPort.TabIndex = 5;
+            txtHttpPort.EditValue = "";
+            txtHttpPort.Location = new System.Drawing.Point(12, 79);
+            txtHttpPort.Name = "txtHttpPort";
+            txtHttpPort.Properties.AutoHeight = false;
+            txtHttpPort.Size = new System.Drawing.Size(377, 22);
+            txtHttpPort.StyleController = layoutControl1;
+            txtHttpPort.TabIndex = 5;
             // 
             // txtXLDirectory
             // 
-            this.txtXLDirectory.Location = new System.Drawing.Point(12, 129);
-            this.txtXLDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.txtXLDirectory.Name = "txtXLDirectory";
-            this.txtXLDirectory.Properties.AutoHeight = false;
-            this.txtXLDirectory.Size = new System.Drawing.Size(377, 22);
-            this.txtXLDirectory.StyleController = this.layoutControl1;
-            this.txtXLDirectory.TabIndex = 6;
+            txtXLDirectory.Location = new System.Drawing.Point(12, 129);
+            txtXLDirectory.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            txtXLDirectory.Name = "txtXLDirectory";
+            txtXLDirectory.Properties.AutoHeight = false;
+            txtXLDirectory.Size = new System.Drawing.Size(377, 22);
+            txtXLDirectory.StyleController = layoutControl1;
+            txtXLDirectory.TabIndex = 6;
             // 
             // txtYDPZThreshold
             // 
-            this.txtYDPZThreshold.Location = new System.Drawing.Point(12, 229);
-            this.txtYDPZThreshold.Name = "txtYDPZThreshold";
-            this.txtYDPZThreshold.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
-            this.txtYDPZThreshold.Properties.AutoHeight = false;
-            this.txtYDPZThreshold.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
-            this.txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
-            this.txtYDPZThreshold.Properties.MaskSettings.Set("mask", "f0");
-            this.txtYDPZThreshold.Size = new System.Drawing.Size(377, 22);
-            this.txtYDPZThreshold.StyleController = this.layoutControl1;
-            this.txtYDPZThreshold.TabIndex = 7;
+            txtYDPZThreshold.Location = new System.Drawing.Point(12, 229);
+            txtYDPZThreshold.Name = "txtYDPZThreshold";
+            txtYDPZThreshold.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
+            txtYDPZThreshold.Properties.AutoHeight = false;
+            txtYDPZThreshold.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "Hz", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
+            txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
+            txtYDPZThreshold.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
+            txtYDPZThreshold.Properties.MaskSettings.Set("mask", "f0");
+            txtYDPZThreshold.Size = new System.Drawing.Size(377, 22);
+            txtYDPZThreshold.StyleController = layoutControl1;
+            txtYDPZThreshold.TabIndex = 7;
             // 
             // txtWmtsSource
             // 
-            this.txtWmtsSource.EditValue = 0;
-            this.txtWmtsSource.Location = new System.Drawing.Point(12, 332);
-            this.txtWmtsSource.Name = "txtWmtsSource";
-            this.txtWmtsSource.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
-            this.txtWmtsSource.Size = new System.Drawing.Size(377, 25);
-            this.txtWmtsSource.StyleController = this.layoutControl1;
-            this.txtWmtsSource.TabIndex = 7;
-            this.txtWmtsSource.ToolTipController = this.toolTipController1;
+            txtWmtsSource.EditValue = 0;
+            txtWmtsSource.Location = new System.Drawing.Point(12, 332);
+            txtWmtsSource.Name = "txtWmtsSource";
+            txtWmtsSource.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+            txtWmtsSource.Size = new System.Drawing.Size(377, 25);
+            txtWmtsSource.StyleController = layoutControl1;
+            txtWmtsSource.TabIndex = 7;
+            txtWmtsSource.ToolTipController = toolTipController1;
             // 
             // toolTipController1
             // 
-            this.toolTipController1.GetActiveObjectInfo += new DevExpress.Utils.ToolTipControllerGetActiveObjectInfoEventHandler(this.toolTipController1_GetActiveObjectInfo);
+            toolTipController1.GetActiveObjectInfo += toolTipController1_GetActiveObjectInfo;
+            // 
+            // txtSampleDire
+            // 
+            txtSampleDire.Location = new System.Drawing.Point(12, 179);
+            txtSampleDire.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            txtSampleDire.Name = "txtSampleDire";
+            txtSampleDire.Properties.AutoHeight = false;
+            txtSampleDire.Size = new System.Drawing.Size(377, 22);
+            txtSampleDire.StyleController = layoutControl1;
+            txtSampleDire.TabIndex = 6;
             // 
             // Root
             // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem3,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem1,
-            this.layoutControlItem8,
-            this.emptySpaceItem1,
-            this.emptySpaceItem2,
-            this.itemWmtsSource,
-            this.itemMapLayer,
-            this.layoutControlItem6,
-            this.layoutControlItem2});
-            this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(401, 465);
-            this.Root.TextVisible = false;
+            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            Root.GroupBordersVisible = false;
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem3, layoutControlItem4, layoutControlItem5, layoutControlItem1, layoutControlItem8, emptySpaceItem1, emptySpaceItem2, itemWmtsSource, itemMapLayer, layoutControlItem6, layoutControlItem2 });
+            Root.Name = "Root";
+            Root.Size = new System.Drawing.Size(401, 465);
+            Root.TextVisible = false;
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.btnSave;
-            this.layoutControlItem3.Location = new System.Drawing.Point(126, 404);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(36, 27);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(127, 41);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
+            layoutControlItem3.Control = btnSave;
+            layoutControlItem3.Location = new System.Drawing.Point(126, 404);
+            layoutControlItem3.MinSize = new System.Drawing.Size(36, 27);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 10, 2);
+            layoutControlItem3.Size = new System.Drawing.Size(127, 41);
+            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem3.TextVisible = false;
             // 
             // layoutControlItem4
             // 
-            this.layoutControlItem4.Control = this.txtHttpPort;
-            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.CustomizationFormText = "HTTP服务端口";
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 43);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(0, 50);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(100, 50);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem4.Size = new System.Drawing.Size(381, 50);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "HTTP服务端口";
-            this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(96, 14);
+            layoutControlItem4.Control = txtHttpPort;
+            layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem4.CustomizationFormText = "HTTP服务端口";
+            layoutControlItem4.Location = new System.Drawing.Point(0, 43);
+            layoutControlItem4.MaxSize = new System.Drawing.Size(0, 50);
+            layoutControlItem4.MinSize = new System.Drawing.Size(100, 50);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            layoutControlItem4.Size = new System.Drawing.Size(381, 50);
+            layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem4.Text = "HTTP服务端口";
+            layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem4.TextSize = new System.Drawing.Size(96, 14);
             // 
             // layoutControlItem5
             // 
-            this.layoutControlItem5.Control = this.txtXLDirectory;
-            this.layoutControlItem5.CustomizationFormText = "星历自动导入目录";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
-            this.layoutControlItem5.MaxSize = new System.Drawing.Size(0, 50);
-            this.layoutControlItem5.MinSize = new System.Drawing.Size(100, 50);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem5.Size = new System.Drawing.Size(381, 50);
-            this.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem5.Text = "星历自动导入目录";
-            this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(96, 14);
+            layoutControlItem5.Control = txtXLDirectory;
+            layoutControlItem5.CustomizationFormText = "星历自动导入目录";
+            layoutControlItem5.Location = new System.Drawing.Point(0, 93);
+            layoutControlItem5.MaxSize = new System.Drawing.Size(0, 50);
+            layoutControlItem5.MinSize = new System.Drawing.Size(100, 50);
+            layoutControlItem5.Name = "layoutControlItem5";
+            layoutControlItem5.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            layoutControlItem5.Size = new System.Drawing.Size(381, 50);
+            layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem5.Text = "星历自动导入目录";
+            layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem5.TextSize = new System.Drawing.Size(96, 14);
             // 
             // layoutControlItem1
             // 
-            this.layoutControlItem1.Control = this.txtYDPZThreshold;
-            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem1.CustomizationFormText = "运动判证阈值";
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 193);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(0, 50);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(100, 50);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem1.Size = new System.Drawing.Size(381, 50);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem1.Text = "运动判证阈值";
-            this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(96, 14);
+            layoutControlItem1.Control = txtYDPZThreshold;
+            layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem1.CustomizationFormText = "运动判证阈值";
+            layoutControlItem1.Location = new System.Drawing.Point(0, 193);
+            layoutControlItem1.MaxSize = new System.Drawing.Size(0, 50);
+            layoutControlItem1.MinSize = new System.Drawing.Size(100, 50);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            layoutControlItem1.Size = new System.Drawing.Size(381, 50);
+            layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem1.Text = "运动判证阈值";
+            layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem1.TextSize = new System.Drawing.Size(96, 14);
+            layoutControlItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // layoutControlItem8
             // 
-            this.layoutControlItem8.Control = this.txtMapType;
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 243);
-            this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 53);
-            this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 53);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem8.Size = new System.Drawing.Size(381, 53);
-            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem8.Text = "地图图源";
-            this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(96, 14);
+            layoutControlItem8.Control = txtMapType;
+            layoutControlItem8.Location = new System.Drawing.Point(0, 243);
+            layoutControlItem8.MaxSize = new System.Drawing.Size(0, 53);
+            layoutControlItem8.MinSize = new System.Drawing.Size(54, 53);
+            layoutControlItem8.Name = "layoutControlItem8";
+            layoutControlItem8.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            layoutControlItem8.Size = new System.Drawing.Size(381, 53);
+            layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem8.Text = "地图图源";
+            layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem8.TextSize = new System.Drawing.Size(96, 14);
             // 
             // emptySpaceItem1
             // 
-            this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 404);
-            this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(126, 41);
-            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
+            emptySpaceItem1.AllowHotTrack = false;
+            emptySpaceItem1.Location = new System.Drawing.Point(0, 404);
+            emptySpaceItem1.Name = "emptySpaceItem1";
+            emptySpaceItem1.Size = new System.Drawing.Size(126, 41);
+            emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // emptySpaceItem2
             // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(253, 404);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(128, 41);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            emptySpaceItem2.AllowHotTrack = false;
+            emptySpaceItem2.Location = new System.Drawing.Point(253, 404);
+            emptySpaceItem2.Name = "emptySpaceItem2";
+            emptySpaceItem2.Size = new System.Drawing.Size(128, 41);
+            emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
             // 
             // itemWmtsSource
             // 
-            this.itemWmtsSource.Control = this.txtWmtsSource;
-            this.itemWmtsSource.Location = new System.Drawing.Point(0, 296);
-            this.itemWmtsSource.MaxSize = new System.Drawing.Size(0, 53);
-            this.itemWmtsSource.MinSize = new System.Drawing.Size(50, 53);
-            this.itemWmtsSource.Name = "itemWmtsSource";
-            this.itemWmtsSource.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.itemWmtsSource.Size = new System.Drawing.Size(381, 53);
-            this.itemWmtsSource.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemWmtsSource.Text = "地图来源";
-            this.itemWmtsSource.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemWmtsSource.TextSize = new System.Drawing.Size(96, 14);
-            this.itemWmtsSource.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            itemWmtsSource.Control = txtWmtsSource;
+            itemWmtsSource.Location = new System.Drawing.Point(0, 296);
+            itemWmtsSource.MaxSize = new System.Drawing.Size(0, 53);
+            itemWmtsSource.MinSize = new System.Drawing.Size(50, 53);
+            itemWmtsSource.Name = "itemWmtsSource";
+            itemWmtsSource.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            itemWmtsSource.Size = new System.Drawing.Size(381, 53);
+            itemWmtsSource.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            itemWmtsSource.Text = "地图来源";
+            itemWmtsSource.TextLocation = DevExpress.Utils.Locations.Top;
+            itemWmtsSource.TextSize = new System.Drawing.Size(96, 14);
+            itemWmtsSource.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // itemMapLayer
             // 
-            this.itemMapLayer.Control = this.txtLayer;
-            this.itemMapLayer.Location = new System.Drawing.Point(0, 349);
-            this.itemMapLayer.MaxSize = new System.Drawing.Size(0, 55);
-            this.itemMapLayer.MinSize = new System.Drawing.Size(54, 55);
-            this.itemMapLayer.Name = "itemMapLayer";
-            this.itemMapLayer.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.itemMapLayer.Size = new System.Drawing.Size(381, 55);
-            this.itemMapLayer.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemMapLayer.Text = "图层类型";
-            this.itemMapLayer.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemMapLayer.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemMapLayer.TextSize = new System.Drawing.Size(48, 14);
-            this.itemMapLayer.TextToControlDistance = 5;
-            this.itemMapLayer.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            itemMapLayer.Control = txtLayer;
+            itemMapLayer.Location = new System.Drawing.Point(0, 349);
+            itemMapLayer.MaxSize = new System.Drawing.Size(0, 55);
+            itemMapLayer.MinSize = new System.Drawing.Size(54, 55);
+            itemMapLayer.Name = "itemMapLayer";
+            itemMapLayer.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            itemMapLayer.Size = new System.Drawing.Size(381, 55);
+            itemMapLayer.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            itemMapLayer.Text = "图层类型";
+            itemMapLayer.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            itemMapLayer.TextLocation = DevExpress.Utils.Locations.Top;
+            itemMapLayer.TextSize = new System.Drawing.Size(48, 14);
+            itemMapLayer.TextToControlDistance = 5;
+            itemMapLayer.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txtTimeZone;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(0, 43);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(100, 43);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(381, 43);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Text = "系统时区";
-            this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(96, 14);
-            // 
-            // txtSampleDire
-            // 
-            this.txtSampleDire.Location = new System.Drawing.Point(12, 179);
-            this.txtSampleDire.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.txtSampleDire.Name = "txtSampleDire";
-            this.txtSampleDire.Properties.AutoHeight = false;
-            this.txtSampleDire.Size = new System.Drawing.Size(377, 22);
-            this.txtSampleDire.StyleController = this.layoutControl1;
-            this.txtSampleDire.TabIndex = 6;
+            layoutControlItem6.Control = txtTimeZone;
+            layoutControlItem6.Location = new System.Drawing.Point(0, 0);
+            layoutControlItem6.MaxSize = new System.Drawing.Size(0, 43);
+            layoutControlItem6.MinSize = new System.Drawing.Size(100, 43);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new System.Drawing.Size(381, 43);
+            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem6.Text = "系统时区";
+            layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem6.TextSize = new System.Drawing.Size(96, 14);
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.txtSampleDire;
-            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem2.CustomizationFormText = "样本存储目录";
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 143);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(0, 50);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(100, 50);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
-            this.layoutControlItem2.Size = new System.Drawing.Size(381, 50);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Text = "样本存储目录";
-            this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(96, 14);
+            layoutControlItem2.Control = txtSampleDire;
+            layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem2.CustomizationFormText = "样本存储目录";
+            layoutControlItem2.Location = new System.Drawing.Point(0, 143);
+            layoutControlItem2.MaxSize = new System.Drawing.Size(0, 50);
+            layoutControlItem2.MinSize = new System.Drawing.Size(100, 50);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 9, 2);
+            layoutControlItem2.Size = new System.Drawing.Size(381, 50);
+            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem2.Text = "样本存储目录";
+            layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
+            layoutControlItem2.TextSize = new System.Drawing.Size(96, 14);
             // 
             // CtrlSysSettings
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.tablePanel1);
-            this.Name = "CtrlSysSettings";
-            this.Size = new System.Drawing.Size(619, 557);
-            this.Load += new System.EventHandler(this.CtrlSysSettings_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).EndInit();
-            this.tablePanel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtTimeZone.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtMapType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtHttpPort.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtXLDirectory.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtYDPZThreshold.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtWmtsSource.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemWmtsSource)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSampleDire.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            this.ResumeLayout(false);
-
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(tablePanel1);
+            Name = "CtrlSysSettings";
+            Size = new System.Drawing.Size(619, 557);
+            Load += CtrlSysSettings_Load;
+            ((System.ComponentModel.ISupportInitialize)tablePanel1).EndInit();
+            tablePanel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)txtTimeZone.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtLayer).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtMapType.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtHttpPort.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtXLDirectory.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtYDPZThreshold.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtWmtsSource.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtSampleDire.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)itemWmtsSource).EndInit();
+            ((System.ComponentModel.ISupportInitialize)itemMapLayer).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ResumeLayout(false);
         }
 
         #endregion

+ 25 - 25
DW5S.App/UserControl/CtrlSysSettings.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
+  <!--
     Microsoft ResX Schema 
-    
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

+ 3 - 0
DW5S.Controller/ResultController.cs

@@ -103,6 +103,8 @@ namespace DW5S.Controllers
             }
         }
 
+        
+
         #region 定位结果查询接口
         /// <summary>
         /// 根据时间范围查询定位结果
@@ -236,6 +238,7 @@ namespace DW5S.Controllers
         }
         #endregion
 
+
         private PosResDto MapDto(PosRes res)
         {
             return new PosResDto()

+ 71 - 0
DW5S.ViewModel/ADResViewModel.cs

@@ -0,0 +1,71 @@
+using DW5S.Entity;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XdCxRhDW5S.ViewModel;
+
+namespace DW5S.ViewModel
+{
+    /// <summary>
+    /// 采集结果表
+    /// </summary>
+    public class ADResViewModel : BaseViewModel<long>
+    {
+        /// <summary>
+        /// 信号时刻
+        /// </summary>
+        [Display(Name = "信号时刻")]
+        public DateTime SigTime { get; set; }
+
+        /// <summary>
+        /// 采集上行频点(Hz)
+        /// </summary>
+        [Display(Name = "采集上行频点(Hz)", AutoGenerateField = false)]
+        public double ADFreqUp { get; set; }
+
+        [Display(Name = "采集上行频点(MHz)")]
+        public double ADFreqUpDis => ADFreqUp / 1e6;
+
+        /// <summary>
+        /// 采集下行频点(Hz)
+        /// </summary>
+        [Display(Name = "采集下行频点(Hz)", AutoGenerateField = false)]
+        public double ADFreqDown { get; set; }
+
+
+        [Display(Name = "采集下行频点(MHz)")]
+        public double ADFreqDownDis => ADFreqDown / 1e6;
+
+
+        /// <summary>
+        /// 卫星
+        /// </summary>
+        [Display(Name = "卫星编号", AutoGenerateField = false)]
+        public int SatInfoId { get; set; }
+
+        [Display(AutoGenerateField = false)]
+        [JsonIgnore]
+        public virtual SatViewModel SatInfo { get; set; }
+
+        [Display(Name = "卫星")]
+        public string Sat => SatInfo.Sat;
+
+        /// <summary>
+        /// 接收站ID
+        /// </summary>
+        [Display(Name = "接收站ID", AutoGenerateField = false)]
+        public long RecTxInfoID { get; set; }
+
+        [Display(AutoGenerateField = false)]
+        [JsonIgnore]
+        public virtual RecTxViewModel RecTxInfo { get; set; }
+
+        [Display(Name = "接收站名称")]
+        public string RecName => RecTxInfo.Name;
+    }
+}