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
        Expand all Show whitespace changes
        Inline Side-by-side
        Showing with 0 additions and 3 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
        This diff is collapsed.
        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