Skip to content

Commit 8b1efd0

Browse files
anyanruhhyu1
anyanru
authored and
hhyu1
committed
修改demo中引用文件路径
1 parent 06c97c7 commit 8b1efd0

9 files changed

+125
-108
lines changed

‎dist/leaflet/include-leaflet.js

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,9 +89,6 @@
8989
if (!inArray(excludes, 'iclient9-plot-leaflet')) {
9090
inputScript("../../dist/iclient9-plot-leaflet.min.js");
9191
}
92-
if (!inArray(excludes, 'PlottingPanel')) {
93-
inputScript("../js/plottingPanel/PlottingPanel.Include.js");
94-
}
9592
if (inArray(includes, 'leaflet.heat')) {
9693
inputScript("http://cdn.bootcss.com/leaflet.heat/0.2.0/leaflet-heat.js");
9794
}

‎examples/js/include-web.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -148,13 +148,23 @@
148148
inputScript("https://cdn.bootcss.com/i18next/10.0.7/i18next.min.js");
149149
inputScript("https://cdn.bootcss.com/jquery-i18next/1.2.1/jquery-i18next.min.js");
150150
}
151+
<<<<<<< .mine
152+
if (inArray(includes, 'plottingPanel')) {
153+
154+
155+
156+
157+
158+
159+
=======
151160
if (inArray(includes, 'ionRangeSlider')) {
152161
inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.css");
153162
inputCSS("https://cdn.bootcss.com/normalize/8.0.0/normalize.css");
154163
inputCSS("https://cdn.bootcss.com/ion-rangeslider/2.2.0/css/ion.rangeSlider.skinHTML5.css");
155164
inputScript("https://cdn.bootcss.com/ion-rangeslider/2.2.0/js/ion.rangeSlider.min.js");
156165
}
157166
if (inArray(includes, 'plottingPanel')) {
167+
>>>>>>> .theirs
158168
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/jquery.ztree.core.js");
159169
inputCSS("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/zTree/css/zTreeStyle.css");
160170
inputScript("http://iclient.supermap.io/libs/iclient8c/examples/js/plottingPanel/jquery-easyui-1.4.4/jquery.easyui.min.js");
@@ -165,12 +175,12 @@ if (inArray(includes, 'plottingPanel')) {
165175

166176
function datGuiI18N() {
167177
document.writeln("<script>function registerEventListener(evt,fn){" +
168-
"if(window.attachEvent){window.attachEvent('on'+evt,fn);}" +
169-
"else{window.addEventListener(evt,fn,false);}" +
170-
"}</script>");
178+
"if(window.attachEvent){window.attachEvent('on'+evt,fn);}" +
179+
"else{window.addEventListener(evt,fn,false);}" +
180+
"}</script>");
171181
document.writeln("<script>registerEventListener('load',function() { " +
172-
"dat.GUI.TEXT_CLOSED=resources.text_close;dat.GUI.TEXT_OPEN=resources.text_open;" +
173-
"})</script>")
182+
"dat.GUI.TEXT_CLOSED=resources.text_close;dat.GUI.TEXT_OPEN=resources.text_open;" +
183+
"})</script>")
174184
}
175185

176186
load();

‎examples/leaflet/plot_defaultStyle.html

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
<title data-i18n="resources.title_defaultStyle"></title>
66
<script type="text/javascript" include="bootstrap-css,responsive,colorpicker" src="../js/include-web.js"></script>
77
</head>
8-
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
9-
<div id="toolbar" class="panel panel-primary" style="position: absolute;top: 10px;right: 10px;width: 300px;text-align: center;z-index: 800;border-radius: 4px;">
8+
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
9+
<div id="toolbar" class="panel panel-primary"
10+
style="position: absolute;top: 10px;right: 10px;width: 300px;text-align: center;z-index: 800;border-radius: 4px;">
1011
<div class='panel-heading'>
1112
<h5 class='panel-title text-center'>缺省属性</h5></div>
1213
<div class='panel-body content'>
@@ -15,29 +16,29 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
1516
<span class='input-group-addon'>线宽：</span>
1617
<input type='text' class='form-control' id='lineWidth' value='2' onchange="lineWidthChanges()"/>
1718
</div>
18-
<div class='input-group' style="margin-bottom: 15px;">
19+
<div class='input-group' style="margin-bottom: 15px;">
1920
<span class='input-group-addon'>线型：</span>
2021
<select class='form-control' id='lineStyle' onchange="lineStyleChanges()">
21-
<option value='0,0' >solid</option>
22+
<option value='0,0'>solid</option>
2223
<option value='1,5'>dot</option>
2324
<option value='5,10'>dash</option>
2425
<option value='5,5,1,5'>dashdot</option>
2526
<option value='10,5'>longdash</option>
2627
<option value='15,10,5,10'>longdashdot</option>
2728
</select>
2829
</div>
29-
<div class='input-group'style="margin-bottom: 15px;">
30+
<div class='input-group' style="margin-bottom: 15px;">
3031
<span class='input-group-addon'>线色：</span>
3132
<input type="text" id="lineColor" value="" class='form-control'/>
3233
<span class='input-group-addon'><img src='../img/colorpicker.png' id="cp1"
33-
style="cursor:pointer z-index: 9999;" /></span>
34+
style="cursor:pointer z-index: 9999;"/></span>
3435
</div>
3536

36-
<div class='input-group'style="margin-bottom: 15px;">
37+
<div class='input-group' style="margin-bottom: 15px;">
3738
<span class='input-group-addon'>标号宽度：</span>
3839
<input type='text' class='form-control' id='symbolWidth' value='40' onchange="symbolWidthChanges()"/>
3940
</div>
40-
<div class='input-group'style="margin-bottom: 15px;">
41+
<div class='input-group' style="margin-bottom: 15px;">
4142
<span class='input-group-addon'>标号高度：</span>
4243
<input type='text' class='form-control' id='symbolHeight' value='40' onchange="symbolHeightChanges()"/>
4344
</div>
@@ -54,12 +55,13 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
5455
</div>
5556
</div>
5657
<div id="map" style="margin:0 auto;width: 100%;height: 100%"></div>
57-
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-leaflet-css,iclient9-plot-leaflet" src="../../dist/include-leaflet.js"></script>
58+
<script type="text/javascript" include="leaflet,iclient9-leaflet,iclient9-leaflet-css,iclient9-plot-leaflet"
59+
src="../../dist/include-leaflet.js"></script>
5860
<script type="text/javascript">
5961
var host = window.isLocal ? window.server : "http://support.supermap.com.cn:8090";
6062
var url = host + "/iserver/services/map-world/rest/maps/World";
6163
var serverUrl = host + "/iserver/services/plot-jingyong/rest/plot/";
62-
var map,symbolLibManager;
64+
var map, symbolLibManager;
6365
map = L.map('map', {
6466
preferCanvas: true,
6567
crs: L.CRS.EPSG4326,
@@ -75,12 +77,12 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
7577
var editControl = L.supermap.plotting.editControl();
7678
editControl.addTo(map);
7779
var plotting = L.supermap.plotting.getControl(map, serverUrl);
78-
function loadSymbolLib(){
80+
function loadSymbolLib() {
7981
symbolLibManager = plotting.getSymbolLibManager();
80-
symbolLibManager.on(L.supermap.plotting.event.initializecompleted,initializeCompleted);
82+
symbolLibManager.on(L.supermap.plotting.event.initializecompleted, initializeCompleted);
8183
symbolLibManager.initializeAsync();
8284
}
83-
function initializeCompleted(){
85+
function initializeCompleted() {
8486
initHtml();
8587
}
8688
function initHtml() {
@@ -125,16 +127,16 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
125127
}
126128
}
127129

128-
function plotSymbol(){
130+
function plotSymbol() {
129131
drawControl.handler.serverUrl = serverUrl;
130132
drawControl.handler.libID = 421;
131133
drawControl.handler.code = 20100;
132134
drawControl.handler.enable();
133135
}
134-
function PlottingDrawCancel(){
136+
function PlottingDrawCancel() {
135137
drawControl.handler.disable();
136138
}
137-
function PlottingClear(){
139+
function PlottingClear() {
138140
plottingLayer.removeAllFeatures();
139141
}
140142

@@ -155,7 +157,7 @@ <h5 class='panel-title text-center'>缺省属性</h5></div>
155157
PlottingDrawCancel();
156158
plotting.getDefaultStyle().lineColor = document.getElementById("lineColor").value;
157159
}
158-
window.onload = function(){
160+
window.onload = function () {
159161
loadSymbolLib();
160162
};
161163
</script>

‎examples/leaflet/plot_drawGraphics.html

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_drawGraphics"></title>
6-
<script type="text/javascript" include="bootstrap-css,easyui,jquery-colorpicker" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="bootstrap-css,plottingPanel" src="../js/include-web.js"></script>
77
<style type="text/css">
88
body {
99
margin: 0;
@@ -88,7 +88,7 @@ <h5 class='panel-title text-center' style=" font-size: 16px;color: #ffffff;">复
8888
drawControl.addTo(map);
8989
var editControl = L.supermap.plotting.editControl();
9090
editControl.addTo(map);
91-
91+
L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
9292
L.supermap.plotting.getControl(map, serverUrl).getSymbolLibManager().initializeAsync();
9393
//对象标注
9494
function createSymbolText(){
@@ -549,10 +549,6 @@ <h5 class='panel-title text-center' style=" font-size: 16px;color: #ffffff;">复
549549
function clearMap(){
550550
plottingLayer.removeAllFeatures();
551551
}
552-
window.onload = function(){
553-
L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
554-
};
555-
556552
</script>
557553
</body>
558554
</html>

‎examples/leaflet/plot_filetransfer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_filetransfer"></title>
6-
<script type="text/javascript" include="bootstrap,fileupLoad,zTree" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="bootstrap,fileupLoad,plottingPanel" src="../js/include-web.js"></script>
77
</head>
88
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%;position: absolute;top: 0;">
99
<div id="toolbar" class="panel panel-primary" style=" position: absolute;top: 15px;right: 10px;width: 320px;text-align: center;z-index: 9999;border-radius: 4px;">

‎examples/leaflet/plot_modifySymbolStyle.html

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8">
55
<title data-i18n="resources.title_modifySymbolStyle"></title>
6-
<script type="text/javascript" include="bootstrap-css,jquery-colorpicker,easyui" src="../js/include-web.js"></script>
6+
<script type="text/javascript" include="bootstrap-css,plottingPanel" src="../js/include-web.js"></script>
77
<style type="text/css">
88
body {
99
margin: 0;
@@ -62,6 +62,7 @@
6262
drawControl.addTo(map);
6363
var editControl = L.supermap.plotting.editControl();
6464
editControl.addTo(map);
65+
L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
6566
function loadSymbolLib(){
6667
var symbolLibManager = L.supermap.plotting.getControl(map, serverUrl).getSymbolLibManager();
6768
symbolLibManager.on(L.supermap.plotting.event.initializecompleted,symbolLibInitializeCompleted);
@@ -88,7 +89,7 @@
8889
plottingLayer.removeAllFeatures();
8990
}
9091
window.onload = function(){
91-
L.supermap.plotting.initStylePanel("stylePanel", serverUrl, editControl);
92+
9293
loadSymbolLib();
9394
};
9495
</script>

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy