11

XdCxRhDW.App/EditForms/TaskEditor.cs

@@ -185,6 +185,11 @@ namespace XdCxRhDW.App.EditForms
                         dxErrorProvider.SetError(txtAdja1Sat, "请选择邻星");
                         return;
                     }
+                    if(txtMainSat.EditValue== txtAdja1Sat.EditValue)
+                    {
+                        dxErrorProvider.SetError(txtAdja1Sat, "邻星不能和主星一致");
+                        return;
+                    }
                 }
                 else if (posType == EnumPosType.X3TwoDto || posType == EnumPosType.X3TwoDfo)
                 {
@@ -203,6 +208,21 @@ namespace XdCxRhDW.App.EditForms
                         dxErrorProvider.SetError(txtAdja2Sat, "请选择邻星2");
                         return;
                     }
+                    if (txtMainSat.EditValue == txtAdja1Sat.EditValue)
+                    {
+                        dxErrorProvider.SetError(txtAdja1Sat, "邻星1不能和主星一致");
+                        return;
+                    }
+                    if (txtMainSat.EditValue == txtAdja2Sat.EditValue)
+                    {
+                        dxErrorProvider.SetError(txtAdja2Sat, "邻星2不能和主星一致");
+                        return;
+                    }
+                    if (txtAdja1Sat.EditValue == txtAdja2Sat.EditValue)
+                    {
+                        dxErrorProvider.SetError(txtAdja2Sat, "邻星2不能和邻星1一致");
+                        return;
+                    }
 
                 }
                 if (txtTaskType.SelectedIndex == 0)

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -3,6 +3,7 @@ using DevExpress.Internal;
 using DevExpress.Map;
 using DevExpress.Map.Native;
 using DevExpress.Utils;
+using DevExpress.Utils.About;
 using DevExpress.Utils.Helpers;
 using DevExpress.Utils.Svg;
 using DevExpress.XtraBars;
@@ -2588,27 +2589,48 @@ public static class MapControlEx
                 {
                     string imgUrl = string.Empty;
                     // imgUrl = $"{HttpServerAddr}/{(int)MapType}/{zoomLevel}/{tilePositionX}/{tilePositionY}";
-                    string layerName;
+                    string layerName=string.Empty;
                     if (WmtsSource == EnumWmtsSource.SJZX)
                     {
-                        if (LayerType == EnumMapLayerType.SatMap)
+                        //if (LayerType == EnumMapLayerType.SatMap)
+                        //    layerName = "satellite";
+                        //else
+                        //    layerName = "electron";
+                        if (LayerType.HasFlag(EnumMapLayerType.SatMap))
+                        {
                             layerName = "satellite";
-                        else
+                        }
+                        if (LayerType.HasFlag(EnumMapLayerType.RoadMap)|| LayerType.HasFlag(EnumMapLayerType.XZQH_Map))
+                        {
                             layerName = "electron";
+                        }
                         imgUrl = $"{HttpServerAddr}?lyr={layerName}&x={tilePositionX}&y={tilePositionY}&z={zoomLevel}";
                     }
                     else
                     {
                         string suffix = ".png";
-                        if (LayerType == EnumMapLayerType.SatMap)
+                        if (LayerType.HasFlag(EnumMapLayerType.SatMap))
                         {
                             suffix = ".jpg";
                             layerName = "NaturalEarthII";
                         }
-                        else if (LayerType == EnumMapLayerType.RoadMap)
-                            layerName = "roadmap-final";
-                        else
-                            layerName = "overlay-final";
+                        if (LayerType.HasFlag(EnumMapLayerType.RoadMap))
+                        {
+
+                        }
+                        if (LayerType.HasFlag(EnumMapLayerType.XZQH_Map))
+                        {
+
+                        }
+                        //if (LayerType == EnumMapLayerType.SatMap)
+                        //{
+                        //    suffix = ".jpg";
+                        //    layerName = "NaturalEarthII";
+                        //}
+                        //else if (LayerType == EnumMapLayerType.RoadMap)
+                        //    layerName = "roadmap-final";
+                        //else
+                        //    layerName = "overlay-final";
                         imgUrl = $"{HttpServerAddr}/{layerName}/{zoomLevel}/{tilePositionX}/{tilePositionY}{suffix}";
 
 

XdCxRhDW.App/UserControl/CtrlSysSettings.Designer.cs

@@ -29,11 +29,11 @@ namespace XdCxRhDW.App.UserControl
         /// </summary>
         private void InitializeComponent()
         {
-            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();
+            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.txtMapType = new DevExpress.XtraEditors.RadioGroup();
@@ -41,7 +41,6 @@ namespace XdCxRhDW.App.UserControl
             this.txtHttpPort = new DevExpress.XtraEditors.TextEdit();
             this.txtXLDirectory = new DevExpress.XtraEditors.TextEdit();
             this.txtYDPZThreshold = new DevExpress.XtraEditors.ButtonEdit();
-            this.txtLayer = new DevExpress.XtraEditors.RadioGroup();
             this.txtWmtsSource = new DevExpress.XtraEditors.RadioGroup();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -49,10 +48,11 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemMapLayer = new DevExpress.XtraLayout.LayoutControlItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.itemWmtsSource = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtLayer = new DevExpress.XtraEditors.CheckedListBoxControl();
+            this.itemMapLayer = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
             this.tablePanel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
@@ -61,7 +61,6 @@ namespace XdCxRhDW.App.UserControl
             ((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.txtLayer.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWmtsSource.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -69,10 +68,11 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemWmtsSource)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).BeginInit();
             this.SuspendLayout();
             // 
             // tablePanel1
@@ -96,12 +96,12 @@ namespace XdCxRhDW.App.UserControl
             // layoutControl1
             // 
             this.tablePanel1.SetColumn(this.layoutControl1, 1);
+            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.txtLayer);
             this.layoutControl1.Controls.Add(this.txtWmtsSource);
             this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutControl1.Location = new System.Drawing.Point(102, 48);
@@ -165,7 +165,7 @@ namespace XdCxRhDW.App.UserControl
             this.txtYDPZThreshold.Name = "txtYDPZThreshold";
             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, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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");
@@ -173,16 +173,6 @@ namespace XdCxRhDW.App.UserControl
             this.txtYDPZThreshold.StyleController = this.layoutControl1;
             this.txtYDPZThreshold.TabIndex = 7;
             // 
-            // txtLayer
-            // 
-            this.txtLayer.EditValue = 0;
-            this.txtLayer.Location = new System.Drawing.Point(12, 294);
-            this.txtLayer.Name = "txtLayer";
-            this.txtLayer.Properties.Columns = 3;
-            this.txtLayer.Size = new System.Drawing.Size(372, 25);
-            this.txtLayer.StyleController = this.layoutControl1;
-            this.txtLayer.TabIndex = 10;
-            // 
             // txtWmtsSource
             // 
             this.txtWmtsSource.EditValue = 0;
@@ -202,10 +192,10 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem5,
             this.layoutControlItem1,
             this.layoutControlItem8,
-            this.itemMapLayer,
             this.emptySpaceItem1,
             this.emptySpaceItem2,
-            this.itemWmtsSource});
+            this.itemWmtsSource,
+            this.itemMapLayer});
             this.Root.Name = "Root";
             this.Root.Size = new System.Drawing.Size(396, 370);
             this.Root.TextVisible = false;
@@ -282,21 +272,6 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(96, 14);
             // 
-            // itemMapLayer
-            // 
-            this.itemMapLayer.Control = this.txtLayer;
-            this.itemMapLayer.Location = new System.Drawing.Point(0, 255);
-            this.itemMapLayer.MaxSize = new System.Drawing.Size(0, 56);
-            this.itemMapLayer.MinSize = new System.Drawing.Size(50, 56);
-            this.itemMapLayer.Name = "itemMapLayer";
-            this.itemMapLayer.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
-            this.itemMapLayer.Size = new System.Drawing.Size(376, 56);
-            this.itemMapLayer.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemMapLayer.Text = "图层类型";
-            this.itemMapLayer.TextLocation = DevExpress.Utils.Locations.Top;
-            this.itemMapLayer.TextSize = new System.Drawing.Size(96, 14);
-            this.itemMapLayer.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
-            // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
@@ -328,6 +303,33 @@ namespace XdCxRhDW.App.UserControl
             this.itemWmtsSource.TextSize = new System.Drawing.Size(96, 14);
             this.itemWmtsSource.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
+            // txtLayer
+            // 
+            this.txtLayer.Location = new System.Drawing.Point(12, 296);
+            this.txtLayer.MultiColumn = true;
+            this.txtLayer.Name = "txtLayer";
+            this.txtLayer.SelectionMode = System.Windows.Forms.SelectionMode.MultiSimple;
+            this.txtLayer.Size = new System.Drawing.Size(372, 23);
+            this.txtLayer.StyleController = this.layoutControl1;
+            this.txtLayer.TabIndex = 12;
+            // 
+            // itemMapLayer
+            // 
+            this.itemMapLayer.Control = this.txtLayer;
+            this.itemMapLayer.Location = new System.Drawing.Point(0, 255);
+            this.itemMapLayer.MaxSize = new System.Drawing.Size(0, 56);
+            this.itemMapLayer.MinSize = new System.Drawing.Size(50, 56);
+            this.itemMapLayer.Name = "itemMapLayer";
+            this.itemMapLayer.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 12, 2);
+            this.itemMapLayer.Size = new System.Drawing.Size(376, 56);
+            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;
+            // 
             // CtrlSysSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -344,7 +346,6 @@ namespace XdCxRhDW.App.UserControl
             ((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.txtLayer.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWmtsSource.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -352,10 +353,11 @@ namespace XdCxRhDW.App.UserControl
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.itemWmtsSource)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtLayer)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.itemMapLayer)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -376,10 +378,10 @@ namespace XdCxRhDW.App.UserControl
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraEditors.RadioGroup txtMapType;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem itemMapLayer;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
-        private DevExpress.XtraEditors.RadioGroup txtLayer;
         private DevExpress.XtraEditors.RadioGroup txtWmtsSource;
+        private DevExpress.XtraEditors.CheckedListBoxControl txtLayer;
+        private DevExpress.XtraLayout.LayoutControlItem itemMapLayer;
     }
 }

XdCxRhDW.App/UserControl/CtrlSysSettings.cs

@@ -23,6 +23,8 @@ using DevExpress.XtraPrinting;
 using XdCxRhDW.Entity;
 using DevExpress.XtraEditors.Controls;
 using System.Security.Policy;
+using DevExpress.Utils.About;
+using XdCxRhDW.Dto;
 
 namespace XdCxRhDW.App.UserControl
 {
@@ -39,7 +41,7 @@ namespace XdCxRhDW.App.UserControl
             try
             {
                 txtWmtsSource.Properties.Items.AddEnum<EnumWmtsSource>();
-                txtLayer.Properties.Items.AddEnum<EnumMapLayerType>();
+                txtLayer.Items.AddEnum<EnumMapLayerType>();
                 txtWmtsSource.SelectedIndex = 0;
                 txtLayer.SelectedIndex = 0;
                 using (RHDWContext db = new RHDWContext())
@@ -50,16 +52,34 @@ namespace XdCxRhDW.App.UserControl
                         this.txtHttpPort.Text = res.HttpPort.ToString();
                         if (!string.IsNullOrEmpty(res.XLDirectory))
                             this.txtXLDirectory.Text = res.XLDirectory.ToString();
-                        this.txtWmtsSource.EditValue = res.WmtsSource;
-                        this.txtLayer.EditValue = res.MapLayerType;
                         if (res.YDPZThreshold > 0)
                             this.txtYDPZThreshold.Text = res.YDPZThreshold.ToString();
                         if (this.txtMapType.SelectedIndex == res.MapType)
-                        {
                             txtMapType_SelectedIndexChanged(null, null);
-                        }
                         else
                             this.txtMapType.SelectedIndex = res.MapType;
+                        if (txtMapType.SelectedIndex != 0)
+                        {
+                            this.txtWmtsSource.EditValue = res.WmtsSource;
+
+                            for (int i = 0; i < txtLayer.Items.Count; i++)
+                            {
+                                if (res.MapLayerType.HasFlag(EnumMapLayerType.SatMap))
+                                {
+                                    this.txtLayer.Items[EnumMapLayerType.SatMap].CheckState = CheckState.Checked;
+                                }
+                                if (res.MapLayerType.HasFlag(EnumMapLayerType.RoadMap))
+                                {
+                                    this.txtLayer.Items[EnumMapLayerType.RoadMap].CheckState = CheckState.Checked;
+                                }
+                                if (res.MapLayerType.HasFlag(EnumMapLayerType.XZQH_Map))
+                                {
+                                    this.txtLayer.Items[EnumMapLayerType.XZQH_Map].CheckState = CheckState.Checked;
+                                }
+                            }
+                               
+                        }
+                       
                     }
                 }
 
@@ -81,14 +101,14 @@ namespace XdCxRhDW.App.UserControl
                     DxHelper.MsgBoxHelper.ShowError("Http端口错误!");
                     return;
                 }
-                if (txtMapType.SelectedIndex != 0 && txtWmtsSource.EditValue == null)
+                //if (txtMapType.SelectedIndex != 0 && txtWmtsSource.EditValue == null)
+                //{
+                //    DxHelper.MsgBoxHelper.ShowError("请选择!");
+                //    return;
+                //}
+                if (txtMapType.SelectedIndex != 0 && txtLayer.CheckedItemsCount<=0)
                 {
-                    DxHelper.MsgBoxHelper.ShowError("请选择行政图类型!");
-                    return;
-                }
-                if (txtMapType.SelectedIndex != 0 && string.IsNullOrEmpty(txtLayer.Text))
-                {
-                    DxHelper.MsgBoxHelper.ShowError("请填写地图图层名称!");
+                    DxHelper.MsgBoxHelper.ShowError("请选择图层类型!");
                     return;
                 }
                 using (RHDWContext db = new RHDWContext())
@@ -102,8 +122,18 @@ namespace XdCxRhDW.App.UserControl
                     if (txtMapType.SelectedIndex != 0)
                     {
                         res.WmtsSource = (EnumWmtsSource)txtWmtsSource.EditValue;
-                        res.MapLayerType = (EnumMapLayerType)txtLayer.EditValue;
-                       
+
+                        EnumMapLayerType layerType = EnumMapLayerType.SatMap;
+                        for (int i = 0; i < txtLayer.Items.Count; i++)
+                        {
+                            if (txtLayer.GetItemChecked(i))
+                            {
+                                layerType |= (EnumMapLayerType)txtLayer.Items[i].Value;
+                            }
+                        }
+                        layerType = layerType & ~EnumMapLayerType.SatMap;//移除
+                        res.MapLayerType = layerType;
+
                     }
                     db.SysSetings.AddOrUpdate(res);
                     needStartHttpSvr = true;
@@ -162,6 +192,6 @@ namespace XdCxRhDW.App.UserControl
             layoutControl1.BestFit();
         }
 
-        
+
     }
 }

XdCxRhDW.Entity/EntityEnum.cs

@@ -136,25 +136,26 @@ namespace XdCxRhDW.Entity
         [Display(Name = "数据中心")]
         SJZX
     }
+    [Flags]
     public enum EnumMapLayerType
     {
         /// <summary>
         /// 卫星图
         /// </summary>
         [Display(Name = "卫星图")]
-        SatMap,
+        SatMap=1,
 
         /// <summary>
         /// 道路图
         /// </summary>
         [Display(Name = "道路图")]
-        RoadMap,
+        RoadMap=2,
 
         /// <summary>
         /// 行政区划图
         /// </summary>
         [Display(Name = "行政区划图")]
-        XZQH_Map
+        XZQH_Map=4
 
     }