|
@@ -2,10 +2,11 @@
|
|
|
<div class="tpwjxm">
|
|
|
<el-row>
|
|
|
<el-col :span="13">
|
|
|
- <!-- daterange value-format="yyyy-MM-dd" :clearable="false"align="left" -->
|
|
|
+ <!-- datetimerange value-format="yyyy-MM-dd" :clearable="false"align="left" -->
|
|
|
<el-date-picker
|
|
|
v-model="pageObj.sj"
|
|
|
- type="datetimerange"
|
|
|
+ type="daterange"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
range-separator="~"
|
|
|
start-placeholder="开始日期"
|
|
|
end-placeholder="结束日期"
|
|
@@ -32,7 +33,8 @@
|
|
|
</el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <div class="listDiv">
|
|
|
+ <!-- :infinite-scroll-disabled="Data.disabled" -->
|
|
|
+ <div class="listDiv" v-infinite-scroll="infiniteScroll">
|
|
|
<div
|
|
|
class="dataItem"
|
|
|
v-for="(item, dindex) in datalist"
|
|
@@ -71,7 +73,6 @@
|
|
|
|
|
|
<script>
|
|
|
import { GetPage, GetFxjg, Delect } from "@/api/ghss/hgxfx.js";
|
|
|
-import hgxfx from "../../../../static/data/ghss/data.js";
|
|
|
import { Message, MessageBox } from "element-ui";
|
|
|
import { rest } from "lodash";
|
|
|
let dataSources;
|
|
@@ -94,6 +95,7 @@ export default {
|
|
|
sj: [],
|
|
|
jssj: "",
|
|
|
xmmc: "",
|
|
|
+ page: 1,
|
|
|
},
|
|
|
defaultTime1: [
|
|
|
new Date(2023, 1, 1, 0, 0, 0),
|
|
@@ -106,16 +108,10 @@ export default {
|
|
|
},
|
|
|
mounted() {
|
|
|
// this.getData();
|
|
|
- if (this.historyList) {
|
|
|
- this.datalist = this.historyList;
|
|
|
- } else {
|
|
|
- this.datalist = hgxfx.datalist;
|
|
|
- }
|
|
|
// this.bus.$on("recordBsm", (val) => {
|
|
|
// console.log(val, "recordBsm");
|
|
|
// this.recordBsm = val
|
|
|
// });
|
|
|
-
|
|
|
},
|
|
|
methods: {
|
|
|
report(item) {
|
|
@@ -157,15 +153,23 @@ export default {
|
|
|
this.$emit("updateParent", "nowObj", item);
|
|
|
this.$emit("updateParent", "rzBsm", item.bsm);
|
|
|
},
|
|
|
-
|
|
|
+ infiniteScroll() {
|
|
|
+ this.pageObj.page += 1;
|
|
|
+ // Data.disabled = true;
|
|
|
+ this.$emit("updateParent", "loading", true);
|
|
|
+ setTimeout(() => {
|
|
|
+ this.getData();
|
|
|
+ }, 500);
|
|
|
+ },
|
|
|
changeForm() {
|
|
|
this.pageObj.page = 1;
|
|
|
+ this.datalist = [];
|
|
|
this.getData();
|
|
|
},
|
|
|
changedate(val) {
|
|
|
if (val) {
|
|
|
- this.pageObj.kssj = proxy.$comfun.setDate(val)[0];
|
|
|
- this.pageObj.jssj = proxy.$comfun.setDate(val)[1];
|
|
|
+ this.pageObj.kssj = this.pageObj.sj[0];
|
|
|
+ this.pageObj.jssj = this.pageObj.sj[1];
|
|
|
} else {
|
|
|
this.pageObj.kssj = "";
|
|
|
this.pageObj.jssj = "";
|
|
@@ -174,16 +178,16 @@ export default {
|
|
|
},
|
|
|
|
|
|
getData() {
|
|
|
- // this.$emit("updateParent", "loading", true);
|
|
|
- // GetPage({ ...this.pageObj }).then((res) => {
|
|
|
- // setTimeout(() => {
|
|
|
- // this.$emit("updateParent", "loading", false);
|
|
|
- // }, 100);
|
|
|
- // this.pageObj.total = res.recordstotal;
|
|
|
- // this.pageObj.page = res.page;
|
|
|
- // this.pageObj.allpage = res.totalpages;
|
|
|
- // this.datalist = res.data;
|
|
|
- // });
|
|
|
+ this.$emit("updateParent", "loading", true);
|
|
|
+ GetPage({ ...this.pageObj }).then((res) => {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$emit("updateParent", "loading", false);
|
|
|
+ }, 100);
|
|
|
+ // this.pageObj.total = res.recordstotal;
|
|
|
+ // this.pageObj.page = res.page;
|
|
|
+ // this.pageObj.allpage = res.totalpages;
|
|
|
+ this.datalist = [...this.datalist, ...res.data];
|
|
|
+ });
|
|
|
},
|
|
|
zoomItem(item) {
|
|
|
this.now = item.bsm;
|