Commit 563d35c9 authored by 邓晓峰's avatar 邓晓峰

fix: 修复client获取undefined

parent 97912df8
This diff was suppressed by a .gitattributes entry.
...@@ -16,10 +16,10 @@ export default { ...@@ -16,10 +16,10 @@ export default {
// activeRule: '/civbase/civ_water', // activeRule: '/civbase/civ_water',
// }, // },
{ {
name: 'civ_water', name: 'civ_pandawork',
entry: `//${window.location.hostname}:8081/civ_water`, entry: `//${window.location.hostname}:8080/civ_pandawork`,
container: '#micro-container', container: '#micro-container',
activeRule: '/civbase/civ_water', activeRule: '/civbase/civ_pandawork',
}, },
// { // {
// name: 'civ_webgis', // name: 'civ_webgis',
......
/* eslint-disable */ /* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin; // const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
const proxyURL = 'http://192.168.10.150:8669'; const proxyURL = 'http://192.168.10.156:8666';
module.exports = { module.exports = {
assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
dev: { dev: {
......
...@@ -30,9 +30,10 @@ class SecurityLayout extends React.Component { ...@@ -30,9 +30,10 @@ class SecurityLayout extends React.Component {
if(_.isNull(global.token) || (global.hasGateWay && _.isNull(global.access_token))) { if(_.isNull(global.token) || (global.hasGateWay && _.isNull(global.access_token))) {
this.props.updateCurrentIndex && this.props.updateCurrentIndex(0); this.props.updateCurrentIndex && this.props.updateCurrentIndex(0);
window.share && window.share.event && window.share.event.emit('initConfig') window.share && window.share.event && window.share.event.emit('initConfig');
const client = global.client ? global.client: 'city';
return ( return (
<Redirect to={`/user/login?client=${global.client}`} /> <Redirect to={`/user/login?client=${client}`} />
); );
} }
......
...@@ -117,7 +117,7 @@ export const initMicroApps = (loader, store) => { ...@@ -117,7 +117,7 @@ export const initMicroApps = (loader, store) => {
excludeAssetFilter: url => excludeAssetFilter: url =>
url.indexOf('framework/highcharts') !== -1 || url.indexOf('framework/highcharts') !== -1 ||
// url.indexOf('framework/amap/AMap.UI') !== -1 || // url.indexOf('framework/amap/AMap.UI') !== -1 ||
url.indexOf('framework/amap/init.js') !== -1 || // url.indexOf('framework/amap/init.js') !== -1 ||
url.indexOf('jquery') !== -1 || url.indexOf('jquery') !== -1 ||
url.indexOf('managers/MapManager.js') !== -1 || url.indexOf('managers/MapManager.js') !== -1 ||
url.indexOf('jquery.mCustomScrollbar.js') !== -1 || url.indexOf('jquery.mCustomScrollbar.js') !== -1 ||
......
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