|
@@ -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,11 @@
|
|
|
</el-input>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <div class="listDiv">
|
|
|
+ <div
|
|
|
+ class="listDiv"
|
|
|
+ v-infinite-scroll="infiniteScroll"
|
|
|
+ :infinite-scroll-disabled="listdisabled"
|
|
|
+ >
|
|
|
<div
|
|
|
class="dataItem"
|
|
|
v-for="(item, dindex) in datalist"
|
|
@@ -55,13 +60,12 @@
|
|
|
<span class="button" v-if="item.fxbg" @click.stop="report(item)"
|
|
|
>报告</span
|
|
|
>
|
|
|
- <!-- <span
|
|
|
-
|
|
|
- style="margin-left: 5px"
|
|
|
+ <span
|
|
|
+ class="button"
|
|
|
@click.stop="del(item)"
|
|
|
v-if="item.rwzt == 2 || item.rwzt == 3"
|
|
|
>删除</span
|
|
|
- > -->
|
|
|
+ >
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -70,10 +74,10 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { GetPage, GetFxjg, Delect } from "@/api/ghss/hgxfx.js";
|
|
|
-import hgxfx from "../../../../static/data/ghss/data.js";
|
|
|
+import { GetPage, Delect } from "@/api/ghss/hgxfx.js";
|
|
|
import { Message, MessageBox } from "element-ui";
|
|
|
import { rest } from "lodash";
|
|
|
+import { GetXzResList } from "../../../api/ghss/ghxz.js";
|
|
|
let dataSources;
|
|
|
export default {
|
|
|
props: {
|
|
@@ -94,28 +98,24 @@ export default {
|
|
|
sj: [],
|
|
|
jssj: "",
|
|
|
xmmc: "",
|
|
|
+ page: 1,
|
|
|
},
|
|
|
defaultTime1: [
|
|
|
new Date(2023, 1, 1, 0, 0, 0),
|
|
|
new Date(2023, 2, 1, 23, 59, 59),
|
|
|
], // '00:00:00', '23:59:59'
|
|
|
datalist: [],
|
|
|
+ listdisabled: false,
|
|
|
now: "",
|
|
|
// recordBsm: "", //辅助选址成功后的标识码
|
|
|
};
|
|
|
},
|
|
|
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) {
|
|
@@ -142,48 +142,68 @@ export default {
|
|
|
.catch(() => {});
|
|
|
},
|
|
|
checkDetails(item) {
|
|
|
- // this.$emit("updateParent", "rwBsm", item.bsm);
|
|
|
- // GetFxjg({ bsm: item.bsm }).then((res) => {
|
|
|
- // if (res.success) {
|
|
|
- // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
|
|
|
- // this.$emit("updateParent", "scjgObj=JSON.parse(JSON.stringify(res.data))
|
|
|
this.$emit("updateParent", "nowObj", item);
|
|
|
let next = this.$props.type == "hgxfx" ? "scjg" : "xzjg";
|
|
|
this.$emit("updateParent", "activeTabs", next);
|
|
|
- // }
|
|
|
- // });
|
|
|
+ if (this.$props.type != "hgxfx") {
|
|
|
+ this.$emit("updateParent", "rwBsm", item.bsm);
|
|
|
+ }
|
|
|
},
|
|
|
checkRz(item) {
|
|
|
this.$emit("updateParent", "nowObj", item);
|
|
|
this.$emit("updateParent", "rzBsm", item.bsm);
|
|
|
},
|
|
|
-
|
|
|
+ infiniteScroll() {
|
|
|
+ this.pageObj.page += 1;
|
|
|
+ this.listdisabled = 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 = "";
|
|
|
}
|
|
|
- this.getData();
|
|
|
+ this.changeForm();
|
|
|
},
|
|
|
|
|
|
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);
|
|
|
+ if (this.$props.type == "hgxfx") {
|
|
|
+ GetPage({ ...this.pageObj }).then((res) => {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$emit("updateParent", "loading", false);
|
|
|
+ }, 100);
|
|
|
+ this.listdisabled = res.data.length < 10;
|
|
|
+ this.datalist = [...this.datalist, ...res.data];
|
|
|
+ });
|
|
|
+ } else {
|
|
|
+ let tempObj = { ...this.pageObj };
|
|
|
+ let obj = {
|
|
|
+ startTime: tempObj.kssj,
|
|
|
+ endTime: tempObj.jssj,
|
|
|
+ name: tempObj.xmmc,
|
|
|
+ pageNum: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ };
|
|
|
+ GetXzResList(obj).then((res) => {
|
|
|
+ setTimeout(() => {
|
|
|
+ this.$emit("updateParent", "loading", false);
|
|
|
+ }, 100);
|
|
|
+ this.listdisabled = res.data.items.length < 10;
|
|
|
+ this.datalist = [...this.datalist, ...res.data.items];
|
|
|
+ });
|
|
|
+ }
|
|
|
},
|
|
|
zoomItem(item) {
|
|
|
this.now = item.bsm;
|
|
@@ -210,6 +230,15 @@ export default {
|
|
|
},
|
|
|
},
|
|
|
watch: {},
|
|
|
+ beforeDestroy() {
|
|
|
+ this.pageObj = {
|
|
|
+ kssj: "",
|
|
|
+ sj: [],
|
|
|
+ jssj: "",
|
|
|
+ xmmc: "",
|
|
|
+ page: 1,
|
|
|
+ };
|
|
|
+ },
|
|
|
};
|
|
|
</script>
|
|
|
|
|
@@ -295,6 +324,28 @@ export default {
|
|
|
rgba(155, 255, 139, 0.7) 100%
|
|
|
);
|
|
|
}
|
|
|
+ .el-tag--warning {
|
|
|
+ background: linear-gradient(
|
|
|
+ 170deg,
|
|
|
+ rgba(249, 180, 71, 0.6) 0%,
|
|
|
+ rgba(249, 180, 71, 0.6) 100%
|
|
|
+ );
|
|
|
+ }
|
|
|
+ .el-tag--light {
|
|
|
+ background: linear-gradient(
|
|
|
+ 170deg,
|
|
|
+ rgba(255, 126, 33, 0.6) 0%,
|
|
|
+ rgba(255, 166, 33, 0.7) 100%
|
|
|
+ );
|
|
|
+ }
|
|
|
+
|
|
|
+ .el-tag--danger {
|
|
|
+ background: linear-gradient(
|
|
|
+ 170deg,
|
|
|
+ rgba(200, 0, 0, 0.6) 0%,
|
|
|
+ rgba(255, 105, 105, 0.6) 100%
|
|
|
+ );
|
|
|
+ }
|
|
|
.button {
|
|
|
width: 48px;
|
|
|
height: 20px;
|