Commit c6cef1d6 authored by 杨思琦's avatar 杨思琦

fix: 报警消息通知修改

parent 058fecbd
Pipeline #65453 passed with stages
...@@ -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 => {
......
...@@ -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}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment