test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: --bug=1007157 --user=刘瑞斌 【github#5743】消息为0时，显示是否应该是0/0? 而不是1/0？ https://www.tapd.cn/55049933/s/1055853

This commit is contained in:
Captain.B 2021-10-15 16:28:24 +08:00 committed by 刘瑞斌
parent 960acf52b3
commit 7c23bf7a09
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
frontend/src/business/components/notice/components/MentionedMeData.vue
View File

@ -3,9 +3,10 @@
<div style="padding-left: 320px; padding-bottom: 5px; width: 100%"> <div style="padding-left: 320px; padding-bottom: 5px; width: 100%">
<span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span> <span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span>
<el-dropdown @command="handleCommand" style="padding-right: 10px"> <el-dropdown @command="handleCommand" style="padding-right: 10px">
<span class="el-dropdown-link"> <span class="el-dropdown-link" v-if="totalPage > 0">
{{ goPage }}/{{ totalPage }}<i class="el-icon-arrow-down el-icon--right"></i> {{ goPage }}/{{ totalPage }}<i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<span v-else class="el-dropdown-link">0/0</span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item> <el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>

7
frontend/src/business/components/notice/components/SystemNoticeData.vue
View File

@ -3,9 +3,10 @@
<div style="padding-left: 320px; padding-bottom: 5px; width: 100%"> <div style="padding-left: 320px; padding-bottom: 5px; width: 100%">
<span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span> <span style="color: gray; padding-right: 10px">({{ totalCount }} {{ $t('commons.notice_count') }})</span>
<el-dropdown @command="handleCommand" style="padding-right: 10px"> <el-dropdown @command="handleCommand" style="padding-right: 10px">
<span class="el-dropdown-link"> <span class="el-dropdown-link" v-if="totalPage > 0">
{{ goPage }}/{{ totalPage }}<i class="el-icon-arrow-down el-icon--right"></i> {{ goPage }}/{{ totalPage }}<i class="el-icon-arrow-down el-icon--right"></i>
</span> </span>
<span v-else class="el-dropdown-link">0/0</span>
<el-dropdown-menu slot="dropdown"> <el-dropdown-menu slot="dropdown">
<el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item> <el-dropdown-item v-for="i in totalPage" :key="i" :command="i">{{ i }}</el-dropdown-item>
</el-dropdown-menu> </el-dropdown-menu>