首页分页优化

src/views/myHistoryTest/myHistoryTest.html

@@ -2,7 +2,7 @@
   <!-- 头部 -->
   <HeaderMain></HeaderMain>
   <!-- 工具栏 -->
-  <div class="history-tools">
+  <div id="historyTools" class="history-tools">
     <div class="left">
       <el-dropdown trigger="click" @command="projectCommand">
         <el-button type="primary">{{ownHouseName}} <i class="el-icon-caret-bottom icon-right"></i>
@@ -29,9 +29,11 @@
   <!-- 列表 -->
   <div class="test-list" v-infinite-scroll="getTestList" infinite-scroll-disabled="disabled">
     <div class="item" v-for="(item,index) in dataList" :key="item.created" :class="{ itemCopy: isCopy && index == 0 }">
+      <!-- <img  mode="" :src="" alt=""> -->
       <el-image class="item-img" :src="item.coverImg" fit="cover">
         <div slot="error" class="outline">
           <img class="item-img-outline" src="../../assets/images/picture-error.png" alt="">
+          <!-- <i class="el-icon-picture-outline"></i> -->
         </div>
       </el-image>
       <div class="tools">
@@ -55,5 +57,5 @@
   <div v-if="loading" class="loading">加载中...</div>
   <div v-if="noMore" class="loading">没有更多了</div>
   <!-- 分享设置 -->
-  <!-- <ShareSetting v-if="isShareSetting" :close="closeShare" :shareModel="shareModel"></ShareSetting> -->
+  <ShareSetting v-if="isShareSetting" :close="closeShare" :shareModel="shareModel"></ShareSetting>
 </div>

src/views/myHistoryTest/myHistoryTest.js

@@ -31,7 +31,6 @@ export default {
         label: '广州'
       }],
       value: '',
-      pageModel: "",
       loading: false,
       houseList: [],
       ownHouseName: "所属项目",
@@ -41,13 +40,12 @@ export default {
       shareModel: "",
       pageNo: 1,
       dataList: [],
-      rowTotal: 0
+      total: 0
     }
   },
   computed: {
     noMore() {
-      console.log(this.rowTotal, this.dataList.length);
-      return this.rowTotal === this.dataList.length;
+      return this.pageNo > this.total;
     },
     disabled() {
       return this.loading || this.noMore;
@@ -78,20 +76,19 @@ export default {
       return timeFormat.dateStr(val);
     },
     getTestList() {
+      console.log("加载第" + this.pageNo + "页");
       this.loading = true
-      console.log("XXXXXSS");
       let data = {
         "orderType": this.currOrderType,
         "houseNameList": this.ownHouseName == "所属项目" ? '' : this.ownHouseName,
         "pageNo": this.pageNo++,
-        "pageSize": 4
+        "pageSize": 39
       }
       api.testList(data).then((res) => {
         if (res.success) {
-          this.pageModel = res.pageModel;
-          this.dataList.push(...this.pageModel.resultSet);
-          console.log("success", this.dataList);
-          this.rowTotal = res.pageModel.rowTotal;
+          this.total = res.pageModel.total;
+          this.dataList.push(...res.pageModel.resultSet);
+          console.log("success", this.dataList, res.pageModel);
         } else {
           console.log("error");
         }
@@ -137,7 +134,7 @@ export default {
               if (res.success) {
                 instance.confirmButtonLoading = false;
                 this.$message.success("删除成功");
-                this.pageModel.resultSet.splice(index, 1);
+                this.dataList.splice(index, 1);
                 done();
               } else {
                 this.$message.error("删除失败,请重试");
@@ -152,6 +149,9 @@ export default {
       }).catch(() => { });
     },
     copyTest(item) {
+      // document.getElementById("historyTools").scrollTo(0, 0);
+      // document.getElementById("historyTools").scrollIntoView();
+      // console.log("SSSS", document.getElementById("historyTools").scrollHeight)
       let data = {
         "id": item._id,
         "operator": "admin"
@@ -162,7 +162,7 @@ export default {
             message: '复制成功',
             type: 'success'
           });
-          this.pageModel.resultSet.unshift(res.single);
+          this.dataList.unshift(res.single);
           this.isCopy = true;
           setTimeout(() => {
             this.isCopy = false;

src/views/myHistoryTest/myHistoryTest.scss

@@ -1,6 +1,7 @@
 .page {
   padding: 60px 0px;
   width: 100%;
+  height: 100%;
   background: rgba(237,239,247,1);
 }