gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：全屏 显示两个弹出层的问题

Browse Source
This commit is contained in:
zhangyu
2021-11-01 14:27:10 +08:00
parent 18d89a0917
commit 03621ed884
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
nezha-fronted/src/components/charts/chart-alert-list.vue
View File

@@ -63,6 +63,7 @@
:height="'calc(100% - 46px)'" :height="'calc(100% - 46px)'"
:customTableTitle="tableTitle" :customTableTitle="tableTitle"
:tableId="''" :tableId="''"
:detailList="false"
:projectAlertId="'tableContainer'+chartIndex" :projectAlertId="'tableContainer'+chartIndex"
@tableDataSort="tableDataSort" @tableDataSort="tableDataSort"
@del="deleteMessage" @del="deleteMessage"
@@ -86,8 +87,9 @@
<!-- <span class="float-right dialog-tool" @click="screenRefreshChart"><i class="global-active-color nz-icon nz-icon-refresh"/></span>--> <!-- <span class="float-right dialog-tool" @click="screenRefreshChart"><i class="global-active-color nz-icon nz-icon-refresh"/></span>-->
</div> </div>
<alertMessageTable <alertMessageTable
:id="'tableContainer'+chartIndex" :id="'tableContainerScreen'+chartIndex"
:tableData="storedScreanTableData" :tableData="storedScreanTableData"
:detailList="false"
:loading="loadingTable" :loading="loadingTable"
:height="'calc(100% - 20px)'" :height="'calc(100% - 20px)'"
:customTableTitle="tableTitle" :customTableTitle="tableTitle"
@@ -96,7 +98,7 @@
@tableDataSort="tableDataSort" @tableDataSort="tableDataSort"
@del="deleteMessage" @del="deleteMessage"
@messageDetail="messageDetail" @messageDetail="messageDetail"
ref="alertListTable" ref="alertListScreenTable"
:form="'chartList'" :form="'chartList'"
:fromPath="'/alertList'" :fromPath="'/alertList'"
style="height: calc(100% - 50px)" style="height: calc(100% - 50px)"
@@ -426,7 +428,7 @@ export default {
screenDialogClose () { screenDialogClose () {
this.screenModal = false this.screenModal = false
this.deleteBox.ids = [] this.deleteBox.ids = []
this.$refs.alertListScreenTable.$refs.alertListTable.clearSelection() this.$refs.alertListScreenTable.$refs.dataTable.clearSelection()
}, },
selectChange (s) { selectChange (s) {
const ids = [] const ids = []
@@ -894,10 +896,12 @@ export default {
// 全屏查看 // 全屏查看
showAllScreen () { showAllScreen () {
this.dropdownMenuShow = false this.dropdownMenuShow = false
this.storedScreanTableData = this.storedTableData // this.storedScreanTableData = this.storedTableData
this.storedScreanTableData = JSON.parse(JSON.stringify(this.storedTableData))
this.screenModal = true this.screenModal = true
this.deleteBox.ids = [] this.deleteBox.ids = []
this.$refs.alertListTable.$refs.alertListTable.clearSelection() // this.$refs.alertListTable.$refs.alertListTable.clearSelection()
// this.$refs.alertListScreenTable.$refs.dataTable.clearSelection()
this.screenPageObj = { ...this.pageObj } this.screenPageObj = { ...this.pageObj }
}, },
// 设置数据, filter区分 // 设置数据, filter区分