Skip to content

Commit 7f3b19c

Browse files
muyao1987muyao1987
committed
同步代码
1 parent fccc211 commit 7f3b19c

166 files changed

Lines changed: 822 additions & 617 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.eslintrc.js‎

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ module.exports = {
33
env: {
44
es6: true,
55
node: false,
6-
browser: true,
6+
browser: true
77
},
88
parser: "babel-eslint",
99
parserOptions: {
10-
sourceType: "module",
10+
sourceType: "module"
1111
},
1212
plugins: ["html", "prettier"],
1313
extends: ["eslint:recommended", "plugin:prettier/recommended"],
@@ -17,6 +17,13 @@ module.exports = {
1717
defineExpose: "readonly",
1818
withDefaults: "readonly",
1919

20+
currentPath: "readonly",
21+
globalMsg: "readonly",
22+
globalAlert: "readonly",
23+
globalNotify: "readonly",
24+
showLoading: "readonly",
25+
hideLoading: "readonly",
26+
2027
Cesium: "readonly",
2128
mars3d: "readonly",
2229
L: "readonly",
@@ -33,21 +40,17 @@ module.exports = {
3340
netcdfjs: "readonly",
3441
ol: "readonly",
3542
olcs: "readonly",
36-
mapv: "readonly",
3743

44+
map: "readonly",
3845
$: false,
3946
haoutil: false,
4047
toastr: false,
4148
layer: false,
4249
localforage: false,
4350
JB: false,
44-
h337: false,
4551
jeDate: false,
46-
kriging: false,
52+
kriging: false
4753
},
48-
// ""0""表示忽略问题，等同于"off";
49-
// ""1""表示给出警告，等同于"warn";
50-
// ""2""表示直接报错，等同于"error"。
5154
rules: {
5255
// mars3d-es5-project项目专用的配置(目的便于示例的开发调试) start
5356
"no-unused-vars": "off", // 不允许有声明后未被使用的变量或参数
@@ -104,6 +107,6 @@ module.exports = {
104107
"no-func-assign": "error", // 禁止对 function 声明重新赋值
105108
"no-nested-ternary": "error", // 禁用嵌套的三元表达式
106109
"no-multiple-empty-lines": ["error", { max: 3 }], // 空行最多不能超过两行
107-
"new-cap": "off", // 关闭eslint fromDegrees方法报错
108-
},
109-
};
110+
"new-cap": "off" // 关闭eslint fromDegrees方法报错
111+
}
112+
}

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,5 @@ testem.log
5050
Thumbs.db
5151
package-lock.json
5252

53-
# ±¾µØ²âÊÔ
54-
widgets-test
55-
/example-test
53+
# 本地测试
54+
*-test

‎config/config.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
{
126126
"pid": 10,
127127
"name": "腾讯影像",
128-
"icon": "img/basemaps/gaode_img.png",
128+
"icon": "img/basemaps/tencent_img.png",
129129
"type": "group",
130130
"layers": [
131131
{ "name": "底图", "type": "tencent", "layer": "img_d" },
@@ -135,7 +135,7 @@
135135
{
136136
"pid": 10,
137137
"name": "腾讯电子",
138-
"icon": "img/basemaps/gaode_vec.png",
138+
"icon": "img/basemaps/tencent_vec.png",
139139
"type": "tencent",
140140
"layer": "vec"
141141
},

‎css/style.css‎

Lines changed: 174 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,11 @@ textarea {
4444
}
4545

4646
a {
47+
text-decoration: none;
4748
color: #62a8ea;
4849
text-decoration: none;
50+
margin-top: 1px;
51+
margin-right: 2px;
4952
}
5053

5154
a:hover,
@@ -174,107 +177,6 @@ li {
174177
background: rgba(63, 72, 84, 0.9);
175178
}
176179

177-
/**cesium 工具按钮栏*/
178-
.cesium-viewer-toolbar {
179-
top: auto;
180-
bottom: 35px;
181-
left: 12px;
182-
right: auto;
183-
}
184-
.cesium-toolbar-button img {
185-
height: 100%;
186-
vertical-align: middle;
187-
}
188-
.cesium-viewer-toolbar > .cesium-toolbar-button,
189-
.cesium-navigationHelpButton-wrapper,
190-
.cesium-viewer-geocoderContainer {
191-
margin-bottom: 5px;
192-
float: left;
193-
clear: both;
194-
text-align: center;
195-
}
196-
.cesium-button {
197-
background-color: #3f4854;
198-
color: #e6e6e6;
199-
fill: #e6e6e6;
200-
box-shadow: 0 1px 4px rgba(0, 0, 0, 0.3);
201-
line-height: 32px;
202-
}
203-
204-
/**cesium 底图切换面板*/
205-
.cesium-baseLayerPicker-dropDown {
206-
bottom: 0;
207-
left: 40px;
208-
max-height: 700px;
209-
margin-bottom: 5px;
210-
}
211-
212-
/**cesium 帮助面板*/
213-
.cesium-navigation-help {
214-
top: auto;
215-
bottom: 0;
216-
left: 40px;
217-
transform-origin: left bottom;
218-
}
219-
220-
/**cesium 二维三维切换*/
221-
.cesium-sceneModePicker-wrapper {
222-
width: auto;
223-
}
224-
.cesium-sceneModePicker-wrapper .cesium-sceneModePicker-dropDown-icon {
225-
float: right;
226-
margin: 0 3px;
227-
}
228-
229-
/**cesium POI查询输入框*/
230-
.cesium-viewer-geocoderContainer .search-results {
231-
left: 0;
232-
right: 40px;
233-
width: auto;
234-
z-index: 9999;
235-
}
236-
.cesium-geocoder-searchButton {
237-
background-color: #3f4854;
238-
}
239-
.cesium-viewer-geocoderContainer .cesium-geocoder-input {
240-
background-color: rgba(63, 72, 84, 0.7);
241-
}
242-
.cesium-viewer-geocoderContainer .cesium-geocoder-input:focus {
243-
background-color: rgba(63, 72, 84, 0.9);
244-
}
245-
.cesium-viewer-geocoderContainer .search-results {
246-
background-color: #3f4854;
247-
}
248-
249-
/**cesium info信息框*/
250-
.cesium-infoBox {
251-
top: 50px;
252-
background: rgba(63, 72, 84, 0.9);
253-
}
254-
.cesium-infoBox-title {
255-
background-color: #3f4854;
256-
}
257-
258-
/**cesium 任务栏的FPS信息*/
259-
.cesium-performanceDisplay-defaultContainer {
260-
top: auto;
261-
bottom: 35px;
262-
right: 50px;
263-
}
264-
.cesium-performanceDisplay-ms,
265-
.cesium-performanceDisplay-fps {
266-
color: #fff;
267-
}
268-
269-
/**cesium tileset调试信息面板*/
270-
.cesium-viewer-cesiumInspectorContainer {
271-
top: 10px;
272-
left: 10px;
273-
right: auto;
274-
background-color: #3f4854;
275-
}
276-
277-
278180
/**infoview浮动面板*/
279181
.infoview {
280182
position: absolute;
@@ -409,3 +311,174 @@ html {
409311
-webkit-box-shadow: inset 1px 1px 3px rgba(0, 0, 0, 0.35);
410312
background-color: rgba(0, 0, 0, 0.5);
411313
}
314+
315+
316+
317+
/**cesium 工具按钮栏*/
318+
319+
.cesium-viewer-toolbar {
320+
top: auto;
321+
bottom: 35px;
322+
left: 12px;
323+
right: auto;
324+
}
325+
326+
.cesium-toolbar-button img {
327+
height: 100%;
328+
vertical-align: middle;
329+
}
330+
331+
.cesium-viewer-toolbar>.cesium-toolbar-button,
332+
.cesium-navigationHelpButton-wrapper,
333+
.cesium-viewer-geocoderContainer {
334+
margin-bottom: 5px;
335+
float: left;
336+
clear: both;
337+
text-align: center;
338+
}
339+
340+
.cesium-button {
341+
background-color: rgba(23, 49, 71, 0.7);
342+
border: none;
343+
color: #ffffff;
344+
fill: #e6e6e6;
345+
line-height: 32px;
346+
}
347+
348+
.cesium-button:hover {
349+
background-color: rgba(0, 138, 255, 0.7);
350+
box-shadow: none;
351+
border: none;
352+
}
353+
354+
/**cesium 底图切换面板*/
355+
.cesium-baseLayerPicker-dropDown {
356+
bottom: 0;
357+
left: 40px;
358+
max-height: 700px;
359+
margin-bottom: 5px;
360+
}
361+
362+
/**cesium 帮助面板*/
363+
.cesium-navigation-help {
364+
top: auto;
365+
bottom: 0;
366+
left: 40px;
367+
transform-origin: left bottom;
368+
}
369+
370+
/**cesium 二维三维切换*/
371+
.cesium-sceneModePicker-wrapper {
372+
width: auto;
373+
}
374+
375+
.cesium-sceneModePicker-wrapper .cesium-sceneModePicker-dropDown-icon {
376+
float: right;
377+
margin: 0 3px;
378+
}
379+
380+
/**cesium POI查询输入框*/
381+
.cesium-viewer-geocoderContainer .search-results {
382+
left: 0;
383+
right: 40px;
384+
width: auto;
385+
z-index: 9999;
386+
}
387+
388+
.cesium-geocoder-searchButton {
389+
background-color: #3f4854;
390+
}
391+
392+
.cesium-viewer-geocoderContainer .cesium-geocoder-input {
393+
background-color: rgba(63, 72, 84, 0.7);
394+
}
395+
396+
.cesium-viewer-geocoderContainer .cesium-geocoder-input:focus {
397+
background-color: rgba(63, 72, 84, 0.9);
398+
}
399+
400+
.cesium-viewer-geocoderContainer .search-results {
401+
background-color: #3f4854;
402+
}
403+
404+
/**cesium info信息框*/
405+
.cesium-infoBox {
406+
top: 50px;
407+
background: rgba(63, 72, 84, 0.9);
408+
}
409+
410+
.cesium-infoBox-title {
411+
background-color: #3f4854;
412+
}
413+
414+
/**cesium 任务栏的FPS信息*/
415+
.cesium-performanceDisplay-defaultContainer {
416+
top: auto;
417+
bottom: 35px;
418+
right: 50px;
419+
}
420+
421+
.cesium-performanceDisplay-ms,
422+
.cesium-performanceDisplay-fps {
423+
color: #fff;
424+
}
425+
426+
/**cesium tileset调试信息面板*/
427+
.cesium-viewer-cesiumInspectorContainer {
428+
top: 10px;
429+
left: 10px;
430+
right: auto;
431+
background-color: #3f4854;
432+
}
433+
434+
435+
436+
/**覆盖mars3d内部控件的颜色等样式*/
437+
.mars3d-compass .mars3d-compass-outer {
438+
fill: rgba(23, 49, 71, 0.8);
439+
}
440+
.mars3d-contextmenu-ul,
441+
.mars3d-sub-menu {
442+
background-color: rgba(23, 49, 71, 0.8);
443+
}
444+
.mars3d-contextmenu-ul > li > a:hover,
445+
.mars3d-sub-menu > li > a:hover,
446+
.mars3d-contextmenu-ul > li > a:focus,
447+
.mars3d-sub-menu > li > a:focus,
448+
.mars3d-contextmenu-ul > li > .active,
449+
.mars3d-sub-menu > li > .active {
450+
background-color: #3ea6ff;
451+
}
452+
.mars3d-contextmenu-ul > .active > a,
453+
.mars3d-sub-menu > .active > a,
454+
.mars3d-contextmenu-ul > .active > a:hover,
455+
.mars3d-sub-menu > .active > a:hover,
456+
.mars3d-contextmenu-ul > .active > a:focus,
457+
.mars3d-sub-menu > .active > a:focus {
458+
background-color: #3ea6ff;
459+
}
460+
/* Popup样式*/
461+
.mars3d-popup-color {
462+
color: #ffffff;
463+
}
464+
.mars3d-popup-background {
465+
background: rgba(23, 49, 71, 0.8);
466+
}
467+
.mars3d-template-content label {
468+
padding-right: 6px;
469+
}
470+
.mars3d-template-titile {
471+
border-bottom: 1px solid #3ea6ff;
472+
}
473+
.mars3d-template-titile a {
474+
font-size: 16px;
475+
}
476+
.mars3d-popup-btn-custom {
477+
padding: 3px 10px;
478+
border: 1px solid #209ffd;
479+
background: #209ffd1c;
480+
}
481+
.mars3d-divGraphic:hover {
482+
z-index: 999 !important;
483+
}
484+

0 commit comments

Comments
 (0)