七个数据隔离 水源，救援设备，起降点，气象站，放火站，防火队，森林管理 经纬度 用户不验证Email Unique

  非必填 APP 七个基础数据 修改用户登录状态判断 用户邮箱保存 Excel 上传 测距离跨域

mybusiness/src/main/resources/static/visualization/superMap/dists/mapboxgl/include-mapboxgl.js

@@ -144,21 +144,21 @@
         // dist
         if (!inArray(excludes, 'iclient-mapboxgl')) {
             if (supportES6()) {
-                inputScript('../../dist/mapboxgl/iclient-mapboxgl-es6.min.js');
+                inputScript('../dists/mapboxgl/iclient-mapboxgl-es6.min.js');
             } else {
-                inputScript('../../dist/mapboxgl/iclient-mapboxgl.min.js');
+                inputScript('../dists/mapboxgl/iclient-mapboxgl.min.js');
             }
         }
         if (!inArray(excludes, 'iclient-mapboxgl-css')) {
-            inputCSS('../../dist/mapboxgl/iclient-mapboxgl.min.css');
+            inputCSS('../dists/mapboxgl/iclient-mapboxgl.min.css');
         }
         if (inArray(includes, 'iclient-mapboxgl-vue')) {
-            inputCSS('../../dist/mapboxgl/iclient-mapboxgl-vue.css');
-            inputScript('../../dist/mapboxgl/iclient-mapboxgl-vue.min.js');
+            inputCSS('../dists/mapboxgl/iclient-mapboxgl-vue.css');
+            inputScript('../dists/mapboxgl/iclient-mapboxgl-vue.min.js');
         }
         if (inArray(includes, 'iclient-mapboxgl-react')) {
-            inputCSS('../../dist/mapboxgl/iclient-mapboxgl-react.css');
-            inputScript('../../dist/mapboxgl/iclient-mapboxgl-react.min.js');
+            inputCSS('../dists/mapboxgl/iclient-mapboxgl-react.css');
+            inputScript('../dists/mapboxgl/iclient-mapboxgl-react.min.js');
         }
     }
 

mybusiness/src/main/resources/static/visualization/superMap/examples/js/include-web.js

@@ -36,7 +36,7 @@
     function load() {
         var includes = (targetScript.getAttribute('include') || "").split(",");
         var excludes = (targetScript.getAttribute('exclude') || "").split(",");
-        inputScript("../js/tokengenerator.js");
+        inputScript("../superMap/examples/js/tokengenerator.js");
         var jQueryInclude = false;
         if (!inArray(excludes, 'example-i18n')) {
             inputScript("https://cdn.bootcss.com/jquery/3.2.1/jquery.min.js");
@@ -44,9 +44,9 @@
             inputScript("https://cdn.bootcss.com/i18next/10.0.7/i18next.min.js");
             inputScript("https://cdn.bootcss.com/jquery-i18next/1.2.1/jquery-i18next.min.js");
 
-            inputScript("../js/utils.js");
-            inputScript("../js/localization.js");
-            document.writeln("<script>Localization.initializeI18N('../', function () {Localization.localize();Localization.initGlobal();}); </script>");
+            inputScript("../superMap/examples/js/utils.js");
+            inputScript("../superMap/examples/js/localization.js");
+            document.writeln("<script>Localization.initializeI18N('../superMap/examples/', function () {Localization.localize();Localization.initGlobal();}); </script>");
             jQueryInclude = true;
         }
         if (inArray(includes, 'jquery') && !jQueryInclude) {
@@ -112,12 +112,12 @@
             inputScript("https://cdn.bootcss.com/ace/1.2.6/ace.js");
         }
         if (inArray(includes, 'widgets.alert')) {
-            inputScript("../js/widgets.js");
+            inputScript("../superMap/examples/js/widgets.js");
         }
 
         if (inArray(includes, 'widgets')) {
             inputCSS("https://cdn.bootcss.com/css-loader/2.2.0/css-loader.css");
-            inputScript("../js/widgets.js");
+            inputScript("../superMap/examples/js/widgets.js");
         }
         if (inArray(includes, 'zTree')) {
             inputCSS("https://cdn.bootcss.com/zTree.v3/3.5.29/css/zTreeStyle/zTreeStyle.min.css");

mybusiness/src/main/resources/templates/business/visualization/event.html

@@ -327,4 +327,73 @@
         $("#map")[0].contentWindow.pushData($(this));
     });
 </script>
+
+<!--<script type="text/javascript" include="bootstrap,jquery,widgets.alert" src="http://218.27.1.157:8090/iserver/iClient/forJavaScript/examples/js/include-web.js"></script>-->
+<script type="text/javascript" include="bootstrap,jquery,widgets.alert" th:src="@{/visualization/superMap/examples/js/include-web.js}"></script>
+<!--<script type="text/javascript" include="draw" src="http://218.27.1.157:8090/iserver/iClient/forJavaScript/dist/mapboxgl/include-mapboxgl.js"></script>-->
+<script type="text/javascript" include="draw" th:src="@{/visualization/superMap/dists/mapboxgl/include-mapboxgl.js}"></script>
+<script type="text/javascript">
+    var host = window.isLocal ? window.server : "https://iserver.supermap.io";
+    var url = host + "/iserver/services/map-world/rest/maps/World";
+    var attribution = "<a href='https://www.mapbox.com/about/maps/' target='_blank'>© Mapbox </a>" +
+        "with <span>© <a href='https://iclient.supermap.io' target='_blank'>SuperMap iClient</a> | </span>" +
+        " Map Data <span>© <a href='http://support.supermap.com.cn/product/iServer.aspx' target='_blank'>SuperMap iServer</a></span> ";
+
+    var map = new mapboxgl.Map({
+        container: 'map',
+        style: {
+            "version": 8,
+            "sources": {
+                "raster-tiles": {
+                    "attribution": attribution,
+                    "type": "raster",
+                    "tiles": [host + '/iserver/services/maps/rest/maps/World/zxyTileImage.png?prjCoordSys={"epsgCode":3857}&z={z}&x={x}&y={y}'],
+                    "tileSize": 256,
+                },
+            },
+            "layers": [{
+                "id": "simple-tiles",
+                "type": "raster",
+                "source": "raster-tiles",
+                "minzoom": 0,
+                "maxzoom": 22
+            }],
+        },
+        center: [0, 0],
+        maxZoom: 18,
+        zoom: 3
+    });
+    map.addControl(new mapboxgl.supermap.LogoControl(), 'bottom-right');
+    map.addControl(new mapboxgl.NavigationControl(), 'top-left');
+
+    var draw = new MapboxDraw({
+        displayControlsDefault: false,
+        controls: {
+            line_string: true,
+            trash: true
+        }
+    });
+
+    map.addControl(draw, "top-left");
+
+    function measureDistance(e) {
+        if (!e.features) {
+            widgets.alert.showAlert(resources.msg_noDataRedraw, false);
+        }
+        var param = new SuperMap.MeasureParameters(e.features[0]);
+        new mapboxgl.supermap.MeasureService(url).measureDistance(param, function (serviceResult) {
+            var distance = serviceResult.result.distance;
+            widgets.alert.showAlert(distance + resources.msg_m, true);
+        });
+    }
+
+    function removeMsg() {
+        $('#msg_container').remove();
+    }
+
+    map.on('draw.create', measureDistance);
+    map.on('draw.delete', removeMsg);
+
+
+</script>
 </html>