From cc3cc145a8cc38dcb2fc123b671fac0c39450a33 Mon Sep 17 00:00:00 2001
From: nnnjjj123 <494715143@qq.com>
Date: Fri, 06 Nov 2020 17:06:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 config.json |  374 ++++++++++++++++++++++++++++++-----------------------
 1 files changed, 211 insertions(+), 163 deletions(-)

diff --git a/config.json b/config.json
index 6eec78c..493a384 100644
--- a/config.json
+++ b/config.json
@@ -13,10 +13,9 @@
     ],
     "version": "2.10"
   },
-  "modeUrl": "http://www.sw797.com:801/gzsw3D/v2/data/mx/",
   "cesiumToken": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJqdGkiOiI2ODUxMWQxMC1lNzZjLTRhZjktYmZiMS1lNWFmYWJkZWIwOTEiLCJpZCI6MTQxNzMsInNjb3BlcyI6WyJhc3IiLCJnYyJdLCJpYXQiOjE1NjQ5Njg5NzV9.ojKhhmjl8L0EtxsZC14LZgmXn5VVS0CRBCYuRK_DdIo",
   "authorizedCrossOriginDomains": [],
-  "title": "水文水生态综合信息管理平台",
+  "title": "虚拟地理环境三维平台",
   "subtitle": "",
   "keepAppState": true,
   "logo": "images/app-logo.png",
@@ -75,7 +74,148 @@
           "height": "auto",
           "relativeTo": "map"
         }
+      },
+      {
+        "name": "右键菜单",
+        "uri": "widgets/ContextMenu/Widget"
+      },
+      {
+        "uri": "widgets/Layermanagement/Widget",
+        "position": {
+          "right": 82,
+          "top": 55,
+          "height": "32px",
+          "width": "72px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/Basemap/Widget",
+        "position": {
+          "right": 10,
+          "top": 55,
+          "height": "32px",
+          "width": "72px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/Tool/Widget",
+        "position": {
+          "right": 154,
+          "top": 55,
+          "height": "32px",
+          "width": "96px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/VrButton/Widget",
+        "position": {
+          "right": 10,
+          "bottom": 120,
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/HelpButton/Widget",
+        "position": {
+          "right": 10,
+          "bottom": 80,
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/HomeButton/Widget",
+        "position": {
+          "right": 10,
+          "bottom": 200,
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/FullScreen/Widget",
+        "position": {
+          "right": 10,
+          "bottom": 160,
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/SceneMode/Widget",
+        "position": {
+          "right": 10,
+          "bottom": 40,
+          "relativeTo": "map"
+        }
+      },
+      {
+        "uri": "widgets/ShowPosition/Widget",
+        "position": {
+          "right": 0,
+          "bottom": 0,
+          "width": "100%",
+          "height": "25px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "name": "图上量算",
+        "uri": "widgets/Measurement/Widget",
+        "position": {
+          "right": 10,
+          "top": 96,
+          "width": "350px",
+          "height": "320px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "name": "要素标绘",
+        "uri": "widgets/Plot/Widget",
+        "position": {
+          "left": 120,
+          "top": 44,
+          "width": "730px",
+          "height": "38px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "name": "测试",
+        "uri": "widgets/cs/Widget",
+        "position": {
+          "right": 10,
+          "top": 96,
+          "width": "350px",
+          "height": "320px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "name": "卷帘对比",
+        "uri": "widgets/Rolling/Widget",
+        "position": {
+          "right": 10,
+          "top": 96,
+          "width": "400px",
+          "height": "50px",
+          "relativeTo": "map"
+        }
+      },
+      {
+        "name": "分屏对比",
+        "uri": "widgets/Screen/Widget",
+        "position": {
+          "right": 10,
+          "top": 96,
+          "width": "400px",
+          "height": "50px",
+          "relativeTo": "map"
+        }
       }
+
+    
     ],
     "groups": [],
     "panel": {
@@ -94,154 +234,6 @@
       "right": 0,
       "bottom": 0
     },
-    "basemaps": [
-      {
-        "label": "行政区划",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/jctczt/MapServer",
-        "layers": "0",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "河流水系",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/jctczt/MapServer",
-        "layers": "1",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "铁路公路",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/jctczt/MapServer",
-        "layers": "2",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "高速公路",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/jctczt/MapServer",
-        "layers": "3",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      }
-    ],
-    "swzwLayers": [
-      {
-        "label": "水文站",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/swzwzt/MapServer",
-        "layers": "0",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "水位站",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/swzwzt/MapServer",
-        "layers": "1",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "雨量站",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/swzwzt/MapServer",
-        "layers": "2",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "水质站",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/swzwzt/MapServer",
-        "layers": "3",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "中小河流站",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/swzwzt/MapServer",
-        "layers": "4",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "水库水位站",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/jctczt/MapServer",
-        "layers": "2",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      }
-    ],
-    "shLayers": [
-      {
-        "label": "山洪隐患点",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/shskzt/MapServer",
-        "layers": "0",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "大型水库",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/shskzt/MapServer",
-        "layers": "1",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "中型水库",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/shskzt/MapServer",
-        "layers": "2",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "小型水库",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/shskzt/MapServer",
-        "layers": "3",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      }
-    ],
-    "djyLayers": [
-      {
-        "label": "东江源区水系图",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/djysx/MapServer",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "水文监测基本站网",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/djyswjcjbzw/MapServer",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "专项分析研究实验站网",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/djyztfxsyzw/MapServer",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      },
-      {
-        "label": "遥测站点",
-        "url": "http://171.35.109.175:18080/arcgis/rest/services/GZSW/djyyczw/MapServer",
-        "type": "arcgis",
-        "icon": "images/basemaps/tiandituimage.png",
-        "show": false
-      }
-    ],
     "imageryProviderViewModels": [
       {
         "name": "天地图影像",
@@ -325,20 +317,73 @@
             "url": "http://www.sw797.com:801/gzsw3D/v2/data/wp/{z}/{x}/{y}.png"
           }
         ]
-      }
-    ],
-    "terrainProviderViewModels": [
-      {
-        "name": "无地形",
-        "tooltip": "WGS84标准球体",
-        "iconUrl": "images/basemaps/TerrainEllipsoid.png",
-        "url": ""
       },
       {
-        "name": "赣州地形",
-        "tooltip": "由 普适科技 提供的赣州地形",
-        "iconUrl": "images/basemaps/TerrainSTK.png",
-        "url": "http://www.sw797.com:801/gzsw3D/v2/data/gzdx"
+        "name": "谷歌",
+        "tooltip": "谷歌",
+        "iconUrl": "images/basemaps/tiandituimage.png",
+        "layers": [
+          {
+            "label": "谷歌",
+            "type": "gg"
+          }
+        ]
+      },
+      {
+        "name": "百度",
+        "tooltip": "百度",
+        "iconUrl": "images/basemaps/tiandituimage.png",
+        "layers": [
+          {
+            "label": "百度",
+            "type": "baidu",
+            "style": "traffic"
+          }
+        ]
+      },
+      {
+        "name": "高德",
+        "tooltip": "高德",
+        "iconUrl": "images/basemaps/tianditushiliang.png",
+        "layers": [
+          {
+            "label": "高德",
+            "type": "gaod"
+          }
+        ]
+      },
+      {
+        "name": "腾讯",
+        "tooltip": "腾讯",
+        "iconUrl": "images/basemaps/tiandituimage.png",
+        "layers": [
+          {
+            "label": "腾讯",
+            "type": "tenx",
+            "layer": "img",
+            "style": 2
+          }
+        ]
+      },
+      {
+        "name": "Gis",
+        "tooltip": "Gis",
+        "iconUrl": "images/basemaps/tianditushiliang.png",
+        "layers": [
+          {
+            "type": "gis"
+          }
+        ]
+      },
+      {
+        "name": "mapbox",
+        "tooltip": "mapbox",
+        "iconUrl": "images/basemaps/tiandituimage.png",
+        "layers": [
+          {
+            "type": "mapbox"
+          }
+        ]
       }
     ],
     "mapOptions": {
@@ -380,7 +425,10 @@
       }
     },
     "widgets": [
-     
+      {
+        "name": "旅游路线",
+        "uri": "widgets/PathShow/Widget"
+      }
     ],
     "groups": []
   },

--
Gitblit v1.9.3