Skip to content

Commit 8c12da3

Browse files
zhurczhurc
committed
大数据分析相关范例更改等待加载样式
1 parent 5597fb5 commit 8c12da3

18 files changed

+433
-568
lines changed

‎examples/classic/SummaryMeshJobService.html‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>点聚合分析</title>
6-
<script type="text/javascript" include="jquery,bootstrap" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="jquery,bootstrap,loader" src="../js/include-web.js"></script>
77
<style>
88
.control {
99
position: absolute;
@@ -17,18 +17,6 @@
1717
</style>
1818
</head>
1919
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
20-
<div id="model" class="modal fade" tabindex="-1" role="dialog">
21-
<div class="modal-dialog" role="document">
22-
<div class="modal-content">
23-
<div class="modal-header">
24-
<h4 class="modal-title">提示</h4>
25-
</div>
26-
<div class="modal-body">
27-
<p>正在创建点聚合分析...</p>
28-
</div>
29-
</div>
30-
</div>
31-
</div>
3220
<div id="map" style="width: 100%;height:100%"></div>
3321
<div id="control" class="control" style='width:350px'>
3422
<div class="panel panel-default">
@@ -102,25 +90,28 @@ <h3 class="panel-title">点聚合分析</h3>
10290
<script type="text/javascript">
10391
var host = window.isLocal ? document.location.protocol + "//" + document.location.host : "http://117.122.248.69:8090";
10492
var resultLayer,
105-
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",mapURL = host + "/iserver/services/map-world/rest/maps/World",
106-
token = 'yurnlSeWak-vh77nAh73yrW_cHDTDJrfZxCVl7-h3GhMSMSNTPjvH7ykQviXfH1tOQ2ckJtUt6J9RY32GFNa6Q..',
107-
map = new SuperMap.Map("map", {
108-
controls: [
109-
new SuperMap.Control.Navigation(),
110-
new SuperMap.Control.Zoom(),
111-
new SuperMap.Control.LayerSwitcher()
93+
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",
94+
mapURL = host + "/iserver/services/map-world/rest/maps/World",
95+
token = 'yurnlSeWak-vh77nAh73yrW_cHDTDJrfZxCVl7-h3GhMSMSNTPjvH7ykQviXfH1tOQ2ckJtUt6J9RY32GFNa6Q..',
96+
map = new SuperMap.Map("map", {
97+
controls: [
98+
new SuperMap.Control.Navigation(),
99+
new SuperMap.Control.Zoom(),
100+
new SuperMap.Control.LayerSwitcher()
112101

113-
], allOverlays: true
114-
});
102+
], allOverlays: true
103+
});
115104
map.addControl(new SuperMap.Control.MousePosition());
116-
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null,{maxResolution:"auto"});
117-
layer.events.on({"layerInitialized":addLayer});
118-
function addLayer(){
105+
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null, {maxResolution: "auto"});
106+
layer.events.on({"layerInitialized": addLayer});
107+
108+
function addLayer() {
119109
map.addLayers([layer]);
120110
map.setCenter(new SuperMap.LonLat(-73.95, 40.75), 12);
121111
}
112+
122113
var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
123-
if(!window.isLocal){
114+
if (!window.isLocal) {
124115
SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
125116
}
126117
$("#type").change(function (e) {
@@ -150,8 +141,7 @@ <h3 class="panel-title">点聚合分析</h3>
150141
}
151142

152143
$('#btn').on('click', function () {
153-
$('#btn').prop('disabled', true);
154-
$("#model").modal({show: true, backdrop: 'static', keyboard: false});
144+
showLoader();
155145
if (map && resultLayer) {
156146
map.removeLayer(resultLayer);
157147
}
@@ -167,8 +157,7 @@ <h3 class="panel-title">点聚合分析</h3>
167157
});
168158
processingService.addSummaryMeshJob(summaryMeshJobParameter, function (serviceResult) {
169159
if (serviceResult.error) {
170-
$('#btn').prop('disabled', false);
171-
$("#model").modal('hide');
160+
removeLoader();
172161
var errorMsg = serviceResult.error.errorMsg || "code: " + serviceResult.error.code;
173162
showAlert("创建失败!<br>" + errorMsg, false);
174163
return;
@@ -184,8 +173,7 @@ <h3 class="panel-title">点聚合分析</h3>
184173

185174
function addLayer() {
186175
map.addLayer(resultLayer);
187-
$("#model").modal('hide');
188-
$('#btn').prop('disabled', false);
176+
removeLoader();
189177
}
190178
});
191179
}

‎examples/classic/SummaryRegionJobService.html‎

Lines changed: 20 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>区域汇总分析</title>
6-
<script type="text/javascript" include="jquery,bootstrap" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="jquery,bootstrap,loader" src="../js/include-web.js"></script>
77
<style>
88
.control {
99
position: absolute;
@@ -17,18 +17,6 @@
1717
</style>
1818
</head>
1919
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
20-
<div id="model" class="modal fade" tabindex="-1" role="dialog">
21-
<div class="modal-dialog" role="document">
22-
<div class="modal-content">
23-
<div class="modal-header">
24-
<h4 class="modal-title">提示</h4>
25-
</div>
26-
<div class="modal-body">
27-
<p>正在创建区域汇总分析...</p>
28-
</div>
29-
</div>
30-
</div>
31-
</div>
3220
<div id="map" style="width: 100%;height:100%"></div>
3321
<div id="control" class="control" style='width:420px'>
3422
<div class="panel panel-default">
@@ -139,25 +127,28 @@ <h3 class="panel-title">区域汇总分析</h3>
139127
<script type="text/javascript">
140128
var host = window.isLocal ? document.location.protocol + "//" + document.location.host : "http://117.122.248.69:8090";
141129
var resultLayer,
142-
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",mapURL = host + "/iserver/services/map-world/rest/maps/World",
143-
token = 'yurnlSeWak-vh77nAh73yrW_cHDTDJrfZxCVl7-h3GhMSMSNTPjvH7ykQviXfH1tOQ2ckJtUt6J9RY32GFNa6Q..',
144-
map = new SuperMap.Map("map", {
145-
controls: [
146-
new SuperMap.Control.Navigation(),
147-
new SuperMap.Control.Zoom(),
148-
new SuperMap.Control.LayerSwitcher()
130+
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",
131+
mapURL = host + "/iserver/services/map-world/rest/maps/World",
132+
token = 'yurnlSeWak-vh77nAh73yrW_cHDTDJrfZxCVl7-h3GhMSMSNTPjvH7ykQviXfH1tOQ2ckJtUt6J9RY32GFNa6Q..',
133+
map = new SuperMap.Map("map", {
134+
controls: [
135+
new SuperMap.Control.Navigation(),
136+
new SuperMap.Control.Zoom(),
137+
new SuperMap.Control.LayerSwitcher()
149138

150-
], allOverlays: true
151-
});
139+
], allOverlays: true
140+
});
152141
map.addControl(new SuperMap.Control.MousePosition());
153-
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null,{maxResolution:"auto"});
154-
layer.events.on({"layerInitialized":addLayer});
155-
function addLayer(){
142+
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null, {maxResolution: "auto"});
143+
layer.events.on({"layerInitialized": addLayer});
144+
145+
function addLayer() {
156146
map.addLayers([layer]);
157147
map.setCenter(new SuperMap.LonLat(-73.95, 40.75), 12);
158148
}
149+
159150
var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
160-
if(!window.isLocal){
151+
if (!window.isLocal) {
161152
SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
162153
}
163154

@@ -193,8 +184,7 @@ <h3 class="panel-title">区域汇总分析</h3>
193184
}
194185

195186
$('#btn').on('click', function () {
196-
$('#btn').prop('disabled', true);
197-
$("#model").modal({show: true, backdrop: 'static', keyboard: false});
187+
showLoader();
198188
if (map && resultLayer) {
199189
map.removeLayer(resultLayer);
200190
}
@@ -216,8 +206,7 @@ <h3 class="panel-title">区域汇总分析</h3>
216206
});
217207
processingService.addSummaryRegionJob(summaryRegionJobParameter, function (serviceResult) {
218208
if (serviceResult.error) {
219-
$('#btn').prop('disabled', false);
220-
$("#model").modal('hide');
209+
removeLoader();
221210
var errorMsg = serviceResult.error.errorMsg || "code: " + serviceResult.error.code;
222211
showAlert("创建失败!<br>" + errorMsg, false);
223212
return;
@@ -233,8 +222,7 @@ <h3 class="panel-title">区域汇总分析</h3>
233222

234223
function addLayer() {
235224
map.addLayer(resultLayer);
236-
$("#model").modal('hide');
237-
$('#btn').prop('disabled', false);
225+
removeLoader();
238226
}
239227
});
240228
}

‎examples/classic/kernelDensityJobService.html‎

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title>密度分析</title>
6-
<script type="text/javascript" include="jquery,bootstrap" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="jquery,bootstrap,loader" src="../js/include-web.js"></script>
77
<style>
88
.control {
99
position: absolute;
@@ -17,18 +17,6 @@
1717
</style>
1818
</head>
1919
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
20-
<div id="model" class="modal fade" tabindex="-1" role="dialog">
21-
<div class="modal-dialog" role="document">
22-
<div class="modal-content">
23-
<div class="modal-header">
24-
<h4 class="modal-title">提示</h4>
25-
</div>
26-
<div class="modal-body">
27-
<p>正在创建密度分析...</p>
28-
</div>
29-
</div>
30-
</div>
31-
</div>
3220
<div id="map" style="width: 100%;height:100%"></div>
3321
<div id="control" class="control" style='width:300px'>
3422
<div class="panel panel-default">
@@ -124,7 +112,9 @@ <h3 class="panel-title">密度分析</h3>
124112
<script type="text/javascript" src="../../dist/include-classic.js"></script>
125113
<script type="text/javascript">
126114
var host = window.isLocal ? document.location.protocol + "//" + document.location.host : "http://117.122.248.69:8090";
127-
var resultLayer, processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",mapURL = host + "/iserver/services/map-world/rest/maps/World",
115+
var resultLayer,
116+
processingsUrl = host + "/iserver/services/distributedanalyst/rest/v1/jobs",
117+
mapURL = host + "/iserver/services/map-world/rest/maps/World",
128118
token = 'yurnlSeWak-vh77nAh73yrW_cHDTDJrfZxCVl7-h3GhMSMSNTPjvH7ykQviXfH1tOQ2ckJtUt6J9RY32GFNa6Q..',
129119
map = new SuperMap.Map("map", {
130120
controls: [
@@ -135,14 +125,16 @@ <h3 class="panel-title">密度分析</h3>
135125
], allOverlays: true
136126
});
137127
map.addControl(new SuperMap.Control.MousePosition());
138-
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null,{maxResolution:"auto"});
139-
layer.events.on({"layerInitialized":addLayer});
140-
function addLayer(){
128+
var layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", mapURL, null, {maxResolution: "auto"});
129+
layer.events.on({"layerInitialized": addLayer});
130+
131+
function addLayer() {
141132
map.addLayers([layer]);
142133
map.setCenter(new SuperMap.LonLat(-73.95, 40.75), 12);
143134
}
135+
144136
var processingService = new SuperMap.REST.ProcessingService(processingsUrl);
145-
if(!window.isLocal){
137+
if (!window.isLocal) {
146138
SuperMap.SecurityManager.registerToken('http://117.122.248.69:8090', token);
147139
}
148140

@@ -163,8 +155,7 @@ <h3 class="panel-title">密度分析</h3>
163155
}
164156

165157
$('#btn').on('click', function () {
166-
$('#btn').prop('disabled', true);
167-
$("#model").modal({show: true, backdrop: 'static', keyboard: false});
158+
showLoader();
168159
if (map && resultLayer) {
169160
map.removeLayer(resultLayer);
170161
}
@@ -182,8 +173,7 @@ <h3 class="panel-title">密度分析</h3>
182173
});
183174
processingService.addKernelDensityJob(kernelDensityJobParameter, function (serviceResult) {
184175
if (serviceResult.error) {
185-
$('#btn').prop('disabled', false);
186-
$("#model").modal('hide');
176+
removeLoader();
187177
var errorMsg = serviceResult.error.errorMsg || "code: " + serviceResult.error.code;
188178
showAlert("创建失败!<br>" + errorMsg, false);
189179
return;
@@ -199,8 +189,7 @@ <h3 class="panel-title">密度分析</h3>
199189

200190
function addLayer() {
201191
map.addLayer(resultLayer);
202-
$("#model").modal('hide');
203-
$('#btn').prop('disabled', false);
192+
removeLoader();
204193
}
205194
});
206195
}

0 commit comments

Comments
 (0)