dzx 4 年之前
父节点
当前提交
9ba9b8b572
共有 46 个文件被更改,包括 470 次插入34848 次删除
  1. 6 2
      css/common.css
  2. 二进制
      css/fonts/yjsz.TTF
  3. 0 3393
      dist/leaflet/iclient-leaflet-es6.js
  4. 0 7
      dist/leaflet/iclient-leaflet-es6.min.js
  5. 0 23
      dist/leaflet/iclient-leaflet-vue.css
  6. 0 1546
      dist/leaflet/iclient-leaflet-vue.js
  7. 0 8
      dist/leaflet/iclient-leaflet-vue.min.css
  8. 0 8
      dist/leaflet/iclient-leaflet-vue.min.js
  9. 0 10
      dist/leaflet/iclient-leaflet.css
  10. 0 3557
      dist/leaflet/iclient-leaflet.js
  11. 0 7
      dist/leaflet/iclient-leaflet.min.css
  12. 0 7
      dist/leaflet/iclient-leaflet.min.js
  13. 0 175
      dist/leaflet/include-leaflet.js
  14. 0 337
      dist/leaflet/workers/TurfWorker.js
  15. 0 1654
      dist/mapboxgl/iclient-mapboxgl-es6.js
  16. 0 7
      dist/mapboxgl/iclient-mapboxgl-es6.min.js
  17. 0 9
      dist/mapboxgl/iclient-mapboxgl-react.css
  18. 0 274
      dist/mapboxgl/iclient-mapboxgl-react.js
  19. 0 7
      dist/mapboxgl/iclient-mapboxgl-react.min.css
  20. 0 8
      dist/mapboxgl/iclient-mapboxgl-react.min.js
  21. 0 23
      dist/mapboxgl/iclient-mapboxgl-vue.css
  22. 0 2418
      dist/mapboxgl/iclient-mapboxgl-vue.js
  23. 0 8
      dist/mapboxgl/iclient-mapboxgl-vue.min.css
  24. 0 8
      dist/mapboxgl/iclient-mapboxgl-vue.min.js
  25. 0 10
      dist/mapboxgl/iclient-mapboxgl.css
  26. 0 1734
      dist/mapboxgl/iclient-mapboxgl.js
  27. 0 7
      dist/mapboxgl/iclient-mapboxgl.min.css
  28. 0 7
      dist/mapboxgl/iclient-mapboxgl.min.js
  29. 0 165
      dist/mapboxgl/include-mapboxgl.js
  30. 0 4014
      dist/ol/iclient-ol-es6.js
  31. 0 7
      dist/ol/iclient-ol-es6.min.js
  32. 0 357
      dist/ol/iclient-ol.css
  33. 0 4947
      dist/ol/iclient-ol.js
  34. 0 7
      dist/ol/iclient-ol.min.css
  35. 0 7
      dist/ol/iclient-ol.min.js
  36. 0 132
      dist/ol/include-ol.js
  37. 0 4014
      dist/openlayers/iclient-openlayers-es6.js
  38. 0 7
      dist/openlayers/iclient-openlayers-es6.min.js
  39. 0 357
      dist/openlayers/iclient-openlayers.css
  40. 0 4947
      dist/openlayers/iclient-openlayers.js
  41. 0 7
      dist/openlayers/iclient-openlayers.min.css
  42. 0 7
      dist/openlayers/iclient-openlayers.min.js
  43. 0 132
      dist/openlayers/include-openlayers.js
  44. 1 1
      js/include-web.js
  45. 300 299
      js/visual.js
  46. 163 187
      root.html

+ 6 - 2
css/common.css

@@ -63,7 +63,7 @@ a:hover {
 
 @font-face {
     font-family: 'numfonts';
-    src: url('../fonts/yjsz.TTF'); /* IE9+,可以是具体的实际链接 */
+    src: url('fonts/yjsz.TTF'); /* IE9+,可以是具体的实际链接 */
 }
 
 /*加载动画*/
@@ -97,6 +97,10 @@ a:hover {
 }
 
 /*主体大屏*/
+.map {
+    padding: 10px 20px 0 20px
+}
+
 .mainbox {
     padding: 10px 20px 0 20px
 }
@@ -212,7 +216,7 @@ a:hover {
 
 .numtxt {
     color: #fef000;
-    font-size: 48px;
+    font-size: 24px;
     font-family: 'numfonts';
     margin: 5px auto;
     letter-spacing: 4px

二进制
css/fonts/yjsz.TTF


文件差异内容过多而无法显示
+ 0 - 3393
dist/leaflet/iclient-leaflet-es6.js


文件差异内容过多而无法显示
+ 0 - 7
dist/leaflet/iclient-leaflet-es6.min.js


文件差异内容过多而无法显示
+ 0 - 23
dist/leaflet/iclient-leaflet-vue.css


文件差异内容过多而无法显示
+ 0 - 1546
dist/leaflet/iclient-leaflet-vue.js


文件差异内容过多而无法显示
+ 0 - 8
dist/leaflet/iclient-leaflet-vue.min.css


文件差异内容过多而无法显示
+ 0 - 8
dist/leaflet/iclient-leaflet-vue.min.js


文件差异内容过多而无法显示
+ 0 - 10
dist/leaflet/iclient-leaflet.css


文件差异内容过多而无法显示
+ 0 - 3557
dist/leaflet/iclient-leaflet.js


文件差异内容过多而无法显示
+ 0 - 7
dist/leaflet/iclient-leaflet.min.css


文件差异内容过多而无法显示
+ 0 - 7
dist/leaflet/iclient-leaflet.min.js


+ 0 - 175
dist/leaflet/include-leaflet.js

@@ -1,175 +0,0 @@
-/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
- * This program are made available under the terms of the Apache License, Version 2.0
- * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-(function() {
-    var r = new RegExp('(^|(.*?\\/))(include-leaflet.js)(\\?|$)'),
-        s = document.getElementsByTagName('script'),
-        targetScript;
-    for (var i = 0; i < s.length; i++) {
-        var src = s[i].getAttribute('src');
-        if (src) {
-            var m = src.match(r);
-            if (m) {
-                targetScript = s[i];
-                break;
-            }
-        }
-    }
-
-    function inputScript(url) {
-        var script = '<script type="text/javascript" src="' + url + '"><' + '/script>';
-        document.writeln(script);
-    }
-
-    function inputCSS(url) {
-        var css = '<link rel="stylesheet" href="' + url + '">';
-        document.writeln(css);
-    }
-
-    function inArray(arr, item) {
-        for (i in arr) {
-            if (arr[i] == item) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function supportES6() {
-        var code = "'use strict'; class Foo {}; class Bar extends Foo {};";
-        try {
-            new Function(code)();
-        } catch (err) {
-            return false;
-        }
-        if (!Array.from) {
-            return false;
-        }
-        return true;
-    }
-
-    //加载类库资源文件
-    function load() {
-        var includes = (targetScript.getAttribute('include') || '').split(',');
-        var excludes = (targetScript.getAttribute('exclude') || '').split(',');
-        // 在线
-        if (!inArray(excludes, 'leaflet')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/leaflet@1.7.1/dist/leaflet.css');
-            inputScript('https://cdn.jsdelivr.net/npm/leaflet@1.7.1/dist/leaflet.js');
-        }
-        if (inArray(includes, 'leaflet.heat')) {
-            inputScript('https://cdn.bootcss.com/leaflet.heat/0.2.0/leaflet-heat.js');
-        }
-        if (inArray(includes, 'leaflet.markercluster')) {
-            inputCSS('https://cdn.bootcss.com/leaflet.markercluster/1.4.1/MarkerCluster.Default.css');
-            inputCSS('https://cdn.bootcss.com/leaflet.markercluster/1.4.1/MarkerCluster.css');
-            inputScript('https://cdn.bootcss.com/leaflet.markercluster/1.4.1/leaflet.markercluster.js');
-        }
-        if (inArray(includes, 'leaflet.draw')) {
-            inputCSS('https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.css');
-            inputScript('https://cdn.bootcss.com/leaflet.draw/1.0.4/leaflet.draw.js');
-        }
-        if (inArray(includes, 'leaflet-geoman')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.css');
-            inputScript('https://cdn.jsdelivr.net/npm/@geoman-io/leaflet-geoman-free@2.7.0/dist/leaflet-geoman.min.js');
-        }
-        if (inArray(includes, 'leaflet.miniMap')) {
-            inputCSS('https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.css');
-            inputScript('https://cdn.bootcss.com/leaflet-minimap/3.6.1/Control.MiniMap.min.js');
-        }
-        if (inArray(includes, 'mapv')) {
-            inputScript('https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js');
-        }
-        if (inArray(includes, 'turf')) {
-            inputScript('https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js');
-        }
-        if (inArray(includes, 'echarts')) {
-            inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
-        }
-        if (inArray(includes, 'elasticsearch')) {
-            inputScript('https://cdn.bootcss.com/elasticsearch/16.7.1/elasticsearch.js');
-        }
-        if (inArray(includes, 'xlsx')) {
-            inputScript('https://cdn.jsdelivr.net/npm/xlsx@0.16.7/dist/xlsx.core.min.js');
-        }
-        // 本地
-        if (inArray(includes, 'leaflet.sidebyside')) {
-            inputScript(
-                'https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-side-by-side/leaflet-side-by-side.min.js'
-            );
-        }
-        if (inArray(includes, 'd3')) {
-            inputScript('https://cdn.bootcss.com/d3/6.1.1/d3.min.js');
-        }
-        if (inArray(includes, 'd3-hexbin')) {
-            inputScript('https://d3js.org/d3-hexbin.v0.2.min.js');
-        }
-        if (inArray(includes, 'd3Layer')) {
-            inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet.d3Layer/leaflet-d3Layer.js');
-        }
-        if (inArray(includes, 'osmbuildings')) {
-            inputScript('https://iclient.supermap.io/web/libs/osmbuildings/OSMBuildings-Leaflet.js');
-        }
-        if (inArray(includes, 'leaflet-icon-pulse')) {
-            inputCSS('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.css');
-            inputScript('https://iclient.supermap.io/web/libs/leaflet/plugins/leaflet-icon-pulse/L.Icon.Pulse.js');
-        }
-        if (inArray(includes, 'deck')) {
-            inputScript('https://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.min.js');
-        }
-        if (inArray(includes, 'pixi')) {
-            inputScript('https://cdn.bootcss.com/pixi.js/4.8.7/pixi.js');
-            inputScript('https://cdn.jsdelivr.net/npm/leaflet-pixi-overlay@1.8.1/L.PixiOverlay.min.js');
-            inputScript(
-                'https://iclient.supermap.io/web/libs/leaflet/plugins/Leaflet.PixiOverlay/1.8.1/MarkerContainer.js'
-            );
-            inputScript('https://iclient.supermap.io/web/libs/bezier-easing/2.1.0/bezier-easing.js');
-        }
-
-        // iclient
-        if (!inArray(excludes, 'iclient-leaflet')) {
-            if (supportES6()) {
-                inputScript('../../dist/leaflet/iclient-leaflet-es6.min.js');
-            } else {
-                inputScript('../../dist/leaflet/iclient-leaflet.min.js');
-            }
-        }
-        if (inArray(includes, 'iclient-leaflet-css')) {
-            inputCSS('../../dist/leaflet/iclient-leaflet.min.css');
-        }
-        if (inArray(includes, 'iclient-plot-leaflet')) {
-            inputCSS('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.1/iclient-plot-leaflet.css');
-            if (supportES6()) {
-                inputScript(
-                    'https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.1/iclient-plot-leaflet-es6.min.js'
-                );
-            } else {
-                inputScript('https://iclient.supermap.io/web/libs/plotting/leaflet/10.1.1/iclient-plot-leaflet.min.js');
-            }
-        }
-        if (inArray(includes, 'ant-design-vue')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.css');
-            inputScript('https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.js');
-        }
-        if (inArray(includes, 'echarts-vue')) {
-            inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
-            inputScript('https://cdn.jsdelivr.net/npm/vue-echarts@4.1.0/dist/vue-echarts.min.js');
-            inputScript('https://cdn.jsdelivr.net/npm/echarts-liquidfill@2.0.6/dist/echarts-liquidfill.min.js');
-            inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
-        }
-        if (inArray(includes, 'iclient-leaflet-vue')) {
-            inputCSS('../../dist/leaflet/iclient-leaflet-vue.css');
-            inputScript('../../dist/leaflet/iclient-leaflet-vue.min.js');
-        }
-        if (inArray(includes, 'leaflet-mapbox-gl')) {
-            inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl-leaflet@0.0.14/leaflet-mapbox-gl.js');
-        }
-        
-    }
-
-    load();
-    window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//)
-        ? 'http://localhost:8090'
-        : document.location.protocol + '//' + document.location.host;
-})();

+ 0 - 337
dist/leaflet/workers/TurfWorker.js

@@ -1,337 +0,0 @@
-/* Copyright© 2000 - 2018 SuperMap Software Co.Ltd. All rights reserved.
- * This program are made available under the terms of the Apache License, Version 2.0
- * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-
-importScripts('https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js')
-
-/**
- * 空间分析所需工具类
- */
-onmessage = function (event) {
-    if (event.data) {
-        let params = event.data;
-        postMessage(analysis(params))
-    }
-}
-
-//IDW 插值
-function interpolate(points, cellSize, options) {
-    options = options || {};
-    if (typeof options !== 'object') {
-        throw new Error('options is invalid');
-    }
-    var gridType = options.gridType;
-    var property = options.property;
-    var weight = options.weight;
-
-    if (!points) {
-        throw new Error('points is required');
-    }
-    turf.collectionOf(points, 'Point', 'input must contain Points');
-    if (!cellSize) {
-        throw new Error('cellSize is required');
-    }
-    if (weight !== undefined && typeof weight !== 'number') {
-        throw new Error('weight must be a number');
-    }
-    property = property || 'elevation';
-    gridType = gridType || 'square';
-    weight = weight || 1;
-
-    var box = options.bbox || turf.bbox(points);
-
-    var grid;
-    switch (gridType) {
-        case 'point':
-        case 'points':
-            grid = squareGrid(box, cellSize, options, gridType);
-            break;
-        case 'square':
-        case 'squares':
-            grid = squareGrid(box, cellSize, options, gridType);
-            break;
-        case 'hex':
-        case 'hexes':
-            grid = turf.hexGrid(box, cellSize, options);
-            break;
-        case 'triangle':
-        case 'triangles':
-            grid = turf.triangleGrid(box, cellSize, options);
-            break;
-        default:
-            throw new Error('invalid gridType');
-    }
-    var results = [];
-    var gridFeatures = grid.features;
-    var pointFeatures = points.features;
-    for (var i = 0, len = gridFeatures.length; i < len; i++) {
-        var zw = 0;
-        var sw = 0;
-        var gridFeature = gridFeatures[i];
-        for (var j = 0, leng = pointFeatures.length; j < leng; j++) {
-            var point = pointFeatures[j];
-            var gridPoint = (gridType === 'point') ? gridFeature : turf.centroid(gridFeature);
-            var d = turf.distance(gridPoint, point, options);
-            var zValue;
-            if (point.properties[property]) {
-                zValue = point.properties[property];
-            }
-            if (zValue === undefined) {
-                zValue = point.geometry.coordinates[2];
-            }
-            if (zValue === undefined) {
-                throw new Error('zValue is missing');
-            }
-            if (d === 0) {
-                zw = zValue;
-            }
-            var w = 1.0 / Math.pow(d, weight);
-            sw += w;
-            zw += w * zValue;
-        }
-        var newFeature = turf.clone(gridFeature);
-        newFeature.properties[property] = zw / sw;
-        results.push(newFeature);
-    }
-    return turf.featureCollection(results);
-}
-
-function squareGrid(bbox, cellSide, options, gridType) {
-    options = options || {};
-    if (!turf.isObject(options)) {
-        throw new Error('options is invalid');
-    }
-    var properties = options.properties;
-    var mask = options.mask;
-
-    var results = [];
-
-    if (cellSide === null || cellSide === undefined) {
-        throw new Error('cellSide is required');
-    }
-    if (!turf.isNumber(cellSide)) {
-        throw new Error('cellSide is invalid');
-    }
-    if (!bbox) {
-        throw new Error('bbox is required');
-    }
-    if (!Array.isArray(bbox)) {
-        throw new Error('bbox must be array');
-    }
-    if (bbox.length !== 4) {
-        throw new Error('bbox must contain 4 numbers');
-    }
-    if (mask && ['Polygon', 'MultiPolygon'].indexOf(turf.getType(mask)) === -1) {
-        throw new Error('options.mask must be a (Multi)Polygon');
-    }
-
-    var west = bbox[0];
-    var south = bbox[1];
-    var east = bbox[2];
-    var north = bbox[3];
-
-    var bboxWidth = (east - west);
-    var bboxHeight = (north - south);
-
-    var cellWidth = cellSide / 111.94;
-    var cellHeight = cellSide / 111.94;
-
-    var columns = Math.floor(bboxWidth / cellWidth);
-    var rows = Math.floor(bboxHeight / cellHeight);
-
-    var deltaX = (bboxWidth - columns * cellWidth) / 2;
-    var deltaY = (bboxHeight - rows * cellHeight) / 2;
-
-    var currentX = west + deltaX;
-    if (gridType === "square" || gridType === "squares") {
-        // for (var column = 0; column < columns; column++) {
-        //     var currentY = south + deltaY;
-        //     for (var row = 0; row < rows; row++) {
-        //         var cellPoly = turf.polygon([[
-        //             [currentX, currentY],
-        //             [currentX, currentY + cellHeight],
-        //             [currentX + cellWidth, currentY + cellHeight],
-        //             [currentX + cellWidth, currentY],
-        //             [currentX, currentY]
-        //         ]], properties);
-        //         if (mask) {
-        //             if (intersect(mask, cellPoly)) results.push(cellPoly);
-        //         } else {
-        //             results.push(cellPoly);
-        //         }
-
-        //         currentY += cellHeight;
-        //     }
-        //     currentX += cellWidth;
-        // }
-        return null;
-    } else {
-        while (currentX <= east) {
-            var currentY1 = south + deltaY;
-            while (currentY1 <= north) {
-                var cellPt = turf.point([currentX, currentY1], properties);
-                if (mask) {
-                    if (turf.booleanWithin(cellPt, mask)) {
-                        results.push(cellPt);
-                    }
-                } else {
-                    results.push(cellPt);
-                }
-                currentY1 += cellHeight;
-            }
-            currentX += cellWidth;
-        }
-    }
-
-    return turf.featureCollection(results);
-}
-
-function processBuffer(buffer, saveAttrs) {
-    var featureCollection = [];
-    //var maxBounds = [-180, -90, 180, 90];
-    //获取缓冲区异常feature, 并从原featureCollection中删除
-    for (var i = 0, len = buffer.features.length; i < len; i++) {
-        var feature = buffer.features[i];
-        //不保留原有的属性值
-        if (!saveAttrs) {
-            //对字段属性进行for循环
-            for (var pro in feature.properties) {
-                var shouldDeleted = true;
-                //序号和参考地点保留
-                if (pro === 'ID') {
-                    shouldDeleted = false;
-                }
-                //删除除了位置和序号字段的其他字段属性
-                if (shouldDeleted) delete feature.properties[pro];
-            }
-        }
-
-        var bbox = turf.bbox(buffer.features[i]);
-        //bounds的x轴距离作为判断依据,看数据误差<=1,这里写大一点防止意外
-        if (parseInt(bbox[2] - bbox[0]) > 5) {
-            //if(util.isRectOverlap(maxBounds, turf.bbox(buffer.features[i]))) {
-
-            //删除功能,第一个参数为第一项位置,第二个参数为要删除几个。 array.splice(index, num) ,返回值为删除内容,array为结果值。
-            //删除位置为i的一个要素
-            featureCollection.push(buffer.features.splice(i, 1)[0]);
-            i--;
-            len--;
-        }
-    }
-    //将异常feature分割为两个正常feature,重新添加到featureCollextion中
-    var newCod;
-    for (var k = 0; k < featureCollection.length; k++) {
-        newCod = [];
-        //获取不正常features
-        var abnormalFeature = featureCollection[k];
-        //获取不正常features的坐标
-        var coordinates = turf.getCoords(abnormalFeature)[0];
-        //对坐标进行循环
-        for (var j = 0, leng = coordinates.length; j < leng; j++) {
-            if (coordinates[j][0] < 0) {
-                newCod.push(coordinates.splice(j, 1)[0]);
-                j--;
-                leng--;
-            }
-        }
-        //闭合polygon
-        if (newCod.length > 3) {
-            if (newCod[newCod.length - 1][0] !== newCod[0][0] || newCod[newCod.length - 1][1] !== newCod[0][1]) {
-                newCod.push(newCod[0]);
-            }
-            //两个feature属性相同
-            buffer.features.push(turf.polygon([newCod], abnormalFeature.properties));
-        }
-        //闭合polygon
-        if (coordinates.length > 3) {
-            if (coordinates[coordinates.length - 1][0] !== coordinates[0][0] || coordinates[coordinates.length - 1][1] !== coordinates[0][1]) {
-                coordinates.push(coordinates[0]);
-            }
-            buffer.features.push(abnormalFeature);
-        }
-    }
-}
-
-
-//feature合并
-function unionFeature(featureCollection, isFirst) {
-    var results = [];
-    var features = featureCollection.features;
-    var featureLength = features.length;
-    var oneceTotal = 2; //两两合并 直到最后剩一个多面对象为止(分网格 合并)
-    var total = Math.round(featureLength / oneceTotal);
-    //数组顺序打乱
-    if (!isFirst) this.random(features);
-    for (var i = 0; i <= total; i++) {
-        var start = i * oneceTotal;
-        var result = featureCollection.features[start];
-        for (var j = 1; j < oneceTotal; j++) {
-            var index = start + j;
-            if (featureCollection.features[index]) {
-                try {
-                    result = this.union(result, featureCollection.features[index]);
-                } catch (e) {
-                    results.push(featureCollection.features[index]);
-                }
-            }
-        }
-        if (result) results.push(result);
-    }
-
-    if (results && results.length > 1) {
-        //结果还是多个 继续合并
-        return this.unionFeature(turf.featureCollection(results), false);
-    } else {
-        return results[0];
-    }
-}
-
-//数组顺序打乱
-function random(arr) {
-    arr.sort(function () { return 0.5 - Math.random() });
-}
-
-function union(features, polys) {
-    let result = turf.union(features, polys);
-    return result;
-}
-
-//多面转单面
-function toPolygons(multiPolygon) {
-    var polygons = [];
-    if (turf.getType(multiPolygon) === "Polygon") {
-        polygons = [multiPolygon];
-    } else {
-        var coords = turf.getCoords(multiPolygon);
-        polygons = coords.map(function (coord) {
-            var poly = turf.polygon(coord);
-            poly.bbox = turf.bbox(poly);
-            poly.properties = multiPolygon.properties;
-            return poly;
-        });
-    }
-    return polygons;
-}
-
-function analysis(params) {
-    let analysisMethod = params.analysisMethod;
-    if (analysisMethod === "isolines") {
-
-        let grid = interpolate(params.pointGrid, params.analysisCellSize, params.options);
-        return turf.isolines(grid, params.breaks, { zProperty: params.zProperty });
-
-    } else if (analysisMethod === "buffer") {
-
-        let buffer = turf.buffer(params.geoJson, params.radius, { unit: params.unit });
-        this.processBuffer(buffer, params.isSave);
-        if (params.isUnion) {
-            if (buffer.features.length > 0) {
-                var unied = this.unionFeature(buffer, true);
-                var result = this.toPolygons(unied);
-                return turf.featureCollection(result);
-            }
-            return null;
-        }
-        return buffer;
-    }
-}

文件差异内容过多而无法显示
+ 0 - 1654
dist/mapboxgl/iclient-mapboxgl-es6.js


文件差异内容过多而无法显示
+ 0 - 7
dist/mapboxgl/iclient-mapboxgl-es6.min.js


文件差异内容过多而无法显示
+ 0 - 9
dist/mapboxgl/iclient-mapboxgl-react.css


文件差异内容过多而无法显示
+ 0 - 274
dist/mapboxgl/iclient-mapboxgl-react.js


文件差异内容过多而无法显示
+ 0 - 7
dist/mapboxgl/iclient-mapboxgl-react.min.css


文件差异内容过多而无法显示
+ 0 - 8
dist/mapboxgl/iclient-mapboxgl-react.min.js


文件差异内容过多而无法显示
+ 0 - 23
dist/mapboxgl/iclient-mapboxgl-vue.css


文件差异内容过多而无法显示
+ 0 - 2418
dist/mapboxgl/iclient-mapboxgl-vue.js


文件差异内容过多而无法显示
+ 0 - 8
dist/mapboxgl/iclient-mapboxgl-vue.min.css


文件差异内容过多而无法显示
+ 0 - 8
dist/mapboxgl/iclient-mapboxgl-vue.min.js


文件差异内容过多而无法显示
+ 0 - 10
dist/mapboxgl/iclient-mapboxgl.css


文件差异内容过多而无法显示
+ 0 - 1734
dist/mapboxgl/iclient-mapboxgl.js


文件差异内容过多而无法显示
+ 0 - 7
dist/mapboxgl/iclient-mapboxgl.min.css


文件差异内容过多而无法显示
+ 0 - 7
dist/mapboxgl/iclient-mapboxgl.min.js


+ 0 - 165
dist/mapboxgl/include-mapboxgl.js

@@ -1,165 +0,0 @@
-/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
- * This program are made available under the terms of the Apache License, Version 2.0
- * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-(function() {
-    var r = new RegExp('(^|(.*?\\/))(include-mapboxgl.js)(\\?|$)'),
-        s = document.getElementsByTagName('script'),
-        targetScript;
-    for (var i = 0; i < s.length; i++) {
-        var src = s[i].getAttribute('src');
-        if (src) {
-            var m = src.match(r);
-            if (m) {
-                targetScript = s[i];
-                break;
-            }
-        }
-    }
-
-    function inputScript(url) {
-        var script = '<script type="text/javascript" src="' + url + '"><' + '/script>';
-        document.writeln(script);
-    }
-
-    function inputCSS(url) {
-        var css = '<link rel="stylesheet" href="' + url + '">';
-        document.writeln(css);
-    }
-
-    function inArray(arr, item) {
-        for (i in arr) {
-            if (arr[i] == item) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function supportES6() {
-        var code = "'use strict'; class Foo {}; class Bar extends Foo {};";
-        try {
-            new Function(code)();
-        } catch (err) {
-            return false;
-        }
-        if (!Array.from) {
-            return false;
-        }
-        return true;
-    }
-
-    //加载类库资源文件
-    function load() {
-        var includes = (targetScript.getAttribute('include') || '').split(',');
-        var excludes = (targetScript.getAttribute('exclude') || '').split(',');
-        if (!inArray(includes, 'mapbox-gl-enhance') && !inArray(excludes, 'mapbox-gl')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/mapbox-gl@1.12.0/dist/mapbox-gl.min.css');
-            inputScript('https://cdn.jsdelivr.net/npm/mapbox-gl@1.12.0/dist/mapbox-gl.min.js');
-        }
-        if (inArray(includes, 'mapbox-gl-enhance')) {
-            inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.css');
-            inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js-enhance/1.12.0/mapbox-gl-enhance.js');
-        }
-        if (inArray(includes, 'draw')) {
-            inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.2.0/mapbox-gl-draw.css');
-            inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-draw/1.2.0/mapbox-gl-draw.js');
-        }
-        if (inArray(includes, 'compare')) {
-            inputCSS('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.css');
-            inputScript('https://iclient.supermap.io/web/libs/mapbox-gl-js/plugins/mapbox-gl-compare/0.4.0/mapbox-gl-compare.js');
-        }
-        if (inArray(includes, 'mapv')) {
-            inputScript('https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js');
-        }
-        if (inArray(includes, 'echarts')) {
-            inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
-            inputScript('https://cdn.jsdelivr.net/npm/echarts-liquidfill@2.0.6/dist/echarts-liquidfill.min.js');
-            inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
-        }
-        if (inArray(includes, 'echarts-vue')) {
-            inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
-            inputScript('https://cdn.jsdelivr.net/npm/vue-echarts@4.1.0/dist/vue-echarts.min.js');
-            inputScript('https://cdn.jsdelivr.net/npm/echarts-liquidfill@2.0.6/dist/echarts-liquidfill.min.js');
-            inputScript('https://iclient.supermap.io/web/libs/echartsLayer/EchartsLayer.min.js');
-        }
-        if (inArray(includes, 'three')) {
-            inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/build/three.js');
-        }
-        if (inArray(includes, 'xlsx')) {
-            inputScript('https://cdn.bootcss.com/xlsx/0.16.7/xlsx.core.min.js');
-        }
-        if (inArray(includes, 'proj4')) {
-            inputScript('https://cdn.bootcss.com/proj4js/2.6.2/proj4.js');
-        }
-        if (inArray(includes, 'shapefile')) {
-            inputScript('https://cdn.jsdelivr.net/npm/shapefile@0.6.6/dist/shapefile.js');
-        }
-        if (inArray(includes, 'ant-design-vue')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.css');
-            inputScript('https://cdn.jsdelivr.net/npm/ant-design-vue@1.3.9/dist/antd.min.js');
-        }
-        if (inArray(includes, 'antd')) {
-            inputCSS('https://cdn.bootcss.com/antd/3.25.3/antd.min.css');
-            inputScript('https://cdn.bootcss.com/moment.js/2.24.0/moment.min.js');
-            inputScript('https://cdn.bootcss.com/antd/3.25.3/antd.js');
-        }
-        if (inArray(includes, 'deck')) {
-            inputScript('https://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.min.js');
-        }
-        if (inArray(includes, 'jsonsql')) {
-            inputScript('https://iclient.supermap.io/web/libs/jsonsql/jsonsql.js');
-        }
-        if (inArray(includes, 'geostats')) {
-            inputScript('https://iclient.supermap.io/web/libs/geostats/geostats.js');
-        }
-        if (inArray(includes, 'canvg')) {
-            inputScript('https://cdn.jsdelivr.net/npm/canvg@3.0.6/lib/umd.min.js');
-        }
-        if (inArray(includes, 'convert')) {
-            inputScript('https://iclient.supermap.io/web/libs/xml-js/1.6.8/xml-js.min.js');
-        }
-        if (inArray(includes, 'LegacyJSONLoader')) {
-            inputScript('https://cdn.jsdelivr.net/npm/three@0.110.0/examples/js/loaders/deprecated/LegacyJSONLoader.js');
-        }
-        if (inArray(includes, 'OBJLoader')) {
-            inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/OBJLoader.js');
-        }
-        if (inArray(includes, 'MTLLoader')) {
-            inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/MTLLoader.js');
-        }
-        if (inArray(includes, 'GLTFLoader')) {
-            inputScript('https://cdn.jsdelivr.net/npm/three@0.121.1/examples/js/loaders/GLTFLoader.js');
-        }
-        if (inArray(includes, 'echarts-gl')) {
-            inputScript('https://iclient.supermap.io/web/libs/echarts-gl/1.1.2/echarts-gl.min.js');
-        }
-        if (inArray(includes, 'mapbox-print-pdf')) {
-            inputScript('https://iclient.supermap.io/web/libs/mapbox-print-pdf/0.4.4/mapbox-print-pdf.min.js');
-        }
-        // dist
-        if (!inArray(excludes, 'iclient-mapboxgl')) {
-            if (supportES6()) {
-                inputScript('../../dist/mapboxgl/iclient-mapboxgl-es6.min.js');
-            } else {
-                inputScript('../../dist/mapboxgl/iclient-mapboxgl.min.js');
-            }
-        }
-        if (!inArray(excludes, 'iclient-mapboxgl-css')) {
-            inputCSS('../../dist/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');
-        }
-        if (inArray(includes, 'iclient-mapboxgl-react')) {
-            inputCSS('../../dist/mapboxgl/iclient-mapboxgl-react.css');
-            inputScript('../../dist/mapboxgl/iclient-mapboxgl-react.min.js');
-        }
-    }
-
-    load();
-    window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//)
-        ? 'http://localhost:8090'
-        : document.location.protocol + '//' + document.location.host;
-})();

文件差异内容过多而无法显示
+ 0 - 4014
dist/ol/iclient-ol-es6.js


文件差异内容过多而无法显示
+ 0 - 7
dist/ol/iclient-ol-es6.min.js


文件差异内容过多而无法显示
+ 0 - 357
dist/ol/iclient-ol.css


文件差异内容过多而无法显示
+ 0 - 4947
dist/ol/iclient-ol.js


文件差异内容过多而无法显示
+ 0 - 7
dist/ol/iclient-ol.min.css


文件差异内容过多而无法显示
+ 0 - 7
dist/ol/iclient-ol.min.js


+ 0 - 132
dist/ol/include-ol.js

@@ -1,132 +0,0 @@
-/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
- * This program are made available under the terms of the Apache License, Version 2.0
- * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-(function() {
-    var r = new RegExp('(^|(.*?\\/))(include-ol.js)(\\?|$)'),
-        s = document.getElementsByTagName('script'),
-        targetScript;
-    for (var i = 0; i < s.length; i++) {
-        var src = s[i].getAttribute('src');
-        if (src) {
-            var m = src.match(r);
-            if (m) {
-                targetScript = s[i];
-                break;
-            }
-        }
-    }
-
-    function inputScript(url) {
-        var script = '<script type="text/javascript" src="' + url + '"><' + '/script>';
-        document.writeln(script);
-    }
-
-    function inputCSS(url) {
-        var css = '<link rel="stylesheet" href="' + url + '">';
-        document.writeln(css);
-    }
-
-    function inArray(arr, item) {
-        for (i in arr) {
-            if (arr[i] == item) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function supportES6() {
-        var code = "'use strict'; class Foo {}; class Bar extends Foo {};";
-        try {
-            new Function(code)();
-        } catch (err) {
-            return false;
-        }
-        if (!Array.from) {
-            return false;
-        }
-        return true;
-    }
-
-    //加载类库资源文件
-    function load() {
-        var includes = (targetScript.getAttribute('include') || '').split(',');
-        var excludes = (targetScript.getAttribute('exclude') || '').split(',');
-        // 在线
-        if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
-            inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/css/ol.css');
-            inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/build/ol.js');
-        }
-        if (inArray(includes, 'ol@4.6.5')) {
-            inputCSS('https://cdn.bootcss.com/openlayers/4.6.5/ol.css');
-            inputScript('https://cdn.bootcss.com/openlayers/4.6.5/ol.js');
-        }
-        if (inArray(includes, 'ol-debug')) {
-            inputCSS('https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.css');
-            inputScript('https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.js');
-        }
-        if (inArray(includes, 'mapv')) {
-            inputScript('https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js');
-        }
-        if (inArray(includes, 'turf')) {
-            inputScript('https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js');
-        }
-        if (inArray(includes, 'echarts')) {
-            inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
-        }
-        if (inArray(includes, 'proj4')) {
-            inputScript('https://cdn.bootcss.com/proj4js/2.6.2/proj4.js');
-        }
-        if (inArray(includes, 'ol3-echarts')) {
-            inputScript('https://cdn.jsdelivr.net/npm/ol3-echarts@2.0.3/dist/ol3Echarts.min.js');
-        }
-        if (inArray(includes, 'ol3-echarts@1.3.6')) {
-            inputScript('https://cdn.jsdelivr.net/npm/ol3-echarts@1.3.6/dist/ol3Echarts.min.js');
-        }
-        if (inArray(includes, 'ol-mapbox-style')) {
-            inputScript('https://iclient.supermap.io/web/libs/openlayers/plugins/ol-mapbox-style/2.11.2-2/olms.js');
-        }
-        if (inArray(includes, 'deck')) {
-            inputScript('https://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.min.js');
-        }
-        if (inArray(includes, 'osmbuildings')) {
-            inputScript('https://iclient.supermap.io/web/libs/osmbuildings/OSMBuildings-OL3.js');
-        }
-        if (inArray(includes, 'animatedclusterlayer')) {
-            inputScript(
-                'https://iclient.supermap.io/web/libs/openlayers/plugins/animatedclusterlayer/animatedclusterlayer.js'
-            );
-        }
-        if (inArray(includes, 'layerswitcher')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/ol-layerswitcher@3.6.0/src/ol-layerswitcher.css');
-            inputScript('https://cdn.jsdelivr.net/npm/ol-layerswitcher@3.6.0/dist/ol-layerswitcher.min.js');
-        }
-        if (inArray(includes, 'jsonsql')) {
-            inputScript('https://iclient.supermap.io/web/libs/jsonsql/jsonsql.js');
-        }
-        if (inArray(includes, 'geostats')) {
-            inputScript('https://iclient.supermap.io/web/libs/geostats/geostats.js');
-        }
-        if (inArray(includes, 'canvg')) {
-            inputScript('https://cdn.jsdelivr.net/npm/canvg@3.0.6/lib/umd.min.js');
-        }
-
-        // dist
-        if (!inArray(excludes, 'iclient-ol')) {
-            if (supportES6()) {
-                inputScript('../../dist/ol/iclient-ol-es6.min.js');
-            } else {
-                inputScript('../../dist/ol/iclient-ol.min.js');
-            }
-        }
-        if (!inArray(excludes, 'iclient-ol-css')) {
-            inputCSS('../../dist/ol/iclient-ol.min.css');
-        }
-    }
-
-    load();
-    window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//)
-        ? 'http://localhost:8090'
-        : document.location.protocol + '//' + document.location.host;
-})();

文件差异内容过多而无法显示
+ 0 - 4014
dist/openlayers/iclient-openlayers-es6.js


文件差异内容过多而无法显示
+ 0 - 7
dist/openlayers/iclient-openlayers-es6.min.js


文件差异内容过多而无法显示
+ 0 - 357
dist/openlayers/iclient-openlayers.css


文件差异内容过多而无法显示
+ 0 - 4947
dist/openlayers/iclient-openlayers.js


文件差异内容过多而无法显示
+ 0 - 7
dist/openlayers/iclient-openlayers.min.css


文件差异内容过多而无法显示
+ 0 - 7
dist/openlayers/iclient-openlayers.min.js


+ 0 - 132
dist/openlayers/include-openlayers.js

@@ -1,132 +0,0 @@
-/* Copyright© 2000 - 2021 SuperMap Software Co.Ltd. All rights reserved.
- * This program are made available under the terms of the Apache License, Version 2.0
- * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
-(function() {
-    var r = new RegExp('(^|(.*?\\/))(include-openlayers.js)(\\?|$)'),
-        s = document.getElementsByTagName('script'),
-        targetScript;
-    for (var i = 0; i < s.length; i++) {
-        var src = s[i].getAttribute('src');
-        if (src) {
-            var m = src.match(r);
-            if (m) {
-                targetScript = s[i];
-                break;
-            }
-        }
-    }
-
-    function inputScript(url) {
-        var script = '<script type="text/javascript" src="' + url + '"><' + '/script>';
-        document.writeln(script);
-    }
-
-    function inputCSS(url) {
-        var css = '<link rel="stylesheet" href="' + url + '">';
-        document.writeln(css);
-    }
-
-    function inArray(arr, item) {
-        for (i in arr) {
-            if (arr[i] == item) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    function supportES6() {
-        var code = "'use strict'; class Foo {}; class Bar extends Foo {};";
-        try {
-            new Function(code)();
-        } catch (err) {
-            return false;
-        }
-        if (!Array.from) {
-            return false;
-        }
-        return true;
-    }
-
-    //加载类库资源文件
-    function load() {
-        var includes = (targetScript.getAttribute('include') || '').split(',');
-        var excludes = (targetScript.getAttribute('exclude') || '').split(',');
-        // 在线
-        if (!inArray(excludes, 'ol') && !inArray(includes, 'ol-debug') && !inArray(includes, 'ol@4.6.5')) {
-            inputCSS('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/css/ol.css');
-            inputScript('https://cdn.jsdelivr.net/gh/openlayers/openlayers.github.io@master/en/v6.4.3/build/ol.js');
-        }
-        if (inArray(includes, 'ol@4.6.5')) {
-            inputCSS('https://cdn.bootcss.com/openlayers/4.6.5/ol.css');
-            inputScript('https://cdn.bootcss.com/openlayers/4.6.5/ol.js');
-        }
-        if (inArray(includes, 'ol-debug')) {
-            inputCSS('https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.css');
-            inputScript('https://cdn.bootcss.com/openlayers/4.6.5/ol-debug.js');
-        }
-        if (inArray(includes, 'mapv')) {
-            inputScript('https://cdn.jsdelivr.net/npm/mapv@2.0.56/build/mapv.min.js');
-        }
-        if (inArray(includes, 'turf')) {
-            inputScript('https://cdn.bootcss.com/Turf.js/5.1.6/turf.min.js');
-        }
-        if (inArray(includes, 'echarts')) {
-            inputScript('https://cdn.jsdelivr.net/npm/echarts@4.9.0/dist/echarts.min.js');
-        }
-        if (inArray(includes, 'proj4')) {
-            inputScript('https://cdn.bootcss.com/proj4js/2.6.2/proj4.js');
-        }
-        if (inArray(includes, 'ol3-echarts')) {
-            inputScript('https://cdn.jsdelivr.net/npm/ol3-echarts@2.0.3/dist/ol3Echarts.min.js');
-        }
-        if (inArray(includes, 'ol3-echarts@1.3.6')) {
-            inputScript('https://cdn.jsdelivr.net/npm/ol3-echarts@1.3.6/dist/ol3Echarts.min.js');
-        }
-        if (inArray(includes, 'ol-mapbox-style')) {
-            inputScript('https://iclient.supermap.io/web/libs/openlayers/plugins/ol-mapbox-style/2.11.2-2/olms.js');
-        }
-        if (inArray(includes, 'deck')) {
-            inputScript('https://iclient.supermap.io/web/libs/deck.gl/5.1.3/deck.gl.min.js');
-        }
-        if (inArray(includes, 'osmbuildings')) {
-            inputScript('https://iclient.supermap.io/web/libs/osmbuildings/OSMBuildings-OL3.js');
-        }
-        if (inArray(includes, 'animatedclusterlayer')) {
-            inputScript(
-                'https://iclient.supermap.io/web/libs/openlayers/plugins/animatedclusterlayer/animatedclusterlayer.js'
-            );
-        }
-        if (inArray(includes, 'layerswitcher')) {
-            inputCSS('https://cdn.jsdelivr.net/npm/ol-layerswitcher@3.6.0/src/ol-layerswitcher.css');
-            inputScript('https://cdn.jsdelivr.net/npm/ol-layerswitcher@3.6.0/dist/ol-layerswitcher.min.js');
-        }
-        if (inArray(includes, 'jsonsql')) {
-            inputScript('https://iclient.supermap.io/web/libs/jsonsql/jsonsql.js');
-        }
-        if (inArray(includes, 'geostats')) {
-            inputScript('https://iclient.supermap.io/web/libs/geostats/geostats.js');
-        }
-        if (inArray(includes, 'canvg')) {
-            inputScript('https://cdn.jsdelivr.net/npm/canvg@3.0.6/lib/umd.min.js');
-        }
-
-        // dist
-        if (!inArray(excludes, 'iclient-openlayers')) {
-            if (supportES6()) {
-                inputScript('../../dist/openlayers/iclient-openlayers-es6.min.js');
-            } else {
-                inputScript('../../dist/openlayers/iclient-openlayers.min.js');
-            }
-        }
-        if (!inArray(excludes, 'iclient-openlayers-css')) {
-            inputCSS('../../dist/openlayers/iclient-openlayers.min.css');
-        }
-    }
-
-    load();
-    window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//)
-        ? 'http://localhost:8090'
-        : document.location.protocol + '//' + document.location.host;
-})();

+ 1 - 1
js/include-web.js

@@ -185,7 +185,7 @@
 
     load();
     window.isLocal = false;
-    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:8090" : document.location.protocol + "//" + document.location.host;
+    window.server = document.location.toString().match(/file:\/\//) ? "http://localhost:9000" : document.location.protocol + "//" + document.location.host;
     window.version = "10.1.1";
     window.preRelease = "";
 })();

+ 300 - 299
js/visual.js

@@ -1,8 +1,8 @@
 $(window).load(function () {
     $(".loading").fadeOut()
 })
-	var map, layer, markerlayer, marker,
-        url = "http://111.42.156.47:806/iserver/services/map-2222/rest/maps/dili";
+var map, layer, markerlayer, marker,
+    url = "http://111.42.156.47:806/iserver/services/map-2222/rest/maps/dili";
 var sT = "";
 var eT = "";
 var fyT = "";
@@ -11,156 +11,157 @@ var res = null;
 var markerList = [];
 var mesList = [];
 $(function () {
-	var oTime=new Date();
-	console.log(changeDate(oTime));
-	$("#dateend").val(changeDate(oTime));
-	$("#datefy").val(changeDate(oTime));
-	$("#datestart").val(changeDate(addDate(oTime, -2)));
-	init();
+    var oTime = new Date();
+    console.log(changeDate(oTime));
+    $("#dateend").val(changeDate(oTime));
+    $("#datefy").val(changeDate(oTime));
+    $("#datestart").val(changeDate(addDate(oTime, -2)));
+    init();
 })
 function init() {
-        map = new SuperMap.Map("map", {
-            controls: [
-                new SuperMap.Control.Zoom(),
-                new SuperMap.Control.Navigation()
-            ]
-        });
-        layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", url, null, {maxResolution: "auto"});
-        markerlayer = new SuperMap.Layer.Markers("markerLayer");
-        layer.events.on({"layerInitialized": addLayer});
-		
-		searchjindu();
-		searchfangyi();
-    }
+    
+    /**map = new SuperMap.Map("map", {
+        controls: [
+            new SuperMap.Control.Zoom(),
+            new SuperMap.Control.Navigation()
+        ]
+    });
+    layer = new SuperMap.Layer.TiledDynamicRESTLayer("World", url, null, { maxResolution: "auto" });
+    markerlayer = new SuperMap.Layer.Markers("markerLayer");
+    layer.events.on({ "layerInitialized": addLayer });
 
-    function addLayer() {
+    searchjindu();
+    searchfangyi();**/
+}
+
+function addLayer() {
 
-        map.addLayers([layer, markerlayer]);
-        //显示地图范围
-        map.setCenter(new SuperMap.LonLat(126.37, 46.05), 1);
+    map.addLayers([layer, markerlayer]);
+    //显示地图范围
+    map.setCenter(new SuperMap.LonLat(126.37, 46.05), 1);
+}
+
+function searchfangyi() {
+    if (fyT != $("#datefy").val()) {
+        fyT = $("#datefy").val();
+        var datajs = { datefy: $("#datefy").val() };
+        $.ajax({
+            url: "https://www.hmedi02.net:802/qiangxian/platform/qiangxianxinxi/qiangxianxinxi/dataFangyi",
+            type: "GET",
+            async: false,
+            contentType: "application/json;charset=utf-8",
+            data: datajs,
+            success: function (result) {
+                fyres = result;
+                if ($("#biaoduan").val() == "合计") {
+                    echarts_1(result.zhengchangAll, result.yichangAll);
+                } else if ($("#biaoduan").val() == "一标段") {
+                    echarts_1(result.zhengchang1, result.yichang1);
+                } else if ($("#biaoduan").val() == "二标段") {
+                    echarts_1(result.zhengchang2, result.yichang2);
+                }
+            },
+            error: function (e) {
+                console.log(e.status);
+                console.log(e.responseText);
+            }
+        });
+    } else {
+        if ($("#biaoduan").val() == "合计") {
+            echarts_1(fyres.zhengchangAll, fyres.yichangAll);
+        } else if ($("#biaoduan").val() == "一标段") {
+            echarts_1(fyres.zhengchang1, fyres.yichang1);
+        } else if ($("#biaoduan").val() == "二标段") {
+            echarts_1(fyres.zhengchang2, fyres.yichang2);
+        }
     }
-	
-function searchfangyi(){
-	if(fyT != $("#datefy").val()){
-		fyT = $("#datefy").val();
-		var datajs = {datefy:$("#datefy").val()};
-		$.ajax({ 
-			url: "https://www.hmedi02.net:802/qiangxian/platform/qiangxianxinxi/qiangxianxinxi/dataFangyi", 
-			type : "GET",
-			async: false,
-			contentType: "application/json;charset=utf-8",
-			data: datajs,
-			success: function(result){
-				fyres = result;
-				if($("#biaoduan").val() == "合计"){
-					echarts_1(result.zhengchangAll,result.yichangAll);
-				} else if($("#biaoduan").val() == "一标段") {
-					echarts_1(result.zhengchang1,result.yichang1);
-				} else if($("#biaoduan").val() == "二标段") {
-					echarts_1(result.zhengchang2,result.yichang2);
-				}
-			},
-			error : function(e){
-				console.log(e.status);
-				console.log(e.responseText);
-			}
-		});
-	} else {
-		if($("#biaoduan").val() == "合计"){
-			echarts_1(fyres.zhengchangAll,fyres.yichangAll);
-		} else if($("#biaoduan").val() == "一标段") {
-			echarts_1(fyres.zhengchang1,fyres.yichang1);
-		} else if($("#biaoduan").val() == "二标段") {
-			echarts_1(fyres.zhengchang2,fyres.yichang2);
-		}
-	}
 }
 
-function searchjindu(){
-	if(sT != $("#datestart").val() || eT != $("#dateend").val()){
-		if(markerList.length > 0){
-			for(var i = 0; i < markerList.length; i ++){
-				markerlayer.removeMarker(markerList[i]);
-			}
-			markerList = [];
-		}
-		sT = $("#datestart").val();
-		eT = $("#dateend").val();
-		var datajs = {datestart:$("#datestart").val(),dateend:$("#dateend").val()};
-		$.ajax({ 
-			url: "https://www.hmedi02.net:802/qiangxian/platform/qiangxianxinxi/qiangxianxinxi/dataDaping", 
-			type : "GET",
-			async: false,
-			contentType: "application/json;charset=utf-8",
-			data: datajs,
-			success: function(result){
-				console.log(result);
-				res = result;
-				mesList = result.mapList;
-				echarts_2(result.mapList);
-				if($("#biaoduan").val() == "合计"){
-					echarts_3(result.xZhou,result.zuoyerenAll,result.zuoyecheAll,result.icecarAll,result.watercarAll,result.jinduAll);
-					table1(result.table, result.table2);
-					echarts_5(result.xZhou,result.fangyirenAll);
-				} else if($("#biaoduan").val() == "一标段") {
-					echarts_3(result.xZhou,result.zuoyeren1,result.zuoyeche1,result.icecar1,result.watercar1,result.jindu1);
-					table1(result.table, result.table2);
-					echarts_5(result.xZhou,result.fangyiren1);
-				} else if($("#biaoduan").val() == "二标段") {
-					echarts_3(result.xZhou,result.zuoyeren2,result.zuoyeche2,result.icecar2,result.watercar2,result.jindu2);
-					table1(result.table, result.table2);
-					echarts_5(result.xZhou,result.fangyiren2);
-				}
-			},
-			error : function(e){
-				console.log(e.status);
-				console.log(e.responseText);
-			}
-		});
-	} else {
-		if($("#biaoduan").val() == "合计"){
-			echarts_3(res.xZhou,res.zuoyerenAll,res.zuoyecheAll,res.icecarAll,res.watercarAll,res.jinduAll);
-			table1(res.table, res.table2);
-			echarts_5(res.xZhou,res.fangyirenAll);
-		} else if($("#biaoduan").val() == "一标段") {
-			echarts_3(res.xZhou,res.zuoyeren1,res.zuoyeche1,res.icecar1,res.watercar1,res.jindu1);
-			table1(res.table, res.table2);
-			echarts_5(res.xZhou,res.fangyiren1);
-		} else if($("#biaoduan").val() == "二标段") {
-			echarts_3(res.xZhou,res.zuoyeren2,res.zuoyeche2,res.icecar2,res.watercar2,res.jindu2);
-			table1(res.table, res.table2);
-			echarts_5(res.xZhou,res.fangyiren2);
-		}
-	}
+function searchjindu() {
+    if (sT != $("#datestart").val() || eT != $("#dateend").val()) {
+        if (markerList.length > 0) {
+            for (var i = 0; i < markerList.length; i++) {
+                markerlayer.removeMarker(markerList[i]);
+            }
+            markerList = [];
+        }
+        sT = $("#datestart").val();
+        eT = $("#dateend").val();
+        var datajs = { datestart: $("#datestart").val(), dateend: $("#dateend").val() };
+        $.ajax({
+            url: "https://www.hmedi02.net:802/qiangxian/platform/qiangxianxinxi/qiangxianxinxi/dataDaping",
+            type: "GET",
+            async: false,
+            contentType: "application/json;charset=utf-8",
+            data: datajs,
+            success: function (result) {
+                console.log(result);
+                res = result;
+                mesList = result.mapList;
+                echarts_2(result.mapList);
+                if ($("#biaoduan").val() == "合计") {
+                    echarts_3(result.xZhou, result.zuoyerenAll, result.zuoyecheAll, result.icecarAll, result.watercarAll, result.jinduAll);
+                    table1(result.table, result.table2);
+                    echarts_5(result.xZhou, result.fangyirenAll);
+                } else if ($("#biaoduan").val() == "一标段") {
+                    echarts_3(result.xZhou, result.zuoyeren1, result.zuoyeche1, result.icecar1, result.watercar1, result.jindu1);
+                    table1(result.table, result.table2);
+                    echarts_5(result.xZhou, result.fangyiren1);
+                } else if ($("#biaoduan").val() == "二标段") {
+                    echarts_3(result.xZhou, result.zuoyeren2, result.zuoyeche2, result.icecar2, result.watercar2, result.jindu2);
+                    table1(result.table, result.table2);
+                    echarts_5(result.xZhou, result.fangyiren2);
+                }
+            },
+            error: function (e) {
+                console.log(e.status);
+                console.log(e.responseText);
+            }
+        });
+    } else {
+        if ($("#biaoduan").val() == "合计") {
+            echarts_3(res.xZhou, res.zuoyerenAll, res.zuoyecheAll, res.icecarAll, res.watercarAll, res.jinduAll);
+            table1(res.table, res.table2);
+            echarts_5(res.xZhou, res.fangyirenAll);
+        } else if ($("#biaoduan").val() == "一标段") {
+            echarts_3(res.xZhou, res.zuoyeren1, res.zuoyeche1, res.icecar1, res.watercar1, res.jindu1);
+            table1(res.table, res.table2);
+            echarts_5(res.xZhou, res.fangyiren1);
+        } else if ($("#biaoduan").val() == "二标段") {
+            echarts_3(res.xZhou, res.zuoyeren2, res.zuoyeche2, res.icecar2, res.watercar2, res.jindu2);
+            table1(res.table, res.table2);
+            echarts_5(res.xZhou, res.fangyiren2);
+        }
+    }
 }
 
-function addDate(date,days){ 
-	var d=new Date(date); 
-	d.setDate(d.getDate()+days); 
-	return d; 
+function addDate(date, days) {
+    var d = new Date(date);
+    d.setDate(d.getDate() + days);
+    return d;
 }
 
-function changeDate(dateT){
-	var year = dateT.getFullYear(); //获取完整的年份(4位,1970-????)
-                var month = dateT.getMonth() + 1; //获取当前月份(0-11,0代表1月)
-                var day = dateT.getDate(); //获取当前日(1-31)
-                if (month < 10) {
-                    month = "0" + month;
-                }
-                if (day < 10) {
-                    day = "0" + day;
-                }
-var dateString =  year + "-" + month + "-" + day;
-return dateString
+function changeDate(dateT) {
+    var year = dateT.getFullYear(); //获取完整的年份(4位,1970-????)
+    var month = dateT.getMonth() + 1; //获取当前月份(0-11,0代表1月)
+    var day = dateT.getDate(); //获取当前日(1-31)
+    if (month < 10) {
+        month = "0" + month;
+    }
+    if (day < 10) {
+        day = "0" + day;
+    }
+    var dateString = year + "-" + month + "-" + day;
+    return dateString
 }
 
-function echarts_1(zc,yc) {
+function echarts_1(zc, yc) {
     var myChart = echarts.init(document.getElementById('echart1'));
-	var datajs = [
-                    {value: zc, name: '体温正常'},
-                    {value: yc, name: '体温异常'},
+    var datajs = [
+        { value: zc, name: '体温正常' },
+        { value: yc, name: '体温异常' },
 
-                ]
+    ]
     var option = {
         color: ['#2ef4ab', '#ffe074'],
         tooltip: {
@@ -170,7 +171,7 @@ function echarts_1(zc,yc) {
         legend: {
             bottom: '3%',
             itemGap: 10,
-            icon:'circle',
+            icon: 'circle',
             textStyle: {
                 color: 'rgba(255,255,255,.6)',
                 fontSize: 12
@@ -213,106 +214,106 @@ function echarts_1(zc,yc) {
 }
 
 function echarts_2(mList) {
-	if(mList.length > 0){
-		for(var i = 0; i < mList.length; i ++){
-			var size = new SuperMap.Size(44, 33);
-			var offset = new SuperMap.Pixel(-(size.w / 2), -size.h);
-			var icon = new SuperMap.Icon('images/marker.png', size, offset);
-			marker = new SuperMap.Marker(new SuperMap.LonLat(mList[i].longitude2, mList[i].latitude2), icon);
-			marker.events.on({
-				"id": mList[i].id,
-				"click": openInfoWin,
-				"scope": marker
-			});
-			markerList.push(marker);
-		}
-		for(var i = 0; i < markerList.length; i ++){
-			markerlayer.addMarker(markerList[i]);
-		}
-	}
+    if (mList.length > 0) {
+        for (var i = 0; i < mList.length; i++) {
+            var size = new SuperMap.Size(44, 33);
+            var offset = new SuperMap.Pixel(-(size.w / 2), -size.h);
+            var icon = new SuperMap.Icon('images/marker.png', size, offset);
+            marker = new SuperMap.Marker(new SuperMap.LonLat(mList[i].longitude2, mList[i].latitude2), icon);
+            marker.events.on({
+                "id": mList[i].id,
+                "click": openInfoWin,
+                "scope": marker
+            });
+            markerList.push(marker);
+        }
+        for (var i = 0; i < markerList.length; i++) {
+            markerlayer.addMarker(markerList[i]);
+        }
+    }
 }
 function openInfoWin() {
     var marker = this;
     var lonlat = marker.getLonLat();
-		console.log(lonlat.lon);
-		console.log(lonlat.lat);
-	for(var i = 0; i < mesList.length; i ++){
-		console.log(mesList[i]);
-		if(ec(lonlat.lon,mesList[i].longitude2,lonlat.lat,mesList[i].latitude2)){
-			$("#sbrq").html(mesList[i].addtime);
-			$("#fkrs").html(mesList[i].fangyiren);
-			$("#yctw").html(mesList[i].yichangren);
-			$("#zyrs").html(mesList[i].zuoyeren);
-			$("#zycs").html(mesList[i].zuoyeche);
-			$("#ybcc").html(mesList[i].icecar);
-			$("#xwcc").html(mesList[i].watercar);
-			$("#wcl").html(mesList[i].jindu);
-			$("#bcsm").html(mesList[i].remark2);
-			$("#sfyc").html(mesList[i].shifouyichang);
-			$("#ycqk").html(mesList[i].yichangxinxi);
-			if(mesList[i].fujianid == ""){
-				$("#xczp").html("暂无现场照片");
-			} else {
-				$("#xczp").html("<button style=\"height:24px;width:100px;color: #000000\" data-toggle=\"modal\" data-target=\"#myModal\">查看现场照片</button>");
-				var tList = mesList[i].fujianid.split(";");
-				var imgHtml = "";
-				for(var j = 0; j < tList.length; j ++){
-					if(tList != ""){
-						imgHtml += "<img src='" + tList[j] + "' /></br>";
-					}
-				}
-				$("#myModalLabel").html(imgHtml);
-			}
-			if(mesList[i].yichangfujian == ""){
-				$("#yczp").html("暂无异常照片");
-			} else {
-				$("#yczp").html("<button style=\"height:24px;width:100px;color: #000000\" data-toggle=\"modal\" data-target=\"#myModal2\">查看异常照片</button>");
-				var tList = mesList[i].yichangfujian.split(";");
-				var imgHtml = "";
-				for(var j = 0; j < tList.length; j ++){
-					if(tList != ""){
-						imgHtml += "<img src='" + tList[j] + "' /></br>";
-					}
-				}
-				$("#myModalLabel2").html(imgHtml);
-			}
-			return;
-		}
-	}
+    console.log(lonlat.lon);
+    console.log(lonlat.lat);
+    for (var i = 0; i < mesList.length; i++) {
+        console.log(mesList[i]);
+        if (ec(lonlat.lon, mesList[i].longitude2, lonlat.lat, mesList[i].latitude2)) {
+            $("#sbrq").html(mesList[i].addtime);
+            $("#fkrs").html(mesList[i].fangyiren);
+            $("#yctw").html(mesList[i].yichangren);
+            $("#zyrs").html(mesList[i].zuoyeren);
+            $("#zycs").html(mesList[i].zuoyeche);
+            $("#ybcc").html(mesList[i].icecar);
+            $("#xwcc").html(mesList[i].watercar);
+            $("#wcl").html(mesList[i].jindu);
+            $("#bcsm").html(mesList[i].remark2);
+            $("#sfyc").html(mesList[i].shifouyichang);
+            $("#ycqk").html(mesList[i].yichangxinxi);
+            if (mesList[i].fujianid == "") {
+                $("#xczp").html("暂无现场照片");
+            } else {
+                $("#xczp").html("<button style=\"height:24px;width:100px;color: #000000\" data-toggle=\"modal\" data-target=\"#myModal\">查看现场照片</button>");
+                var tList = mesList[i].fujianid.split(";");
+                var imgHtml = "";
+                for (var j = 0; j < tList.length; j++) {
+                    if (tList != "") {
+                        imgHtml += "<img src='" + tList[j] + "' /></br>";
+                    }
+                }
+                $("#myModalLabel").html(imgHtml);
+            }
+            if (mesList[i].yichangfujian == "") {
+                $("#yczp").html("暂无异常照片");
+            } else {
+                $("#yczp").html("<button style=\"height:24px;width:100px;color: #000000\" data-toggle=\"modal\" data-target=\"#myModal2\">查看异常照片</button>");
+                var tList = mesList[i].yichangfujian.split(";");
+                var imgHtml = "";
+                for (var j = 0; j < tList.length; j++) {
+                    if (tList != "") {
+                        imgHtml += "<img src='" + tList[j] + "' /></br>";
+                    }
+                }
+                $("#myModalLabel2").html(imgHtml);
+            }
+            return;
+        }
+    }
 }
 
-function ec(lon1,lon2,lat1,lat2){
-	var l1 = left(lon1 + " ",14);
-	var l2 = left(lon2 + " ",14);
-	var l3 = left(lat1 + " ",14);
-	var l4 = left(lat2 + " ",14);
-	if(l1 == l2 && l3 == l4){
-		return true;
-	}
-	return false;
+function ec(lon1, lon2, lat1, lat2) {
+    var l1 = left(lon1 + " ", 14);
+    var l2 = left(lon2 + " ", 14);
+    var l3 = left(lat1 + " ", 14);
+    var l4 = left(lat2 + " ", 14);
+    if (l1 == l2 && l3 == l4) {
+        return true;
+    }
+    return false;
 }
-function left(mainStr,lngLen) {
-if (lngLen>0) {return mainStr.substring(0,lngLen)}
-else{return null}
+function left(mainStr, lngLen) {
+    if (lngLen > 0) { return mainStr.substring(0, lngLen) }
+    else { return null }
 }
-function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
+function echarts_3(dtLisT, zyrList, zycList, ybcList, xwcList, jdList) {
 
     var myChart = echarts.init(document.getElementById('echart3'));
 
     var option = {
-		legend:{
-			left:'center',
-			textStyle: {
-			  color: "rgba(255, 255, 255, 1)"
-			}
-		},
+        legend: {
+            left: 'center',
+            textStyle: {
+                color: "rgba(255, 255, 255, 1)"
+            }
+        },
         color: ['#1921ff', '#01c3dd', '#008198', '#2ef4ab', '#ffe074'],
         tooltip: {
-			textStyle:{
-				align:'left'
-			},
+            textStyle: {
+                align: 'left'
+            },
             trigger: 'axis',
-			formatter: "{b0} " + $("#biaoduan").val() + ":</br>{a0} : {c0} 人</br>{a1} : {c1} 辆</br>{a2} : {c2} 次</br>{a3} : {c3} 次</br>{a4} : {c4} 平方米"
+            formatter: "{b0} " + $("#biaoduan").val() + ":</br>{a0} : {c0} 人</br>{a1} : {c1} 辆</br>{a2} : {c2} 次</br>{a3} : {c3} 次</br>{a4} : {c4} 平方米"
         },
         dataZoom: {
             start: 0,
@@ -351,7 +352,7 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
         xAxis: [
             {
                 type: 'category',
-                axisTick: {show: false},
+                axisTick: { show: false },
                 boundaryGap: false,
                 axisLabel: {
                     textStyle: {
@@ -387,7 +388,7 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
         },
         series: [
             {
-				name:'作业人数',
+                name: '作业人数',
                 lineStyle: {
                     color: '#1921ff',
                 },
@@ -406,16 +407,16 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
                 },
                 smooth: true,
                 itemStyle: {
-                    normal: {areaStyle: {type: 'default'}}
+                    normal: { areaStyle: { type: 'default' } }
                 },
-                label:{
-                    show:true,
-                    position:'top'
+                label: {
+                    show: true,
+                    position: 'top'
                 },
                 data: zyrList
             },
-			{
-				name:'作业车数',
+            {
+                name: '作业车数',
                 lineStyle: {
                     color: '#01c3dd',
                 },
@@ -434,16 +435,16 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
                 },
                 smooth: true,
                 itemStyle: {
-                    normal: {areaStyle: {type: 'default'}}
+                    normal: { areaStyle: { type: 'default' } }
                 },
-                label:{
-                    show:true,
-                    position:'top'
+                label: {
+                    show: true,
+                    position: 'top'
                 },
                 data: zycList
             },
-			{
-				name:'运冰车次',
+            {
+                name: '运冰车次',
                 lineStyle: {
                     color: '#008198',
                 },
@@ -462,16 +463,16 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
                 },
                 smooth: true,
                 itemStyle: {
-                    normal: {areaStyle: {type: 'default'}}
+                    normal: { areaStyle: { type: 'default' } }
                 },
-                label:{
-                    show:true,
-                    position:'top'
+                label: {
+                    show: true,
+                    position: 'top'
                 },
                 data: ybcList
             },
-			{
-				name:'吸污车次',
+            {
+                name: '吸污车次',
                 lineStyle: {
                     color: '#2ef4ab',
                 },
@@ -490,16 +491,16 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
                 },
                 smooth: true,
                 itemStyle: {
-                    normal: {areaStyle: {type: 'default'}}
+                    normal: { areaStyle: { type: 'default' } }
                 },
-                label:{
-                    show:true,
-                    position:'top'
+                label: {
+                    show: true,
+                    position: 'top'
                 },
                 data: xwcList
             },
-			{
-				name:'完成量',
+            {
+                name: '完成量',
                 lineStyle: {
                     color: '#ffe074',
                 },
@@ -518,11 +519,11 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
                 },
                 smooth: true,
                 itemStyle: {
-                    normal: {areaStyle: {type: 'default'}}
+                    normal: { areaStyle: { type: 'default' } }
                 },
-                label:{
-                    show:true,
-                    position:'top'
+                label: {
+                    show: true,
+                    position: 'top'
                 },
                 data: jdList
             }
@@ -535,64 +536,64 @@ function echarts_3(dtLisT,zyrList,zycList,ybcList,xwcList,jdList) {
     });
 }
 
-function echarts_5(dtLisT,fkrList) {
+function echarts_5(dtLisT, fkrList) {
     var myChart = echarts.init(document.getElementById('echart5'));
 
     var option = {
         color: ['#ffe074'],
         tooltip: {
-			textStyle:{
-				align:'left'
-			},
+            textStyle: {
+                align: 'left'
+            },
             trigger: 'axis',
-			formatter: "{b} " + $("#biaoduan").val() + ":</br>{a} : {c} 人"
+            formatter: "{b} " + $("#biaoduan").val() + ":</br>{a} : {c} 人"
+        },
+        xAxis: {
+            type: 'category',
+            data: dtLisT
         },
-		xAxis: {
-			type: 'category',
-			data: dtLisT
-		},
-		yAxis: {
-			type: 'value'
-		},
-		series: [{
-			name: "防疫人数",
-			data: fkrList,
-			type: 'bar'
-		}]
-	};
+        yAxis: {
+            type: 'value'
+        },
+        series: [{
+            name: "防疫人数",
+            data: fkrList,
+            type: 'bar'
+        }]
+    };
 
     myChart.setOption(option);
     window.addEventListener("resize", function () {
         myChart.resize();
     });
 }
-function table1(t1,t2){
-	$("#td1").html(t1[0]);
-	$("#td2").html(t1[1]);
-	$("#td3").html(t1[2]);
-	$("#td4").html(t1[3]);
-	$("#td5").html(t1[4]);
-	$("#td6").html(t1[5]);
-	$("#td7").html(t1[6]);
-	$("#td8").html(t1[7]);
-	$("#td9").html(t1[8]);
-	$("#td10").html(t1[9]);
-	$("#td11").html(t1[10]);
-	$("#td12").html(t1[11]);
-	$("#td13").html(t1[12]);
-	$("#td14").html(t1[13]);
-	$("#td15").html(t1[14]);
-	$("#td16").html(t1[15]);
-	$("#td17").html(t1[16]);
-	$("#td18").html(t1[17]);
-	$("#td19").html(t1[18]);
-	$("#td20").html(t1[19]);
-	$("#td21").html(t1[20]);
-	$("#td22").html(t1[21]);
-	$("#td23").html(t1[22]);
-	$("#td24").html(t1[23]);
-	$("#td25").html(t2[0]);
-	$("#td26").html(t2[1]);
-	$("#td27").html(t2[2]);
+function table1(t1, t2) {
+    $("#td1").html(t1[0]);
+    $("#td2").html(t1[1]);
+    $("#td3").html(t1[2]);
+    $("#td4").html(t1[3]);
+    $("#td5").html(t1[4]);
+    $("#td6").html(t1[5]);
+    $("#td7").html(t1[6]);
+    $("#td8").html(t1[7]);
+    $("#td9").html(t1[8]);
+    $("#td10").html(t1[9]);
+    $("#td11").html(t1[10]);
+    $("#td12").html(t1[11]);
+    $("#td13").html(t1[12]);
+    $("#td14").html(t1[13]);
+    $("#td15").html(t1[14]);
+    $("#td16").html(t1[15]);
+    $("#td17").html(t1[16]);
+    $("#td18").html(t1[17]);
+    $("#td19").html(t1[18]);
+    $("#td20").html(t1[19]);
+    $("#td21").html(t1[20]);
+    $("#td22").html(t1[21]);
+    $("#td23").html(t1[22]);
+    $("#td24").html(t1[23]);
+    $("#td25").html(t2[0]);
+    $("#td26").html(t2[1]);
+    $("#td27").html(t2[2]);
 
 }

+ 163 - 187
root.html

@@ -3,9 +3,9 @@
 <head>
     <meta charset="UTF-8" name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no">
     <title>松北区1.3事件应急抢险工程现场信息采集系统</title>
-    <script type="text/javascript" src="js/jquery.min.js"></script>
-	<link rel="stylesheet" href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
-	<script src="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
+    <script src="https://code.jquery.com/jquery-1.12.4.min.js" integrity="sha256-ZosEbRLbNQzLpnKIkEdrPv7lOy9C27hHQ+Xp8a4MxAQ=" crossorigin="anonymous"></script>
+    <link rel="stylesheet" href="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/css/bootstrap.min.css">
+    <script src="https://cdn.staticfile.org/twitter-bootstrap/3.3.7/js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/echarts.min.js"></script>
     <script type="text/javascript" src="js/visual.js"></script>
     <script type="text/javascript" src="js/times.js"></script>
@@ -13,21 +13,16 @@
     <script type="text/javascript" include="bootstrap" src="js/include-web.js"></script>
     <script type="text/javascript" exclude="iclient-classic" src="dist/classic/include-classic.js"></script>
     <link rel="stylesheet" href="css/common.css">
-	<style type="text/css">
+    <style type="text/css">
         #map {
             position: absolute;
             width: 100%;
             height: 100%;
         }
     </style>
-<body>
-<div>
-    <!--加载动画-->
-    <div class="loading">
-        <div class="loadbox"><img src="images/loading.gif"> loading...</div>
-    </div>
-    <div class="back"></div>
 
+<body>
+    <div class="map" id="map"></div>
     <!--主体指标-->
     <div class="mainbox">
         <ul class="clearfix">
@@ -39,103 +34,49 @@
                 <div class="boxall" style="height:110px;">
                     <div class="alltitle">防疫日期选择</div>
                     <div class="navboxall">
-						防疫日期:<input type="date" id="datefy" style="width:240px"/></br>
-						查询标段:<select id="biaoduanfy" style="width:240px">
-									  <option value ="合计" select>合计</option>
-									  <option value ="一标段">一标段</option>
-									  <option value="二标段">二标段</option>
-								  </select></br>
-						<input type="button" value="查询" style="height:24px;width:40px" onclick="javascript:searchfangyi()"/>
-					</div>
+                        防疫日期:<input type="date" id="datefy" style="width:240px" /></br>
+                        查询标段:<select id="biaoduanfy" style="width:240px">
+                            <option value="合计" select>合计</option>
+                            <option value="一标段">一标段</option>
+                            <option value="二标段">二标段</option>
+                        </select></br>
+                        <input type="button" value="查询" style="height:24px;width:40px"
+                            onclick="javascript:searchfangyi()" />
+                    </div>
                 </div>
                 <div class="boxall" style="height:230px;">
                     <div class="alltitle">异常体温人数</div>
                     <div class="navboxall" id="echart1">
-                        
+
                     </div>
                 </div>
                 <div class="boxall" style="height:410px;">
                     <div class="alltitle">施工进度统计</div>
                     <div class="navboxall">
-						<table class="table1" width="100%" border="1" cellspacing="0" cellpadding="0">
-                            <tbody>
-                            <tr>
-                                <th scope="col">&nbsp;</th>
-                                <th scope="col">一标段</th>
-                                <th scope="col">二标段</th>
-                                <th scope="col">合计</th>
-                            </tr>
-                            <tr>
-                                <td>作业人数</td>
-                                <td id="td1"></td>
-                                <td id="td2"></td>
-                                <td id="td3"></td>
-                            </tr>
-                            <tr>
-                                <td>作业车数</td>
-                                <td id="td4"></td>
-                                <td id="td5"></td>
-                                <td id="td6"></td>
-                            </tr>
-                            <tr>
-                                <td>运冰车次</td>
-                                <td id="td7"></td>
-                                <td id="td8"></td>
-                                <td id="td9"></td>
-                            </tr>
-                            <tr>
-                                <td>吸污车次</td>
-                                <td id="td10"></td>
-                                <td id="td11"></td>
-                                <td id="td12"></td>
-                            </tr>
-                            <tr>
-                                <td>完成量</td>
-                                <td id="td25"></td>
-                                <td id="td26"></td>
-                                <td id="td27"></td>
-                            </tr>
-                            <tr>
-                                <td>异常天数</td>
-                                <td id="td13"></td>
-                                <td id="td14"></td>
-                                <td id="td15"></td>
-                            </tr>
-                            <tr>
-                                <td>天气原因天数</td>
-                                <td id="td16"></td>
-                                <td id="td17"></td>
-                                <td id="td18"></td>
-                            </tr>
-                            <tr>
-                                <td>人为阻挠施工天数</td>
-                                <td id="td19"></td>
-                                <td id="td20"></td>
-                                <td id="td21"></td>
-                            </tr>
-                            <tr>
-                                <td>疫情原因天数</td>
-                                <td id="td22"></td>
-                                <td id="td23"></td>
-                                <td id="td24"></td>
-                            </tr>
-                            </tbody>
-                        </table>
-					</div>
+                        <div class="wraptit">
+                            <span>&nbsp;</span><span>一标段</span><span>二标段</span><span>合计</span>
+                        </div>
+                        <div class="wrap">
+                            <ul>
+                                <li><p><span>作业人数</span><span id="td1"></span><span id="td2"></span><span id="td3"></span></p></li>
+                                <li><p><span>作业车数</span><span id="td4"></span><span id="td5"></span><span id="td6"></span></p></li>
+                                <li><p><span>运冰车次</span><span id="td7"></span><span id="td8"></span><span id="td9"></span></p></li>
+                                <li><p><span>吸污车次</span><span id="td10"></span><span id="td11"></span><span id="td12"></span></p></li>
+                                <li><p><span>完成量</span><span id="td25"></span><span id="td26"></span><span id="td27"></span></p></li>
+                                <li><p><span>异常天数</span><span id="td13"></span><span id="td14"></span><span id="td15"></span></p></li>
+                                <li><p><span>天气原因天数</span><span id="td16"></span><span id="td17"></span><span id="td18"></span></p></li>
+                                <li><p><span>人为阻挠施工天数</span><span id="td19"></span><span id="td20"></span><span id="td21"></span></p></li>
+                                <li><p><span>疫情原因天数</span><span id="td22"></span><span id="td23"></span><span id="td24"></span></p></li>
+                            </ul>
+                        </div>
+                    </div>
                 </div>
             </li>
             <li>
                 <div class="boxall" style="height:230px">
                     <div class="norm" style="height: 100%">
                         <h1>松北区1.3事件应急抢险工程现场信息采集系统</h1>
-                        <div class="times"><img src="images/attendance.png" alt=""><span id="showTime"></span></div>
-                    </div>
-                </div>
-                <div class="boxmap" style="height:650px; width:1142px">
-                    <div class="navboxall" id="echart4"><div id="map"></div></div>
-
-                    <div class="boxsub" style="height:260px;width:1142px">
-                        <div class="navboxall" id="echart3"></div>
+                        <div class="numtxt"><span id="showTime"></span></div>
                     </div>
                 </div>
             </li>
@@ -143,14 +84,15 @@
                 <div class="boxall" style="height:300px">
                     <div class="alltitle">施工进度日期选择</div>
                     <div class="navboxall">
-                        开始日期:<input type="date" id="datestart" style="width:240px"/></br>
-						结束日期:<input type="date" id="dateend" style="width:240px"/></br>
-						查询标段:<select id="biaoduan" style="width:240px">
-									  <option value ="合计" select>合计</option>
-									  <option value ="一标段">一标段</option>
-									  <option value="二标段">二标段</option>
-								  </select></br>
-						<input type="button" value="查询" style="height:24px;width:40px" onclick="javascript:searchjindu()"/>
+                        开始日期:<input type="date" id="datestart" style="width:240px" /></br>
+                        结束日期:<input type="date" id="dateend" style="width:240px" /></br>
+                        查询标段:<select id="biaoduan" style="width:240px">
+                            <option value="合计" select>合计</option>
+                            <option value="一标段">一标段</option>
+                            <option value="二标段">二标段</option>
+                        </select></br>
+                        <input type="button" value="查询" style="height:24px;width:40px"
+                            onclick="javascript:searchjindu()" />
                     </div>
                 </div>
 
@@ -159,59 +101,83 @@
                     <div class="navboxall">
                         <table class="table1" width="100%" border="0" cellspacing="0" cellpadding="0">
                             <tbody>
-                            <tr>
-                                <th scope="col" style="width:100px">上报日期</th>
-                                <th scope="col" id="sbrq" style="width:220px"></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">防控人数</th>
-                                <th scope="col" id="fkrs" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">异常体温</th>
-                                <th scope="col" id="yctw" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">作业人数</th>
-                                <th scope="col" id="zyrs" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">作业车数</th>
-                                <th scope="col" id="zycs" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">运冰车次</th>
-                                <th scope="col" id="ybcc" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">吸污车次</th>
-                                <th scope="col" id="xwcc" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">完成量</th>
-                                <th scope="col" id="wcl" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">补充说明</th>
-                                <th scope="col" id="bcsm" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">现场照片</th>
-                                <th scope="col" id="xczp" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">是否异常</th>
-                                <th scope="col" id="sfyc" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">异常情况</th>
-                                <th scope="col" id="ycqk" style="width:220px"></></th>
-                            </tr>
-                            <tr>
-                                <th scope="col" style="width:100px">异常现场照片</th>
-                                <th scope="col" id="yczp" style="width:220px"></></th>
-                            </tr>
-                            
+                                <tr>
+                                    <th scope="col" style="width:100px">上报日期</th>
+                                    <th scope="col" id="sbrq" style="width:220px"></th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">防控人数</th>
+                                    <th scope="col" id="fkrs" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">异常体温</th>
+                                    <th scope="col" id="yctw" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">作业人数</th>
+                                    <th scope="col" id="zyrs" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">作业车数</th>
+                                    <th scope="col" id="zycs" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">运冰车次</th>
+                                    <th scope="col" id="ybcc" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">吸污车次</th>
+                                    <th scope="col" id="xwcc" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">完成量</th>
+                                    <th scope="col" id="wcl" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">补充说明</th>
+                                    <th scope="col" id="bcsm" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">现场照片</th>
+                                    <th scope="col" id="xczp" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">是否异常</th>
+                                    <th scope="col" id="sfyc" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">异常情况</th>
+                                    <th scope="col" id="ycqk" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th scope="col" style="width:100px">异常现场照片</th>
+                                    <th scope="col" id="yczp" style="width:220px">
+                                        </>
+                                    </th>
+                                </tr>
+
                             </tbody>
                         </table>
                     </div>
@@ -219,38 +185,48 @@
             </li>
         </ul>
     </div>
-</div>
-<div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-					&times;
-				</button>
-				<h4 class="modal-title" id="myModalLabel">
-					现场照片
-				</h4>
-			</div>
-			<div class="modal-body" id="imagediv">
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal -->
-</div>
-<div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-	<div class="modal-dialog">
-		<div class="modal-content">
-			<div class="modal-header">
-				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">
-					&times;
-				</button>
-				<h4 class="modal-title" id="myModalLabel2">
-					异常情况现场照片
-				</h4>
-			</div>
-			<div class="modal-body" id="imagediv">
-			</div>
-		</div><!-- /.modal-content -->
-	</div><!-- /.modal -->
-</div>
+
+    <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
+                    <h4 class="modal-title" id="myModalLabel">
+                        现场照片
+                    </h4>
+                </div>
+                <div class="modal-body" id="imagediv">
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal -->
+    </div>
+    <div class="modal fade" id="myModal2" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                        &times;
+                    </button>
+                    <h4 class="modal-title" id="myModalLabel2">
+                        异常情况现场照片
+                    </h4>
+                </div>
+                <div class="modal-body" id="imagediv">
+                </div>
+            </div><!-- /.modal-content -->
+        </div><!-- /.modal -->
+    </div>
+    <script>
+        $(function () {
+            $('.wrap').liMarquee({
+                direction: 'up',
+                runshort: false,
+                scrollamount: 20
+            });
+        });
+    </script>
 </body>
+
 </html>

部分文件因为文件数量过多而无法显示