|
|
@@ -33,8 +33,11 @@
|
|
|
</el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <!-- :infinite-scroll-disabled="Data.disabled" -->
|
|
|
- <div class="listDiv" v-infinite-scroll="infiniteScroll">
|
|
|
+ <div
|
|
|
+ class="listDiv"
|
|
|
+ v-infinite-scroll="infiniteScroll"
|
|
|
+ :infinite-scroll-disabled="listdisabled"
|
|
|
+ >
|
|
|
<div
|
|
|
class="dataItem"
|
|
|
v-for="(item, dindex) in datalist"
|
|
|
@@ -103,6 +106,7 @@ export default {
|
|
|
new Date(2023, 2, 1, 23, 59, 59),
|
|
|
], // '00:00:00', '23:59:59'
|
|
|
datalist: [],
|
|
|
+ listdisabled: false,
|
|
|
now: "",
|
|
|
// recordBsm: "", //辅助选址成功后的标识码
|
|
|
};
|
|
|
@@ -159,12 +163,11 @@ export default {
|
|
|
},
|
|
|
infiniteScroll() {
|
|
|
this.pageObj.page += 1;
|
|
|
- // Data.disabled = true;
|
|
|
+ this.listdisabled = true;
|
|
|
this.$emit("updateParent", "loading", true);
|
|
|
setTimeout(() => {
|
|
|
this.getData();
|
|
|
console.log(111);
|
|
|
-
|
|
|
}, 500);
|
|
|
},
|
|
|
changeForm() {
|
|
|
@@ -180,7 +183,7 @@ export default {
|
|
|
this.pageObj.kssj = "";
|
|
|
this.pageObj.jssj = "";
|
|
|
}
|
|
|
- this.getData();
|
|
|
+ this.changeForm();
|
|
|
},
|
|
|
|
|
|
getData() {
|
|
|
@@ -190,11 +193,11 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
this.$emit("updateParent", "loading", false);
|
|
|
}, 100);
|
|
|
+ this.listdisabled = res.data.length < 10;
|
|
|
this.datalist = [...this.datalist, ...res.data];
|
|
|
});
|
|
|
} else {
|
|
|
- let tempObj = { ...this.pageObj }
|
|
|
- console.log(tempObj.page,'tempObj.page');
|
|
|
+ let tempObj = { ...this.pageObj };
|
|
|
let obj = {
|
|
|
startTime: tempObj.kssj,
|
|
|
endTime: tempObj.jssj,
|
|
|
@@ -206,7 +209,8 @@ export default {
|
|
|
setTimeout(() => {
|
|
|
this.$emit("updateParent", "loading", false);
|
|
|
}, 100);
|
|
|
- this.datalist = res.data.items;
|
|
|
+ this.listdisabled = res.data.items.length < 10;
|
|
|
+ this.datalist = [...this.datalist, ...res.data.items];
|
|
|
});
|
|
|
}
|
|
|
},
|
