diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index eff72d0..af757bd 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -84,7 +84,7 @@ } .el-loading-mask { - z-index: 900 !important; + z-index: 2000 !important; } .el-input-number.full-width-input, diff --git a/src/assets/styles/globals.scss b/src/assets/styles/globals.scss index eff72d0..af757bd 100644 --- a/src/assets/styles/globals.scss +++ b/src/assets/styles/globals.scss @@ -84,7 +84,7 @@ } .el-loading-mask { - z-index: 900 !important; + z-index: 2000 !important; } .el-input-number.full-width-input, diff --git a/src/views/business/lab/measureData/measureDataList.vue b/src/views/business/lab/measureData/measureDataList.vue index fc97efb..9321767 100644 --- a/src/views/business/lab/measureData/measureDataList.vue +++ b/src/views/business/lab/measureData/measureDataList.vue @@ -89,7 +89,12 @@ // 列表数据查询 const fetchData = (isNowPage: boolean) => { - loadingTable.value = true + // loadingTable.value = true + const loading = ElLoading.service({ + lock: true, + text: '表格数据加载中, 请稍后...', + background: 'rgba(255, 255, 255, 0.6)', + }) if (!isNowPage) { // 是否显示当前页,否则跳转第一页 listQuery.value.offset = 1 @@ -105,9 +110,11 @@ } }) total.value = parseInt(response.data.total) - loadingTable.value = false + loading.close() + // loadingTable.value = false }).catch((_) => { - loadingTable.value = false + loading.close() + // loadingTable.value = false }) } @@ -472,7 +479,6 @@ :total="total" :columns="columns" :query="listQuery" - :list-loading="loadingTable" is-showmulti-select @change="changePage" @multi-select="handleSelectionChange"