Skip to content

Commit b7cd340

Browse files
author
潘卓然ParnDeedlit
committed
Merge branch 'dev' of https://github.com/MapGIS/WebClient-JavaScript into dev
2 parents 22308d3 + e2e5faf commit b7cd340

File tree

5 files changed

+77
-25
lines changed

5 files changed

+77
-25
lines changed

‎website/public/static/demo/cesium/example/m3d/m3d-fileserver.htm‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,29 @@
3333
viewer: webGlobe.viewer
3434
});
3535
//加载天地图
36-
var tdtLayer = thirdPartyLayer.appendTDTuMap({
36+
/* var tdtLayer = thirdPartyLayer.appendTDTuMap({
3737
//天地图经纬度数据
3838
url: 'http://t3.tianditu.com/DataServer?T=vec_c&X={x}&Y={y}&L={l}',
3939
//开发token （请到天地图官网申请自己的开发token，自带token仅做功能验证随时可能失效）
4040
token: '9c157e9585486c02edf817d2ecbc7752',
4141
//地图类型 'vec'矢量 'img'影像 'ter'地形
4242
ptype: 'img'
43-
});
43+
}); */
4444

4545
//加载M3D地图文档（服务地址，配置参数）
4646
var { protocol, ip, port } = window.webclient;
4747
ip = 'localhost';
4848
port = 7777;
49-
/* tileset = new Cesium.MapGISM3DSet({
49+
tileset = new Cesium.MapGISM3DSet({
5050
url: `${protocol}://${ip}:${port}/福田地质体_挖后效果.mcj`, //
5151
igserver: false
52-
}); */
53-
tileset = new Cesium.Cesium3DTileset({
52+
});
53+
/* tileset = new Cesium.Cesium3DTileset({
5454
url: `${protocol}://${ip}:${port}/福田地质体_挖后效果.mcj`, //
5555
igserver: false
56-
});
56+
}); */
5757

58-
// webGlobe.viewer.scene.primitives.add(tileset);
58+
webGlobe.viewer.scene.primitives.add(tileset);
5959

6060
tileset.readyPromise.then(function (primitives) {
6161
console.log('file m3d', primitives);

‎website/public/static/demo/vue-cesium/example/analysis/sightline.htm‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,16 @@
1515
</head>
1616

1717
<body>
18-
<div id="app">
19-
<mapgis-web-scene>
20-
<mapgis-3d-raster-layer :url="url"></mapgis-3d-raster-layer>
21-
<mapgis-3d-igs-m3d :auto-reset="autoReset" :maximum-screen-space-error="maximumScreenSpaceError"
22-
:url="m3dUrl"></mapgis-3d-igs-m3d>
23-
<mapgis-3d-sightline></mapgis-3d-sightline>
24-
</mapgis-web-scene>
25-
</div>
18+
<div id="app">
19+
<mapgis-web-scene
20+
lib-path="./static/libs/cdn/cesium/Cesium.js"
21+
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js">
22+
<mapgis-3d-raster-layer :url="url"></mapgis-3d-raster-layer>
23+
<mapgis-3d-igs-m3d :auto-reset="autoReset" :maximum-screen-space-error="maximumScreenSpaceError"
24+
:url="m3dUrl"></mapgis-3d-igs-m3d>
25+
<mapgis-3d-sightline></mapgis-3d-sightline>
26+
</mapgis-web-scene>
27+
</div>
2628

2729
<script>
2830
new Vue({

‎website/public/static/demo/vue-cesium/example/analysis/viewshed.htm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
<body>
1818
<div id="app">
19-
<mapgis-web-scene>
19+
<mapgis-web-scene
20+
lib-path="./static/libs/cdn/cesium/Cesium.js"
21+
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js">
2022
<mapgis-3d-raster-layer :url="url"></mapgis-3d-raster-layer>
2123
<mapgis-3d-igs-m3d :auto-reset="autoReset" :maximum-screen-space-error="maximumScreenSpaceError"
2224
:url="m3dUrl"></mapgis-3d-igs-m3d>

‎website/public/static/demo/vue-cesium/example/igserver/vector.htm‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616

1717
<body>
1818
<div id="app">
19-
<mapgis-web-scene>
19+
<mapgis-web-scene
20+
lib-path="./static/libs/cdn/cesium/Cesium.js"
21+
plugin-path="./static/libs/cdn/zondyclient/webclient-cesium-plugin.min.js">
2022
<mapgis-3d-igs-vector-layer :gdbps="gdbps" :base-url="baseUrl"></mapgis-3d-igs-vector-layer>
2123
</mapgis-web-scene>
2224
</div>

‎website/public/static/demo/vue-mapboxgl/example/vue-control/table.htm‎

Lines changed: 54 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@
4646
v-bind:data-source="dataSource"
4747
v-bind:pagination="pagination"
4848
v-bind:columns="columns"
49+
v-on:pageChanged="pageChanged"
50+
v-on:sorted="sorted"
51+
v-on:fullScreen="fullScreen"
52+
v-on:originScreen="originScreen"
4953
v-show="show"
5054
>
5155
</mapgis-base-table>
@@ -91,26 +95,68 @@
9195
},
9296
methods: {
9397
serviceLoaded(service){
98+
//初始化服务事件
9499
this.service = service;
95100
this.getData();
96101
},
97102
getData(){
98-
this.query(0,10,undefined,undefined,true);
103+
this.query({
104+
//因为query方法中会减1，因此这里设为1，表示请求第0分页
105+
current: 1,
106+
pageSize: 10
107+
},undefined,undefined);
99108
},
100-
query(pageIndex,pagination,orderBy,isAsc,initial){
109+
pageChanged(pagination,sorter){
110+
//分页事件
111+
this.query(pagination,sorter);
112+
},
113+
sorted(sorter,pagination){
114+
//排序事件
115+
this.query(pagination,sorter);
116+
},
117+
fullScreen(pageInfo,sorter){
118+
//全屏事件
119+
this.query(pageInfo,sorter,pageInfo.pageSize);
120+
},
121+
originScreen(pageInfo,sorter){
122+
//收起全屏事件
123+
this.query(pageInfo,sorter,pageInfo.pageSize);
124+
},
125+
query(pageInfo,sorter,pageSize){
126+
//设置排序规则
127+
var isAsc = false;
128+
if(!sorter){
129+
sorter = {};
130+
sorter.columnKey = "";
131+
} else if(sorter.order === "ascend"){
132+
isAsc = true;
133+
}else if(sorter.order === "") {
134+
sorter.columnKey = "";
135+
}
101136
var vm = this;
137+
//设置查询参数
102138
var sql = this.service.$_getSQLParameter({
139+
//查询图层id为1的图层
103140
layers: "1",
104-
where: '',
105-
pageIndex: pageIndex,
106-
pagination: pagination,
107-
orderBy: orderBy,
108-
isAsc: isAsc
141+
//设置分页信息
142+
pageIndex: pageInfo.current - 1,
143+
pagination: pageInfo.pageSize,
144+
//设置排序字段
145+
orderBy: sorter.columnKey,
146+
//设置是升序(true)还是降序(false)
147+
isAsc: isAsc,
148+
//设置是否返回几何信息，false不返回
149+
IncludeGeometry: false
109150
})
110-
//zondy格式
151+
//查询数据
111152
vm.service.$_queryBySQL(sql,function (result) {
112153
vm.dataSource = result;
154+
//设置分页信息中
113155
vm.pagination.total = result.TotalCount;
156+
if(pageSize){
157+
vm.pagination.pageSize = pageSize;
158+
}
159+
//请求完成后显示表格
114160
vm.show = true;
115161
},function () {})
116162
}

0 commit comments

Comments
 (0)