From 5ba3dff421a0beb491ee88975f74cb85ead475ef Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 08 Jun 2021 10:22:26 +0800
Subject: [PATCH] 项目所需图标，部分样式更改，部分逻辑修改，配置文件修改
---
config.json | 83 +++--------
images/收起.png | 0
images/缓冲分析.png | 0
images/漫游视角-选中.png | 0
images/图上测量.png | 0
images/定位.png | 0
images/固定视角-选中.png | 0
images/展开.png | 0
images/卷帘对比.png | 0
images/自主体验.png | 0
widgets/LeftNavigationBar/Widget.js | 2
widgets/visualAngle/Widget.html | 8
widgets/visualAngle/Widget.js | 34 +---
images/问题指引.png | 0
images/场景快照.png | 0
jimu.js/MapManager.js | 13 -
images/自主体验-1.png | 0
index.html | 2
widgets/Basemap/Widget.html | 2
widgets/visualAngle/css/style.css | 46 ++++--
images/叠加分析.png | 0
images/不全选.png | 0
images/漫游体验.png | 0
widgets/Basemap/css/style.css | 45 ++++--
images/站点选中.png | 0
widgets/Tool/Widget.html | 2
images/要素标绘.png | 0
images/工具.png | 0
images/2D.png | 0
images/坐标定位.png | 0
images/工具（用以切换图层的透明度）.png | 0
images/搜索.png | 0
widgets/Basemap/Widget.js | 114 ++++++++--------
images/VR.png | 0
images/缩小.png | 0
images/我的标记.png | 0
images/放大.png | 0
images/分屏对比.png | 0
widgets/Tool/css/style.css | 51 ++++---
images/固定视角.png | 0
images/全屏.png | 0
images/回到原来的视角.png | 0
images/未选中.png | 0
images/3D.png | 0
images/底图.png | 0
45 files changed, 186 insertions(+), 216 deletions(-)
diff --git a/config.json b/config.json
index 15ed21d..9157f7c 100644
--- a/config.json
+++ b/config.json
@@ -32,7 +32,7 @@
{
"uri": "widgets/Tool/Widget",
"position": {
- "right": 96,
+ "right": 82,
"top": 20,
"height": "36px",
"width": "86px",
@@ -45,7 +45,7 @@
"right": 10,
"top": 20,
"height": "36px",
- "width": "86px",
+ "width": "72px",
"relativeTo": "map"
}
},
@@ -201,50 +201,6 @@
},
"imageryProviderViewModels": [
{
- "name": "天地图影像",
- "tooltip": "天地图全球影像地图服务（国家测绘局）",
- "iconUrl": "images/basemaps/tiandituimage.png",
- "layers": [
- {
- "label": "天地图影像",
- "type": "wmts",
- "url": "http://t0.tianditu.gov.cn/img_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
- "layer": "img",
- "style": "default",
- "format": "tiles",
- "tileMatrixSetID": "w",
- "maximumLevel": 17
- },
- {
- "label": "天地图影像标注",
- "type": "wmts",
- "url": "http://t0.tianditu.gov.cn/cia_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
- "layer": "cia",
- "style": "default",
- "format": "tiles",
- "tileMatrixSetID": "w",
- "maximumLevel": 17
- }
- ]
- },
- {
- "name": "赣州电子地图",
- "tooltip": "赣州电子地图",
- "iconUrl": "images/basemaps/tianditushiliang.png",
- "layers": [
- {
- "label": "赣州电子地图",
- "type": "wmts",
- "url": "http://sw797.com:6080/arcgis/rest/services/GZHS/MapServer/WMTS",
- "layer": "GZHS",
- "style": "default",
- "format": "image/jpgpng",
- "tileMatrixSetID": "default028mm",
- "maximumLevel": 17
- }
- ]
- },
- {
"name": "天地图矢量",
"tooltip": "天地图矢量",
"iconUrl": "images/basemaps/tianditushiliang.png",
@@ -270,16 +226,31 @@
"maximumLevel": 17
}
]
- },
+ },
{
- "name": "离线影像",
- "tooltip": "赣州市离线影像",
- "iconUrl": "images/basemaps/gzyx.png",
+ "name": "天地图影像",
+ "tooltip": "天地图全球影像地图服务（国家测绘局）",
+ "iconUrl": "images/basemaps/tiandituimage.png",
"layers": [
{
- "label": "赣州市离线影像",
- "type": "url",
- "url": "http://www.sw797.com:10011/gzsw3D/v2/data/wp/{z}/{x}/{y}.png"
+ "label": "天地图影像",
+ "type": "wmts",
+ "url": "http://t0.tianditu.gov.cn/img_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
+ "layer": "img",
+ "style": "default",
+ "format": "tiles",
+ "tileMatrixSetID": "w",
+ "maximumLevel": 17
+ },
+ {
+ "label": "天地图影像标注",
+ "type": "wmts",
+ "url": "http://t0.tianditu.gov.cn/cia_w/wmts?tk=e9533f5acb2ac470b07f406a4d24b4f0",
+ "layer": "cia",
+ "style": "default",
+ "format": "tiles",
+ "tileMatrixSetID": "w",
+ "maximumLevel": 17
}
]
}
@@ -290,12 +261,6 @@
"tooltip": "WGS84标准球体",
"iconUrl": "images/basemaps/TerrainEllipsoid.png",
"url": ""
- },
- {
- "name": "赣州地形",
- "tooltip": "由 普适科技 提供的赣州地形",
- "iconUrl": "images/basemaps/TerrainSTK.png",
- "url": "http://www.sw797.com:10011/gzsw3D/v2/data/gzdx"
}
],
"mapOptions": {
diff --git a/images/2D.png b/images/2D.png
new file mode 100644
index 0000000..409ea74
--- /dev/null
+++ b/images/2D.png
Binary files differ
diff --git a/images/3D.png b/images/3D.png
new file mode 100644
index 0000000..7101b48
--- /dev/null
+++ b/images/3D.png
Binary files differ
diff --git a/images/VR.png b/images/VR.png
new file mode 100644
index 0000000..2df7264
--- /dev/null
+++ b/images/VR.png
Binary files differ
diff --git "a/images/\344\270\215\345\205\250\351\200\211.png" "b/images/\344\270\215\345\205\250\351\200\211.png"
new file mode 100644
index 0000000..3875751
--- /dev/null
+++ "b/images/\344\270\215\345\205\250\351\200\211.png"
Binary files differ
diff --git "a/images/\345\205\250\345\261\217.png" "b/images/\345\205\250\345\261\217.png"
new file mode 100644
index 0000000..88ccabd
--- /dev/null
+++ "b/images/\345\205\250\345\261\217.png"
Binary files differ
diff --git "a/images/\345\210\206\345\261\217\345\257\271\346\257\224.png" "b/images/\345\210\206\345\261\217\345\257\271\346\257\224.png"
new file mode 100644
index 0000000..5d729e1
--- /dev/null
+++ "b/images/\345\210\206\345\261\217\345\257\271\346\257\224.png"
Binary files differ
diff --git "a/images/\345\215\267\345\270\230\345\257\271\346\257\224.png" "b/images/\345\215\267\345\270\230\345\257\271\346\257\224.png"
new file mode 100644
index 0000000..3fb1d00
--- /dev/null
+++ "b/images/\345\215\267\345\270\230\345\257\271\346\257\224.png"
Binary files differ
diff --git "a/images/\345\217\240\345\212\240\345\210\206\346\236\220.png" "b/images/\345\217\240\345\212\240\345\210\206\346\236\220.png"
new file mode 100644
index 0000000..6d4919a
--- /dev/null
+++ "b/images/\345\217\240\345\212\240\345\210\206\346\236\220.png"
Binary files differ
diff --git "a/images/\345\233\236\345\210\260\345\216\237\346\235\245\347\232\204\350\247\206\350\247\222.png" "b/images/\345\233\236\345\210\260\345\216\237\346\235\245\347\232\204\350\247\206\350\247\222.png"
new file mode 100644
index 0000000..9a2c212
--- /dev/null
+++ "b/images/\345\233\236\345\210\260\345\216\237\346\235\245\347\232\204\350\247\206\350\247\222.png"
Binary files differ
diff --git "a/images/\345\233\272\345\256\232\350\247\206\350\247\222-\351\200\211\344\270\255.png" "b/images/\345\233\272\345\256\232\350\247\206\350\247\222-\351\200\211\344\270\255.png"
new file mode 100644
index 0000000..483ea69
--- /dev/null
+++ "b/images/\345\233\272\345\256\232\350\247\206\350\247\222-\351\200\211\344\270\255.png"
Binary files differ
diff --git "a/images/\345\233\272\345\256\232\350\247\206\350\247\222.png" "b/images/\345\233\272\345\256\232\350\247\206\350\247\222.png"
new file mode 100644
index 0000000..779725c
--- /dev/null
+++ "b/images/\345\233\272\345\256\232\350\247\206\350\247\222.png"
Binary files differ
diff --git "a/images/\345\233\276\344\270\212\346\265\213\351\207\217.png" "b/images/\345\233\276\344\270\212\346\265\213\351\207\217.png"
new file mode 100644
index 0000000..c4ff700
--- /dev/null
+++ "b/images/\345\233\276\344\270\212\346\265\213\351\207\217.png"
Binary files differ
diff --git "a/images/\345\234\272\346\231\257\345\277\253\347\205\247.png" "b/images/\345\234\272\346\231\257\345\277\253\347\205\247.png"
new file mode 100644
index 0000000..09a2d8c
--- /dev/null
+++ "b/images/\345\234\272\346\231\257\345\277\253\347\205\247.png"
Binary files differ
diff --git "a/images/\345\235\220\346\240\207\345\256\232\344\275\215.png" "b/images/\345\235\220\346\240\207\345\256\232\344\275\215.png"
new file mode 100644
index 0000000..d510c88
--- /dev/null
+++ "b/images/\345\235\220\346\240\207\345\256\232\344\275\215.png"
Binary files differ
diff --git "a/images/\345\256\232\344\275\215.png" "b/images/\345\256\232\344\275\215.png"
new file mode 100644
index 0000000..7a01d76
--- /dev/null
+++ "b/images/\345\256\232\344\275\215.png"
Binary files differ
diff --git "a/images/\345\261\225\345\274\200.png" "b/images/\345\261\225\345\274\200.png"
new file mode 100644
index 0000000..502feeb
--- /dev/null
+++ "b/images/\345\261\225\345\274\200.png"
Binary files differ
diff --git "a/images/\345\267\245\345\205\267.png" "b/images/\345\267\245\345\205\267.png"
new file mode 100644
index 0000000..17b7256
--- /dev/null
+++ "b/images/\345\267\245\345\205\267.png"
Binary files differ
diff --git "a/images/\345\267\245\345\205\267\357\274\210\347\224\250\344\273\245\345\210\207\346\215\242\345\233\276\345\261\202\347\232\204\351\200\217\346\230\216\345\272\246\357\274\211.png" "b/images/\345\267\245\345\205\267\357\274\210\347\224\250\344\273\245\345\210\207\346\215\242\345\233\276\345\261\202\347\232\204\351\200\217\346\230\216\345\272\246\357\274\211.png"
new file mode 100644
index 0000000..9ad736d
--- /dev/null
+++ "b/images/\345\267\245\345\205\267\357\274\210\347\224\250\344\273\245\345\210\207\346\215\242\345\233\276\345\261\202\347\232\204\351\200\217\346\230\216\345\272\246\357\274\211.png"
Binary files differ
diff --git "a/images/\345\272\225\345\233\276.png" "b/images/\345\272\225\345\233\276.png"
new file mode 100644
index 0000000..83c722f
--- /dev/null
+++ "b/images/\345\272\225\345\233\276.png"
Binary files differ
diff --git "a/images/\346\210\221\347\232\204\346\240\207\350\256\260.png" "b/images/\346\210\221\347\232\204\346\240\207\350\256\260.png"
new file mode 100644
index 0000000..fdb05bf
--- /dev/null
+++ "b/images/\346\210\221\347\232\204\346\240\207\350\256\260.png"
Binary files differ
diff --git "a/images/\346\220\234\347\264\242.png" "b/images/\346\220\234\347\264\242.png"
new file mode 100644
index 0000000..4d6f0a9
--- /dev/null
+++ "b/images/\346\220\234\347\264\242.png"
Binary files differ
diff --git "a/images/\346\224\266\350\265\267.png" "b/images/\346\224\266\350\265\267.png"
new file mode 100644
index 0000000..5c42574
--- /dev/null
+++ "b/images/\346\224\266\350\265\267.png"
Binary files differ
diff --git "a/images/\346\224\276\345\244\247.png" "b/images/\346\224\276\345\244\247.png"
new file mode 100644
index 0000000..a45a210
--- /dev/null
+++ "b/images/\346\224\276\345\244\247.png"
Binary files differ
diff --git "a/images/\346\234\252\351\200\211\344\270\255.png" "b/images/\346\234\252\351\200\211\344\270\255.png"
new file mode 100644
index 0000000..7cf8cff
--- /dev/null
+++ "b/images/\346\234\252\351\200\211\344\270\255.png"
Binary files differ
diff --git "a/images/\346\274\253\346\270\270\344\275\223\351\252\214.png" "b/images/\346\274\253\346\270\270\344\275\223\351\252\214.png"
new file mode 100644
index 0000000..a5193a3
--- /dev/null
+++ "b/images/\346\274\253\346\270\270\344\275\223\351\252\214.png"
Binary files differ
diff --git "a/images/\346\274\253\346\270\270\350\247\206\350\247\222-\351\200\211\344\270\255.png" "b/images/\346\274\253\346\270\270\350\247\206\350\247\222-\351\200\211\344\270\255.png"
new file mode 100644
index 0000000..50ab713
--- /dev/null
+++ "b/images/\346\274\253\346\270\270\350\247\206\350\247\222-\351\200\211\344\270\255.png"
Binary files differ
diff --git "a/images/\347\253\231\347\202\271\351\200\211\344\270\255.png" "b/images/\347\253\231\347\202\271\351\200\211\344\270\255.png"
new file mode 100644
index 0000000..cd51210
--- /dev/null
+++ "b/images/\347\253\231\347\202\271\351\200\211\344\270\255.png"
Binary files differ
diff --git "a/images/\347\274\223\345\206\262\345\210\206\346\236\220.png" "b/images/\347\274\223\345\206\262\345\210\206\346\236\220.png"
new file mode 100644
index 0000000..9d6ba05
--- /dev/null
+++ "b/images/\347\274\223\345\206\262\345\210\206\346\236\220.png"
Binary files differ
diff --git "a/images/\347\274\251\345\260\217.png" "b/images/\347\274\251\345\260\217.png"
new file mode 100644
index 0000000..c252116
--- /dev/null
+++ "b/images/\347\274\251\345\260\217.png"
Binary files differ
diff --git "a/images/\350\207\252\344\270\273\344\275\223\351\252\214-1.png" "b/images/\350\207\252\344\270\273\344\275\223\351\252\214-1.png"
new file mode 100644
index 0000000..69709a0
--- /dev/null
+++ "b/images/\350\207\252\344\270\273\344\275\223\351\252\214-1.png"
Binary files differ
diff --git "a/images/\350\207\252\344\270\273\344\275\223\351\252\214.png" "b/images/\350\207\252\344\270\273\344\275\223\351\252\214.png"
new file mode 100644
index 0000000..8247e8b
--- /dev/null
+++ "b/images/\350\207\252\344\270\273\344\275\223\351\252\214.png"
Binary files differ
diff --git "a/images/\350\246\201\347\264\240\346\240\207\347\273\230.png" "b/images/\350\246\201\347\264\240\346\240\207\347\273\230.png"
new file mode 100644
index 0000000..1076edf
--- /dev/null
+++ "b/images/\350\246\201\347\264\240\346\240\207\347\273\230.png"
Binary files differ
diff --git "a/images/\351\227\256\351\242\230\346\214\207\345\274\225.png" "b/images/\351\227\256\351\242\230\346\214\207\345\274\225.png"
new file mode 100644
index 0000000..6b93e66
--- /dev/null
+++ "b/images/\351\227\256\351\242\230\346\214\207\345\274\225.png"
Binary files differ
diff --git a/index.html b/index.html
index d8dff07..88ca9c8 100644
--- a/index.html
+++ b/index.html
@@ -232,7 +232,7 @@
.cesium-viewer-toolbar .cesium-baseLayerPicker-dropDown {
position: fixed !important;
- top: 98px !important;
+ top: 54px !important;
right: 10px !important;
z-index: 213 !important;
}
diff --git a/jimu.js/MapManager.js b/jimu.js/MapManager.js
index 22f8af9..a2535e8 100644
--- a/jimu.js/MapManager.js
+++ b/jimu.js/MapManager.js
@@ -89,7 +89,7 @@
var imageryLayers = this.map.imageryLayers;
imageryLayers.removeAll();
- this.map.baseLayerPicker.viewModel.selectedImagery = this.map.baseLayerPicker.viewModel.imageryProviderViewModels[2];
+ this.map.baseLayerPicker.viewModel.selectedImagery = this.map.baseLayerPicker.viewModel.imageryProviderViewModels[1];
this.map.baseLayerPicker.viewModel.selectedTerrain = this.map.baseLayerPicker.viewModel.terrainProviderViewModels[0];
$(".cesium-baseLayerPicker-sectionTitle").eq(0).html("底图");
$(".cesium-baseLayerPicker-sectionTitle").eq(1).html("地形");
@@ -163,17 +163,6 @@
creationFunction: function () {
return new Cesium.EllipsoidTerrainProvider({
ellipsoid: Cesium.Ellipsoid.WGS84
- })
- }
- }), new Cesium.ProviderViewModel({
- name: "赣州地形",
- tooltip: "由 普适科技 提供的赣州地区地形",
- iconUrl: "images/basemaps/TerrainSTK.png",
- creationFunction: function () {
- return new Cesium.CesiumTerrainProvider({
- url: "http://www.sw797.com:10011/gzsw3D/v2/data/gzdx",
- requestWaterMask: !0,
- requestVertexNormals: !0
})
}
})];
diff --git a/widgets/Basemap/Widget.html b/widgets/Basemap/Widget.html
index 905fdc8..8f64ad2 100644
--- a/widgets/Basemap/Widget.html
+++ b/widgets/Basemap/Widget.html
@@ -1,3 +1,3 @@
<div>
- <div class="base-map"><i></i> <span>底图</span><del></del> </div>
+ <div class="base-map"><i></i> <span>底图</span></div>
</div>
\ No newline at end of file
diff --git a/widgets/Basemap/Widget.js b/widgets/Basemap/Widget.js
index 9776a66..7faf3c0 100644
--- a/widgets/Basemap/Widget.js
+++ b/widgets/Basemap/Widget.js
@@ -45,80 +45,80 @@
}
});
- var self = this;
- var scene = this.map.scene;
+ // var self = this;
+ // var scene = this.map.scene;
- this.map.scene.globe.depthTestAgainstTerrain = false;
+ // this.map.scene.globe.depthTestAgainstTerrain = false;
//添加S3M图层服务
//var promise = scene.open("http://61.131.223.3:8090/iserver/services/3D-WLQX/rest/realspace");
- var promise = scene.open("http://61.131.223.3:8090/iserver/services/3D-WLQXS3MB/rest/realspace");
+ // var promise = scene.open("http://61.131.223.3:8090/iserver/services/3D-WLQXS3MB/rest/realspace");
- var promises = scene.open("http://61.131.223.3:8090/iserver/services/3D-WLQXRGJM/rest/realspace");
+ // var promises = scene.open("http://61.131.223.3:8090/iserver/services/3D-WLQXRGJM/rest/realspace");
//定位到场景
- Cesium.loadJson('http://61.131.223.3:8090/iserver/services/3D-WLQX/rest/realspace/scenes.json').then(function (scenes) {
- var sname = scenes[0].name;
- Cesium.loadJson('http://61.131.223.3:8090/iserver/services/3D-WLQX/rest/realspace/scenes/' + sname + '.json').then(function (jsonData) {
- var cameraPosition = jsonData.camera;
- var tilt = Cesium.Math.toRadians(cameraPosition.tilt - 90);
- Cesium.when(promise, function (layer) {
- /*for (var i = 0; i < layer.length; i++) {
- layer[i].style3D.bottomAltitude = 60;
- layer[i].refresh();
- }*/
- self.tileset = layer[0];
- //设置相机位置、视角，便于观察场景
- scene.camera.setView({
- destination: Cesium.Cartesian3.fromDegrees(115.728604, 28.786312, 58000),
- //heading : Cesium.Math.toRadians(175.0),
- // pitch : -55.0,
- // roll : 10.0
- });
+ // Cesium.loadJson('http://61.131.223.3:8090/iserver/services/3D-WLQX/rest/realspace/scenes.json').then(function (scenes) {
+ // var sname = scenes[0].name;
+ // Cesium.loadJson('http://61.131.223.3:8090/iserver/services/3D-WLQX/rest/realspace/scenes/' + sname + '.json').then(function (jsonData) {
+ // var cameraPosition = jsonData.camera;
+ // var tilt = Cesium.Math.toRadians(cameraPosition.tilt - 90);
+ // Cesium.when(promise, function (layer) {
+ // /*for (var i = 0; i < layer.length; i++) {
+ // layer[i].style3D.bottomAltitude = 60;
+ // layer[i].refresh();
+ // }*/
+ // self.tileset = layer[0];
+ // //设置相机位置、视角，便于观察场景
+ // scene.camera.setView({
+ // destination: Cesium.Cartesian3.fromDegrees(115.728604, 28.786312, 58000),
+ // //heading : Cesium.Math.toRadians(175.0),
+ // // pitch : -55.0,
+ // // roll : 10.0
+ // });
- //设置相机位置、视角，便于观察场景
- // topic.publish("gis/map/flyTo", {
- // 'longitude': 115.728604,
- // 'latitude': 28.786312,
- // "height": 58000,
- // "heading": 290.02,
- // "pitch": -10.17,
- // "roll": 359.86
- // }); //进行地图定位
+ // //设置相机位置、视角，便于观察场景
+ // // topic.publish("gis/map/flyTo", {
+ // // 'longitude': 115.728604,
+ // // 'latitude': 28.786312,
+ // // "height": 58000,
+ // // "heading": 290.02,
+ // // "pitch": -10.17,
+ // // "roll": 359.86
+ // // }); //进行地图定位
- if (!scene.pickPositionSupported) {
- alert('不支持深度纹理,无法拾取位置！');
- }
- }, function (e) {
+ // if (!scene.pickPositionSupported) {
+ // alert('不支持深度纹理,无法拾取位置！');
+ // }
+ // }, function (e) {
- });
- });
- });
+ // });
+ // });
+ // });
- var tit = dojo.query(".cesium-baseLayerPicker-sectionTitle")[1];
- html.create('div', {
- style: "font-size: 14px;margin-top: 3px;float: right;",
- innerHTML: "倾斜三维"
- }, tit);
+ // var tit = dojo.query(".cesium-baseLayerPicker-sectionTitle")[1];
+ // html.create('div', {
+ // style: "font-size: 14px;margin-top: 3px;float: right;",
+ // innerHTML: "倾斜三维"
+ // }, tit);
- var qxNode = html.create('input', {
- style: "margin-top: 6px;margin-right: 5px;float: right;",
- type: "checkbox",
- checked: "checked"
- }, tit);
- on(qxNode, "click", lang.hitch(this, this._switchTile))
+ // var qxNode = html.create('input', {
+ // style: "margin-top: 6px;margin-right: 5px;float: right;",
+ // type: "checkbox",
+ // checked: "checked"
+ // }, tit);
+ // on(qxNode, "click", lang.hitch(this, this._switchTile))
},
- _switchTile: function () {
- if (this.tileset.visible) {
- this.tileset.visible = false;
- } else {
- this.tileset.visible = true;
- }
- },
+ // _switchTile: function () {
+ // if (this.tileset.visible) {
+ // this.tileset.visible = false;
+ // } else {
+ // this.tileset.visible = true;
+ // }
+ // },
closeBaseMap: function (item) {
if (item != this.name) {
if ($('.cesium-baseLayerPicker-dropDown').hasClass('cesium-baseLayerPicker-dropDown-visible') == true) {
diff --git a/widgets/Basemap/css/style.css b/widgets/Basemap/css/style.css
index add8d36..c1d6a36 100644
--- a/widgets/Basemap/css/style.css
+++ b/widgets/Basemap/css/style.css
@@ -16,25 +16,17 @@
width: 100%;
display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: center;
}
.jimu-widget-Basemap .base-map i {
display: inline-block;
- width: 22px;
- height: 22px;
- background: url(../../../images/ditu.png) no-repeat;
- background-size: 22px;
+ margin-right: 4px;
+ width: 14px;
+ height: 14px;
+ background: url(../../../images/底图.png) no-repeat;
+ background-size: 100% 100%;
vertical-align: middle;
-}
-
-.jimu-widget-Basemap .base-map del {
- display: inline-block;
- width: 10px;
- height: 6px;
- background: url(../../../images/toolbottom1.png) no-repeat;
- background-size: 10px 6px;
- /* vertical-align: / */
}
.jimu-widget-Basemap .base-map span:hover {
@@ -44,7 +36,7 @@
/* 弹窗样式 */
.cesium-baseLayerPicker-dropDown {
- background-color: rgba(255, 255, 255, 0.7);
+ background-color: rgb(255, 255, 255);
}
.cesium-baseLayerPicker-sectionTitle, .cesium-baseLayerPicker-itemLabel {
@@ -52,4 +44,27 @@
}
.cesium-baseLayerPicker-selectedItem .cesium-baseLayerPicker-itemLabel{
color: rgb(16, 120, 218);
+}
+
+.cesium-baseLayerPicker-dropDown,
+.cesium-baseLayerPicker-choices,
+.cesium-baseLayerPicker-itemIcon {
+ border: none !important;
+}
+
+.cesium-baseLayerPicker-selectedItem img {
+ border: 2px solid #459DEE !important;
+}
+
+.cesium-baseLayerPicker-selectedItem div {
+ color: #459DEE;
+}
+
+.cesium-baseLayerPicker-dropDown div:nth-child(3) {
+ padding-top: 10px;
+ border-top: 1px solid #F2F2F2;
+}
+
+.cesium-baseLayerPicker-dropDown .cesium-baseLayerPicker-sectionTitle {
+ font-size: 16px;
}
\ No newline at end of file
diff --git a/widgets/LeftNavigationBar/Widget.js b/widgets/LeftNavigationBar/Widget.js
index 4495a67..84bbfc5 100644
--- a/widgets/LeftNavigationBar/Widget.js
+++ b/widgets/LeftNavigationBar/Widget.js
@@ -125,7 +125,7 @@
},
getData: function () {
- var url = 'http://171.34.76.171:8880/zhsd-wetResource/GeoData/queryGeoDataTree',
+ var url = 'http://171.34.76.171:8880/pyh-wetResource/GeoData/queryGeoDataTree',
that = this;
axios.get(url, {
diff --git a/widgets/Tool/Widget.html b/widgets/Tool/Widget.html
index 502fe7c..a03f82c 100644
--- a/widgets/Tool/Widget.html
+++ b/widgets/Tool/Widget.html
@@ -4,7 +4,7 @@
<div class="tool-y-box">
<ul>
<li class="measure-tool"><i></i> <span>图上量算</span></li>
- <li class="plotting-tool"><i></i> <span>要素标绘</span></li>
+ <!-- <li class="plotting-tool"><i></i> <span>要素标绘</span></li> -->
<li class="rolling-tool"><i></i> <span>卷帘对比</span></li>
<li class="splitScreen-tool"><i></i> <span>分屏对比</span></li>
<li class="sign-tool"><i></i> <span>我的标记</span></li>
diff --git a/widgets/Tool/css/style.css b/widgets/Tool/css/style.css
index 8fb3236..b3520a6 100644
--- a/widgets/Tool/css/style.css
+++ b/widgets/Tool/css/style.css
@@ -2,12 +2,10 @@
position: relative;
font-size: 14px;
height: 36px;
- line-height: 36px;
width: 100%;
/* 240px */
background: rgb(254, 254, 254);
color: #838383;
- border-right: 1px solid #DDDDDD;
border-radius: 6px 0 0 6px;
text-align: center;
cursor: pointer;
@@ -16,19 +14,24 @@
.jimu-widget-Tool .tool-bar {
width: 100%;
+ height: 24px;
+ line-height: 24px;
+ margin-top: 6px;
+ border-right: 1px solid #DDDDDD;
}
.jimu-widget-Tool .tool-bar .tool-btn {
+ display: flex;
align-items: center;
- justify-content: space-around;
+ justify-content: center;
}
.jimu-widget-Tool .tool-bar .tool-btn i {
- display: inline-block;
- width: 22px;
- height: 22px;
- background: url(../../../images/gongju.png) no-repeat;
- background-size: 22px;
+ width: 14px;
+ height: 14px;
+ margin-right: 4px;
+ background: url(../../../images/工具.png) no-repeat;
+ background-size: 100% 100%;
vertical-align: middle;
}
@@ -37,10 +40,10 @@
}
.jimu-widget-Tool .tool-bar .tool-btn del {
- display: inline-block;
+ margin-left: 4px;
width: 10px;
height: 6px;
- background: url(../../../images/toolbottom1.png) no-repeat;
+ background: url(../../../images/展开.png) no-repeat;
background-size: 10px 6px;
/* vertical-align: / */
}
@@ -79,6 +82,11 @@
background: #3F9CFC;
}
+.jimu-widget-Tool .tool-bar .tool-y-box li:hover i {
+ filter: grayscale(100%) brightness(200%);
+}
+
+
.jimu-widget-Tool .tool-bar .tool-y-box li i {
margin-top: -2px;
display: inline-block;
@@ -93,45 +101,46 @@
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(1) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 0;
+ background: url(../../../images/图上测量.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(2) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -141px;
+ background: url(../../../images/卷帘对比.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(3) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -63px;
+ background: url(../../../images/分屏对比.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(4) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -110px;
+ background: url(../../../images/我的标记.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(5) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -32px;
+ background: url(../../../images/坐标定位.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(6) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -126px;
+ background: url(../../../images/场景快照.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(7) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -173px;
+ background: url(../../../images/叠加分析.png ) no-repeat;
}
.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(8) i {
- background: url(../../../images/toolbox1.png ) no-repeat 0 -16px;
+ background: url(../../../images/缓冲分析.png ) no-repeat;
}
-.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) i {
+/* .jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) i {
background: url(../../../images/toolbox1.png ) no-repeat 0 -156px;
-}
+} */
-.jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(9) {
+.jimu-widget-Tool .tool-bar .tool-y-box li:last-child {
border-radius: 0 0 5px 5px;
}
+
/* .jimu-widget-Tool .tool-bar .tool-y-box li:nth-child(2) i {
background: url(../../../images/toolbox.png ) no-repeat 0 -16px;
} */
diff --git a/widgets/visualAngle/Widget.html b/widgets/visualAngle/Widget.html
index cc16510..bba0a0b 100644
--- a/widgets/visualAngle/Widget.html
+++ b/widgets/visualAngle/Widget.html
@@ -1,14 +1,14 @@
<div>
- <div class="visualAngleOnce v-a-One">
- <img class="v-a-o-img" src="../../../images/addL/wtiyan.png" alt="">
+ <div class="visualAngleOnce v-a-One on">
+ <img class="v-a-o-img" src="../../../images/自主体验-1.png" alt="">
<div class="v-a-o-title">自主体验</div>
</div>
<div class="visualAngleOnce v-a-Two">
- <img class="v-a-o-img" src="../../../images/addL/bquanqiu.png" alt="">
+ <img class="v-a-o-img" src="../../../images/漫游体验.png" alt="">
<div class="v-a-o-title">漫游体验</div>
</div>
<div class="visualAngleOnce v-a-Three">
- <img class="v-a-o-img" src="../../../images/addL/bshijiao.png" alt="">
+ <img class="v-a-o-img" src="../../../images/固定视角.png" alt="">
<div class="v-a-o-title">固定视角</div>
</div>
</div>
\ No newline at end of file
diff --git a/widgets/visualAngle/Widget.js b/widgets/visualAngle/Widget.js
index beb708a..fdead0b 100644
--- a/widgets/visualAngle/Widget.js
+++ b/widgets/visualAngle/Widget.js
@@ -31,27 +31,23 @@
// 暴露在外的接口
var that = this;
$(".v-a-One").click(function () {
- that.clearColor('one');
- $(".v-a-One").css({ 'backgroundColor': '#3F9DFD', 'color': '#fff' });
- $(this).find('.v-a-o-img').attr("src", "../../../images/addL/wtiyan.png");
- // .attr("src", src_value);
-
+ $(this).addClass('on').siblings().removeClass('on');
// 控制视角平移：
- that.map.scene.screenSpaceCameraController.enableRotate = true
+ that.map.scene.screenSpaceCameraController.enableRotate = true;
// true: 允许左键按下视角平移；
// false: 禁止左键按下视角平移；
// 控制视角缩放：
- that.map.scene.screenSpaceCameraController.enableZoom = true
+ that.map.scene.screenSpaceCameraController.enableZoom = true;
// true: 允许中键缩放视角；
// false:禁止中键缩放视角；
// 控制视角旋转：
- that.map.scene.screenSpaceCameraController.enableTilt = true
+ that.map.scene.screenSpaceCameraController.enableTilt = true;
// true:允许视角旋转；
@@ -59,14 +55,12 @@
})
$(".v-a-Two").click(function () {
- that.clearColor('two');
- $(".v-a-Two").css({ 'backgroundColor': '#3F9DFD', 'color': '#fff' });
- $(this).find('.v-a-o-img').attr("src", "../../../images/addL/wquanqiu.png");
+
+ $(this).addClass('on').siblings().removeClass('on');
+
})
$(".v-a-Three").click(function () {
- that.clearColor('three');
- $(".v-a-Three").css({ 'backgroundColor': '#3F9DFD', 'color': '#fff' });
- $(this).find('.v-a-o-img').attr("src", "../../../images/addL/wshijiao.png");
+ $(this).addClass('on').siblings().removeClass('on');
that.map.scene.screenSpaceCameraController.enableRotate = false
that.map.scene.screenSpaceCameraController.enableZoom = true
that.map.scene.screenSpaceCameraController.enableTilt = false
@@ -108,18 +102,6 @@
resize: function () {
- },
- clearColor: function (val) {
- $(".visualAngleOnce").css({ 'backgroundColor': '#fff', 'color': '#000' });
- if (val != 'one') {
- $('.v-a-One').find('.v-a-o-img').attr("src", "../../../images/addL/btiyan.png")
- }
- if (val != 'two') {
- $('.v-a-Two').find('.v-a-o-img').attr("src", "../../../images/addL/bquanqiu.png")
- }
- if (val != 'three') {
- $('.v-a-Three').find('.v-a-o-img').attr("src", "../../../images/addL/bshijiao.png")
- }
},
destroy: function () {
diff --git a/widgets/visualAngle/css/style.css b/widgets/visualAngle/css/style.css
index d8bf1c1..e242544 100644
--- a/widgets/visualAngle/css/style.css
+++ b/widgets/visualAngle/css/style.css
@@ -1,28 +1,27 @@
.jimu-widget-visualAngle {
- position : fixed;
- font-size : 14px;
- height : 72px !important;
+ position: fixed;
+ font-size: 14px;
+ height: 72px !important;
/* line-height : 32px; */
- width : 216px !important;
+ width: 216px !important;
right: auto !important;
top: auto !important;
bottom: 100px !important;
left: calc(50% - 90px) !important;
/* 240px */
- background : rgba(255, 255, 255, 1);
- color : #fff;
+ background: rgba(255, 255, 255, 1);
/* border : 1px solid #000; */
border-radius: 6px;
- text-align : center;
+ text-align: center;
/* cursor : pointer; */
- z-index : 10 !important;
+ z-index: 10 !important;
box-sizing: border-box;
display: flex;
align-items: center;
justify-content: center;
}
-.jimu-widget-visualAngle .visualAngleOnce{
+.jimu-widget-visualAngle .visualAngleOnce {
width: 72px;
box-sizing: border-box;
/* border: 1px solid springgreen; */
@@ -35,20 +34,31 @@
font-size: 13px;
}
-.jimu-widget-visualAngle .visualAngleOnce:nth-child(1){
- border-radius: 6px 0 0 6px;
- border-right: 1px solid rgba(155, 155, 155, 0.2);
+
+.jimu-widget-visualAngle .visualAngleOnce .v-a-o-title {
+ color: #969696 !important;
+}
+
+.jimu-widget-visualAngle .visualAngleOnce.on {
background-color: #3F9DFD;
}
-.jimu-widget-visualAngle .visualAngleOnce:nth-child(2){
- color: #000;
+
+.jimu-widget-visualAngle .visualAngleOnce.on img,
+.jimu-widget-visualAngle .visualAngleOnce.on div {
+ filter: grayscale(100%) brightness(200%);
}
-.jimu-widget-visualAngle .visualAngleOnce:nth-child(3){
+
+.jimu-widget-visualAngle .visualAngleOnce:nth-child(1) {
+ border-radius: 6px 0 0 6px;
+ border-right: 1px solid rgba(155, 155, 155, 0.2);
+}
+
+.jimu-widget-visualAngle .visualAngleOnce:nth-child(3) {
border-radius: 0 6px 6px 0;
border-left: 1px solid rgba(155, 155, 155, 0.2);
- color: #000;
}
-.jimu-widget-visualAngle .v-a-o-img{
- width: 30px;
+.jimu-widget-visualAngle .v-a-o-img {
+ width: 20px;
+ margin-bottom: 8px;
}
\ No newline at end of file
--
Gitblit v1.9.3