Commit c39242ef authored by 邓晓峰's avatar 邓晓峰

fix: 修复withRouter 依赖

parent a2287125
Pipeline #38143 passed with stages
in 14 minutes 46 seconds
...@@ -3,12 +3,12 @@ export function genActiveRule(routerPrefix) { ...@@ -3,12 +3,12 @@ export function genActiveRule(routerPrefix) {
} }
export default { export default {
dev: [ dev: [
// { {
// name: 'civ_monitor', name: 'civ_oa',
// entry: `//${window.location.hostname}:8082/civ_monitor`, entry: `//${window.location.hostname}:8080/civ_oa`,
// container: '#micro-container', container: '#micro-container',
// activeRule: '/civbase/civ_monitor', activeRule: '/civbase/civ_oa',
// }, },
// { // {
// name: 'civ_water', // name: 'civ_water',
// entry: `//${window.location.hostname}:8081/civ_water`, // entry: `//${window.location.hostname}:8081/civ_water`,
...@@ -21,12 +21,12 @@ export default { ...@@ -21,12 +21,12 @@ export default {
container: '#micro-container', container: '#micro-container',
activeRule: '/civbase/civ_webgis', activeRule: '/civbase/civ_webgis',
}, },
{ // {
name: 'civ_webgis', // name: 'civ_webgis',
entry: `//${window.location.hostname}:8080/civ_webgis`, // entry: `//${window.location.hostname}:8080/civ_webgis`,
container: '#micro-container', // container: '#micro-container',
activeRule: '/civbase/civ_energy', // activeRule: '/civbase/civ_energy',
}, // },
{ {
name: 'civweb4', name: 'civweb4',
entry: `//${window.location.hostname}:3020/civweb4`, entry: `//${window.location.hostname}:3020/civweb4`,
......
/* 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 = 'https://mis.panda-water.cn'
//'http://192.168.12.47:8081'; //'http://192.168.12.47:8081';
module.exports = { module.exports = {
assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './', assetsRoot: process.env.NODE_ENV !== 'production' ? proxyURL : './',
......
...@@ -23,7 +23,6 @@ const defaultSetting = config.layout; ...@@ -23,7 +23,6 @@ const defaultSetting = config.layout;
function App(props) { function App(props) {
const { routes } = dyRoutes(props.menu); const { routes } = dyRoutes(props.menu);
console.log("routes", routes)
return ( return (
<> <>
<Helmet <Helmet
......
This diff is collapsed.
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
import React from 'react'; import React from 'react';
import styles from './style/infoLogin.less' import styles from './style/infoLogin.less'
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { withRouter } from 'react-router-dom'; // import { withRouter } from 'react-router-dom';
import { withRouter } from '@wisdom-utils/runtime';
import Logo from '@/assets/oa/login/信息化logo.png' import Logo from '@/assets/oa/login/信息化logo.png'
import Code from '@/assets/oa/login/扫码.png' import Code from '@/assets/oa/login/扫码.png'
import Web from '@/assets/oa/login/电脑.png' import Web from '@/assets/oa/login/电脑.png'
......
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