From 873ec036ec89b681e253705c2e025278cadf58dc Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期三, 24 四月 2024 17:30:24 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/view/index-index.vue | 73 +++++++++++++++++++++++++++++++----- 1 files changed, 63 insertions(+), 10 deletions(-) diff --git a/src/components/view/index-index.vue b/src/components/view/index-index.vue index c222aeb..f74e1ec 100644 --- a/src/components/view/index-index.vue +++ b/src/components/view/index-index.vue @@ -350,20 +350,26 @@ </div> <div class="right-3 card" style="overflow: hidden;"> <div class="right-3-tab"> - <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==0}" @click="currentIndex=0">棰勮鎻愰啋 10</div> - <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==1}" @click="currentIndex=1">閫氱煡閫氬憡 12</div> + <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==4}" @click="currentIndex=4">棰勮鎻愰啋</div> + <div class="tab-item" style="cursor: pointer;" :class="{active:currentIndex==5}" @click="currentIndex=5">閫氱煡閫氬憡</div> </div> - <div class="right-3-list"> - <div class="list3-item" v-for="(m,i) in 5" :key="i"> + <div class="right-3-list" v-loading="listLoading"> + <scroll-pagination @load="getList" :finishLoding="finishLoding"> + <div class="list3-item" v-for="(m,i) in list" :key="i"> <div class="list3-item-title"> <img src="../../../static/img/index-tip.svg" alt=""> - <p>璁惧鍒版湡鎻愰啋</p> + <p>{{ m.theme }}</p> </div> <div class="list3-item-info"> - <p style="width: 73%;-webkit-line-clamp: 1;" class="ellipsis-multiline">缂栧彿<span style="color:#3A7BFA;"> SB20240101-001 </span>鐨勮澶囧皢浜�2023-09-09 11:11:11杩囨湡</p> - <p>2023-09-09 09:09:09</p> + <p style="width: 73%;-webkit-line-clamp: 1;" class="ellipsis-multiline"> + <!-- 缂栧彿<span style="color:#3A7BFA;"> SB20240101-001 </span>鐨勮澶囧皢浜�2023-09-09 11:11:11杩囨湡 --> + {{ m.content }} + </p> + <p>{{ m.createTime }}</p> </div> </div> + </scroll-pagination> + <div v-if="list.length<1&&!listLoading" style="color:#909399;font-size:14px;text-align: center;margin-top:80px" >鏆傛棤鏁版嵁</div> </div> </div> </el-col> @@ -405,13 +411,17 @@ import { getYearAndMonthAndDays } from '../../util/date' + import ScrollPagination from '../tool/scroll-paging.vue' export default { + components: { + ScrollPagination + }, data() { return { user: {}, now: null, calendarValue: new Date(), - currentIndex:0, + currentIndex:4, dialogVisible:false, query:{ time:'', @@ -424,11 +434,22 @@ weekdays:[], listScheduleByMe:[], scheduleLoading:false, + list:[], + currentPage:1, + pageSize: 8, // 涓�椤�7鏉� + total: null, + listLoading: true, // 缁勪欢loading鐨勫睍绀�,榛樿涓簍rue + finishLoding: false // 鍔犺浇瀹屾垚锛屾樉绀哄凡缁忔病鏈夋洿澶氫簡 } }, watch:{ calendarValue(val){ this.getScheduleByMe() + }, + currentIndex(){ + this.currentPage = 1; + this.list = []; + this.getList(); } }, mounted() { @@ -440,8 +461,39 @@ this.init(); this.weekdays = this.getWeekdaysForNextWeek() this.getScheduleByMe() + this.currentPage = 1; + this.list = []; + this.getList(); }, methods: { + getList(){ + if(this.currentPage==1){ + this.listLoading = true + } + if(this.list.length==0){ + this.finishLoding = false; + } + this.$axios.get(this.$api.informationNotification.page+'?size='+this.pageSize+'¤t='+this.currentPage+'&messageType='+this.currentIndex).then(res => { + if(res.code === 201){ + return + } + let list = res.data.records; + this.total = res.data.total; + if(list.length==0){ + this.finishLoding = true; + }else{ + if(list.length<this.pageSize){ + this.finishLoding = true; + } + this.list = this.list.concat(list) + if(this.total==this.list.length){ + this.finishLoding = true; + } + this.currentPage++; + } + this.listLoading = false + }) + }, nowTime() { var date = new Date(); var y = date.getFullYear(); @@ -562,7 +614,8 @@ this.workList.push(res.data[`work${i}`]) } this.workDay = res.data.weekDays.map(m=>{ - return m[2] + let arr = m.split('-') + return arr[2] }) }) }, @@ -624,6 +677,6 @@ }) }) }, - } + }, } </script> -- Gitblit v1.9.3