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

Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue
#	nezha-fronted/src/components/page/alert/alertMessage.vue
This commit is contained in:
zhangyu
2022-04-01 17:58:57 +08:00
parent 9c4e2a9525 cf98a31414
commit 5db1c00f13
6 changed files with 52 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/alert/alertMessageInfoTimeLine.vue
View File

@@ -56,7 +56,7 @@
</div>
</div>
</el-timeline-item>
<div v-if="timeLineData.length >= total">{{$t('overall.noMoreData')}}}</div>
<div v-if="timeLineData.length >= total" style="text-align: center">{{$t('overall.noMoreData')}}</div>
<div v-else class="load-more-box">
<el-button size="small" @click="getTimeLineData()" :loading="loading">{{$t('overall.loadMore')}}}</el-button>
</div>