fix:修复字体图标冲突
This commit is contained in:
@@ -212,7 +212,6 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
i{
|
||||
font-size: 16px;
|
||||
margin-right: 5px;
|
||||
}
|
||||
line-height: 32px;
|
||||
@@ -834,7 +833,7 @@ input::placeholder{
|
||||
|
||||
.operationTutorial-dialog{
|
||||
.el-dialog{
|
||||
width: 85%;
|
||||
width: auto;
|
||||
height: 90%;
|
||||
}
|
||||
.el-dialog__header{
|
||||
@@ -867,8 +866,11 @@ input::placeholder{
|
||||
padding: 30px;
|
||||
padding-top: 0;
|
||||
height: calc(100% - 55px);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
.operationTutorial-img{
|
||||
width: 100%;
|
||||
max-width: fit-content;
|
||||
width: auto;
|
||||
height: calc(100% - 70px);
|
||||
display: block;
|
||||
box-shadow: 0px 2px 4px 0px rgba(0,0,0,0.1);
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@@ -5,6 +5,20 @@
|
||||
"css_prefix_text": "nz-icon-",
|
||||
"description": "",
|
||||
"glyphs": [
|
||||
{
|
||||
"icon_id": "38284763",
|
||||
"name": "Notification",
|
||||
"font_class": "Notification",
|
||||
"unicode": "e805",
|
||||
"unicode_decimal": 59397
|
||||
},
|
||||
{
|
||||
"icon_id": "38284764",
|
||||
"name": "Dark theme",
|
||||
"font_class": "a-Darktheme",
|
||||
"unicode": "e806",
|
||||
"unicode_decimal": 59398
|
||||
},
|
||||
{
|
||||
"icon_id": "124495",
|
||||
"name": "警告",
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
@@ -62,16 +62,16 @@
|
||||
<div class="notification-dropdown">
|
||||
<div class="notification-dropdown-item" style="justify-content: space-between;">
|
||||
<div style="display:flex;align-items:center;">
|
||||
<i class="el-icon-moon"></i>
|
||||
<i class="nz-icon nz-icon-a-Darktheme" style="font-size:15px;"></i>
|
||||
<span>{{$t('overall.darkTheme')}}</span>
|
||||
</div>
|
||||
<el-switch v-model="darkTheme" @change="darkThemeChange" :disabled="themeSave"></el-switch>
|
||||
</div>
|
||||
</div>
|
||||
<div class="notification-dropdown">
|
||||
<div class="notification-dropdown-item" style="font-weight: bold;">
|
||||
<i class="el-icon-bell"></i>
|
||||
<span>{{$t('overall.notification')}}</span>
|
||||
<div class="notification-dropdown-item">
|
||||
<i class="nz-icon nz-icon-Notification" style="font-size:15px;"></i>
|
||||
<span style="font-weight: bold;">{{$t('overall.notification')}}</span>
|
||||
</div>
|
||||
<div class="notification-dropdown-item" style="justify-content: space-between;">
|
||||
<span>{{$t('overall.newAlertMessage')}}</span>
|
||||
@@ -195,6 +195,7 @@ export default {
|
||||
const audio = new Audio(audioUrl)
|
||||
audio.muted = true
|
||||
audio.play().then(() => {
|
||||
console.log('autoplay')
|
||||
this.operationTutorial = false
|
||||
}).catch((err) => {
|
||||
console.log(err)
|
||||
|
||||
@@ -368,15 +368,11 @@ export default new Vue({
|
||||
const response = await get('/alert/message/query', queryParams, { headers: { notCancel: true } })
|
||||
this.lastId = this.$lodash.get(response, 'data.list[0].id', -1)
|
||||
const interval = store.state.nzDefaultConfig.interval
|
||||
// 防止正在请求时关闭 此时不再执行
|
||||
if (this.newAlertTimer === null) {
|
||||
return
|
||||
}
|
||||
this.getNewAlert(interval || 10)
|
||||
},
|
||||
// 查询告警消息
|
||||
getNewAlert (interval = 10) {
|
||||
if (this.newAlertTimer && this.newAlertTimer !== true) {
|
||||
if (this.newAlertTimer !== true) {
|
||||
return
|
||||
}
|
||||
const ms = parseInt(interval) * 1000
|
||||
@@ -407,7 +403,7 @@ export default new Vue({
|
||||
setTimeout(() => {
|
||||
this.$notify({
|
||||
duration: 5000,
|
||||
iconClass: 'el-icon-bell',
|
||||
iconClass: 'nz-icon nz-icon-Notification',
|
||||
dangerouslyUseHTMLString: true,
|
||||
message: h('div', [
|
||||
h('p',
|
||||
|
||||
Reference in New Issue
Block a user