Skip to content

Commit f073e32

Browse files
author
潘卓然ParnDeedlit
committed
Merge branch 'dev' of https://github.com/MapGIS/WebClient-JavaScript into dev
2 parents 2b8af0b + 115e943 commit f073e32

File tree

7 files changed

+123
-30
lines changed

7 files changed

+123
-30
lines changed

‎website/public/static/demo/config/config-headers.json‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,47 @@
347347
"title": "Leaflet",
348348
"icon": "iconLeaf",
349349
"menus": [
350+
{
351+
"title": "产品",
352+
"icon": "icon3chanpin",
353+
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
354+
"hightlights": [[true, false, false, false, false, false, false, false, false]],
355+
"routes": [
356+
[
357+
"/product/leaflet/produce_leaflet",
358+
"/product/leaflet/download",
359+
"/product/leaflet/developEnvironment",
360+
"/product/leaflet/authorization",
361+
"/product/leaflet/moduleIntroduction",
362+
"/product/leaflet/relatedProduct",
363+
"/product/leaflet/thirdPartyProducts",
364+
"/product/leaflet/newFeatures",
365+
"/product/leaflet/startDevelop"
366+
]
367+
]
368+
},
369+
{
370+
"title": "开发指南",
371+
"icon": "iconicon_zhinan",
372+
"links": [
373+
[
374+
"准备",
375+
"数据准备",
376+
"数据处理",
377+
"数据发布",
378+
"新建网站",
379+
"引入开发包",
380+
"数据可视化",
381+
"视图设置",
382+
"标题添加",
383+
"量算分析",
384+
"数据查询",
385+
"可视化效果"
386+
]
387+
],
388+
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
389+
"routes": [["/guide/leaflet/development_leaflet", "", "", "", "", "", "", "", "", "", "", ""]]
390+
},
350391
{
351392
"title": "开发示例",
352393
"icon": "iconkaifashili",
@@ -392,6 +433,47 @@
392433
"title": "Openlayers",
393434
"icon": "iconlayers",
394435
"menus": [
436+
{
437+
"title": "产品",
438+
"icon": "icon3chanpin",
439+
"links": [["产品介绍", "资源下载", "开发环境", "开发授权", "模块介绍", "相关产品", "三方产品", "新特性", "开始开发"]],
440+
"hightlights": [[true, false, false, false, false, false, false, false, false]],
441+
"routes": [
442+
[
443+
"/product/openlayers/produce_ol",
444+
"/product/openlayers/download",
445+
"/product/openlayers/developEnvironment",
446+
"/product/openlayers/authorization",
447+
"/product/openlayers/moduleIntroduction",
448+
"/product/openlayers/relatedProduct",
449+
"/product/openlayers/thirdPartyProducts",
450+
"/product/openlayers/newFeatures",
451+
"/product/openlayers/startDevelop"
452+
]
453+
]
454+
},
455+
{
456+
"title": "开发指南",
457+
"icon": "iconicon_zhinan",
458+
"links": [
459+
[
460+
"准备",
461+
"数据准备",
462+
"数据处理",
463+
"数据发布",
464+
"新建网站",
465+
"引入开发包",
466+
"数据可视化",
467+
"视图设置",
468+
"标题添加",
469+
"量算分析",
470+
"数据查询",
471+
"可视化效果"
472+
]
473+
],
474+
"hightlights": [[false, false, false, false, false, false, false, false, false, false, false, false]],
475+
"routes": [["/guide/openlayers/development_ol", "", "", "", "", "", "", "", "", "", "", ""]]
476+
},
395477
{
396478
"title": "开发示例",
397479
"icon": "iconkaifashili",

‎website/src/router/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ export const routes = [
159159
name: 'product'
160160
},
161161
{
162-
path: '/guide/:mapmpde/:file',
162+
path: '/guide/:mapmode/:file',
163163
component: Guide,
164164
name: 'guide'
165165
}

‎website/src/views/component/product.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<el-container class="mapgis-product-wrapper">
3-
<el-header style="padding:0px;" :height="mobile?'48px':'64px'">
3+
<el-header style="padding:0px;" :height="mobile?'48px':'72px'">
44
<Header></Header>
55
</el-header>
66
<div class="product-header">

‎website/src/views/guide/DevelopGuide.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<el-container class="mapgis-guide-wrapper">
3-
<el-header style="padding: 0px" :height="mobile ? '48px' : '64px'">
3+
<el-header style="padding: 0px" :height="mobile ? '48px' : '72px'">
44
<Header></Header>
55
</el-header>
66
<div class="product-header">

‎website/src/views/layout/components/Header/Header.vue‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ export default {
120120
if (title.indexOf(this.activeMenu) >= 0) {
121121
return true;
122122
}
123+
if (title === "组件" && this.activeMenu === "component"){
124+
return true
125+
}
123126
return false;
124127
}
125128
}
@@ -140,6 +143,7 @@ export default {
140143
.mapgis-webclient-menu {
141144
margin-right: 22px !important;
142145
}
146+
143147
.mapgis-webclient-menu {
144148
height: 48px !important;
145149
span {
@@ -203,6 +207,7 @@ export default {
203207
position: relative;
204208
display: flex;
205209
align-items: center;
210+
height: 72px;
206211
207212
.mapgis-webclient-nav {
208213
margin-left: auto;
@@ -222,7 +227,6 @@ export default {
222227
223228
span {
224229
width: fit-content;
225-
height: 72px;
226230
margin: 0px 2px;
227231
padding: 0px 4px;
228232
// margin-let: 12.5px;
@@ -231,7 +235,7 @@ export default {
231235
font-weight: bold;
232236
text-align: center;
233237
color: #3f454d;
234-
line-height: 72px;
238+
line-height: 45px;
235239
236240
.el-button {
237241
padding: 0;
@@ -245,11 +249,11 @@ export default {
245249
246250
.active {
247251
border-radius: 0px;
248-
border-bottom: 3px solid #33dbe8;
249-
span {
250-
color: linear-gradient(90deg, #4794fa, #31e1e6) !important;
251-
font-size: bold;
252-
}
252+
border-bottom: 3px solid #3a85c6 !important;
253+
//span {
254+
// color: linear-gradient(90deg, #4794fa, #31e1e6) !important;
255+
// font-size: bold;
256+
//}
253257
}
254258
}
255259
}

‎website/src/views/layout/components/Header/Menu.vue‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,13 +204,17 @@ export default {
204204
width: 160px;
205205
height: 36px;
206206
// border-radius: 4px;
207-
background: linear-gradient(90deg, rgba(71, 148, 250, 1), rgba(49, 225, 230, 1));
208207
}
209208
.header-menu-link-text {
210209
width: 160px;
211210
height: 36px;
212211
display: block;
213212
}
213+
.header-menu-link-text:hover{
214+
span{
215+
color: #47abff !important;
216+
}
217+
}
214218
}
215219
216220
.header-menu-wrapper-mobile {

‎website/src/views/total/Download.vue‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,24 @@
44
<div class="content-wrapper">
55
<div class="title">
66
<img src="../../../public/static/assets/total/retouch.png" />
7-
<div class="text">SDK下载</div>
7+
<div class="text">离线包下载</div>
88
</div>
9-
<div class="warning">在这里，可以下载到所有您需要的中地数码 WebClient 产品：{{ SDK.version }}</div>
10-
<div :class="['download-area', { mobile: mobile }]">
11-
<div class="complete package">
12-
<span class="name">完整包</span>
13-
<div class="text">该包含有webclient四大主脚本以及所需的全部的三方cdn脚本</div>
14-
<el-button type="primary"><a :href="SDK.websiteUrl" target="_blank">立即下载</a></el-button>
15-
</div>
16-
<div class="streamline package">
17-
<span class="name">精简包</span>
18-
<div class="text">只包含webclient主脚本</div>
19-
<el-button type="primary"><a :href="SDK.websiteUrl" target="_blank">立即下载</a></el-button>
20-
</div>
9+
<div class="warning">下载地址：
10+
<!-- <el-button type="primary"><a href="http://smaryun.com/dev/download_detail.html#/download828" target="_blank">下载</a></el-button>-->
11+
<a href="http://smaryun.com/dev/download_detail.html#/download828" >http://smaryun.com/dev/download_detail.html#/download828</a>
2112
</div>
13+
<!-- <div :class="['download-area', { mobile: mobile }]">-->
14+
<!-- <div class="complete package">-->
15+
<!-- <span class="name">完整包</span>-->
16+
<!-- <div class="text">该包含有webclient四大主脚本以及所需的全部的三方cdn脚本</div>-->
17+
<!-- <el-button type="primary"><a :href="SDK.websiteUrl" target="_blank">立即下载</a></el-button>-->
18+
<!-- </div>-->
19+
<!-- <div class="streamline package">-->
20+
<!-- <span class="name">精简包</span>-->
21+
<!-- <div class="text">只包含webclient主脚本</div>-->
22+
<!-- <el-button type="primary"><a :href="SDK.websiteUrl" target="_blank">立即下载</a></el-button>-->
23+
<!-- </div>-->
24+
<!-- </div>-->
2225
<div class="title">
2326
<img src="../../../public/static/assets/total/retouch.png" />
2427
<div class="text">Npm</div>
@@ -108,8 +111,8 @@ export default {
108111
display: flex;
109112
align-items: center;
110113
height: 22px;
111-
margin-top: 56px;
112-
margin-bottom: 32px;
114+
margin-top: 37px;
115+
margin-bottom: 2px;
113116
114117
img {
115118
width: 10px;
@@ -206,16 +209,16 @@ export default {
206209
}
207210
208211
.warning {
209-
margin-bottom: 24px;
210-
padding: 25px 20px;
211-
background-color: #eeeeee;
212+
margin-bottom: 2px;
213+
padding: 18px 20px;
214+
//background-color: #eeeeee;
212215
font-size: 16px;
213216
font-family: Microsoft YaHei;
214217
font-weight: 400;
215218
color: #333;
216219
}
217220
a {
218-
color: #ffffff;
221+
color: #4794fa;
219222
}
220223
.download-tag {
221224
width: 100%;

0 commit comments

Comments
 (0)