Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivWeb
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivWeb
Commits
c39242ef
Commit
c39242ef
authored
Nov 18, 2021
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复withRouter 依赖
parent
a2287125
Pipeline
#38143
passed with stages
in 14 minutes 46 seconds
Changes
5
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
15 deletions
+15
-15
micor.js
config/micor.js
+12
-12
proxy.js
config/proxy.js
+1
-1
index.js
src/containers/App/index.js
+0
-1
micro.js
src/micro.js
+0
-0
infoLogin.js
src/pages/user/login/template/infoLogin.js
+2
-1
No files found.
config/micor.js
View file @
c39242ef
...
...
@@ -3,12 +3,12 @@ export function genActiveRule(routerPrefix) {
}
export
default
{
dev
:
[
//
{
// name: 'civ_monitor
',
// entry: `//${window.location.hostname}:8082/civ_monitor
`,
//
container: '#micro-container',
// activeRule: '/civbase/civ_monitor
',
//
},
{
name
:
'civ_oa
'
,
entry
:
`//
${
window
.
location
.
hostname
}
:8080/civ_oa
`
,
container
:
'#micro-container'
,
activeRule
:
'/civbase/civ_oa
'
,
},
// {
// name: 'civ_water',
// entry: `//${window.location.hostname}:8081/civ_water`,
...
...
@@ -21,12 +21,12 @@ export default {
container
:
'#micro-container'
,
activeRule
:
'/civbase/civ_webgis'
,
},
{
name
:
'civ_webgis'
,
entry
:
`//
${
window
.
location
.
hostname
}
:8080/civ_webgis`
,
container
:
'#micro-container'
,
activeRule
:
'/civbase/civ_energy'
,
},
//
{
//
name: 'civ_webgis',
//
entry: `//${window.location.hostname}:8080/civ_webgis`,
//
container: '#micro-container',
//
activeRule: '/civbase/civ_energy',
//
},
{
name
:
'civweb4'
,
entry
:
`//
${
window
.
location
.
hostname
}
:3020/civweb4`
,
...
...
config/proxy.js
View file @
c39242ef
/* eslint-disable */
// 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
s://mis.panda-water.cn
'
//'http://192.168.12.47:8081';
module
.
exports
=
{
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
...
...
src/containers/App/index.js
View file @
c39242ef
...
...
@@ -23,7 +23,6 @@ const defaultSetting = config.layout;
function
App
(
props
)
{
const
{
routes
}
=
dyRoutes
(
props
.
menu
);
console
.
log
(
"routes"
,
routes
)
return
(
<>
<
Helmet
...
...
src/micro.js
View file @
c39242ef
This diff is collapsed.
Click to expand it.
src/pages/user/login/template/infoLogin.js
View file @
c39242ef
...
...
@@ -9,7 +9,8 @@
import
React
from
'react'
;
import
styles
from
'./style/infoLogin.less'
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
Code
from
'@/assets/oa/login/扫码.png'
import
Web
from
'@/assets/oa/login/电脑.png'
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment