空间信息
-
+
+
+
+
+
-
-
-
+
上传
-
-
附属设施信息
-
+
-
+
+
-
-
-
-
+
+
@@ -89,11 +90,11 @@
{{limitWords(item.shyqrdbxm)}}
-
diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue
index 7c7533ee..723272aa 100644
--- a/src/views/homesteadSurvey/list2.vue
+++ b/src/views/homesteadSurvey/list2.vue
@@ -28,7 +28,7 @@
成员信息
+
保存
@@ -335,6 +352,8 @@
showhncyjzqk:false,
showhzoccupation:false,
showhzjzqk:false,
+ nhdmOptions:null,
+ showHzxx:false,
// 下拉刷新
isLoadingnh:false,
countnh:0,
@@ -495,6 +514,7 @@
this.jzhcssfyzfOptions = this.dictTypeList.jzhcssfyzf;
this.cybzOptions = this.dictTypeList.member_remark;
})
+ this.getList();
this.item = JSON.parse(localStorage.getItem("surveyItem"));
let data = this.$route.query;
this.form = data.item;
@@ -515,6 +535,11 @@
this.$set(this.form, 'sfbccm', "1");
this.$set(this.form, 'occupation', "1");
this.$set(this.form, 'jzqk', "1");
+ }
+ if(this.form.yhzgx !== "02"){
+ this.showHzxx = false;
+ }else{
+ this.showHzxx = true;
}
this.getDicts("family_status").then(response => {
var arr = [];
@@ -569,6 +594,15 @@
}
},
methods: {
+ getList(){
+ listNhhncy({yhzgx:"02"}).then(response => {
+ this.nhdmOptions = response.rows;
+ this.nhdmOptions = this.nhdmOptions.map(function(item){
+ item.xm = item.xm +"-"+ item.nhdm;
+ return {xm:item.xm,nhdm:item.nhdm}
+ });
+ });
+ },
showUploadList(){
this.showImageList = true;
},
@@ -785,6 +819,16 @@
// on cancel
});
},
+ onnhdmChanged(val){
+ this.$set(this.form, 'nhdm', val.nhdm);
+ },
+ onyhzgxChanged(val){
+ if(val === "02" ){
+ this.showHzxx = true;
+ }else{
+ this.showHzxx = false;
+ }
+ },
//删除户主
deletenh(item,index){
let yes = true
@@ -920,6 +964,7 @@
})
return label
},
+
onRefreshzjd(){
this.isLoadingzjd = false;
let _this = this
diff --git a/src/views/homesteadSurvey/hncyList2.vue b/src/views/homesteadSurvey/hncyList2.vue
index de605131..13237452 100644
--- a/src/views/homesteadSurvey/hncyList2.vue
+++ b/src/views/homesteadSurvey/hncyList2.vue
@@ -57,27 +57,31 @@
-
-
-
+
+ 
分户
移户设为户主
+
+
+ 农户成员信息
- +户主专用信息
+
+
户主专用信息
-户内成员
-
+
+
+
+
+
+
+
-
- {{item.xm}}
-
分户
移户
设为户主
成员详情
删除
+
-
-
-
+
+ {{item.xm}}
+
成员详情
删除
与户主关系:{{yhzgxfy(item.yhzgx)}}
证件号码:{{item.zjhm}}
农户代码:{{item.nhdm}}
与户主关系:{{yhzgxfy(item.yhzgx)}}
证件号码:{{item.zjhm}}
农户代码:{{item.nhdm}}
分户移户设为户主
-
@@ -24,7 +25,7 @@
width="50"
height="50"
:src="require('../../assets/images/housesteadSurvey/task1.png')"
- @click="active=1,getList()"
+ @click="active=1,checkBadge()"
/>
+
@@ -131,6 +135,7 @@
finished2:false,
loading3:false,
finished3:false,
+ finished:true,
//全部
qbNums:0,
//已调查数量
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index d6a65fe0..adbc8535 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -9,9 +9,10 @@
src="https://img.yzcdn.cn/vant/leaf.jpg"
/>
+ 添加成员信息
-
调查员·采集员
-审核员
-{{nickName}}
+{{nickName}} + ·调查员 + ·审核员 +
全部任务
@@ -35,7 +36,7 @@ width="50" height="50" :src="require('../../assets/images/housesteadSurvey/task2.png')" - @click="active=2,getList()" + @click="active=2,checkBadge()" />已完成
@@ -46,7 +47,7 @@ width="50" height="50" :src="require('../../assets/images/housesteadSurvey/task3.png')" - @click="active=3,getList()" + @click="active=3,checkBadge()" />待调查
@@ -197,6 +198,12 @@ rwfbzt:"PUBLISHED", rwzxr:null }, + // 切换查询参数 + switchParams: { + rwwczt: null, + rwfbzt:"PUBLISHED", + rwzxr:null + }, nickName:"", text:0, isLoadingtask:false, @@ -218,6 +225,7 @@ }) if(this.checked){ let userId = this.$store.getters.userId; + this.nickName = this.$store.getters.nickName; this.$set(this.queryParams, "rwzxr", userId); this.getList(); }else{ @@ -367,6 +375,7 @@ this.$set(this.queryParams, "rwzxr", null); this.getList(); } + this.queryNum(); }, setCookies(item){ /* if(this.$cookies.get("upload")==null||this.$cookies.get("upload")==0){ @@ -410,6 +419,47 @@ this.showDropList = false; this.$set(this.queryParams, "parentId", val.deptId); this.getList(); + this.$set(this.switchParams, "parentId", val.deptId); + this.queryNum(); + }, + checkBadge(){ + this.getList(); + this.queryNum(); + }, + queryNum(){ + if(this.checked){ + let userId = this.$store.getters.userId; + this.$set(this.switchParams, "rwzxr", userId); + listTask(this.switchParams).then(response => { + this.done = 0; + this.todo = 0; + this.total = response.total; + response.rows.map(res => { + if(res.rwwczt == "FINISHED"){ + this.done+=1 + }else{ + this.todo+=1 + } + // if(res.rwzxr!=null&&res.rwzxr!=''){ + // res.rwzxr = res.rwzxr.split(',') + }) + + }); + }else{ + this.$set(this.switchParams, "rwzxr", null); + listTask(this.switchParams).then(response => { + this.done = 0; + this.todo = 0; + this.total = response.total; + response.rows.map(res => { + if(res.rwwczt == "FINISHED"){ + this.done+=1 + }else{ + this.todo+=1 + } + }) + }); + } }, getList() { this.totalList = [] @@ -430,10 +480,13 @@ this.$set(this.queryParams, "pageNum", this.countqb + 1); } listTask(this.queryParams).then(response => { - this.done = 0; - this.todo = 0; - this.total = response.total; + if(this.active==1) { + this.done = 0; + this.todo = 0; + this.total = response.total; + } response.rows.map(res => { + console.info(this.active); if(this.active==1) { if(res.rwwczt == "FINISHED"){ this.done+=1 @@ -447,10 +500,8 @@ // } this.totalList = response.rows; }else if(this.active==2) { - this.done+=1 this.doneList.push(res); }else{ - this.todo+=1 this.todoList.push(res); } }) diff --git a/src/views/homesteadSurvey/list.vue b/src/views/homesteadSurvey/list.vue index 6a8d37f8..7d2379b7 100644 --- a/src/views/homesteadSurvey/list.vue +++ b/src/views/homesteadSurvey/list.vue @@ -52,13 +52,14 @@
{{limitWords(item.shyqrdbxm)}}
- 
详情
详情
调查
调查
删除
-
入户核查
+ 入户
农户信息
所有权人
切换地图
@@ -50,12 +50,13 @@
-
-
-
+
-
-
-
-
-
-
+
入户核查
+ 农户信息
+ 所有权人
+ 切换地图
-
@@ -1243,9 +1255,13 @@
totalH:0,
// 总人数
totalR:0,
- zjdSx:true,
- zrzSx :true,
- fsssSx:true,
+ zjdDdc:true,
+ zjdDcyc:false,
+ zjdDcwc:false,
+ zjdDcbh:false,
+ zjdSptg:false,
+ zrzSx :false,
+ fsssSx:false,
showhncysjly:false,
showhzsjly:false,
showhncycybz:false,
@@ -1337,6 +1353,7 @@
mapZrzData:"",
mapFsssData:"",
mapZjdDataTure:"",
+ height: null,
mapZjdTeAll:{
active:"",
mapZjdAData:{},
@@ -1354,7 +1371,7 @@
mapTownList: null,
mapVillageList: null,
coordinate:"",
- checked:['zjdSx', 'zrzSx', 'fsssSx'],
+ checked:['zjdDdc'],
checkAllMap: false,
sx:"",
drawingClick:true,
@@ -1375,12 +1392,12 @@
//绘图
htZjdZrzFsss:"",
//筛选
- checkAllFlag: true,
+ checkAllFlag: false,
CheckedAllArr: [],//全选数组
dataForm: {
imageUrl: []
},
- dataList: [["fsssSx"],["zjdSx"],["zrzSx"]], //地图使用 --end
+ dataList: [["zjdDdc"],["zjdDcyc"],["zjdDcwc"],["zjdDcbh"],["zjdSptg"], ["fsssSx"],["zrzSx"]], //地图使用 --end
checkBoxAll:[],
//地图跳转存之
mapAddJump:"",
@@ -1400,7 +1417,7 @@
uploadImgList:[],
uploadImgList1:[],
// 字典列表json
- dictTypeList:null,
+ dictTypeList:null
};
},
mounted(){
@@ -1447,7 +1464,6 @@
this.mapAddJumpNum =1;
this.mapShow();
this.getZjdList();
- this.getTotalHR();
if(this.item.taskStatus=="FINISHED"){
this.isFinished = true
}else{
@@ -1458,7 +1474,6 @@
}else {
this.item = JSON.parse(localStorage.getItem("surveyItem"));
this.getZjdList();
- this.getTotalHR();
}
},
methods: {
@@ -3288,13 +3303,61 @@
//国有数据加载----------------------------------end
//宅基地图层查询开始 ------------------start
//var cql_filter_all = "dept_id='" + that.$cookies.get("item").deptId + "'";
- var zjdTc = new ol.layer.Image({
+ let zjdDdc = new ol.layer.Image({
+ source: new ol.source.ImageWMS({
+ url: that.mapGeoServerUrl + "/wms",
+ params: {
+ LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+ TILED: true,
+ cql_filter: cql_filter+" and survey_status = '1'",
+ SRID: 3857,
+ TIMESTAMP: new Date().getTime(),
+ },
+ }),
+ });
+ let zjdDcyc = new ol.layer.Image({
+ source: new ol.source.ImageWMS({
+ url: that.mapGeoServerUrl + "/wms",
+ params: {
+ LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+ TILED: true,
+ cql_filter: cql_filter+" and survey_status = '2'",
+ SRID: 3857,
+ TIMESTAMP: new Date().getTime(),
+ },
+ }),
+ });
+ let zjdDcwc = new ol.layer.Image({
+ source: new ol.source.ImageWMS({
+ url: that.mapGeoServerUrl + "/wms",
+ params: {
+ LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+ TILED: true,
+ cql_filter: cql_filter+" and survey_status = '3'",
+ SRID: 3857,
+ TIMESTAMP: new Date().getTime(),
+ },
+ }),
+ });
+ let zjdDcbh = new ol.layer.Image({
+ source: new ol.source.ImageWMS({
+ url: that.mapGeoServerUrl + "/wms",
+ params: {
+ LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
+ TILED: true,
+ cql_filter: cql_filter+" and survey_status = '4'",
+ SRID: 3857,
+ TIMESTAMP: new Date().getTime(),
+ },
+ }),
+ });
+ let zjdSptg = new ol.layer.Image({
source: new ol.source.ImageWMS({
url: that.mapGeoServerUrl + "/wms",
params: {
- LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx',
+ LAYERS: 'nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey',
TILED: true,
- cql_filter: cql_filter+"and survey_status = '1'",
+ cql_filter: cql_filter+" and survey_status = '5'",
SRID: 3857,
TIMESTAMP: new Date().getTime(),
},
@@ -3306,9 +3369,9 @@
service: "WFS",
version: "1.0.0",
request: "GetFeature",
- typename: "nsgk_wulanhaote:t_homestead_zjdzdxx",
+ typename: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
//featureNS: 'nsgk_hc',//命名空间 URI
- cql_filter: cql_filter+" and survey_status = '1'",
+ cql_filter: cql_filter,
//featurePrefix: 'nationalwater',//工作区名称
//featureTypes: ['nationalwater:01fir'],//查询图层，可以是同一个工作区下多个图层，逗号隔开
outputFormat: "application/json",
@@ -3477,7 +3540,6 @@
},
}),
});
- map.addLayer(zrzTc);
//自然幢图层查询开始 ------------------start
var fsssTc;
@@ -3494,8 +3556,7 @@
},
}),
});
- map.addLayer(fsssTc);
- map.addLayer(zjdTc);
+ map.addLayer(zjdDdc);
var Zb;
var latitude;
var longitude;
@@ -4092,37 +4153,135 @@
//按照查询 定位地图-----------------end
//筛选附属设施-----------------------------------start
- $("#fsssSx").click(function () {
- if(!that.fsssSx){
+ $("#fsssSx").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
map.addLayer(fsssTc);
- }else {
+ that.fsssSx = true;
+ }else{
map.removeLayer(fsssTc);
+ that.fsssSx = false;
}
});
- $("#zrzSx").click(function () {
- if(!that.zrzSx){
+ $("#zrzSx").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
map.addLayer(zrzTc);
- }else {
+ that.zrzSx = true;
+ }else{
map.removeLayer(zrzTc);
+ that.zrzSx = false;
+ }
+ });
+ $("#zjdDdc").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
+ map.addLayer(zjdDdc);
+ that.zjdDdc = true;
+ }else{
+ map.removeLayer(zjdDdc);
+ that.zjdDdc = false;
}
});
- $("#zjdSx").click(function () {
- if(!that.zjdSx){
- map.addLayer(zjdTc);
+ $("#zjdDcyc").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
+ map.addLayer(zjdDcyc);
+ that.zjdDcyc = true;
+ }else{
+ map.removeLayer(zjdDcyc);
+ that.zjdDcyc = false;
+ }
+ });
+ $("#zjdDcwc").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
+ map.addLayer(zjdDcwc);
+ that.zjdDcwc = true;
+ }else{
+ map.removeLayer(zjdDcwc);
+ that.zjdDcwc = false;
+ }
+ });
+ $("#zjdDcbh").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
+ map.addLayer(zjdDcbh);
+ that.zjdDcbh = true;
+ }else{
+ map.removeLayer(zjdDcbh);
+ that.zjdDcbh = false;
+ }
+ });
+ $("#zjdSptg").click(function (e) {
+ if(e.delegateTarget.ariaChecked === "false"){
+ map.addLayer(zjdSptg);
+ that.zjdSptg = true;
}else {
- map.removeLayer(zjdTc);
+ map.removeLayer(zjdSptg);
+ that.zjdSptg = false;
}
});
$("#checkAll").click(function () {
- if(!that.fsssSx && !that.zjdSx && !that.zrzSx){
- map.addLayer(zjdTc);
- map.addLayer(zrzTc);
- map.addLayer(fsssTc);
- }else {
+ if(!that.checkAllFlag){
+
+ if(!that.fsssSx){
+ map.addLayer(fsssTc);
+ }
+ if(!that.zrzSx){
+ map.addLayer(zrzTc);
+ }
+ if(!that.zjdDdc){
+ map.addLayer(zjdDdc);
+ }
+ if(!that.zjdDcyc){
+ map.addLayer(zjdDcyc);
+ }
+ if(!that.zjdDcwc){
+ map.addLayer(zjdDcwc);
+ }
+ if(!that.zjdDcbh){
+ map.addLayer(zjdDcbh);
+ }
+ if(!that.zjdSptg){
+ map.addLayer(zjdSptg);
+ }
+ }else{
+ that.zjdDdc = false;
map.removeLayer(zrzTc);
- map.removeLayer(zjdTc);
+ map.removeLayer(zjdDdc);
+ map.removeLayer(zjdDcyc);
+ map.removeLayer(zjdDcwc);
+ map.removeLayer(zjdDcbh);
+ map.removeLayer(zjdSptg);
map.removeLayer(fsssTc);
}
+ // console.info(that.fsssSx);
+ // if(!that.fsssSx && !that.zjdDdc && !that.zjdDcyc && !that.zjdDcwc && !that.zjdDcbh && !that.zjdSptg && !that.zrzSx){
+ // map.addLayer(zjdDdc);
+ // map.addLayer(zjdDcyc);
+ // map.addLayer(zjdDcwc);
+ // map.addLayer(zjdDcbh);
+ // map.addLayer(zjdSptg);
+ // map.addLayer(zrzTc);
+ // map.addLayer(fsssTc);
+ // that.fsssSx = true;
+ // that.zjdDdc = true;
+ // that.zjdDcyc = true;
+ // that.zjdDcwc = true;
+ // that.zjdDcbh = true;
+ // that.zjdSptg = true;
+ // that.zrzSx = true;
+ // }else {
+ // map.removeLayer(zrzTc);
+ // map.removeLayer(zjdDdc);
+ // map.removeLayer(zjdDcyc);
+ // map.removeLayer(zjdDcwc);
+ // map.removeLayer(zjdDcbh);
+ // map.removeLayer(zjdSptg);
+ // map.removeLayer(fsssTc);
+ // that.fsssSx = false;
+ // that.zjdDdc = false;
+ // that.zjdDcyc = false;
+ // that.zjdDcwc = false;
+ // that.zjdDcbh = false;
+ // that.zjdSptg = false;
+ // that.zrzSx = false;
+ // }
});
//筛选附属设施-----------------------------------end
// //获取类型开始 侧面-----------------------------------------------------------------start
@@ -4495,7 +4654,7 @@
var wmsSource = new ol.source.TileWMS({
url: that.mapGeoServerUrl+"/wms",
params: {
- LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx",
+ LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
TILED: true,
SRID: 3857,
serverType: "geoserver",
@@ -4508,7 +4667,7 @@
var ZjdwmsSource = new ol.source.TileWMS({
url: that.mapGeoServerUrl+"/wms",
params: {
- LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx",
+ LAYERS: "nsgk_wulanhaote:t_homestead_zjdzdxx_mobile_survey",
TILED: true,
SRID: 3857,
serverType: "geoserver",
@@ -4689,14 +4848,14 @@
that.mapZjdTeAll.mapFsssAData = {};
that.mapZjdDataTure = "";
setTimeout(() => {
- if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx") {
+ if ($("#info .featureInfo .featureInfo").text() == "t_homestead_zjdzdxx_mobile_survey") {
map.removeLayer(hc_land_on);
that.mapHasDateStatus = 2;
that.mapXs = true;
let obj = {};
let trs = $("#info .featureInfo").find("tr:eq(1)");
let zjdXq = trs.find("td").eq(0).text();
- let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", "");
+ let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx_mobile_survey.", "");
obj.id = zjdIdNum; // 主键id
obj.deptName = trs.find("td").eq(3).text();//行政区划名称
@@ -4731,19 +4890,19 @@
//自然幢图层查询开始 ------------------start
//附属设施图层查询开始 ------------------start
//var cql_filter_map = "dept_id='" + that.$cookies.get("item").deptId + "'" + "and zjddm='" + obj.zjddm + "'";
- fsssTc = new ol.layer.Image({
- source: new ol.source.ImageWMS({
- url: that.mapGeoServerUrl + "/wms",
- params: {
- LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
- TILED: true,
- cql_filter: cql_filter_map,
- SRID: 3857,
- TIMESTAMP: new Date().getTime(),
- },
- }),
- });
- map.addLayer(fsssTc);
+ // fsssTc = new ol.layer.Image({
+ // source: new ol.source.ImageWMS({
+ // url: that.mapGeoServerUrl + "/wms",
+ // params: {
+ // LAYERS: 'nsgk_wulanhaote:t_homestead_fsss',
+ // TILED: true,
+ // cql_filter: cql_filter_map,
+ // SRID: 3857,
+ // TIMESTAMP: new Date().getTime(),
+ // },
+ // }),
+ // });
+ // map.addLayer(fsssTc);
//附属设施图层查询开始 ------------------end
that.$cookies.set("search", "")
//that.$cookies.set("map", "")
@@ -5650,7 +5809,7 @@
this.$cookies.set("search","")
let trs = $("#info .featureInfo").find("tr:eq(1)");
let zjdXq = trs.find("td").eq(0).text();
- let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx.", "");
+ let zjdIdNum = zjdXq.replace("t_homestead_zjdzdxx_mobile_survey.", "");
getZjdzd(zjdIdNum).then((response) => {
this.mapZjdData = response.data;
this.mapZjdTeAll.active = 1;
@@ -5668,6 +5827,7 @@
//this.$cookies.set("search",this.mapZjdTeAll);
this.$cookies.set("search","")
console.info(this.mapZjdTeAll);
+ localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
this.$router.push({path:'/homesteadSurvey/zrzAdd',query: this.mapZjdTeAll.mapZrzAData});
} else {
this.$toast("必须有宅基地数据才能进入自然幢核查");
@@ -5677,6 +5837,7 @@
this.mapZjdTeAll.active = 4;
//this.$cookies.set("search", this.mapZjdTeAll);
this.$cookies.set("search","")
+ localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZjdAData));
this.$router.push({path: '/homesteadSurvey/fsssAdd',query: this.mapZjdTeAll.mapFsssAData});
} else {
this.$toast("必须有宅基地数据才能进入附属设施核查");
@@ -5744,7 +5905,7 @@
},
//
checkAllArray(value){
- if(this.checked.length<3){
+ if(this.checked.length<7){
this.$refs.checkboxGroup.toggleAll(true);
}else{
this.$refs.checkboxGroup.toggleAll(false);
@@ -5769,12 +5930,17 @@
//单选
handleChecked(value) {
// this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
- if (value.length<3){
+ if (value.length<7){
this.checkAllFlag = false;
}else{
this.checkAllFlag = true;
}
- value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true;
+ console.info(value);
+ value.indexOf('zjdDdc') == -1 ? this.zjdDdc = false : this.zjdDdc = true;
+ value.indexOf('zjdDcyc') == -1 ? this.zjdDcyc = false : this.zjdDcyc = true;
+ value.indexOf('zjdDcwc') == -1 ? this.zjdDcwc = false : this.zjdDcwc = true;
+ value.indexOf('zjdDcbh') == -1 ? this.zjdDcbh = false : this.zjdDcbh = true;
+ value.indexOf('zjdSptg') == -1 ? this.zjdSptg = false : this.zjdSptg = true;
value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
},
@@ -5795,6 +5961,25 @@
this.mapZjdTeAll.active =1;
this.mapZjdTeAll.mapZjdAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
this.mapZjdTeAll.mapZjdAData.theGeomJson =this.htZjdZrzFsss;
+ console.info(this.mapZjdTeAll.mapZjdAData.theGeomJson);
+ listSuyqr({deptId: this.item.deptId}).then((response) => {
+ this.$set(this.mapZjdTeAll.mapZjdAData, "suyqrdm",response.rows[0]);
+ });
+ this.$set(this.mapZjdTeAll.mapZjdAData, "zjdlyzk","1");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "landStatus","1");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "houseOwnership","2");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "landPhms","10");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "isMore","0");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "sffz","0");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "sfcz","0");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "zjdqdfs","01");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "sjly","01");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "qlsdfs","1");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "qllx","1");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "qlxz","203");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "yt","01");
+ this.$set(this.mapZjdTeAll.mapZjdAData, "dj","1");
+
//this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
//this.$cookies.set("search",this.mapZjdTeAll);
this.$cookies.set("search","")
@@ -5807,28 +5992,33 @@
},
zrzTz(){
if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
+ console.info(this.mapZjdData);
this.mapZjdTeAll.active =3;
- this.mapZjdTeAll.mapZrzAData.theGeom =this.htZjdZrzFsss;
+ this.mapZjdTeAll.mapZrzAData.theGeomJson =this.htZjdZrzFsss;
+ console.info(this.htZjdZrzFsss);
this.mapZjdTeAll.mapZrzAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
+ this.mapZjdTeAll.mapZrzAData.zjddm = this.mapZjdData.zjddm;
+ this.mapZjdTeAll.mapZrzAData.fwjg = "01";
//this.mapZjdTeAll.mapZrzAData.deptId = this.$cookies.get("item").deptId;
//this.$cookies.set("search",this.mapZjdTeAll);
this.$cookies.set("search","")
- localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapZrzAData));
- this.$router.push({path:'/homesteadSurvey/add3'});
+ localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdData));
+ this.$router.push({name:'zrzAdd',query:this.mapZjdTeAll.mapZrzAData});
}else {
this.$toast("请先在地图上选择宅基地后，再选择自然幢按钮");
}
},
fsssTz(){
if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
- this.mapZjdTeAll.active =4;
- this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss;
+ this.mapZjdTeAll.active =4;
+ this.mapZjdTeAll.mapFsssAData.theGeomJson =this.htZjdZrzFsss;
+ this.mapZjdTeAll.mapFsssAData.zjddm = this.mapZjdData.zjddm;
this.mapZjdTeAll.mapFsssAData.deptId =JSON.parse(localStorage.getItem("surveyItem")).deptId;
//this.mapZjdTeAll.mapFsssAData.deptId = this.$cookies.get("item").deptId;
//this.$cookies.set("search",this.mapZjdTeAll);
this.$cookies.set("search","")
- localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdTeAll.mapFsssAData));
- this.$router.push({path:'/homesteadSurvey/add4'});
+ localStorage.setItem("zjdzdxxItem",JSON.stringify(this.mapZjdData));
+ this.$router.push({name:'fsssAdd',query:this.mapZjdTeAll.mapFsssAData});
}else {
this.$toast("请先在地图上选择宅基地后，再选择附属设施按钮");
}
@@ -5872,25 +6062,23 @@
}
.activeBtn{
background:#fff;
- height:50px;
- border-radius:25px;
+ border-radius:25PX;
color:#7AC943;
- line-height:50px;
+ line-height:30PX;
text-align:center;
- font-size:20px;
- width: 26%;
+ font-size:14PX;
+ width: 25%;
margin:0 10px;
box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
}
.disactiveBtn{
background:rgba(255,255,255,.4);
- height:50px;
- border-radius:25px;
+ border-radius:25PX;
color:#fff;
- line-height:50px;
+ line-height:30PX;
text-align:center;
- font-size:20px;
- width: 26%;
+ font-size:14PX;
+ width: 25%;
margin:0 10px;
box-shadow: 0px 5px 6px 0px rgba(0,0,0,0.16);
}
diff --git a/src/views/homesteadSurvey/nhAdd.vue b/src/views/homesteadSurvey/nhAdd.vue
index d9e49fc9..17ed5209 100644
--- a/src/views/homesteadSurvey/nhAdd.vue
+++ b/src/views/homesteadSurvey/nhAdd.vue
@@ -3,7 +3,7 @@
-
全选
-
-
+
+
- 附属设施
+ 待调查
-
+
+
+ 调查异常
+
+
+
+
+ 调查完成
+
+
+
- 自然幢
+ 调查驳回
-
+
- 宅基地
+ 审批通过
+
+
+ 附属设施
+
+
+
+
+
+ 自然幢
+
+
+
@@ -1198,8 +1210,8 @@
- 宅基地数：
- {{qbNums}} 宗
-
-
- 使用权人数：
- {{totalR}} 人
-
+
+
@@ -567,22 +557,44 @@
+ 
+
+
+ + 宅基地数： + {{qbNums}} 宗 +
+
+ 
+
+ + 使用权人数： + {{totalR}} 人 +
宅基地
- - +自然幢
+附属设施
+
保存
@@ -296,6 +313,8 @@ export default {
active:2,
permission:false,
yhzgxOperate:false,
+ nhdmOptions:null,
+ showHzxx:false,
// 使用权人列表
syqrlist:[
{
@@ -318,6 +337,7 @@ export default {
}else{
this.$set(this.form, 'yhzgx', "11");
}
+
this.$set(this.form, 'zjlx', "01");
this.$set(this.form, 'xb', "1");
this.$set(this.form, 'hklx', "01");
@@ -334,15 +354,24 @@ export default {
this.$set(this.form, 'occupation', "1");
this.$set(this.form, 'jzqk', "1");
}
- console.info(data);
+ if(this.form.yhzgx !== "02"){
+ this.showHzxx = false;
+ }else{
+ this.showHzxx = true;
+ }
+ this.getList();
},
mounted(){
},
methods: {
getList(){
- listNhhncy(this.form).then(response => {
-
+ listNhhncy({yhzgx:"02"}).then(response => {
+ this.nhdmOptions = response.rows;
+ this.nhdmOptions = this.nhdmOptions.map(function(item){
+ item.xm = item.xm +"-"+ item.nhdm;
+ return {xm:item.xm,nhdm:item.nhdm}
+ });
});
},
submitzjd(){
@@ -398,6 +427,16 @@ export default {
MapTag: function (data) {
this.$refs[this.zjdProductResh].drawingPaceCountryDarw();
},
+ onnhdmChanged(val){
+ this.$set(this.form, 'nhdm', val.nhdm);
+ },
+ onyhzgxChanged(val){
+ if(val === "02" ){
+ this.showHzxx = true;
+ }else{
+ this.showHzxx = false;
+ }
+ },
goBack(){
if(this.ztMap && this.enterMap ==1){
if(this.form.id == null){
diff --git a/src/views/homesteadSurvey/nhcyList.vue b/src/views/homesteadSurvey/nhcyList.vue
index ae6f7240..e67b818d 100644
--- a/src/views/homesteadSurvey/nhcyList.vue
+++ b/src/views/homesteadSurvey/nhcyList.vue
@@ -3,7 +3,7 @@
-
农户信息
- +户主专用信息
+
+
户主专用信息
-
+
@@ -104,7 +104,7 @@
户内成员
-
-
+
diff --git a/src/views/homesteadSurvey/nmfwAdd.vue b/src/views/homesteadSurvey/nmfwAdd.vue
index ec1b7978..f61a3946 100644
--- a/src/views/homesteadSurvey/nmfwAdd.vue
+++ b/src/views/homesteadSurvey/nmfwAdd.vue
@@ -3,7 +3,7 @@
+ 添加成员信息
+
+
+
+ 保存
+
+
+
@@ -64,6 +77,10 @@
data(){
return{
showPassword:false,
+ showMessage:false,
+ userName:null,
+ nickName:null,
+ jsName:null,
oldPassword: "",
newPassword: "",
confirmPassword: "",
@@ -83,6 +100,11 @@
this.$cookies.set("upload",0)
}
+ },
+ userMessage(){
+ this.userName = this.$store.getters.name;
+ this.nickName = this.$store.getters.nickName;
+ this.showMessage = true;
},
submit() {
if(this.confirmPassword
diff --git a/src/views/homesteadSurvey/shyqrAdd.vue b/src/views/homesteadSurvey/shyqrAdd.vue
index 47b191a4..eb37113d 100644
--- a/src/views/homesteadSurvey/shyqrAdd.vue
+++ b/src/views/homesteadSurvey/shyqrAdd.vue
@@ -3,7 +3,7 @@
-
农民房屋信息
- +
+
个人信息
+修改密码
@@ -45,6 +48,16 @@ + +
+
+
{
+ this.nmfwDictionaries = response.rows;
+ });
}
this.$set(this.form, 'zjddm', this.zjdzdxx.zjddm);
listZjdzd({zjddm:this.zjdzdxx.zjddm}).then(response => {
this.form.bdcdyh = response.rows[0].bdcdyh;
});
- listNmfw({zjddm:this.zjdzdxx.zjddm}).then(response => {
- this.nmfwDictionaries = response.rows;
- });
- // this.getList();
+ this.getList();
},
mounted(){
},
methods: {
getList(){
- listNh({}).then(response => {
- this.nhdmDictionaries = response.rows;
+ listNhhncy({yhzgx:"02"}).then(response => {
+ this.nhdmDictionaries = response.rows.map(function(item){
+ item.nhValue = item.xm + item.nhdm;
+ return {
+ nhValue:item.nhValue,
+ hzxm:item.xm,
+ sqrxb:item.xb,
+ hzzjhm:item.zjhm,
+ nhdm:item.nhdm,
+ hzzjlx:item.zjlx,
+ lxdh:item.lxdh,
+ hklx:item.hklx,
+ sfbjtjjzzcy:item.sfbjtjjzzcy,
+ deptId:item.deptId,
+ deptName:item.deptName,
+ };
+ });
+ this.newList = this.nhdmDictionaries;
});
},
/** 模糊查询人员信息 */
remoteTransfereeMethod(query) {
if (query !== "") {
- listNh({hzxm:query}).then((response) => {
+ listNhhncy({xm:query,yhzgx:"02"}).then((response) => {
if (response.code == 200) {
this.nhdmDictionaries = response.rows.map(function (item) {
return {
- hzxm:item.hzxm,
+ hzxm:item.xm,
sqrxb:item.xb,
- hzzjhm:item.hzzjhm,
+ hzzjhm:item.zjhm,
nhdm:item.nhdm,
- hzzjlx:item.hzzjlx,
+ hzzjlx:item.zjlx,
lxdh:item.lxdh,
+ hklx:item.hklx,
+ sfbjtjjzzcy:item.sfbjtjjzzcy,
deptId:item.deptId,
deptName:item.deptName,
}
@@ -422,7 +459,15 @@ export default {
shyqrdmxmChange(val){
this.$set(this.form, "nhdm", val.nhdm);
this.$set(this.form, "shyqrdbzjhm", val.hzzjhm);
- this.showDropList = false;
+ this.$set(this.form, "shyqrdbxm", val.hzxm);
+ this.$set(this.form, "dh", val.lxdh);
+ this.$set(this.form, "xb", val.sqrxb);
+ this.$set(this.form, "hklx", val.hklx);
+ this.$set(this.form, "sfbncjtjjzzcy", val.sfbjtjjzzcy);
+ listNmfw({zjddm:this.zjdzdxx.zjddm,nhdm:val.nhdm}).then(response => {
+ this.nmfwDictionaries = response.rows;
+ });
+ this.shownhdm = false;
},
submitzjd(){
this.$refs.form.validate().then(() => {
@@ -461,6 +506,20 @@ export default {
this.$refs.zjdProductResh.drawingLyPaceCountryDarw();
},1000);
},
+ onSearch(val) {
+ console.info(val);
+ if(this.nhdmDictionaries.length>0){
+ this.newList = []
+ for(let j = 0 ;j-1){
+ this.newList.push(this.nhdmDictionaries[j]);
+ }
+ }
+ }
+ if(val==""){
+ this.getList()
+ }
+ },
/** 查找地图中宅基地 */
closeMoule: function (data) {
this.form.zjddm = data;
diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue
index 5c72b877..eaa507a0 100644
--- a/src/views/homesteadSurvey/zrzAdd.vue
+++ b/src/views/homesteadSurvey/zrzAdd.vue
@@ -3,7 +3,7 @@
-
使用权人信息
-
-
- {{item.hzxm}}-{{item.nhdm}}
-
-
+
+
自然幢信息