Skip to content

C
CivWeb
Commit f036cc07 authored by 邓晓峰's avatar 邓晓峰
Browse files
Options

merge: 合并集成arcgis

parent 6c9ce0a4
Pipeline #46250 passed with stages
        in 11 minutes 11 seconds
        Hide whitespace changes
        Inline Side-by-side
        Showing with 0 additions and 183 deletions
        config/config.js
        View file @ f036cc07
        ...@@ -4,9 +4,7 @@ const defaultSetting = require('./defaultSetting'); ...@@ -4,9 +4,7 @@ const defaultSetting = require('./defaultSetting');
        const cesiumBuild = '../node_modules/cesium/Build/Cesium'; const cesiumBuild = '../node_modules/cesium/Build/Cesium';
        const pkgName = require('../package.json').name; const pkgName = require('../package.json').name;
        // eslint-disable-next-line import/order // eslint-disable-next-line import/order
        const path = require('path');
        const { REACT_APP_ENV } = process.env; const { REACT_APP_ENV } = process.env;
        const pkgName = require('../package.json').name;
        const path = require('path'); const path = require('path');
        const CESIUM_BASE_URL = `/${pkgName}`; const CESIUM_BASE_URL = `/${pkgName}`;
        module.exports = { module.exports = {
        ......
        package-lock.json
        View file @ f036cc07
        ...@@ -3996,11 +3996,6 @@ ...@@ -3996,11 +3996,6 @@
        "version": "6.5.0", "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fnearest-point/-/nearest-point-6.5.0.tgz", "resolved": "https://g.civnet.cn:4873/@turf%2fnearest-point/-/nearest-point-6.5.0.tgz",
        "integrity": "sha1-LxeBwm/z8FQAXU/zUgQpczGLkvE=", "integrity": "sha1-LxeBwm/z8FQAXU/zUgQpczGLkvE=",
        <<<<<<< HEAD
        "requires": {
        "@turf/clone": "^6.5.0",
        "@turf/distance": "^6.5.0",
        =======
        "requires": { "requires": {
        "@turf/clone": "^6.5.0", "@turf/clone": "^6.5.0",
        "@turf/distance": "^6.5.0", "@turf/distance": "^6.5.0",
        ...@@ -4140,160 +4135,15 @@ ...@@ -4140,160 +4135,15 @@
        "integrity": "sha1-0qrYYjcL8D8icHARFUZKhAbBRLI=", "integrity": "sha1-0qrYYjcL8D8icHARFUZKhAbBRLI=",
        "requires": { "requires": {
        "@turf/clone": "^6.5.0", "@turf/clone": "^6.5.0",
        >>>>>>> master
        "@turf/helpers": "^6.5.0", "@turf/helpers": "^6.5.0",
        "@turf/meta": "^6.5.0" "@turf/meta": "^6.5.0"
        } }
        }, },
        <<<<<<< HEAD
        "@turf/nearest-point-on-line": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fnearest-point-on-line/-/nearest-point-on-line-6.5.0.tgz",
        "integrity": "sha1-jhzSzcC1rK9MjYs7M7sAjTy5nns=",
        "requires": {
        "@turf/bearing": "^6.5.0",
        "@turf/destination": "^6.5.0",
        "@turf/distance": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0",
        "@turf/line-intersect": "^6.5.0",
        "@turf/meta": "^6.5.0"
        }
        },
        "@turf/nearest-point-to-line": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fnearest-point-to-line/-/nearest-point-to-line-6.5.0.tgz",
        "integrity": "sha1-VUm0hpDVI/mvR2X+ZKPL6/vGu3U=",
        "requires": {
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0",
        "@turf/meta": "^6.5.0",
        "@turf/point-to-line-distance": "^6.5.0",
        "object-assign": "*"
        }
        },
        "@turf/planepoint": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fplanepoint/-/planepoint-6.5.0.tgz",
        "integrity": "sha1-XLeIZwwxprBkrkZBgNUbTVUNh94=",
        "requires": {
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0"
        }
        },
        "@turf/point-grid": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpoint-grid/-/point-grid-6.5.0.tgz",
        "integrity": "sha1-9ijTCv4p1g3L9UsZXkbqtIpPv6o=",
        "requires": {
        "@turf/boolean-within": "^6.5.0",
        "@turf/distance": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0"
        }
        },
        "@turf/point-on-feature": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpoint-on-feature/-/point-on-feature-6.5.0.tgz",
        "integrity": "sha1-N9B6/rMYluU8CDOqQEmTun1QDww=",
        "requires": {
        "@turf/boolean-point-in-polygon": "^6.5.0",
        "@turf/center": "^6.5.0",
        "@turf/explode": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/nearest-point": "^6.5.0"
        }
        },
        "@turf/point-to-line-distance": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpoint-to-line-distance/-/point-to-line-distance-6.5.0.tgz",
        "integrity": "sha1-vEb+CepjCq9z8TxAs4p995BQ//g=",
        "requires": {
        "@turf/bearing": "^6.5.0",
        "@turf/distance": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0",
        "@turf/meta": "^6.5.0",
        "@turf/projection": "^6.5.0",
        "@turf/rhumb-bearing": "^6.5.0",
        "@turf/rhumb-distance": "^6.5.0"
        }
        },
        "@turf/points-within-polygon": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpoints-within-polygon/-/points-within-polygon-6.5.0.tgz",
        "integrity": "sha1-1J9NfPGbekQL8eBvdx/04d8TEH8=",
        "requires": {
        "@turf/boolean-point-in-polygon": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/meta": "^6.5.0"
        }
        },
        "@turf/polygon-smooth": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpolygon-smooth/-/polygon-smooth-6.5.0.tgz",
        "integrity": "sha1-AMo2aHHLbqO+5E/z6ocKr3VxFzM=",
        "requires": {
        "@turf/helpers": "^6.5.0",
        "@turf/meta": "^6.5.0"
        }
        },
        "@turf/polygon-tangents": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpolygon-tangents/-/polygon-tangents-6.5.0.tgz",
        "integrity": "sha1-3AJSAnJ7ovM0e6qV28pOD/2y3fU=",
        "requires": {
        "@turf/bbox": "^6.5.0",
        "@turf/boolean-within": "^6.5.0",
        "@turf/explode": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0",
        "@turf/nearest-point": "^6.5.0"
        }
        },
        "@turf/polygon-to-line": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpolygon-to-line/-/polygon-to-line-6.5.0.tgz",
        "integrity": "sha1-TchttmFosyu4PORIz5ZiCKRH2VI=",
        "requires": {
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0"
        }
        },
        "@turf/polygonize": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fpolygonize/-/polygonize-6.5.0.tgz",
        "integrity": "sha1-iqDx44bpbFM6MgxCaq84cCAyD6M=",
        "requires": {
        "@turf/boolean-point-in-polygon": "^6.5.0",
        "@turf/envelope": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/invariant": "^6.5.0",
        "@turf/meta": "^6.5.0"
        }
        },
        "@turf/projection": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2fprojection/-/projection-6.5.0.tgz",
        "integrity": "sha1-0qrYYjcL8D8icHARFUZKhAbBRLI=",
        "requires": {
        "@turf/clone": "^6.5.0",
        "@turf/helpers": "^6.5.0",
        "@turf/meta": "^6.5.0"
        }
        },
        "@turf/random": {
        "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2frandom/-/random-6.5.0.tgz",
        "integrity": "sha1-sZZyz0VJVXZgA01KMDkRZW33dH4=",
        "requires": {
        =======
        "@turf/random": { "@turf/random": {
        "version": "6.5.0", "version": "6.5.0",
        "resolved": "https://g.civnet.cn:4873/@turf%2frandom/-/random-6.5.0.tgz", "resolved": "https://g.civnet.cn:4873/@turf%2frandom/-/random-6.5.0.tgz",
        "integrity": "sha1-sZZyz0VJVXZgA01KMDkRZW33dH4=", "integrity": "sha1-sZZyz0VJVXZgA01KMDkRZW33dH4=",
        "requires": { "requires": {
        >>>>>>> master
        "@turf/helpers": "^6.5.0" "@turf/helpers": "^6.5.0"
        } }
        }, },
        ...@@ -7748,8 +7598,6 @@ ...@@ -7748,8 +7598,6 @@
        "turf": "^3.0.14" "turf": "^3.0.14"
        } }
        }, },
        <<<<<<< HEAD
        =======
        "@wisdom-components/basictable": { "@wisdom-components/basictable": {
        "version": "1.5.16", "version": "1.5.16",
        "resolved": "https://g.civnet.cn:4873/@wisdom-components%2fbasictable/-/basictable-1.5.16.tgz", "resolved": "https://g.civnet.cn:4873/@wisdom-components%2fbasictable/-/basictable-1.5.16.tgz",
        ...@@ -7758,7 +7606,6 @@ ...@@ -7758,7 +7606,6 @@
        "classnames": "^2.2.6" "classnames": "^2.2.6"
        } }
        }, },
        >>>>>>> master
        "@wisdom-components/empty": { "@wisdom-components/empty": {
        "version": "1.4.3", "version": "1.4.3",
        "resolved": "https://g.civnet.cn:4873/@wisdom-components%2fempty/-/empty-1.4.3.tgz", "resolved": "https://g.civnet.cn:4873/@wisdom-components%2fempty/-/empty-1.4.3.tgz",
        ...@@ -11205,10 +11052,6 @@ ...@@ -11205,10 +11052,6 @@
        "version": "0.3.0", "version": "0.3.0",
        "resolved": "https://g.civnet.cn:4873/create-react-context/-/create-react-context-0.3.0.tgz", "resolved": "https://g.civnet.cn:4873/create-react-context/-/create-react-context-0.3.0.tgz",
        "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==", "integrity": "sha512-dNldIoSuNSvlTJ7slIKC/ZFGKexBMBrrcc+TTe1NdmROnaASuLPvqpwj9v4XS4uXZ8+YPu0sNmShX2rXI5LNsw==",
        <<<<<<< HEAD
        =======
        "dev": true,
        >>>>>>> master
        "requires": { "requires": {
        "gud": "^1.0.0", "gud": "^1.0.0",
        "warning": "^4.0.3" "warning": "^4.0.3"
        ...@@ -15096,12 +14939,7 @@ ...@@ -15096,12 +14939,7 @@
        "gud": { "gud": {
        "version": "1.0.0", "version": "1.0.0",
        "resolved": "https://g.civnet.cn:4873/gud/-/gud-1.0.0.tgz", "resolved": "https://g.civnet.cn:4873/gud/-/gud-1.0.0.tgz",
        <<<<<<< HEAD
        "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw=="
        =======
        "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==",
        "dev": true
        >>>>>>> master
        }, },
        "gzip-size": { "gzip-size": {
        "version": "5.1.1", "version": "5.1.1",
        ...@@ -25272,10 +25110,6 @@ ...@@ -25272,10 +25110,6 @@
        "version": "0.9.9", "version": "0.9.9",
        "resolved": "https://g.civnet.cn:4873/react-activation/-/react-activation-0.9.9.tgz", "resolved": "https://g.civnet.cn:4873/react-activation/-/react-activation-0.9.9.tgz",
        "integrity": "sha512-KeCbPGkWnRzYKxwaS3nEnsDIWLzrjKT5GfBb3WlzT1lunSVIeAhUP8vu6yoCgTv/GRYLpC+SGEmVGULyegKlaw==", "integrity": "sha512-KeCbPGkWnRzYKxwaS3nEnsDIWLzrjKT5GfBb3WlzT1lunSVIeAhUP8vu6yoCgTv/GRYLpC+SGEmVGULyegKlaw==",
        <<<<<<< HEAD
        =======
        "dev": true,
        >>>>>>> master
        "requires": { "requires": {
        "create-react-context": "^0.3.0", "create-react-context": "^0.3.0",
        "hoist-non-react-statics": "^3.3.0", "hoist-non-react-statics": "^3.3.0",
        ...@@ -25502,10 +25336,6 @@ ...@@ -25502,10 +25336,6 @@
        "version": "0.3.1", "version": "0.3.1",
        "resolved": "https://g.civnet.cn:4873/react-node-key/-/react-node-key-0.3.1.tgz", "resolved": "https://g.civnet.cn:4873/react-node-key/-/react-node-key-0.3.1.tgz",
        "integrity": "sha512-PPMeZiDD5Od4cnEamiDZUifVgK7DKhan2NeYZPCmH5xsaeKDc+UrcQJK21CelLcyaMjPiQz1cxAR2hD4AB9I7g==", "integrity": "sha512-PPMeZiDD5Od4cnEamiDZUifVgK7DKhan2NeYZPCmH5xsaeKDc+UrcQJK21CelLcyaMjPiQz1cxAR2hD4AB9I7g==",
        <<<<<<< HEAD
        =======
        "dev": true,
        >>>>>>> master
        "requires": { "requires": {
        "jsx-ast-utils": "^2.2.1", "jsx-ast-utils": "^2.2.1",
        "szfe-tools": "^0.0.0-beta.7" "szfe-tools": "^0.0.0-beta.7"
        ...@@ -27416,14 +27246,11 @@ ...@@ -27416,14 +27246,11 @@
        "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==", "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
        "dev": true "dev": true
        }, },
        <<<<<<< HEAD
        =======
        "size-sensor": { "size-sensor": {
        "version": "1.0.1", "version": "1.0.1",
        "resolved": "https://g.civnet.cn:4873/size-sensor/-/size-sensor-1.0.1.tgz", "resolved": "https://g.civnet.cn:4873/size-sensor/-/size-sensor-1.0.1.tgz",
        "integrity": "sha1-+E5GIG0+JZ+v8dVI5LO+ypMhnbs=" "integrity": "sha1-+E5GIG0+JZ+v8dVI5LO+ypMhnbs="
        }, },
        >>>>>>> master
        "skmeans": { "skmeans": {
        "version": "0.9.7", "version": "0.9.7",
        "resolved": "https://g.civnet.cn:4873/skmeans/-/skmeans-0.9.7.tgz", "resolved": "https://g.civnet.cn:4873/skmeans/-/skmeans-0.9.7.tgz",
        ...@@ -29335,10 +29162,6 @@ ...@@ -29335,10 +29162,6 @@
        "version": "0.0.0-beta.7", "version": "0.0.0-beta.7",
        "resolved": "https://g.civnet.cn:4873/szfe-tools/-/szfe-tools-0.0.0-beta.7.tgz", "resolved": "https://g.civnet.cn:4873/szfe-tools/-/szfe-tools-0.0.0-beta.7.tgz",
        "integrity": "sha1-WAusvD1ONTxqwAqzN7A3qlPRTpY=", "integrity": "sha1-WAusvD1ONTxqwAqzN7A3qlPRTpY=",
        <<<<<<< HEAD
        =======
        "dev": true,
        >>>>>>> master
        "requires": { "requires": {
        "@babel/runtime": "^7.10.2" "@babel/runtime": "^7.10.2"
        } }
        ...@@ -32351,8 +32174,6 @@ ...@@ -32351,8 +32174,6 @@
        "integrity": "sha1-6NV3TRwHOKR7z6hynzcS4t7d6yU=", "integrity": "sha1-6NV3TRwHOKR7z6hynzcS4t7d6yU=",
        "dev": true "dev": true
        }, },
        <<<<<<< HEAD
        =======
        "zrender": { "zrender": {
        "version": "5.3.0", "version": "5.3.0",
        "resolved": "https://g.civnet.cn:4873/zrender/-/zrender-5.3.0.tgz", "resolved": "https://g.civnet.cn:4873/zrender/-/zrender-5.3.0.tgz",
        ...@@ -32368,7 +32189,6 @@ ...@@ -32368,7 +32189,6 @@
        } }
        } }
        }, },
        >>>>>>> master
        "zwitch": { "zwitch": {
        "version": "1.0.5", "version": "1.0.5",
        "resolved": "https://g.civnet.cn:4873/zwitch/-/zwitch-1.0.5.tgz", "resolved": "https://g.civnet.cn:4873/zwitch/-/zwitch-1.0.5.tgz",
        src/layouts/BasicLayout1.js
        View file @ f036cc07
        ...@@ -37,7 +37,6 @@ import { connect } from 'react-redux'; ...@@ -37,7 +37,6 @@ import { connect } from 'react-redux';
        import { Router, Switch, useHistory } from '@wisdom-utils/runtime'; import { Router, Switch, useHistory } from '@wisdom-utils/runtime';
        import RightContent from '@/components/GlobalHeader/ExtendRightContent'; import RightContent from '@/components/GlobalHeader/ExtendRightContent';
        import Panel from '@/components/SliderPanel/MinPanel'; import Panel from '@/components/SliderPanel/MinPanel';
        import CesiumMap from '../pages/cesiumMap';
        import { actionCreators } from '@/containers/App/store'; import { actionCreators } from '@/containers/App/store';
        import CreateBaseMap from '@/pages/map'; import CreateBaseMap from '@/pages/map';
        import CesiumMap from '@/pages/cesiumMap'; import CesiumMap from '@/pages/cesiumMap';
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment