|
@@ -39,7 +39,7 @@
|
|
|
size="mini"
|
|
|
type="primary"
|
|
|
icon="el-icon-search"
|
|
|
- @click="getTableData"
|
|
|
+ @click="searchFun"
|
|
|
>
|
|
|
</el-button>
|
|
|
</template>
|
|
@@ -73,7 +73,7 @@
|
|
|
<div class="tip" v-if="type == 0">
|
|
|
说明:系统判断疑似闲置的条件(合同约定开工之日起仍未开工的项目)
|
|
|
</div>
|
|
|
- <handleModal ref="handleRef"></handleModal>
|
|
|
+ <handleModal ref="handleRef" @close="searchFun()"></handleModal>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -90,7 +90,7 @@ import {
|
|
|
reasonList,
|
|
|
} from "./config";
|
|
|
import { loadGeoJSON } from "@/utils/MapHelper/help.js";
|
|
|
-let geoSources;
|
|
|
+let geoSources = {};
|
|
|
export default {
|
|
|
components: {
|
|
|
tablePage,
|
|
@@ -114,6 +114,7 @@ export default {
|
|
|
isConfirm: true,
|
|
|
pageNum: 1,
|
|
|
pageSize: 10,
|
|
|
+ isDisposal: false,
|
|
|
},
|
|
|
datalist: [{}],
|
|
|
formConfig: ysForm,
|
|
@@ -129,19 +130,18 @@ export default {
|
|
|
mounted() {
|
|
|
this.formConfig = this.$props.type == 0 ? ysForm : xzForm;
|
|
|
this.cloumn = this.$props.type == 0 ? TableHeader : TableHeader2;
|
|
|
-
|
|
|
- console.log("s0s-scddcd-s");
|
|
|
+ this.pageObj.isConfirm = this.$props.type == 2;
|
|
|
+ this.pageObj.isDisposal = this.$props.type == 2;
|
|
|
},
|
|
|
methods: {
|
|
|
- searchFun(page) {
|
|
|
+ searchFun(page = {}) {
|
|
|
this.getTableData({
|
|
|
- pageNum: page.pageIndex,
|
|
|
- pageSize: page.size,
|
|
|
...this.pageObj,
|
|
|
+ pageNum: page.pageIndex || 1,
|
|
|
+ pageSize: page.size || 10,
|
|
|
});
|
|
|
},
|
|
|
getTableData() {
|
|
|
- console.log("s0s-s-s", this.$props.type);
|
|
|
this.$emit("updateParent", "loading", true);
|
|
|
this.removeGeoJSON();
|
|
|
if (this.$props.type == 0) {
|
|
@@ -154,7 +154,7 @@ export default {
|
|
|
};
|
|
|
this.active_tableData(res.data.list);
|
|
|
});
|
|
|
- } else if (this.$props.type == 1) {
|
|
|
+ } else {
|
|
|
idleLandList(this.pageObj).then((res) => {
|
|
|
this.$emit("updateParent", "loading", false);
|
|
|
this.table = {
|
|
@@ -164,7 +164,6 @@ export default {
|
|
|
};
|
|
|
this.active_tableData(res.data.list);
|
|
|
});
|
|
|
- } else if (this.$props.type == 2) {
|
|
|
}
|
|
|
},
|
|
|
active_tableData(newVal) {
|
|
@@ -188,6 +187,7 @@ export default {
|
|
|
flyTo(item) {
|
|
|
let id = "h_" + item.id;
|
|
|
this.tempdataLayerId = id;
|
|
|
+ if (geoSources[id]) return;
|
|
|
loadGeoJSON(
|
|
|
item.geom || item.st_asewkt,
|
|
|
"#ff0000",
|
|
@@ -220,7 +220,7 @@ export default {
|
|
|
},
|
|
|
changerdxz() {
|
|
|
this.pageObj.isConfirm = !this.pageObj.isConfirm;
|
|
|
- this.getTableData();
|
|
|
+ this.searchFun();
|
|
|
},
|
|
|
},
|
|
|
watch: {
|