Skip to content

Commit 613c855

Browse files
zhangjiangqiuzhangjiangqiu
committed
【update】 自然资源更改header为导航栏组件；打开指南针倾斜配置；图层列表打开查看属性表配置； review by qiwei
1 parent 026b24f commit 613c855

File tree

7 files changed

+15785
-12123
lines changed

7 files changed

+15785
-12123
lines changed

‎dist/mapboxgl/iclient-mapboxgl-vue.css‎

Lines changed: 157 additions & 13 deletions
Large diffs are not rendered by default.

‎dist/mapboxgl/iclient-mapboxgl-vue.js‎

Lines changed: 15346 additions & 11930 deletions
Large diffs are not rendered by default.

‎dist/mapboxgl/iclient-mapboxgl-vue.min.css‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/mapboxgl/iclient-mapboxgl-vue.min.js‎

Lines changed: 152 additions & 152 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/component/components_compass_vue.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
2222
<div id="main">
2323
<sm-web-map server-url='https://iportal.supermap.io/iportal' map-id="801571284">
24-
<sm-compass></sm-compass>
24+
<sm-compass :visualize-pitch="true"></sm-compass>
2525
</sm-web-map>
2626
</div>
2727

‎examples/component/components_layerList_vue.html‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,45 @@
1010
<script type="text/javascript" include="vue" src="../js/include-web.js"></script>
1111
<script include="iclient-mapboxgl-vue,mapbox-gl-enhance" src="../../dist/mapboxgl/include-mapboxgl.js"></script>
1212
<style>
13-
#main{
14-
margin: 0 auto;
15-
width: 100%;
16-
height: 100%;
13+
#main {
14+
margin: 0 auto;
15+
width: 100%;
16+
height: 100%;
1717
}
1818
</style>
1919
</head>
2020

2121
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
2222
<div id="main">
23-
<sm-web-map server-url='https://iportal.supermap.io/iportal' map-id="801571284">
23+
<sm-web-map server-url='https://iportal.supermap.io/iportal' map-id="801571284" style="position: absolute;">
2424
<!-- 图层列表组件：sm-layer-list -->
25-
<sm-layer-list position="top-left" :collapsed="false"></sm-layer-list>
25+
<sm-layer-list position="top-left" :collapsed="false" :attributes="attributes"></sm-layer-list>
2626
</sm-web-map>
2727
</div>
2828
<script>
2929
new Vue({
30-
el: '#main'
30+
el: '#main',
31+
data() {
32+
return {
33+
attributes: {
34+
enabled: true,
35+
position: 'bottom',
36+
style: {
37+
width: '100%',
38+
height: '40%',
39+
background: 'rgba(255, 255, 255, 0.3)'
40+
},
41+
associateWithMap: {
42+
enabled: true,
43+
zoomToFeature: true,
44+
centerToFeature: true
45+
}
46+
}
47+
}
48+
}
3149
})
3250

3351
</script>
3452
</body>
3553

36-
</html>
54+
</html>

‎examples/component/components_natureResource_vue.html‎

Lines changed: 101 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,12 @@
2020
box-sizing: border-box;
2121
}
2222

23+
#iframe {
24+
width: 100%;
25+
height: 91%;
26+
27+
}
28+
2329
@media screen and (max-width: 992px) {
2430
#main {
2531
overflow: auto;
@@ -38,25 +44,11 @@
3844
<div id="main">
3945
<sm-layout-header>
4046
<div class="dashboard-header">
41-
<div class="left-header">
42-
<sm-text class="btn-active" v-bind="textPropsCommon" title="指标总览"></sm-text>
43-
<sm-text v-bind="textPropsCommon" title="调查监测"></sm-text>
44-
<sm-text v-bind="textPropsCommon" title="耕地保护"></sm-text>
45-
<sm-text v-bind="textPropsCommon" title="空间规划"></sm-text>
46-
<sm-text v-bind="textPropsCommon" title="用途管制"></sm-text>
47-
</div>
48-
<sm-text class="middle-header" v-bind="headerTitleProps"></sm-text>
49-
<div class="right-header">
50-
<sm-text v-bind="textPropsCommon" title="权益保护"></sm-text>
51-
<sm-text v-bind="textPropsCommon" title="地质矿产"></sm-text>
52-
<sm-text v-bind="textPropsCommon" title="生态修复"></sm-text>
53-
<sm-text v-bind="textPropsCommon" title="确权登记"></sm-text>
54-
<sm-text v-bind="textPropsCommon" title="执法监察"></sm-text>
55-
</div>
47+
<sm-nav v-bind="navProps" @change="changeScreen"></sm-nav>
5648
</div>
5749
</sm-layout-header>
5850

59-
<sm-layout-content>
51+
<sm-layout-content v-if="!isIframe">
6052
<a-row>
6153
<a-col :span="6">
6254
<sm-border
@@ -262,6 +254,9 @@
262254
</a-col>
263255
</a-row>
264256
</sm-layout-content>
257+
<sm-layout-content v-else>
258+
<iframe id="iframe" :src="iframeSrc" frameborder="0" scrolling="auto"></iframe>
259+
</sm-layout-content>
265260
</div>
266261

267262
<script>
@@ -270,6 +265,83 @@
270265
el: '#main',
271266
data() {
272267
return {
268+
isIframe: false,
269+
iframeSrc: '',
270+
navProps: {
271+
title: {
272+
title: "自然资源承载能力监管决策平台",
273+
position: "center",
274+
target: "_blank",
275+
style: {
276+
width: "29%",
277+
height: "100%",
278+
letterSpacing: "1px",
279+
fontSize: "32px",
280+
color: "#fff",
281+
fontWeight: "normal",
282+
fontFamily: "微软雅黑"
283+
}
284+
},
285+
items: [
286+
{
287+
key: 0,
288+
title: "指标总览"
289+
},
290+
{
291+
key: 1,
292+
title: "调查监测"
293+
},
294+
{
295+
key: 2,
296+
title: "耕地保护"
297+
},
298+
{
299+
key: 3,
300+
title: "空间规划"
301+
},
302+
{
303+
key: 4,
304+
title: "用途管制"
305+
},
306+
{
307+
key: 5,
308+
title: "权益保护",
309+
},
310+
{
311+
key: 6,
312+
title: "地质矿产"
313+
},
314+
{
315+
key: 7,
316+
title: "生态修复"
317+
},
318+
{
319+
key: 8,
320+
title: "确权登记"
321+
},
322+
{
323+
key: 9,
324+
title: "执法监察"
325+
}
326+
],
327+
itemStyle: function() {
328+
return {
329+
fontSize: "16px",
330+
fontWeight: "normal",
331+
fontFamily: "微软雅黑",
332+
color: "rgba(255, 255, 255, 0.65)"
333+
}
334+
},
335+
itemActiveStyle: function() {
336+
return {
337+
backgroundImage: "url('../img/background/image8.png')",
338+
backgroundRepeat: 'no-repeat',
339+
backgroundPosition: 'center',
340+
backgroundSize: 'contain',
341+
color: "rgba(255, 255, 255)"
342+
}
343+
},
344+
},
273345
headerTitleProps: {
274346
frequency: 2,
275347
startTiming: false,
@@ -1333,6 +1405,18 @@
13331405
if (screenWidth <= 540) {
13341406
this.showMap = false;
13351407
}
1408+
},
1409+
methods: {
1410+
changeScreen(item, index) {
1411+
this.isIframe = true;
1412+
if (index === 1) {
1413+
this.iframeSrc = window.location.href.replace(/editor/, 'components_demo_vue');
1414+
} else if (index === 2) {
1415+
this.iframeSrc = window.location.href.replace(/editor/, 'components_estateMonitoringPlatform_vue');
1416+
} else {
1417+
this.isIframe = false;
1418+
}
1419+
}
13361420
}
13371421
});
13381422
</script>
@@ -1430,6 +1514,7 @@
14301514
}
14311515

14321516
.sm-component-layout-content {
1517+
height: 100%;
14331518
margin-top: 20px;
14341519
}
14351520

@@ -1550,7 +1635,6 @@
15501635
}
15511636

15521637
.dashboard-header {
1553-
background-image: url('../img/background/image1.png');
15541638
height: 72px;
15551639
display: flex;
15561640
align-items: center;

0 commit comments

Comments
 (0)