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
51340d16
Commit
51340d16
authored
Feb 23, 2023
by
杨思琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 跳转修改
parent
9867bba3
Pipeline
#67903
passed with stages
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
7 deletions
+7
-7
NoticeIconView.js
src/components/GlobalHeader/NoticeIconView.js
+3
-3
index.js
src/layouts/AppLayout/notifier/templates/alarm/index.js
+2
-2
index.js
src/layouts/AppLayout/notifier/templates/case/index.js
+2
-2
No files found.
src/components/GlobalHeader/NoticeIconView.js
View file @
51340d16
...
@@ -314,7 +314,7 @@ class NoticeIconView extends Component {
...
@@ -314,7 +314,7 @@ class NoticeIconView extends Component {
this
.
renderSysPlatform
(
message
);
this
.
renderSysPlatform
(
message
);
};
};
handlerUnknowDetail
=
(
message
,
type
)
=>
{
handlerUnknowDetail
=
(
message
,
product
,
type
)
=>
{
// 需要有跳转路径
// 需要有跳转路径
if
(
!
message
.
webPath
)
if
(
!
message
.
webPath
)
return
notification
.
info
({
message
:
'提示'
,
duration
:
3
,
description
:
'未配置跳转路径'
});
return
notification
.
info
({
message
:
'提示'
,
duration
:
3
,
description
:
'未配置跳转路径'
});
...
@@ -343,11 +343,11 @@ class NoticeIconView extends Component {
...
@@ -343,11 +343,11 @@ class NoticeIconView extends Component {
}
}
params
.
_source
=
'消息通知'
;
params
.
_source
=
'消息通知'
;
params
.
_target
=
message
.
webPath
;
params
.
_target
=
message
.
webPath
;
if
(
type
)
{
if
(
product
)
{
if
(
/civweb4/
.
test
(
targetMenuPath
))
return
true
;
if
(
/civweb4/
.
test
(
targetMenuPath
))
return
true
;
}
}
sessionStorage
.
setItem
(
'routerParams'
,
JSON
.
stringify
(
params
));
sessionStorage
.
setItem
(
'routerParams'
,
JSON
.
stringify
(
params
));
window
.
history
.
pushState
(
params
,
''
,
`/civbase/
${
targetMenuPath
}
?v=
${
Date
.
now
()
}
`
);
window
.
history
.
pushState
(
params
,
''
,
`/civbase/
${
targetMenuPath
}
${
type
?
''
:
`?v=
${
Date
.
now
()}
`
}
`
);
}
}
render
()
{
render
()
{
...
...
src/layouts/AppLayout/notifier/templates/alarm/index.js
View file @
51340d16
...
@@ -41,7 +41,7 @@ const Alarm = ({ message, confirmRead, config, handlerUnknowDetail }) => {
...
@@ -41,7 +41,7 @@ const Alarm = ({ message, confirmRead, config, handlerUnknowDetail }) => {
const
alarmThreshold
=
message
?.
infoContent
?.
alarmThreshold
;
const
alarmThreshold
=
message
?.
infoContent
?.
alarmThreshold
;
const
goPath
=
(
item
)
=>
{
const
goPath
=
(
item
)
=>
{
if
(
handlerUnknowDetail
&&
handlerUnknowDetail
(
message
,
'
alarm
'
))
{
if
(
handlerUnknowDetail
&&
handlerUnknowDetail
(
message
,
'
civweb4
'
))
{
const
widgetID
=
'widget_city_综合运营_管网监控_实时监控_报警监控'
;
const
widgetID
=
'widget_city_综合运营_管网监控_实时监控_报警监控'
;
const
webPath
=
'product/scada/AlertMonitoring/AlertMonitoring'
;
const
webPath
=
'product/scada/AlertMonitoring/AlertMonitoring'
;
const
widget
=
findPathByWidget
(
const
widget
=
findPathByWidget
(
...
@@ -57,7 +57,7 @@ const Alarm = ({ message, confirmRead, config, handlerUnknowDetail }) => {
...
@@ -57,7 +57,7 @@ const Alarm = ({ message, confirmRead, config, handlerUnknowDetail }) => {
url
:
widget
.
url
||
webPath
,
url
:
widget
.
url
||
webPath
,
});
});
}
else
{
}
else
{
handlerUnknowDetail
(
message
);
handlerUnknowDetail
(
message
,
null
,
'alarm'
);
}
}
}
}
confirmRead
(
false
,
[
message
.
id
]);
confirmRead
(
false
,
[
message
.
id
]);
...
...
src/layouts/AppLayout/notifier/templates/case/index.js
View file @
51340d16
...
@@ -30,7 +30,7 @@ const Case = ({ message, confirmRead, handlerUnknowDetail }) => {
...
@@ -30,7 +30,7 @@ const Case = ({ message, confirmRead, handlerUnknowDetail }) => {
const
content
=
message
?.
infoContent
?.
content
;
const
content
=
message
?.
infoContent
?.
content
;
const
goPath
=
item
=>
{
const
goPath
=
item
=>
{
if
(
handlerUnknowDetail
&&
handlerUnknowDetail
(
message
,
'c
ase
'
))
{
if
(
handlerUnknowDetail
&&
handlerUnknowDetail
(
message
,
'c
ivweb4
'
))
{
const
messageType
=
item
.
messType
;
const
messageType
=
item
.
messType
;
let
label
=
''
;
let
label
=
''
;
let
widgetID
=
''
;
let
widgetID
=
''
;
...
@@ -60,7 +60,7 @@ const Case = ({ message, confirmRead, handlerUnknowDetail }) => {
...
@@ -60,7 +60,7 @@ const Case = ({ message, confirmRead, handlerUnknowDetail }) => {
url
:
webPath
,
url
:
webPath
,
});
});
}
else
{
}
else
{
handlerUnknowDetail
(
message
);
handlerUnknowDetail
(
message
,
null
,
'case'
);
}
}
}
}
confirmRead
(
false
,
[
message
.
id
]);
confirmRead
(
false
,
[
message
.
id
]);
...
...
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