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
4230c42a
Commit
4230c42a
authored
Nov 18, 2021
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 修复路由问题
parent
c39242ef
Pipeline
#38152
skipped with stages
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
6 deletions
+7
-6
micor.js
config/micor.js
+3
-3
proxy.js
config/proxy.js
+1
-1
BasicLayout1.js
src/layouts/BasicLayout1.js
+1
-2
micro.js
src/micro.js
+2
-0
No files found.
config/micor.js
View file @
4230c42a
...
...
@@ -4,10 +4,10 @@ export function genActiveRule(routerPrefix) {
export
default
{
dev
:
[
{
name
:
'civ_
oa
'
,
entry
:
`//
${
window
.
location
.
hostname
}
:808
0/civ_oa
`
,
name
:
'civ_
energy
'
,
entry
:
`//
${
window
.
location
.
hostname
}
:808
1/civ_energy
`
,
container
:
'#micro-container'
,
activeRule
:
'/civbase/civ_
oa
'
,
activeRule
:
'/civbase/civ_
energy
'
,
},
// {
// name: 'civ_water',
...
...
config/proxy.js
View file @
4230c42a
/* eslint-disable */
// const proxyURL = process.env.NODE_ENV !== 'production' ? 'http://192.168.10.150:8777' : window.location.origin;
const
proxyURL
=
'http
s://mis.panda-water.cn
'
const
proxyURL
=
'http
://192.168.12.136:8989
'
//'http://192.168.12.47:8081';
module
.
exports
=
{
assetsRoot
:
process
.
env
.
NODE_ENV
!==
'production'
?
proxyURL
:
'./'
,
...
...
src/layouts/BasicLayout1.js
View file @
4230c42a
...
...
@@ -252,7 +252,6 @@ const BasicLayout = props => {
/* eslint-disable no-unused-vars */
const
{
getPrefixCls
}
=
useContext
(
ConfigProvider
.
ConfigContext
);
const
prefixCls
=
props
.
prefixCls
||
getPrefixCls
(
''
);
console
.
log
(
"prefixCls"
,
prefixCls
);
// const [currentRoutes, setCurrentRoutes] = useState([]);
const
[
collapse
,
setCollapse
]
=
useState
(
false
);
const
[
toggleSystem
,
setToggleSystem
]
=
useState
(
false
);
...
...
@@ -628,7 +627,7 @@ const BasicLayout = props => {
item
.
routes
?
renderChildrenMenu
(
item
)
:
(
<>
{
item
.
icon
?
item
.
icon
:
item
.
extData
&&
/.svg/
.
test
(
item
.
extData
.
icon
)
?
<
ReactSVG
src
=
{
item
.
extData
.
icon
}
beforeInjection
=
{
svg
=>
console
.
log
(
svg
)}
style
=
{{
width
:
'18px'
,
height
:
'18px'
}}
/>:item.extData && <img src={item.extData.icon} style={{width: '18px', height: '18px'}}/
>
item
.
icon
?
item
.
icon
:
item
.
extData
&&
/.svg/
.
test
(
item
.
extData
.
icon
)
?
<
ReactSVG
src
=
{
item
.
extData
.
icon
}
style
=
{{
width
:
'18px'
,
height
:
'18px'
}}
/>:item.extData && <img src={item.extData.icon} style={{width: '18px', height: '18px'}}/
>
}
<
span
className
=
{
layoutStyles
[
'menu-item-name'
]}
>
{
item
.
name
}
<
/span
>
{
...
...
src/micro.js
View file @
4230c42a
...
...
@@ -180,6 +180,8 @@ export const defaultApp = () => {
const
config
=
createStoreage
.
get
(
'globalConfig'
);
if
(
config
&&
config
.
token
)
{
// const startWith = config.homepage ? config.homepage.split('/') : [];
// console.log(findPathByLeafId(config.homepage, '', 'url'))
const
basePath
=
...
...
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