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
c57d778f
Commit
c57d778f
authored
3 years ago
by
邓晓峰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: locales LocaleContainer
parent
3f5979a2
Pipeline
#47276
skipped with stages
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
7 deletions
+9
-7
NoticeIconView.js
src/components/GlobalHeader/NoticeIconView.js
+1
-1
BasicLayout1.js
src/layouts/BasicLayout1.js
+4
-4
UserLayout.js
src/layouts/UserLayout.js
+3
-1
index.js
src/pages/bootpage/index.js
+1
-1
No files found.
src/components/GlobalHeader/NoticeIconView.js
View file @
c57d778f
...
...
@@ -12,7 +12,7 @@ import {
findPathByWidget
,
isJSON
,
}
from
'@wisdom-utils/components/lib/AppLayout/helpers'
;
import
{
FormattedMessage
}
from
'@
/locales/localeExpor
ts'
;
import
{
FormattedMessage
}
from
'@
wisdom-utils/componen
ts'
;
import
service
from
'../../api/service/notification'
;
import
{
actionCreators
}
from
'../../containers/App/store'
;
import
isProd
from
'../../utils/env'
;
...
...
This diff is collapsed.
Click to expand it.
src/layouts/BasicLayout1.js
View file @
c57d778f
...
...
@@ -653,11 +653,11 @@ const BasicLayout = props => {
onChange
=
{
index
=>
handleUpdateCurrentIndex
(
index
)}
data
=
{
props
.
route
.
routes
||
[]}
/
>
<
SettingDrawer
{
/*
<SettingDrawer
settings={defaultSetting}
onSettingChange={config => updateSettings(config)}
publicPath={`${window.location.origin}/${basename}/theme`}
/
>
/>
*/
}
<
div
className
=
{
classNames
(
layoutStyles
[
'basicLayout-content'
],
{
[
layoutStyles
[
'hook_web4'
]]:
location
.
pathname
.
startsWith
(
'/civbase/civweb4'
)
})}
>
...
...
@@ -718,7 +718,7 @@ const BasicLayout = props => {
<
/div
>
<
PageContainer
style
=
{{
paddingTop
:
'0px'
,
height
:
'100%'
}}
>
{
renderRoutes
(
props
.
route
.
routes
,
this
.
props
.
global
)
renderRoutes
(
props
.
route
.
routes
,
props
)
}
{
...
...
@@ -742,7 +742,7 @@ const BasicLayout = props => {
): (
<PageContainer style={{paddingTop: '
0
px
', height: '
100
%
'}}>
{
renderRoutes(props.route.routes,
this.props.global
)
renderRoutes(props.route.routes,
props
)
}
{
...
...
This diff is collapsed.
Click to expand it.
src/layouts/UserLayout.js
View file @
c57d778f
...
...
@@ -13,6 +13,7 @@ const UserLayout = props => {
routes
:
[],
},
}
=
props
;
console
.
log
(
props
)
const
{
breadcrumb
}
=
getMenuData
(
route
.
routes
);
const
title
=
getPageTitle
({
breadcrumb
,
...
...
@@ -34,7 +35,8 @@ const UserLayout = props => {
<
div
className
=
{
styles
.
container
}
>
<
div
className
=
{
styles
.
content
}
>
{
renderRoutes
(
route
.
routes
,
props
.
global
)}
{
renderRoutes
(
route
.
routes
,
props
)}
{
props
.
children
}
<
/div
>
{
/* <DefaultFooter links={[]} copyright="Copyright © 熊猫智慧水务 2020 All Rights Reserved 沪ICP备11036640-1"/> */
}
...
...
This diff is collapsed.
Click to expand it.
src/pages/bootpage/index.js
View file @
c57d778f
...
...
@@ -180,7 +180,7 @@ const BootPage = props => {
<
/div
>
{
hasRole
?
(
<
div
className
=
{
styles
.
cloudMonitorBtns
}
>
<
div
class
=
"cloud-using-anaylysis-btn"
onClick
=
{
toOMSUsingAnalysis
}
>
<
div
class
Name
=
"cloud-using-anaylysis-btn"
onClick
=
{
toOMSUsingAnalysis
}
>
<
img
src
=
{
usingIcon
}
alt
=
""
title
=
"点击查看平台使用监控"
/>
<
span
>
平台使用分析
<
/span
>
<
/div
>
...
...
This diff is collapsed.
Click to expand it.
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