fix:alertMessage 添加 lastAt
This commit is contained in:
@@ -162,7 +162,7 @@ export default {
|
|||||||
stateOptions: alertMessageConstant.states,
|
stateOptions: alertMessageConstant.states,
|
||||||
url: 'alert/message',
|
url: 'alert/message',
|
||||||
tableId: 'alertMessageModule', // 需要分页的table的id,用于记录每页数量
|
tableId: 'alertMessageModule', // 需要分页的table的id,用于记录每页数量
|
||||||
state: '1',
|
state: '',
|
||||||
blankSilenceObject: {
|
blankSilenceObject: {
|
||||||
id: '',
|
id: '',
|
||||||
startAt: '',
|
startAt: '',
|
||||||
@@ -331,6 +331,8 @@ export default {
|
|||||||
this.tableData = response.data.list
|
this.tableData = response.data.list
|
||||||
this.deleteBox.ids = ''
|
this.deleteBox.ids = ''
|
||||||
this.pageObj.total = response.data.total
|
this.pageObj.total = response.data.total
|
||||||
|
} else {
|
||||||
|
this.$message.error(response.msg)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -58,6 +58,7 @@
|
|||||||
<i :style="{color:scope.row['severity'].color,'font-size':'12px','margin-right':'5px'}" class="nz-icon nz-icon-circle"></i> {{scope.row['severity'].name}}
|
<i :style="{color:scope.row['severity'].color,'font-size':'12px','margin-right':'5px'}" class="nz-icon nz-icon-circle"></i> {{scope.row['severity'].name}}
|
||||||
</span>
|
</span>
|
||||||
<span v-else-if="item.prop === 'startAt'">{{utcTimeToTimezoneStr(scope.row.startAt)}}</span>
|
<span v-else-if="item.prop === 'startAt'">{{utcTimeToTimezoneStr(scope.row.startAt)}}</span>
|
||||||
|
<span v-else-if="item.prop === 'lastAt'">{{utcTimeToTimezoneStr(scope.row.lastAt)}}</span>
|
||||||
<template v-else-if="item.prop === 'duration'">
|
<template v-else-if="item.prop === 'duration'">
|
||||||
<el-tooltip :disabled="!scope.row.endAt" effect="light" placement="right">
|
<el-tooltip :disabled="!scope.row.endAt" effect="light" placement="right">
|
||||||
<div slot="content">
|
<div slot="content">
|
||||||
@@ -225,6 +226,12 @@ export default {
|
|||||||
}, {
|
}, {
|
||||||
label: this.$t('alert.startAt'),
|
label: this.$t('alert.startAt'),
|
||||||
prop: 'startAt',
|
prop: 'startAt',
|
||||||
|
show: false,
|
||||||
|
width: 150,
|
||||||
|
sortable: 'custom'
|
||||||
|
}, {
|
||||||
|
label: this.$t('alert.lastAt'),
|
||||||
|
prop: 'lastAt',
|
||||||
show: true,
|
show: true,
|
||||||
width: 150,
|
width: 150,
|
||||||
sortable: 'custom'
|
sortable: 'custom'
|
||||||
|
|||||||
@@ -180,7 +180,7 @@ export default {
|
|||||||
alertMessageNzTableHeightOffset: 242,
|
alertMessageNzTableHeightOffset: 242,
|
||||||
stateOptions: alertMessageConstant.states,
|
stateOptions: alertMessageConstant.states,
|
||||||
dataListLayout: localStorage.getItem('dataList-layout' + 'alertMessageTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'alertMessageTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
|
dataListLayout: localStorage.getItem('dataList-layout' + 'alertMessageTable') ? JSON.parse(localStorage.getItem('dataList-layout' + 'alertMessageTable')) : ['searchInput', 'elementSet', 'clickSearch', 'pagination'],
|
||||||
state: '1',
|
state: '',
|
||||||
dialogShowText: false,
|
dialogShowText: false,
|
||||||
dialogText: '',
|
dialogText: '',
|
||||||
url: 'alert/message',
|
url: 'alert/message',
|
||||||
@@ -791,6 +791,8 @@ export default {
|
|||||||
}
|
}
|
||||||
this.deleteBox.ids = ''
|
this.deleteBox.ids = ''
|
||||||
this.pageObj.total = response.data.total
|
this.pageObj.total = response.data.total
|
||||||
|
} else {
|
||||||
|
this.$message.error(response.msg)
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user