Skip to content

Commit 0771753

Browse files
Yuki-ZhaoYuki-Zhao
committed
【update】提交周五对接修改的问题
1 parent 98956ec commit 0771753

File tree

9 files changed

+1254
-463
lines changed

9 files changed

+1254
-463
lines changed

‎dist/openlayers/iclient9-openlayers-es6.js

Lines changed: 369 additions & 153 deletions
Large diffs are not rendered by default.

‎dist/openlayers/iclient9-openlayers.js

Lines changed: 416 additions & 142 deletions
Large diffs are not rendered by default.

‎dist/openlayers/iclient9-openlayers.min.js

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

‎examples/openlayers/iportalWebMap.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,11 @@
1616
<div id="map" style="width: 100%;height:100%"></div>
1717
<div id="testMap" ></div>
1818
<script type="text/javascript">
19-
new ol.supermap.DatavizWebMap('map', 'http://127.0.0.1:8090/iportal/apps/viewer/1975400925');
19+
new ol.supermap.DatavizWebMap('map', 'http://127.0.0.1:8090/iportal/webmaps/11012430',{
20+
callback: function (map) {
21+
window.map = map;
22+
}
23+
});
2024
</script>
2125
</body>
2226

‎examples/openlayers/iportalWebMapShow.html

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<!--********************************************************************
2+
* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
3+
*********************************************************************-->
4+
<!DOCTYPE html>
5+
<html style=" width: 100%;height: 100%;">
6+
<head>
7+
<meta charset="UTF-8">
8+
<title data-i18n="resources.title_iportalWebMap"></title>
9+
<!-- 字体图标 -->
10+
<link rel="stylesheet" href="../../src/openlayers/css/dataviz_font/iconfont.css" type="text/css">
11+
<script type="text/javascript" src="../js/include-web.js"></script>
12+
<script type="text/javascript" src="../../dist/openlayers/include-openlayers.js"></script>
13+
<script type="text/javascript" src="./webmap/geostats.js"></script>
14+
<style>
15+
div {
16+
display: inline-block;
17+
border: 1px solid #56b781;
18+
}
19+
</style>
20+
</head>
21+
<body style=" margin: 0;overflow: hidden;background: #fff;width: 100%;height:100%">
22+
<div id="base" style="width: 500px;height:300px"></div>
23+
<div id="svg" style="width: 500px;height:300px"></div>
24+
<div id="unique" style="width: 500px;height:300px"></div>
25+
<div id="range" style="width: 500px;height:300px"></div>
26+
<div id="heat" style="width: 500px;height:300px"></div>
27+
<div id="marker" style="width: 500px;height:300px;"></div>
28+
<div id="wmts" style="width: 500px;height:300px"></div>
29+
<div id="wms" style="width: 500px;height:300px"></div>
30+
<script type="text/javascript">
31+
new ol.supermap.DatavizWebMap('base', 'http://127.0.0.1:8090/iportal/webmaps/1705961709',{
32+
callback: function (map) {
33+
window.map = map;
34+
}
35+
});
36+
new ol.supermap.DatavizWebMap('svg', 'http://127.0.0.1:8090/iportal/webmaps/1513445567',{
37+
callback: function (map) {
38+
window.map = map;
39+
}
40+
});
41+
new ol.supermap.DatavizWebMap('unique', 'http://127.0.0.1:8090/iportal/webmaps/1544180444',{
42+
callback: function (map) {
43+
window.map = map;
44+
}
45+
});
46+
new ol.supermap.DatavizWebMap('range', 'http://127.0.0.1:8090/iportal/webmaps/684243370',{
47+
callback: function (map) {
48+
window.map = map;
49+
}
50+
});
51+
new ol.supermap.DatavizWebMap('heat', 'http://127.0.0.1:8090/iportal/webmaps/1935203825',{
52+
callback: function (map) {
53+
window.map = map;
54+
}
55+
});
56+
new ol.supermap.DatavizWebMap('marker', 'http://127.0.0.1:8090/iportal/webmaps/11012430',{
57+
callback: function (map) {
58+
window.map = map;
59+
}
60+
});
61+
new ol.supermap.DatavizWebMap('wmts', 'http://127.0.0.1:8090/iportal/webmaps/1258215445',{
62+
callback: function (map) {
63+
window.map = map;
64+
}
65+
});
66+
new ol.supermap.DatavizWebMap('wms', 'http://127.0.0.1:8090/iportal/webmaps/48684760',{
67+
callback: function (map) {
68+
window.map = map;
69+
}
70+
});
71+
</script>
72+
</body>
73+

‎src/openlayers/core/ArrayStatistic.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export class ArrayStatistic {
2525

2626
/**
2727
* 获取数组统计的值
28-
*
28+
*
2929
* @param array 需要统计的数组
3030
* @param type 统计方法
3131
*/
@@ -59,7 +59,7 @@ export class ArrayStatistic {
5959
* @param segNum 分段个数
6060
*/
6161
static getArraySegments(array, type, segNum) {
62-
if(type === "Offset") {
62+
if(type === "offset") {
6363
return this.getEqInterval(array, segNum);
6464
} else if(type === "jenks") {
6565
return this.getJenks(array, segNum);
@@ -69,7 +69,6 @@ export class ArrayStatistic {
6969
if(minValue >= 0){
7070
return this.getSqrtInterval(array, segNum);
7171
}else {
72-
// todo 提示数据不合法
7372
//console.log('数据都必须 >= 0');
7473
// Util.showMessage(Language.hasNegValue + Language.noSupportRange, 'ERROR');
7574
return false;
@@ -81,7 +80,6 @@ export class ArrayStatistic {
8180
if(minValue > 0){
8281
return this.getGeometricProgression(array, segNum);
8382
}else {
84-
// todo 提示数据不合法
8583
//console.log('数据都必须 > 0');
8684
// Util.showMessage(Language.hasZeroNegValue + Language.noSupportRange, 'ERROR');
8785
return false;

‎src/openlayers/core/StyleUtils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -699,6 +699,7 @@ export class StyleUtils {
699699
//一个图层对应一个canvas
700700
let canvas = document.createElement('canvas');
701701
canvas.id = 'dataviz-canvas-' + Util.newGuid(8);
702+
canvas.style.display = "none";
702703
divDom.appendChild(canvas);
703704
try {
704705
canvg(canvas.id, svgUrl, {

‎src/openlayers/core/Util.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ export class Util {
266266
return Boolean(canvas && canvas.getContext("webgl2"));
267267
}
268268
static getRootUrl(url) {
269-
let tempRootUrl = {};
269+
/*let tempRootUrl = {};
270270
let onlineUrl = 'https://www.supermapol.com/', itestUrl = 'https://itest.supermapol.com/';
271271
if (tempRootUrl[url]) return tempRootUrl[url];
272272
let rootUrl = "";
@@ -284,8 +284,8 @@ export class Util {
284284
}
285285
}
286286
tempRootUrl[url] = rootUrl;
287-
return rootUrl;
288-
// return 'http://127.0.0.1:8090/iportal/';
287+
return rootUrl;*/
288+
return 'http://127.0.0.1:8090/iportal/'; //因为地址用的是本地地址，端口号不一致所以还是用测试的url
289289
}
290290
/**
291291
* 获取https或http域名

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