Commit 90cb81e8 authored by 邓晓峰's avatar 邓晓峰

chore: merge dev-wisdom branch

parent 7be1624e
This diff was suppressed by a .gitattributes entry.
...@@ -16,7 +16,7 @@ class NoticeIconView extends Component { ...@@ -16,7 +16,7 @@ class NoticeIconView extends Component {
this.state = { this.state = {
count: 0, count: 0,
noticeData: [], noticeData: [],
platformVisible: true, platformVisible: false,
videoVisible: false, videoVisible: false,
// eslint-disable-next-line react/no-unused-state // eslint-disable-next-line react/no-unused-state
noticeVisible: false, noticeVisible: false,
...@@ -275,14 +275,18 @@ class NoticeIconView extends Component { ...@@ -275,14 +275,18 @@ class NoticeIconView extends Component {
this.state.alarmMessage.messageContent && this.state.alarmMessage.messageContent &&
this.state.alarmMessage.messageContent.alarmThreshold} this.state.alarmMessage.messageContent.alarmThreshold}
</p> </p>
<span>{this.state.alarmMessage && this.state.alarmMessage.message && this.state.alarmMessage.message.time}</span> <span>
{this.state.alarmMessage &&
this.state.alarmMessage.message &&
this.state.alarmMessage.message.time}
</span>
</div> </div>
</div> </div>
</div> </div>
</Modal> </Modal>
)} )}
{this.state.videoVisible && ( {this.state.videoVisible && this.state.videoMessage && (
<Modal <Modal
visible={this.state.videoVisible} visible={this.state.videoVisible}
title={this.state.videoMessage.name} title={this.state.videoMessage.name}
......
...@@ -490,9 +490,7 @@ class Notifier { ...@@ -490,9 +490,7 @@ class Notifier {
} }
renderSysNoticePlatform(message) { renderSysNoticePlatform(message) {
debugger this.renderSysPlatform && this.renderSysPlatform(message)
this.renderSysElement = null;
this.renderSysElement = this.renderSysPlatform && this.renderSysPlatform(message)
} }
renderPopVideo(message) { renderPopVideo(message) {
......
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