Merge branch 'master' into 10.6.0.10_prerelease

mayuanye2008 · web-flow · commit e9435c39df35 · 2022-07-29T17:05:54.000+08:00
diff --git a/website/public/static/demo/config/config-headers.json b/website/public/static/demo/config/config-headers.json
@@ -94,9 +94,9 @@
             {
                 "title": "开发API",
                 "icon": "iconsanfangAPI",
-                "links": [["Cesium-API", "MapboxGL-API", "UI-API", "PLOT-API"]],
+                "links": [["Cesium-API", "MapboxGL-API", "UI-API"]],
                 "hightlights": [[true, false, true]],
-                "routes": [["http://120.78.82.242:8891", "http://120.78.82.242:8892", "http://120.78.82.242:8893", "http://192.168.82.89:8093"]]
+                "routes": [["http://120.78.82.242:8891", "http://120.78.82.242:8892", "http://120.78.82.242:8893"]]
             }
         ]
     },
diff --git a/website/public/static/libs/include-cesium-local.js b/website/public/static/libs/include-cesium-local.js
@@ -58,7 +58,6 @@
                 inputCSS(httpUrl + '/cdn/cesium/Widgets/widgets.css');
                 inputCSS(httpUrl + '/cdn/cesium/MapGIS/css/mapgis.css');
                 inputScript(httpUrl + '/cdn/cesium/Cesium.js');
-                inputScript(httpUrl + '/cdn/zondyclient/webclient-es6-service.js');
             }
         }
         

Original file line number	Diff line number	Diff line change
`@@ -94,9 +94,9 @@`
`94`	`94`	`{`
`95`	`95`	`"title": "开发API",`
`96`	`96`	`"icon": "iconsanfangAPI",`
`97`		`- "links": [["Cesium-API", "MapboxGL-API", "UI-API", "PLOT-API"]],`
	`97`	`+ "links": [["Cesium-API", "MapboxGL-API", "UI-API"]],`
`98`	`98`	`"hightlights": [[true, false, true]],`
`99`		`- "routes": [["http://120.78.82.242:8891", "http://120.78.82.242:8892", "http://120.78.82.242:8893", "http://192.168.82.89:8093"]]`
	`99`	`+ "routes": [["http://120.78.82.242:8891", "http://120.78.82.242:8892", "http://120.78.82.242:8893"]]`
`100`	`100`	`}`
`101`	`101`	`]`
`102`	`102`	`},`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@`
`58`	`58`	`inputCSS(httpUrl + '/cdn/cesium/Widgets/widgets.css');`
`59`	`59`	`inputCSS(httpUrl + '/cdn/cesium/MapGIS/css/mapgis.css');`
`60`	`60`	`inputScript(httpUrl + '/cdn/cesium/Cesium.js');`
`61`		`- inputScript(httpUrl + '/cdn/zondyclient/webclient-es6-service.js');`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`