Skip to content

Commit 5592217

+
34-
"<li id='geodecode' role='presentation'><a href='#'>反向匹配</a></li>" +
35-
"</ul><p>" +
36-
"<div class='tab-content'>" +
37-
"<div id='geocodeParam' role='tabpanel' class='tab-pane deplistContent active'>" +
38-
"<div class='input-group'>" +
39-
"<span class='input-group-addon'>地址　　　</span>" +
40-
"<input id='address' type='text' class='form-control' placeholder='公司'/>" +
41-
"</div><p>" +
42-
"<div class='input-group'>" +
43-
"<span class='input-group-addon'>过滤字段　</span>" +
44-
"<input id='filters' type='text' class='form-control'placeholder='北京市,海淀区'/>" +
45-
"</div><p>" +
46-
"<div class='input-group'>" +
47-
"<span class='input-group-addon'>最小索引　</span>" +
48-
"<input id='fromIndex' type='text' class='form-control' placeholder='0'/>" +
49-
"</div><p>" +
50-
"<div class='input-group'>" +
51-
"<span class='input-group-addon'>最大索引　</span>" +
52-
"<input id='toIndex' type='text' class='form-control' placeholder='10'/>" +
53-
"</div><p>" +
54-
"<div class='input-group'>" +
55-
"<span class='input-group-addon'>最大结果数</span>" +
56-
"<input id='maxReturn' type='text' class='form-control' placeholder='-1'/>" +
57-
"</div><p>" +
58-
"<div class='input-group'>" +
59-
"<span class='input-group-addon'>坐标系　　</span>" +
60-
"<input id='prjCoordSys' type='text' class='form-control' placeholder='{epsgcode:4326}'/>" +
61-
"</div><p>" +
62-
"<div align='right'>" +
63-
"<input type='button' id='codeBtn' class='btn btn-primary' value='匹配'/>" +
64-
"</div></div>" +
65-
"<div id='geodecodeParam' role='tabpanel' class='tab-pane deplistContent'>" +
66-
"<div class='input-group'>" +
67-
"<span class='input-group-addon'>横坐标　　</span>" +
68-
"<input id='xCoord' type='text' class='form-control' placeholder='116.3518541194752'/>" +
69-
"</div><p>" +
70-
"<div class='input-group'>" +
71-
"<span class='input-group-addon'>纵坐标　　</span>" +
72-
"<input id='yCoord' type='text' class='form-control' placeholder='40.00097839595237'/>" +
73-
"</div><p>" +
74-
"<div class='input-group'>" +
75-
"<span class='input-group-addon'>过滤字段　</span>" +
76-
"<input id='filters2' type='text' class='form-control' placeholder='北京市,海淀区'/>" +
77-
"</div><p>" +
78-
"<div class='input-group'>" +
79-
"<span class='input-group-addon'>最小索引　</span>" +
80-
"<input id='fromIndex2' type='text' class='form-control' placeholder='0'/>" +
81-
"</div><p>" +
82-
"<div class='input-group'>" +
83-
"<span class='input-group-addon'>最大索引　</span>" +
84-
"<input id='toIndex2' type='text' class='form-control' placeholder='10'/>" +
85-
"</div><p>" +
86-
"<div class='input-group'>" +
87-
"<span class='input-group-addon'>最大结果数</span>" +
88-
"<input id='maxReturn2' type='text' class='form-control' placeholder='-1'/>" +
89-
"</div><p>" +
90-
"<div class='input-group'>" +
91-
"<span class='input-group-addon'>查询半径　</span>" +
92-
"<input id='geoDecodingRadius' type='text' class='form-control' placeholder='-1'/>" +
93-
"</div><p>" +
94-
"<div class='input-group'>" +
95-
"<span class='input-group-addon'>坐标系　　</span>" +
96-
"<input id='prjCoordSys2' type='text' class='form-control' placeholder='{epsgcode:4326}'/>" +
97-
"</div><p>" +
98-
"<div align='right'>" +
99-
"<input type='button' id='decodeBtn' class='btn btn-primary' value='匹配'/>" +
100-
"</div></div></div>";
31+
"<div class='panel-body'>" +
32+
"<ul class='nav nav-tabs nav-justified'>" +
33+
"<li id='geocode' role='presentation' class='active'><a href='#'>正向匹配</a></li>" +
34+
"<li id='geodecode' role='presentation'><a href='#'>反向匹配</a></li>" +
35+
"</ul><p>" +
36+
"<div class='tab-content'>" +
37+
"<div id='geocodeParam' role='tabpanel' class='tab-pane deplistContent active'>" +
38+
"<div class='input-group'>" +
39+
"<span class='input-group-addon'>地址　　　</span>" +
40+
"<input id='address' type='text' class='form-control' placeholder='公司'/>" +
41+
"</div><p>" +
42+
"<div class='input-group'>" +
43+
"<span class='input-group-addon'>过滤字段　</span>" +
44+
"<input id='filters' type='text' class='form-control'placeholder='北京'/>" +
45+
"</div><p>" +
46+
"<div class='input-group'>" +
47+
"<span class='input-group-addon'>最小索引　</span>" +
48+
"<input id='fromIndex' type='text' class='form-control' placeholder='0'/>" +
49+
"</div><p>" +
50+
"<div class='input-group'>" +
51+
"<span class='input-group-addon'>最大索引　</span>" +
52+
"<input id='toIndex' type='text' class='form-control' placeholder='10'/>" +
53+
"</div><p>" +
54+
"<div class='input-group'>" +
55+
"<span class='input-group-addon'>最大结果数</span>" +
56+
"<input id='maxReturn' type='text' class='form-control' placeholder='-1'/>" +
57+
"</div><p>" +
58+
"<div class='input-group'>" +
59+
"<span class='input-group-addon'>坐标系　　</span>" +
60+
"<input id='prjCoordSys' type='text' class='form-control' placeholder='{epsgcode:4326}'/>" +
61+
"</div><p>" +
62+
"<div align='right'>" +
63+
"<input type='button' id='codeBtn' class='btn btn-primary' value='匹配'/>" +
64+
"</div></div>" +
65+
"<div id='geodecodeParam' role='tabpanel' class='tab-pane deplistContent'>" +
66+
"<div class='input-group'>" +
67+
"<span class='input-group-addon'>横坐标　　</span>" +
68+
"<input id='xCoord' type='text' class='form-control' placeholder='116.3518541194752'/>" +
69+
"</div><p>" +
70+
"<div class='input-group'>" +
71+
"<span class='input-group-addon'>纵坐标　　</span>" +
72+
"<input id='yCoord' type='text' class='form-control' placeholder='40.00097839595237'/>" +
73+
"</div><p>" +
74+
"<div class='input-group'>" +
75+
"<span class='input-group-addon'>过滤字段　</span>" +
76+
"<input id='filters2' type='text' class='form-control' placeholder=''/>" +
77+
"</div><p>" +
78+
"<div class='input-group'>" +
79+
"<span class='input-group-addon'>最小索引　</span>" +
80+
"<input id='fromIndex2' type='text' class='form-control' placeholder='0'/>" +
81+
"</div><p>" +
82+
"<div class='input-group'>" +
83+
"<span class='input-group-addon'>最大索引　</span>" +
84+
"<input id='toIndex2' type='text' class='form-control' placeholder='10'/>" +
85+
"</div><p>" +
86+
"<div class='input-group'>" +
87+
"<span class='input-group-addon'>最大结果数</span>" +
88+
"<input id='maxReturn2' type='text' class='form-control' placeholder='-1'/>" +
89+
"</div><p>" +
90+
"<div class='input-group'>" +
91+
"<span class='input-group-addon'>查询半径　</span>" +
92+
"<input id='geoDecodingRadius' type='text' class='form-control' placeholder='-1'/>" +
93+
"</div><p>" +
94+
"<div class='input-group'>" +
95+
"<span class='input-group-addon'>坐标系　　</span>" +
96+
"<input id='prjCoordSys2' type='text' class='form-control' placeholder='{epsgcode:4326}'/>" +
97+
"</div><p>" +
98+
"<div align='right'>" +
99+
"<input type='button' id='decodeBtn' class='btn btn-primary' value='匹配'/>" +
100+
"</div></div></div>";
101101
handleMapEvent(popup, this._map);
102102
return popup;
103103
};
@@ -115,12 +115,20 @@
115115
$("#geodecodeParam").addClass('active');
116116
$("#geocodeParam").removeClass('active');
117117
});
118+
//判断输入字符串是否为空或者全部都是空格
119+
function isNull(str) {
120+
if (str == "") return true;
121+
var regu = "^[ ]+$";
122+
var re = new RegExp(regu);
123+
return re.test(str);
124+
}
125+
var filters = $('#filters').val() || $('#filters').attr('placeholder');
118126
$("#codeBtn").click(function () {
119127
var geoCodeParam = new SuperMap.GeoCodingParameter({
120128
address: $('#address').val() || $('#address').attr('placeholder'),
121129
fromIndex: $('#fromIndex').val() || $('#fromIndex').attr('placeholder'),
122130
toIndex: $('#toIndex').val() || $('#toIndex').attr('placeholder'),
123-
filters: $('#filters').val() || $('#filters').attr('placeholder'),
131+
filters: isNull(filters) ? '' : filters,
124132
prjCoordSys: $('#prjCoordSys').val() || $('#prjCoordSys').attr('placeholder'),
125133
maxReturn: $('#maxReturn').val() || $('#maxReturn').attr('placeholder')
126134
});

‎examples/legacy/addressMatchService.html‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<div class="input-group">
3737
<span class="input-group-addon">过滤字段　</span>
3838
<input id="filters" type="text" class="form-control"
39-
placeholder="北京市,海淀区"/>
39+
placeholder="北京"/>
4040
</div>
4141
<p>
4242
<div class="input-group">
@@ -82,7 +82,7 @@
8282
<div class="input-group">
8383
<span class="input-group-addon">过滤字段　</span>
8484
<input id="filters2" type="text" class="form-control"
85-
placeholder="北京市,海淀区"/>
85+
placeholder=""/>
8686
</div>
8787
<p>
8888
<div class="input-group">
@@ -162,12 +162,20 @@
162162
$("#geodecodeParam").addClass('active');
163163
$("#geocodeParam").removeClass('active');
164164
});
165+
//判断输入字符串是否为空或者全部都是空格
166+
function isNull(str) {
167+
if (str == "") return true;
168+
var regu = "^[ ]+$";
169+
var re = new RegExp(regu);
170+
return re.test(str);
171+
}
172+
var filters = $('#filters').val() || $('#filters').attr('placeholder');
165173
$("#codeBtn").click(function () {
166174
var geoCodeParam = new SuperMap.GeoCodingParameter({
167175
address: $('#address').val() || $('#address').attr('placeholder'),
168176
fromIndex: $('#fromIndex').val() || $('#fromIndex').attr('placeholder'),
169177
toIndex: $('#toIndex').val() || $('#toIndex').attr('placeholder'),
170-
filters: $('#filters').val() || $('#filters').attr('placeholder'),
178+
filters: isNull(filters) ? '' : filters,
171179
prjCoordSys: $('#prjCoordSys').val() || $('#prjCoordSys').attr('placeholder'),
172180
maxReturn: $('#maxReturn').val() || $('#maxReturn').attr('placeholder')
173181
});

‎examples/openlayers/SummaryRegionJobService.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ <h3 class="panel-title">范围汇总分析</h3>
133133
</div>
134134
</div>
135135

136-
<script src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
136+
<script src="http://cdn.bootcss.com/openlayers/4.2.0/ol.js"></script>
137137
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
138138
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
139139
<script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>

‎examples/openlayers/addressMatchService.html‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<div class="input-group">
7272
<span class="input-group-addon">过滤字段　</span>
7373
<input id="filters" type="text" class="form-control"
74-
placeholder="北京市,海淀区"/>
74+
placeholder="北京"/>
7575
</div>
7676
<p>
7777
<div class="input-group">
@@ -117,7 +117,7 @@
117117
<div class="input-group">
118118
<span class="input-group-addon">过滤字段　</span>
119119
<input id="filters2" type="text" class="form-control"
120-
placeholder="北京市,海淀区"/>
120+
placeholder=""/>
121121
</div>
122122
<p>
123123
<div class="input-group">
@@ -241,12 +241,20 @@
241241
$("#geodecodeParam").addClass('active');
242242
$("#geocodeParam").removeClass('active');
243243
});
244+
//判断输入字符串是否为空或者全部都是空格
245+
function isNull(str) {
246+
if (str == "") return true;
247+
var regu = "^[ ]+$";
248+
var re = new RegExp(regu);
249+
return re.test(str);
250+
}
251+
var filters = $('#filters').val() || $('#filters').attr('placeholder');
244252
$("#codeBtn").click(function () {
245253
var geoCodeParam = new SuperMap.GeoCodingParameter({
246254
address: $('#address').val() || $('#address').attr('placeholder'),
247255
fromIndex: $('#fromIndex').val() || $('#fromIndex').attr('placeholder'),
248256
toIndex: $('#toIndex').val() || $('#toIndex').attr('placeholder'),
249-
filters: $('#filters').val() || $('#filters').attr('placeholder'),
257+
filters: isNull(filters) ? '' : filters,
250258
prjCoordSys: $('#prjCoordSys').val() || $('#prjCoordSys').attr('placeholder'),
251259
maxReturn: $('#maxReturn').val() || $('#maxReturn').attr('placeholder')
252260
});

‎examples/openlayers/singleObjectQueryJobService.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ <h3 class='panel-title'>单对象查询分析</h3>
6565
</div>
6666
</div>
6767
</div>
68-
<script src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
68+
<script src="http://cdn.bootcss.com/openlayers/4.2.0/ol.js"></script>
6969
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
7070
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
7171
<script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>

‎examples/openlayers/vectorClipJobService.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ <h3 class='panel-title'>矢量裁剪分析</h3>
5959
</div>
6060
</div>
6161
</div>
62-
<script src="http://cdn.bootcss.com/openlayers/4.2.0/ol-debug.js"></script>
62+
<script src="http://cdn.bootcss.com/openlayers/4.2.0/ol.js"></script>
6363
<script src="https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js"></script>
6464
<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
6565
<script type="text/javascript" src="../../dist/iclient9-openlayers.min.js"></script>

0 commit comments

Comments
 (0)