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
c6cef1d6
Commit
c6cef1d6
authored
Dec 14, 2022
by
杨思琦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 报警消息通知修改
parent
058fecbd
Pipeline
#65453
passed with stages
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
notice.js
src/layouts/AppLayout/notifier/notice.js
+2
-2
BasicLayout.js
src/layouts/BasicLayout.js
+1
-0
No files found.
src/layouts/AppLayout/notifier/notice.js
View file @
c6cef1d6
...
@@ -449,8 +449,8 @@ class Notifier {
...
@@ -449,8 +449,8 @@ class Notifier {
const
alarmType
=
message
?.
infoContent
?.
alarmType
;
// 报警类型:“状态报警”
const
alarmType
=
message
?.
infoContent
?.
alarmType
;
// 报警类型:“状态报警”
const
content
=
message
?.
infoContent
?.
alarmContent
;
// 报警内容:“出水超压报警”
const
content
=
message
?.
infoContent
?.
alarmContent
;
// 报警内容:“出水超压报警”
const
alarmValue
=
message
?.
infoContent
?.
alarmValue
??
''
;
// 报警值
const
alarmValue
=
message
?.
infoContent
?.
alarmValue
??
''
;
// 报警值
const
level
=
message
?.
infoLevel
!==
'1'
?
'紧急报警,紧急报警,紧急报警:'
:
''
let
msg
=
`
紧急报警:
${
device
}
,
${
alarmType
}
,
${
content
}
,报警值:
${
isString
(
alarmValue
)
?
replaceSpeak
(
alarmValue
)
:
''
}
,请注意!!!`
;
let
msg
=
`
${
level
}
${
device
}
,
${
alarmType
}
,
${
content
}
,报警值:
${
isString
(
alarmValue
)
?
replaceSpeak
(
alarmValue
)
:
''
}
,请注意!!!`
;
this
.
speak
(
msg
);
this
.
speak
(
msg
);
};
};
speakCase
=
message
=>
{
speakCase
=
message
=>
{
...
...
src/layouts/BasicLayout.js
View file @
c6cef1d6
...
@@ -403,6 +403,7 @@ const Layout = props => {
...
@@ -403,6 +403,7 @@ const Layout = props => {
route
=
{
props
.
route
}
route
=
{
props
.
route
}
location
=
{
location
}
location
=
{
location
}
navTheme
=
{
props
.
global
?.
variableTheme
?.
navTheme
??
'dark'
}
navTheme
=
{
props
.
global
?.
variableTheme
?.
navTheme
??
'dark'
}
homepage
=
{
props
.
global
?.
homepage
??
''
}
mode
=
"MDI"
mode
=
"MDI"
fixedHeader
fixedHeader
headerHeight
=
{
52
}
headerHeight
=
{
52
}
...
...
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