|
@@ -3,7 +3,7 @@
|
|
|
<div class="map-content">
|
|
|
<div class="content">
|
|
|
<div :id="id" class="map">
|
|
|
-<div
|
|
|
+ <div
|
|
|
class="radar-scan-an"
|
|
|
v-show="radarShow"
|
|
|
:style="`width: ${radarScanStyle.width}; heigth: ${radarScanStyle.height}; top: ${radarScanStyle.top};left: ${radarScanStyle.left};`"
|
|
@@ -568,6 +568,7 @@ export default {
|
|
|
// let that = this;
|
|
|
// this.getDetailByIdList(this.xgdk, (data) => {
|
|
|
// this.xgdk = data;
|
|
|
+ // this.toggleContentVisabledAll();
|
|
|
// });
|
|
|
// this.addGdLayer(this.xgdk);
|
|
|
// this.detailData = {
|
|
@@ -1023,14 +1024,6 @@ export default {
|
|
|
//隐藏详情
|
|
|
hideDetail() {
|
|
|
this.showDetail = false;
|
|
|
- // if (this.geojsonLayer) {
|
|
|
- // this.map.removeLayer(this.geojsonLayer);
|
|
|
- // this.geojsonLayer = null;
|
|
|
- // }
|
|
|
- // if (this.identifyGeojsonLayer) {
|
|
|
- // this.map.removeLayer(this.identifyGeojsonLayer);
|
|
|
- // }
|
|
|
- // this.clearMark();
|
|
|
},
|
|
|
//收藏
|
|
|
doCollect(collect) {
|
|
@@ -1157,20 +1150,24 @@ export default {
|
|
|
idList = idList.map((ele) => ele.id);
|
|
|
this.klyzyQuery(idList, (res) => {
|
|
|
let result = res.map((ele) => {
|
|
|
- return {
|
|
|
+ let viewObj = {
|
|
|
id: ele.id,
|
|
|
name: ele.dkmc,
|
|
|
tdyt: ele.tdyt,
|
|
|
dkmj: ele.dkmj.toFixed(2),
|
|
|
center_wkt: ele.center_wkt,
|
|
|
};
|
|
|
+ if(ele.center_wkt){
|
|
|
+ let geojson = wkt.parse(ele.center_wkt);
|
|
|
+ if (ele.tdyt.indexOf("工业") > -1) {
|
|
|
+ that.getGyydWzxx(geojson.coordinates, viewObj);
|
|
|
+ } else {
|
|
|
+ that.getNoGyydWzxx(geojson.coordinates, viewObj);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ return viewObj;
|
|
|
});
|
|
|
- let geojson = wkt.parse(ele.center_wkt);
|
|
|
- if (ele.tdyt.indexOf("工业")) {
|
|
|
- that.getGyydWzxx(geojson.coordinates, viewObj);
|
|
|
- } else {
|
|
|
- that.getNoGyydWzxx(geojson.coordinates, viewObj);
|
|
|
- }
|
|
|
func(result);
|
|
|
});
|
|
|
} else if (this.dSource == "1") {
|
|
@@ -1187,7 +1184,7 @@ export default {
|
|
|
center_wkt: ele.center_wkt,
|
|
|
};
|
|
|
let geojson = wkt.parse(ele.center_wkt);
|
|
|
- if (ele.ydxz.indexOf("工业")>-1) {
|
|
|
+ if (ele.ydxz.indexOf("工业") > -1) {
|
|
|
that.getGyydWzxx(geojson.coordinates, viewObj);
|
|
|
} else {
|
|
|
that.getNoGyydWzxx(geojson.coordinates, viewObj);
|
|
@@ -1451,7 +1448,6 @@ export default {
|
|
|
},
|
|
|
//详情页tab切换地图绘制相关清空
|
|
|
toggleInfoTab(type, index) {
|
|
|
- console.log(type, index);
|
|
|
if (this.markerLayer) {
|
|
|
this.map.removeLayer(this.markerLayer);
|
|
|
this.markerLayer = null;
|
|
@@ -1794,9 +1790,6 @@ export default {
|
|
|
question = this.zwinputText.trim();
|
|
|
}
|
|
|
let mock = false;
|
|
|
- if (question === "帮我在萧山区推荐三宗31亩左右的工业用地") {
|
|
|
- mock = true;
|
|
|
- }
|
|
|
|
|
|
this.interval = setInterval(
|
|
|
() => {
|
|
@@ -1940,10 +1933,12 @@ export default {
|
|
|
// T.addGdLayer(data);
|
|
|
T.xgdk = data;
|
|
|
T.showXgdkCenterPoint();
|
|
|
+ //todo
|
|
|
+ // T.toggleContentVisabledAll();
|
|
|
});
|
|
|
|
|
|
T.answer = e.data;
|
|
|
- T.toggleContentVisabledAll();
|
|
|
+
|
|
|
// T.burialPoint();
|
|
|
} else {
|
|
|
T.xgdk = [];
|