diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue
index 984c2289..87c0540e 100644
--- a/src/views/homesteadSurvey/list.vue
+++ b/src/views/homesteadSurvey/list.vue
@@ -498,10 +498,10 @@
-
全选
+
全选
-
-
+
+
附属设施
@@ -1129,9 +1129,9 @@
请选择绘制类型
-
宅基地
-
自然幢
-
附属设施
+
宅基地
+
自然幢
+
附属设施
@@ -1275,10 +1275,8 @@
mapVillageList: null,
coordinate:"",
checked:[],
- checkAllFlag: false,//全选判断标识
- CheckedAllArr: false,//全选数组
+ checkAllMap: false,
sx:"",
- dataList:[],
//搜索---start
seachText: "",
selectionIconShow: false,
@@ -1294,6 +1292,15 @@
textMjAllNum:"",
//核查
zjdHcDy:"",
+ //绘图
+ htZjdZrzFsss:"",
+ //筛选
+ checkAllFlag: true,
+ CheckedAllArr: [],//全选数组
+ dataForm: {
+ imageUrl: []
+ },
+ dataList: [["fsssSx"],["zjdSx"],["zrzSx"]]
//地图使用 --end
};
},
@@ -2614,6 +2621,7 @@
//提示当前坐标是否绘制完成
if(that.coordinate != "" && that.coordinate !=null) {
that.showhzht = true;
+ that.htZjdZrzFsss =that.coordinate;
// htMapAllFu();
}else {
console.log("6");
@@ -3000,19 +3008,28 @@
//筛选附属设施-----------------------------------start
// $("#fsssSx").click(function () {
- // map.removeLayer(zrzTc);
- // map.removeLayer(zjdTc);
- // map.addLayer(fsssTc);
+ // console.log(that.checked);
+ // // if(!event.target.checked){
+ // // map.addLayer(fsssTc);
+ // // }else {
+ // // map.removeLayer(fsssTc);
+ // // }
// });
// $("#zrzSx").click(function () {
- // map.addLayer(zrzTc);
- // map.removeLayer(zjdTc);
- // map.removeLayer(fsssTc);
+ // console.log(that.checked);
+ // // if(!event.target.checked){
+ // // map.addLayer(zrzTc);
+ // // }else {
+ // // map.removeLayer(zrzTc);
+ // // }
// });
// $("#zjdSx").click(function () {
- // map.removeLayer(zrzTc);
- // map.addLayer(zjdTc);
- // map.removeLayer(fsssTc);
+ // console.log(that.checked);
+ // // if(!event.target.checked){
+ // // map.addLayer(zjdTc);
+ // // }else {
+ // // map.removeLayer(zjdTc);
+ // // }
// });
//筛选附属设施-----------------------------------end
// //获取类型开始 侧面-----------------------------------------------------------------start
@@ -3467,6 +3484,7 @@
that.mapZjdData ="";
that.mapZrzData ="";
that.mapFsssData ="";
+ that.mapZjdTeAll.active ="1";
that.mapZjdTeAll.mapZjdAData ={};
that.mapZjdTeAll.mapZrzAData ={};
that.mapZjdTeAll.mapFsssAData ={};
@@ -4256,6 +4274,7 @@
},
homesteadListShrink() {
this.selectionIconShow = false;
+ this.checked =[["zjdSx"],["zrzSx"],["fsssSx"]];
$(".homesteadList_wrap").animate(
{
right: "-300px",
@@ -4329,14 +4348,25 @@
//搜索详情跳转
zjdSs(item){
console.log(item);
+ this.mapZjdTeAll.mapZjdAData ={};
+ this.mapZjdTeAll.mapZrzAData ={};
+ this.mapZjdTeAll.mapFsssAData ={};
+ //this.mapZjdTeAll.active =1;
+ getZjdzd(item.id).then((response) => {
+ this.mapZjdData = response.data;
+ this.mapZjdData.active = 1;
+ this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ this.$router.push({path:'/homesteadSurvey/add'});
+ });
+ },
+ //地图查询
+ toggleSearch() {
+ $("#query").trigger("click");
},
- //全选
+ //筛选//全选
checkAll(val) {
- console.log(val);
- console.log(this.checked);
- console.log(this.CheckedAllArr);
- let checkedCount = this.CheckedAllArr.length;
- console.log(checkedCount);
+ let checkedCount = this.CheckedAllArr.length
if (val) {
//全选
this.CheckedAllArr = this.dataList.map(item => item.id)
@@ -4348,43 +4378,11 @@
}
}
},
- //地图查询
- toggleSearch() {
- $("#query").trigger("click");
- },
- //显示和隐藏详情
- houseLandLookInfo(type, status) {
- if (type == "show") {
- this.houseLandLookAnmitFun("show");
- } else {
- this.houseLandLookAnmitFun("hide");
- }
- },
- //显示农地\农房详情 动画
- houseLandLookAnmitFun(type) {
- if (type == "show") {
- this.landHomesteadDetailsVisibile = true;
- $(".landHomesteadDetails_wrap").css({ bottom: "-100vh" });
- $(".landHomesteadDetails_wrap").animate(
- {
- bottom: "0",
- },
- 300
- );
- } else {
- $(".landHomesteadDetails_wrap").css({ bottom: "0" });
- $(".landHomesteadDetails_wrap").animate(
- {
- bottom: "-100vh",
- },
- 300
- );
- setTimeout(() => {
- this.landHomesteadDetailsVisibile = false;
- }, 300);
- }
+ //单选
+ handleChecked() {
+ this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
+ console.log(this.checkAllFlag);
},
-
closeSearchBox(){
this.showSearch = false ;
var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
@@ -4400,6 +4398,30 @@
deleteHistory(){
console.log("进入aa");
},
+ zjdTz(){
+ console.log(this.htZjdZrzFsss);
+ this.mapZjdTeAll.active =1;
+ this.mapZjdTeAll.mapZjdAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
+ this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ this.$router.push({path:'/homesteadSurvey/add'});
+ console.log(this.mapZjdTeAll);
+ },
+ zrzTz(){
+ this.mapZjdTeAll.active =3;
+ this.mapZjdTeAll.mapZrzAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
+ this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ this.$router.push({path:'/homesteadSurvey/add'});
+ },
+ fsssTz(){
+ this.mapZjdTeAll.active =4;
+ this.mapZjdTeAll.mapFsssAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
+ this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
+ this.$cookies.set("search",this.mapZjdTeAll);
+ this.$router.push({path:'/homesteadSurvey/add'});
+ }
+
}
}