Commit 001cce6a authored by 邓晓峰's avatar 邓晓峰

chore: 升级全局配置

parent c8d7d320
Pipeline #47293 skipped with stages
/* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
// const proxyURL = 'https://work.panda-water.cn';
// const proxyURL = 'http://192.168.12.47:8082';
const proxyURL = 'https://panda-water.cn';
const proxyURL = 'http://192.168.12.47:8082';
// const proxyURL = 'https://panda-water.cn';
module.exports = {
......
......@@ -110,9 +110,9 @@
"@wisdom-map/Map": "^1.0.12-17",
"@wisdom-map/arcgismap": "^1.0.79-17",
"@wisdom-map/util": "^1.0.27-0",
"@wisdom-utils/components": "0.0.56",
"@wisdom-utils/components": "0.0.57",
"@wisdom-utils/runtime": "0.0.15",
"@wisdom-utils/utils": "0.0.95",
"@wisdom-utils/utils": "0.0.96",
"animate.css": "^4.1.1",
"antd": "^4.17.4",
"compression": "1.7.4",
......
......@@ -192,7 +192,7 @@ const GlobalHeaderRight = props => {
<HomeIcon onClick={goHome} title={intl.formatMessage({id: 'component.header.icon.home'})} />
<OrderIcon onClick={handleOrder} title={intl.formatMessage({id: 'component.header.icon.order'})} />
</div>
<NoticeIconView title={intl.formatMessage({id: 'component.header.icon.alarm'})} />
{/* <NoticeIconView title={intl.formatMessage({id: 'component.header.icon.alarm'})} /> */}
<Avatar menu global={props.global} updateCurrentIndex={props.updateCurrentIndex} updateConfig={props.updateConfig} logout={props.logout}/>
{/* <SelectLang className={styles.action} /> */}
</div>
......
import React, { useEffect, useRef, useState, useContext } from 'react';
import React, { useEffect, useRef, useState, useContext, Suspense } from 'react';
import { Anchor, Popover, Radio, Spin, Tabs, Divider, Dropdown, Menu, Tooltip, ConfigProvider, Skeleton } from 'antd';
import { PageContainer } from '@ant-design/pro-layout';
......@@ -20,7 +20,7 @@ import { MinPanel } from '@wisdom-utils/components';
import { findPathByLeafId } from '@wisdom-utils/components/lib/AppLayout/helpers';
import RightContent from '@/components/GlobalHeader/ExtendRightContent';
import { actionCreators } from '@/containers/App/store';
import { ArcgisMap, AMap, CesiumMap } from '../pages/map';
// import { ArcgisMap, AMap, CesiumMap } from '../pages/map';
import { WEB_GIS_TYPE } from '../constants';
// import { getBaseName } from '@/utils/utils';
// eslint-disable-next-line import/no-duplicates
......@@ -28,6 +28,9 @@ import SecurityLayout from './SecurityLayout';
import Site from './Site';
import styles from './UserLayout.less';
import layoutStyles from './BasicLayout.less';
const ArcgisMap = React.lazy(() => import('../pages/map/arcgis'));
const AMap = React.lazy(() => import('../pages/map/amap'));
const CesiumMap = React.lazy(() => import('../pages/map/cesiumMap'));
// eslint-disable-next-line import/extensions
const { TabPane } = Tabs;
const { renderRoutes, params } = helpers;
......@@ -686,9 +689,12 @@ const BasicLayout = props => {
{
renderRoutes('panda-console-base', props.route.routes, props)
}
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <KeepAlive><CesiumMap /></KeepAlive> : window.location.pathname.startsWith('/civbase/civ_webgis') ? ((mapMode === 'AMap' ? <AMap/>: <ArcgisMap options={{ type: 'ArcgisMap' }}/>)) : null
}
<Suspense fallback={<></>}>
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <KeepAlive><CesiumMap /></KeepAlive> : window.location.pathname.startsWith('/civbase/civ_webgis') ? ((mapMode === 'AMap' ? <AMap/>: <ArcgisMap options={{ type: 'ArcgisMap' }}/>)) : null
}
</Suspense>
<div id="micro-container" className="subapp-container">
{props.children}
......@@ -706,9 +712,11 @@ const BasicLayout = props => {
renderRoutes('panda-console-base', props.route.routes, props)
}
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <KeepAlive><CesiumMap /></KeepAlive> : window.location.pathname.startsWith('/civbase/civ_webgis') ? ((mapMode === 'AMap' ? <AMap/>: <ArcgisMap options={{ type: 'ArcgisMap' }}/>)) : null
}
<Suspense fallback={<></>}>
{
window.location.pathname.startsWith('/civbase/civ_3d') ? <KeepAlive><CesiumMap /></KeepAlive> : window.location.pathname.startsWith('/civbase/civ_webgis') ? ((mapMode === 'AMap' ? <AMap/>: <ArcgisMap options={{ type: 'ArcgisMap' }}/>)) : null
}
</Suspense>
<div id="micro-container" className="subapp-container">
{/*<CreateBaseMap/>*/}
{props.children}
......
......@@ -2,7 +2,7 @@ import React from 'react';
import { AMapScene } from '@wisdom-map/Amap';
import { connect } from 'react-redux';
import { store } from '@wisdom-utils/utils';
import { actionCreators } from '../../../containers/App/store';
const AMap = props => {
const getMap = (obj, current) => {
store.set('amapView', {
......
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