Skip to content

Commit 0cf7b11

Browse files
author
caoxinke
committed
2 parents a948d4f + 0b65fe1 commit 0cf7b11

File tree

5 files changed

+60
-41
lines changed

5 files changed

+60
-41
lines changed

‎build/webpack.config.leaflet.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ module.exports = {
1212
resolve: {
1313
extensions: ['', '.js', '.json', '.css']
1414
},
15-
15+
externals: {
16+
'echarts': 'echarts',
17+
'leaflet': 'L'
18+
},
1619
module: {
1720
//加载器配置
1821
loaders: [

‎build/webpack.config.openlayers.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,16 @@ module.exports = {
1212
resolve: {
1313
extensions: ['', '.js', '.json', '.css']
1414
},
15+
externals: {
16+
'echarts': 'echarts',
17+
'openlayers': 'ol'
18+
},
1519

1620
module: {
21+
noParse: /[\/\\]node_modules[\/\\]openlayers[\/\\]dist[\/\\]ol\.js$/,
1722
//加载器配置
1823
loaders: [
24+
1925
// {test: /\.css$/, loader: 'style-loader!css-loader'},
2026
//{test: /\.css$/, loader: ExtractTextPlugin.extract("style-loader", "css-loader")},
2127
//{test: /\.(png|jpg)$/, loader: "file-loader?name=images/[name].[ext]"}

‎package.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
"license": "Apache-2.0",
2727
"devDependencies": {
2828
"browserify": "^14.3.0",
29-
"commander": "2.9.0",
30-
"commonjs": "0.0.1",
29+
"commander": "^2.9.0",
30+
"commonjs": "^0.0.1",
3131
"css-loader": "^0.26.1",
3232
"extract-text-webpack-plugin": "^1.0.1",
3333
"file-loader": "^0.10.0",
@@ -41,13 +41,14 @@
4141
"karma-coverage": "^1.1.1",
4242
"karma-jasmine": "^1.1.0",
4343
"karma-teamcity-reporter": "^1.0.0",
44-
"leaflet": "1.0.3",
45-
"openlayers": "4.0.0",
46-
"shelljs": "0.7.6",
44+
"shelljs": "^0.7.6",
4745
"style-loader": "^0.13.1",
4846
"underscore": "^1.8.3",
4947
"watchify": "^3.9.0",
50-
"webpack": "^1.14.0"
48+
"webpack": "^1.14.0",
49+
"leaflet": "1.0.3",
50+
"openlayers": "4.1.0",
51+
"echarts ": "3.5.3"
5152
},
5253
"dependencies": {
5354
"proj4": "^2.4.3",

‎web/css/header.css‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
padding: 4px 9px;
3131
border: solid 2px transparent;
3232
border-radius: 4px;
33-
margin-right: 8px;
33+
margin-right: 0;
3434
line-height: 20px;
3535
}
3636

3737
.navbar #headerMenu > li > a:hover {
38-
background-color: #0099cc;
38+
background-color: #3c8dbc; /*#0099cc*/
3939
}
4040

4141
.navbar #headerMenu > .open > a {
42-
background-color: #0099cc;
42+
background-color: #3c8dbc; /*#0099cc*/
4343
}
4444
.nav_apis_box_li > li:hover {
4545
color: #ffffff;
@@ -74,13 +74,20 @@
7474
@media screen and (max-width:992px)
7575
{
7676
#title{
77-
font-size:16px;
77+
font-size:18px;
7878
}
7979
}
8080

8181
@media screen and (max-width:768px)
8282
{
8383
#title{
84-
font-size:12px;
84+
font-size:16px;
8585
}
8686
}
87+
88+
@media screen and (max-width:650px)
89+
{
90+
#title{
91+
font-size:13px;
92+
}
93+
}

‎web/index.html‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,15 @@
3636

3737

3838
#header2-text{
39-
padding-top: 70px;
39+
padding-top: 80px;
4040
padding-bottom: 20px;
4141
text-align: center
4242
}
4343

4444
@media screen and (max-width:992px) {
4545
#header2-text {
46-
padding-top: 30px;
46+
padding-top: 75px;
47+
padding-bottom: 0;
4748
}
4849
}
4950

@@ -107,7 +108,7 @@
107108
@media screen and (max-width:1200px) {
108109
#button_zip {
109110
float: right;
110-
margin-right: 15%;
111+
margin-right: 24%;
111112
}
112113
}
113114

@@ -140,7 +141,7 @@
140141
@media screen and (max-width:1200px) {
141142
#button_sourceCode {
142143
float: right;
143-
margin-right: 15%;
144+
margin-right: 24%;
144145
}
145146
}
146147

@@ -170,16 +171,17 @@
170171
}
171172

172173
#new-attributes{
173-
margin-top: 40px;
174+
margin-top: 50px;
174175
}
175176

176177
.new-attributes_bottomMenu .panel-heading {
177178
margin-top: 0;
178179
margin-bottom: 0;
179-
margin-left: 5px;
180+
margin-left: 0;
180181
color: dimgray;
181182
font-size: 14px;
182183
cursor: pointer;
184+
background-color: transparent;
183185
}
184186
</style>
185187
</head>
@@ -198,15 +200,15 @@
198200
<div class="row">
199201
<!-- 左边的图片 -->
200202
<!-- 在class中加入hidden-xs可以在小屏幕时将图片隐藏-->
201-
<div class="col-md-4 col-md-offset-2 col-sm-4">
203+
<div class="col-md-4 col-md-offset-1 col-sm-4">
202204
<img src="./img/banner.png" alt="header-img" class="img-responsive center-block">
203205
</div>
204206
<!-- 右边的文字 -->
205207
<div class="col-md-5 col-md-offset-1 col-sm-6 col-sm-offset-2" id="header2-text">
206208
<h3 class="tc pt50">开放式 GIS 客户端开发包</h3>
207209
</div>
208210
<!-- 右边的链接按钮 -->
209-
<div class="row" style="margin-bottom: 10px">
211+
<div class="row" style="margin-bottom: 20px">
210212
<div class="col-md-2 col-md-offset-1 col-sm-6 col-xs-6" id="button_zip">
211213
<button type="button" class="btn">
212214
<img src="./img/packageIcon.png" style="height: 20px;width: 20px"><a href="downloads/iclient9.zip">&nbsp;iclient9.zip</a>
@@ -238,37 +240,37 @@ <h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16
238240
style="height:300px;position: relative;margin-top: 18px;background-color: #f5f5f5;border: 1px solid #ccc;border-radius: 4px;"></div>
239241
<p style="margin-top: 18px">将 iSevrer 发布的地图加载至 Leaflet 的 map 中 </p>
240242
<pre class="basic-code javascript" style="margin-top: 18px"><code class="hljs">var map = L.map(&#39;mapLeaflet&#39;, {
241-
center: [39.89393354258348, 116.38738402603143],
242-
maxZoom: 18,
243-
zoom: 10
244-
});
243+
center: [39.89393354258348, 116.38738402603143],
244+
maxZoom: 18,
245+
zoom: 10
246+
});
245247

246-
L.supermap.tiledMapLayer(&quot;http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China&quot;).addTo(map);</code></pre>
247-
<a href="#" style="font-size: 10px;margin-top: 10px">查看源码&nbsp;&raquo;</a></h3>
248+
L.supermap.tiledMapLayer(&quot;http://support.supermap.com.cn:8090/iserver/services/map-china400/rest/maps/China&quot;).addTo(map);</code></pre>
249+
<a href="#" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a></h3>
248250

249251
<h3 style="margin-top: 34px;font-size: 24px;color: #404040;letter-spacing: -0.16px;">openLayers</h3>
250252
<div id="map"
251253
style="height:300px;position: relative;margin-top: 18px;background-color: #f5f5f5;border: 1px solid #ccc;border-radius: 4px;"></div>
252254
<p style="margin-top: 19px">将 iSevrer 发布的地图加载至 OpenLayers 的 map 中 </p>
253255
<pre class="basic-code javascript" style="margin-top: 18px"><code class="hljs">var map = new ol.Map({
254-
target: &#39;map&#39;,
255-
view: new ol.View({
256-
center: [100.94238281254322,35.496456056550095],
257-
zoom: 4,
258-
projection:&quot;EPSG:4326&quot;
259-
}),
260-
layers: [new ol.layer.Tile({
261-
source: new ol.supermap.TileSuperMapRest({
262-
url: &quot;http://support.supermap.com:8090/iserver/services/map-world/rest/maps/World&quot;,
263-
projection:&quot;EPSG:4326&quot;
264-
}),
265-
})]
266-
});</code></pre>
267-
<a href="#" style="font-size: 10px">查看源码&nbsp;&raquo;</a></h3>
256+
target: &#39;map&#39;,
257+
view: new ol.View({
258+
center: [100.94238281254322,35.496456056550095],
259+
zoom: 4,
260+
projection:&quot;EPSG:4326&quot;
261+
}),
262+
layers: [new ol.layer.Tile({
263+
source: new ol.supermap.TileSuperMapRest({
264+
url: &quot;http://support.supermap.com:8090/iserver/services/map-world/rest/maps/World&quot;,
265+
projection:&quot;EPSG:4326&quot;
266+
}),
267+
})]
268+
});</code></pre>
269+
<a href="#" style="font-size: 10px;float:right">查看源码&nbsp;&raquo;</a></h3>
268270

269271
<h2 id="new-attributes">新特性</h2>
270272

271-
<div class="panel-group table-responsive" id="accordion" role="tablist">
273+
<div class="panel-group" id="accordion" role="tablist">
272274
<div class="panel panel-default new-attributes_bottomMenu">
273275
<div class="panel-heading" id="collapseListGroupHeading1" data-toggle="collapse"
274276
data-target="#collapse1" role="tab">

0 commit comments

Comments
 (0)