Pārlūkot izejas kodu

核查功能优化

wulanhaote
hbao pirms 3 gadiem
vecāks
revīzija
4e4202956c
1 mainītis faili ar 110 papildinājumiem un 57 dzēšanām
  1. +110
    -57
      src/views/homesteadSurvey/list.vue

+ 110
- 57
src/views/homesteadSurvey/list.vue Parādīt failu

@@ -471,7 +471,7 @@
<van-cell center v-for="(item,index) in mapDataAll" :key="index"> <van-cell center v-for="(item,index) in mapDataAll" :key="index">
<template #title> <template #title>
<p><van-icon name="manager" /><span>{{item.syqr}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span> <p><van-icon name="manager" /><span>{{item.syqr}}</span><span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.paceType}}</span>
<span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span></p>
<!--<span style="background: rgba(122, 201, 67, 0.4);color:#7ac943">{{item.typeTc}}</span>--></p>
</template> </template>
<template #default> <template #default>
<p style="border: 1px solid #7ac943;color:#7ac943;" @click="zjdSs(item)">查看详情</p> <p style="border: 1px solid #7ac943;color:#7ac943;" @click="zjdSs(item)">查看详情</p>
@@ -1505,7 +1505,6 @@
}, },
setCookies(item){ setCookies(item){
this.$cookies.set("search",JSON.stringify(item)); this.$cookies.set("search",JSON.stringify(item));
console.log(JSON.stringify(item));
}, },
// 入户核查搜索框新增。 // 入户核查搜索框新增。
onClickzjd(){ onClickzjd(){
@@ -1759,7 +1758,6 @@
"deptId" : this.item.deptId, "deptId" : this.item.deptId,
"nhValue" : this.nhvalue "nhValue" : this.nhvalue
} }
console.log(params)
listNh(params).then((response) => { listNh(params).then((response) => {
this.nhlist = response.rows this.nhlist = response.rows
}); });
@@ -1784,7 +1782,6 @@
"syqr" : this.zjdvalue "syqr" : this.zjdvalue
} }
listZjdzd(params).then((response) => { listZjdzd(params).then((response) => {
console.log(response)
if (response.code == 200) { if (response.code == 200) {
this.list2 = response.rows this.list2 = response.rows
} }
@@ -1998,7 +1995,6 @@
"pageSize":10, "pageSize":10,
} }
listZjdzd(params).then((response) => { listZjdzd(params).then((response) => {
console.log(response)
if (response.code == 200) { if (response.code == 200) {
this.qbNums = response.total this.qbNums = response.total
this.list = response.rows this.list = response.rows
@@ -2111,7 +2107,6 @@
var that = this; var that = this;
setTimeout(function () { setTimeout(function () {
var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true) var height = $(".searchBar_wrap").outerHeight(true) - $(".searchBar_wrap .van-search").outerHeight(true)
console.log($('.searchBox').outerHeight(true)+'px')
that.bottomHeight = -height+'px' that.bottomHeight = -height+'px'
},500) },500)
}, },
@@ -2224,7 +2219,6 @@
return geojsonmap; return geojsonmap;
}) })
.then((data) => { .then((data) => {
console.log(data);
let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize()); let resolution = map.getView().getResolutionForExtent(data.bbox,map.getSize());
map.getView().fit(data.bbox); map.getView().fit(data.bbox);
map.getView().setResolution(resolution); map.getView().setResolution(resolution);
@@ -2614,7 +2608,6 @@
//地图操作定义------------end //地图操作定义------------end
//定位当前位置 ------start //定位当前位置 ------start
$("#dwMapAll").on("click", function () { $("#dwMapAll").on("click", function () {
console.log("进入定位图层")
//删除测量记录操作--------start //删除测量记录操作--------start
//将矢量图层从图中删除 //将矢量图层从图中删除
//map.removeLayer(helpTooltip); //map.removeLayer(helpTooltip);
@@ -2633,7 +2626,6 @@
latitude = position.coords.latitude;// 获取纬度 latitude = position.coords.latitude;// 获取纬度
longitude = position.coords.longitude;// 获取经度 longitude = position.coords.longitude;// 获取经度
}); });
console.log(longitude,latitude);
if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){ if(latitude !=null && longitude !=null && latitude !="" && longitude !="" && latitude !=undefined && longitude !=undefined ){
Zb = [longitude,latitude]; Zb = [longitude,latitude];
}else { }else {
@@ -2698,7 +2690,6 @@


//开始绘制图层- -----start //开始绘制图层- -----start
$("#htMapAll").on("click", function () { $("#htMapAll").on("click", function () {
console.log("进入绘制图层")
//删除之前 测距操作添加map中的绘图 --------start //删除之前 测距操作添加map中的绘图 --------start
//map.removeLayer(helpTooltip); //map.removeLayer(helpTooltip);
map.removeLayer(vector); map.removeLayer(vector);
@@ -2732,7 +2723,6 @@
that.htZjdZrzFsss =that.coordinate; that.htZjdZrzFsss =that.coordinate;
// htMapAllFu(); // htMapAllFu();
}else { }else {
console.log("6");
$("#htMapAll").trigger("click"); $("#htMapAll").trigger("click");
} }
}); });
@@ -2762,7 +2752,6 @@
}); });
//删除之前绘制图层 //删除之前绘制图层
$("#deleteHistory").on("click", function () { $("#deleteHistory").on("click", function () {
console.log("否进入");
map.removeLayer(drawing); map.removeLayer(drawing);
that.showhzht = false; that.showhzht = false;
}); });
@@ -2800,11 +2789,9 @@
"syqr" : val, "syqr" : val,
"pageSize":20, "pageSize":20,
} }
console.log(params);
listZjdzd(params).then((response) => { listZjdzd(params).then((response) => {
if(response.rows.length>=0){ if(response.rows.length>=0){
that.mapDataAll = response.rows; that.mapDataAll = response.rows;
console.log(that.mapDataAll);
for(var hg=0; hg < that.mapDataAll.length; hg++){ for(var hg=0; hg < that.mapDataAll.length; hg++){
var mapNum = that.mapDataAll[hg].houseDataConfirmStatus; var mapNum = that.mapDataAll[hg].houseDataConfirmStatus;
if(mapNum == "UNCONFIRMED"){ if(mapNum == "UNCONFIRMED"){
@@ -2842,9 +2829,7 @@
duration: 1000, // 缩放持续时间,默认不需要设置 duration: 1000, // 缩放持续时间,默认不需要设置
}); });
} }
console.log(that.mapDataAll[hg].zjddm);
// listFsss(paramsZrz).then((response) => { // listFsss(paramsZrz).then((response) => {
// console.log(response);
// that.mapDataAll.push(response.rows); // that.mapDataAll.push(response.rows);
// }); // });
} }
@@ -3176,7 +3161,6 @@
//样式加载定义 //样式加载定义
var vector_drawing_delete; var vector_drawing_delete;
$("#area").click(function () { $("#area").click(function () {
console.log("进入测面");
if(that.textMjAll != "" && that.clickBbox !=""){ if(that.textMjAll != "" && that.clickBbox !=""){
// var styleFsss = new ol.style.Style({ // var styleFsss = new ol.style.Style({
// text: new ol.style.Text({ // text: new ol.style.Text({
@@ -3559,6 +3543,7 @@
* @param {option 可选} geometryField * @param {option 可选} geometryField
*/ */


//查询全部图层 -------查询叠加图层出现覆盖问题
var wmsSource = new ol.source.TileWMS({ var wmsSource = new ol.source.TileWMS({
url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms", url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
params: { params: {
@@ -3570,6 +3555,43 @@
}, },
}); });


//查询宅基地图层
var ZjdwmsSource = new ol.source.TileWMS({
url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
params: {
LAYERS: "zjd_dc:t_house_survey_zjdzd",
TILED: true,
SRID: 3857,
serverType: "geoserver",
crossOrigin: "anonymous",
},
});

//查询自然幢图层
var ZrzwmsSource = new ol.source.TileWMS({
url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
params: {
LAYERS: "zjd_dc:t_house_survey_zrz",
TILED: true,
SRID: 3857,
serverType: "geoserver",
crossOrigin: "anonymous",
},
});

//查询附属设施图层
var FssswmsSource = new ol.source.TileWMS({
url: "http://116.255.223.226:8080/geoserver/zjd_dc/wms",
params: {
LAYERS: "zjd_dc:t_house_survey_fsss",
TILED: true,
SRID: 3857,
serverType: "geoserver",
crossOrigin: "anonymous",
},
});


map.on("pointermove", function (evt) { map.on("pointermove", function (evt) {
if (evt.dragging) { if (evt.dragging) {
return; return;
@@ -3589,18 +3611,76 @@
); );
var viewResolution = map.getView().getResolution(); ///** @type {number} */ (view.getResolution()); var viewResolution = map.getView().getResolution(); ///** @type {number} */ (view.getResolution());
var zb = evt.coordinate; var zb = evt.coordinate;
var url = wmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "text/html" }
);
var url_bbox = wmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "application/json" }
);
var url;
var url_bbox;
if(that.fsssSx && that.zjdSx && that.zrzSx){
url = wmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "text/html" }
);
url_bbox = wmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "application/json" }
);
}else {
if(that.zjdSx){
url = ZjdwmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "text/html" }
);
url_bbox = ZjdwmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "application/json" }
);
} else if (that.fsssSx){
url = FssswmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "text/html" }
);
url_bbox = FssswmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "application/json" }
);
} else if (that.zrzSx){
url = ZrzwmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "text/html" }
);
url_bbox = ZrzwmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "application/json" }
);
} else {
url = wmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "text/html" }
);
url_bbox = wmsSource.getFeatureInfoUrl(
evt.coordinate,
viewResolution,
"EPSG:3857",
{ INFO_FORMAT: "application/json" }
);
}
}
if (url_bbox) { if (url_bbox) {
fetch(url_bbox).then((res) => { fetch(url_bbox).then((res) => {
var geojsonmap = res.json(); var geojsonmap = res.json();
@@ -3608,6 +3688,7 @@
}) })
.then((data) => { .then((data) => {
var center = ol.extent.getCenter(data.bbox); //获取边界区域的中心位置 var center = ol.extent.getCenter(data.bbox); //获取边界区域的中心位置
center = [center[0],center[1]-16];
that.clickBbox = center; that.clickBbox = center;
}) })
.catch((error) => { .catch((error) => {
@@ -3632,7 +3713,6 @@
that.mapZjdDataTure =""; that.mapZjdDataTure ="";
setTimeout(() => { setTimeout(() => {
if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") { if ($("#info .featureInfo .featureInfo").text() == "t_house_survey_zjdzd") {

// that.mapZjdDataTure =""; // that.mapZjdDataTure ="";
// that.mapZjdTeAll.mapZrzAData ={}; // that.mapZjdTeAll.mapZrzAData ={};
// that.mapZjdTeAll.mapFsssAData ={}; // that.mapZjdTeAll.mapFsssAData ={};
@@ -3783,14 +3863,12 @@
// } // }
// } // }
// }); // });
console.log(obj.id);
var vector_drawing_map; var vector_drawing_map;
let params = { let params = {
"deptId" : that.$cookies.get("item").deptId, "deptId" : that.$cookies.get("item").deptId,
"zjddm" : obj.zjddm, "zjddm" : obj.zjddm,
} }
listZjdzd(params).then((response) => { listZjdzd(params).then((response) => {
console.log(response);
that.mapZjdData = response.rows[0]; that.mapZjdData = response.rows[0];
that.mapZjdData.active = 1; that.mapZjdData.active = 1;
that.mapZjdTeAll.mapZjdAData =that.mapZjdData; that.mapZjdTeAll.mapZjdAData =that.mapZjdData;
@@ -3923,16 +4001,11 @@
"deptId" : that.$cookies.get("item").deptId, "deptId" : that.$cookies.get("item").deptId,
"zjddm" : obj.zjddm, "zjddm" : obj.zjddm,
} }
console.log(obj.zjddm);
console.log(params);
listZjdzd(params).then((response) => { listZjdzd(params).then((response) => {
console.log(response);
that.mapZjdData = response.rows[0]; that.mapZjdData = response.rows[0];
//that.mapZjdAData.active = 1; //that.mapZjdAData.active = 1;
that.mapZjdTeAll.mapZjdAData = that.mapZjdData; that.mapZjdTeAll.mapZjdAData = that.mapZjdData;
console.log(that.mapZjdData);
getZrz(obj.id).then((response) => { getZrz(obj.id).then((response) => {
console.log(response);
that.mapZrzData = response.data; that.mapZrzData = response.data;
that.mapZrzData.active = 3; that.mapZrzData.active = 3;
that.mapZjdTeAll.mapZrzAData =that.mapZrzData; that.mapZjdTeAll.mapZrzAData =that.mapZrzData;
@@ -4186,7 +4259,6 @@
} }
//数据库查询详情时使用----------------------------------------start //数据库查询详情时使用----------------------------------------start
// if(feature) { // if(feature) {
// console.log(feature);
// //document.getElementById("info").innerHTML = ""; // //document.getElementById("info").innerHTML = "";
// that.mapHaDataValue = true; // that.mapHaDataValue = true;
// var ifConsole = feature.values_.createBy; // var ifConsole = feature.values_.createBy;
@@ -4583,7 +4655,6 @@
checkClick(res){ checkClick(res){
// 1、全选与不全选模块 // 1、全选与不全选模块
$(".checkall").change(function() { $(".checkall").change(function() {
// console.log($(this).prop("checked"));输出全选按钮的选中状态
$(".item-list-checkbox .checkitem").prop("checked", $(this).prop("checked")); $(".item-list-checkbox .checkitem").prop("checked", $(this).prop("checked"));
if($(this).prop("checked")){ if($(this).prop("checked")){


@@ -4613,9 +4684,6 @@
}, },
//宅基地点击地图核查 //宅基地点击地图核查
zjdHc(){ zjdHc(){
console.log(this.zjdHcDy);
console.log(this.mapZjdDataTure);
console.log(this.mapZjdData);
if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){ if(this.zjdHcDy != "" && this.zjdHcDy != "undefined"){
if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){ if(this.mapZjdData !=undefined && this.mapZjdData !="" && this.mapZjdDataTure !=""){
this.mapZjdTeAll.active =1; this.mapZjdTeAll.active =1;
@@ -4652,7 +4720,6 @@
}, },
//搜索详情跳转 //搜索详情跳转
zjdSs(item){ zjdSs(item){
console.log(item);
this.mapZjdTeAll.mapZjdAData ={}; this.mapZjdTeAll.mapZjdAData ={};
this.mapZjdTeAll.mapZrzAData ={}; this.mapZjdTeAll.mapZrzAData ={};
this.mapZjdTeAll.mapFsssAData ={}; this.mapZjdTeAll.mapFsssAData ={};
@@ -4660,7 +4727,6 @@
if(item.typeTc =="宅基地"){ if(item.typeTc =="宅基地"){
getZjdzd(item.id).then((response) => { getZjdzd(item.id).then((response) => {
this.mapZjdData = response.data; this.mapZjdData = response.data;
console.log(this.mapZjdData);
this.mapZjdTeAll.active = 1; this.mapZjdTeAll.active = 1;
this.mapZjdTeAll.mapZjdAData = this.mapZjdData; this.mapZjdTeAll.mapZjdAData = this.mapZjdData;
this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search",this.mapZjdTeAll);
@@ -4672,7 +4738,6 @@
//let = //let =
getZjdzd(item.id).then((response) => { getZjdzd(item.id).then((response) => {
this.mapZrzData = response.data; this.mapZrzData = response.data;
console.log(this.mapZrzData);
this.mapZjdTeAll.active = 3; this.mapZjdTeAll.active = 3;
this.mapZjdTeAll.mapZrzAData = this.mapZrzData; this.mapZjdTeAll.mapZrzAData = this.mapZrzData;
this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search",this.mapZjdTeAll);
@@ -4683,7 +4748,6 @@
}else if(item.typeTc =="附属设施"){ }else if(item.typeTc =="附属设施"){
getFsss(item.id).then((response) => { getFsss(item.id).then((response) => {
this.mapFsssData = response.data; this.mapFsssData = response.data;
console.log(this.mapZjdData);
this.mapZjdTeAll.active = 4; this.mapZjdTeAll.active = 4;
this.mapZjdTeAll.mapFsssAData = this.mapFsssData; this.mapZjdTeAll.mapFsssAData = this.mapFsssData;
this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search",this.mapZjdTeAll);
@@ -4709,11 +4773,7 @@
}, },
//筛选//全选 //筛选//全选
checkAll(val) { checkAll(val) {

this.$refs.checkboxGroup.value.toggleAll(true); this.$refs.checkboxGroup.value.toggleAll(true);

console.log(this.checkAllFlag)

return; return;
let checkedCount = this.CheckedAllArr.length let checkedCount = this.CheckedAllArr.length
if (val) { if (val) {
@@ -4729,7 +4789,6 @@
}, },
//单选 //单选
handleChecked(value) { handleChecked(value) {
console.log(value);
// this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length; // this.checkAllFlag = this.CheckedAllArr.length == this.dataList.length;
if (value.length<3){ if (value.length<3){
this.checkAllFlag = false; this.checkAllFlag = false;
@@ -4739,9 +4798,6 @@
value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true; value.indexOf('zjdSx') == -1 ? this.zjdSx = false : this.zjdSx = true;
value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true; value.indexOf('zrzSx') == -1 ? this.zrzSx = false : this.zrzSx = true;
value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true; value.indexOf('fsssSx') == -1 ? this.fsssSx = false : this.fsssSx = true;
console.log(this.zjdSx)
console.log(this.zrzSx)
console.log(this.fsssSx)
}, },
closeSearchBox(){ closeSearchBox(){
this.showSearch = false ; this.showSearch = false ;
@@ -4756,13 +4812,11 @@
$('.searchBar_wrap').css({'animation':'test2 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test2 0.5s ease-in-out 0s 1 alternate forwards'}); $('.searchBar_wrap').css({'animation':'test2 0.5s ease-in-out 0s 1 alternate forwards','-webkit-animation':'test2 0.5s ease-in-out 0s 1 alternate forwards'});
}, },
zjdTz(){ zjdTz(){
console.log(this.htZjdZrzFsss);
this.mapZjdTeAll.active =1; this.mapZjdTeAll.active =1;
this.mapZjdTeAll.mapZjdAData.theGeom =JSON.stringify(this.htZjdZrzFsss); this.mapZjdTeAll.mapZjdAData.theGeom =JSON.stringify(this.htZjdZrzFsss);
this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId; this.mapZjdTeAll.mapZjdAData.deptId = this.$cookies.get("item").deptId;
this.$cookies.set("search",this.mapZjdTeAll); this.$cookies.set("search",this.mapZjdTeAll);
this.$router.push({path:'/homesteadSurvey/add'}); this.$router.push({path:'/homesteadSurvey/add'});
console.log(this.mapZjdTeAll);
}, },
zrzTz(){ zrzTz(){
if(this.mapZjdTeAll.mapZjdAData !=undefined && this.mapZjdTeAll.mapZjdAData !="" && this.mapZjdDataTure !=""){ if(this.mapZjdTeAll.mapZjdAData !=undefined && this.mapZjdTeAll.mapZjdAData !="" && this.mapZjdDataTure !=""){
@@ -4788,7 +4842,6 @@
}, },
//绘图重置清除之前图层 //绘图重置清除之前图层
deleteHistory(){ deleteHistory(){
console.log("进入重置");
$("#deleteHistory").trigger("click"); $("#deleteHistory").trigger("click");
} }




Notiek ielāde…
Atcelt
Saglabāt