|
|
@@ -1,18 +1,9 @@
|
|
|
<template>
|
|
|
<div id="map2DViewer">
|
|
|
<!-- 特殊地图属性弹窗 -- 有审计功能 -->
|
|
|
- <CaseAuditPopup
|
|
|
- v-show="auditPopupShow"
|
|
|
- :tableObj="auditRefTableObj"
|
|
|
- :defaultStatus="defaultStatus"
|
|
|
- ref="auditRef"
|
|
|
- />
|
|
|
+ <CaseAuditPopup v-show="auditPopupShow" :tableObj="auditRefTableObj" :defaultStatus="defaultStatus" ref="auditRef" />
|
|
|
<!-- 通用地图属性弹窗 -- 无审计功能 -->
|
|
|
- <NormalAttrPopup
|
|
|
- v-show="normalAttrPopupShow"
|
|
|
- :tableObj="tableObj"
|
|
|
- ref="normalRef"
|
|
|
- />
|
|
|
+ <NormalAttrPopup v-show="normalAttrPopupShow" :tableObj="tableObj" ref="normalRef" />
|
|
|
<LabelCasePopup v-show="labelDetailsPopupShow" ref="labelRef" />
|
|
|
</div>
|
|
|
</template>
|
|
|
@@ -31,7 +22,7 @@ export default {
|
|
|
components: {
|
|
|
CaseAuditPopup,
|
|
|
NormalAttrPopup,
|
|
|
- LabelCasePopup,
|
|
|
+ LabelCasePopup
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -59,15 +50,15 @@ export default {
|
|
|
镇域名称: "--",
|
|
|
"面积(平方米)": "--",
|
|
|
土地类型: "--",
|
|
|
- 图斑编号: "--",
|
|
|
+ 图斑编号: "--"
|
|
|
},
|
|
|
auditRefTableObj: {
|
|
|
镇域名称: "--",
|
|
|
"面积(平方米)": "--",
|
|
|
图层构成: "--",
|
|
|
- 性质: "--",
|
|
|
+ 性质: "--"
|
|
|
},
|
|
|
- defaultStatus: "未标记",
|
|
|
+ defaultStatus: "未标记"
|
|
|
};
|
|
|
},
|
|
|
created() {},
|
|
|
@@ -100,7 +91,7 @@ export default {
|
|
|
deleteGroupFromMap: this.deleteGroupFromMap,
|
|
|
drawGeometry: this.drawGeometry,
|
|
|
deleteGeometry: this.deleteGeometry,
|
|
|
- addTiledMapLayer: this.addTiledMapLayer,
|
|
|
+ addTiledMapLayer: this.addTiledMapLayer
|
|
|
});
|
|
|
},
|
|
|
beforeDestroyed() {
|
|
|
@@ -121,7 +112,7 @@ export default {
|
|
|
// 监听当前菜单
|
|
|
getCurrentMenu() {
|
|
|
return this.$store.state.navSelect;
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
watch: {
|
|
|
getLabelCaseBtnStatus(val) {
|
|
|
@@ -164,9 +155,9 @@ export default {
|
|
|
this.$nextTick(() => {
|
|
|
this.getJSonData();
|
|
|
});
|
|
|
- },
|
|
|
+ }
|
|
|
// immediate: true
|
|
|
- },
|
|
|
+ }
|
|
|
},
|
|
|
methods: {
|
|
|
// 添加tiledMapLayer图层 -- 针对arcgis rest services
|
|
|
@@ -177,7 +168,7 @@ export default {
|
|
|
minZoom: 0,
|
|
|
minNativeZoom: 0,
|
|
|
maxNativeZoom: 7,
|
|
|
- maxZoom: 14,
|
|
|
+ maxZoom: 14
|
|
|
});
|
|
|
return layer;
|
|
|
},
|
|
|
@@ -189,7 +180,7 @@ export default {
|
|
|
stopLabelCase() {
|
|
|
if (map2DViewer.measureTool) {
|
|
|
map2DViewer.setDrawTool({
|
|
|
- action: "remove",
|
|
|
+ action: "remove"
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
@@ -220,13 +211,13 @@ export default {
|
|
|
if ($(`#${str}_id a`)) {
|
|
|
$(`#${str}_id a`)
|
|
|
.eq(0)
|
|
|
- .click((e) => {
|
|
|
+ .click(e => {
|
|
|
this.$store.state.lawPopupShow = true;
|
|
|
this.$store.state.lawSourceType = sourceType;
|
|
|
});
|
|
|
$(`#${str}_id a`)
|
|
|
.eq(1)
|
|
|
- .click((e) => {
|
|
|
+ .click(e => {
|
|
|
// 触发综合分析右侧面板点击事件
|
|
|
this.$bus.$emit("viewDetailsPopup", geojsonData);
|
|
|
});
|
|
|
@@ -281,17 +272,11 @@ export default {
|
|
|
// 下拉框内容
|
|
|
if ($(`#${str}_id .center-table-item-special select`)) {
|
|
|
if (this.caseStatusMap.has(str)) {
|
|
|
- $(`#${str}_id .center-table-item-special select`).val(
|
|
|
- this.caseStatusMap.get(str)
|
|
|
- );
|
|
|
+ $(`#${str}_id .center-table-item-special select`).val(this.caseStatusMap.get(str));
|
|
|
let inputStatus = "";
|
|
|
if (this.caseStatusMap.has(str)) {
|
|
|
- this.caseStatusMap.get(str) === "isTrue" &&
|
|
|
- $(`#${str}_id .center-table-item-special input`).val("疑点");
|
|
|
- !this.caseStatusMap.get(str) === "isTrue" &&
|
|
|
- $(`#${str}_id .center-table-item-special input`).val(
|
|
|
- "非疑点"
|
|
|
- );
|
|
|
+ this.caseStatusMap.get(str) === "isTrue" && $(`#${str}_id .center-table-item-special input`).val("疑点");
|
|
|
+ !this.caseStatusMap.get(str) === "isTrue" && $(`#${str}_id .center-table-item-special input`).val("非疑点");
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
@@ -300,13 +285,13 @@ export default {
|
|
|
if ($(`#${str}_id a`)) {
|
|
|
$(`#${str}_id a`)
|
|
|
.eq(0)
|
|
|
- .click((e) => {
|
|
|
+ .click(e => {
|
|
|
this.$store.state.lawPopupShow = true;
|
|
|
this.$store.state.lawSourceType = sourceType;
|
|
|
});
|
|
|
$(`#${str}_id a`)
|
|
|
.eq(1)
|
|
|
- .click((e) => {
|
|
|
+ .click(e => {
|
|
|
// 触发综合分析右侧面板点击事件
|
|
|
|
|
|
this.$bus.$emit("viewDetailsPopup", geojsonData);
|
|
|
@@ -314,7 +299,7 @@ export default {
|
|
|
}
|
|
|
// input添加点击事件
|
|
|
if ($(`#${str}_id input`)[1]) {
|
|
|
- $(`#${str}_id input`).click((e) => {
|
|
|
+ $(`#${str}_id input`).click(e => {
|
|
|
switch (e.target.defaultValue) {
|
|
|
case "取消":
|
|
|
this.cancelBtnEvent();
|
|
|
@@ -349,7 +334,7 @@ export default {
|
|
|
console.log($(`#${str}_id textarea`).val(), "textarea");
|
|
|
$(`#${str}_id`).css("height", "100%");
|
|
|
|
|
|
- $(`#${str}_id input`).click((e) => {
|
|
|
+ $(`#${str}_id input`).click(e => {
|
|
|
console.log(e.target.defaultValue);
|
|
|
switch (e.target.defaultValue) {
|
|
|
case "取消":
|
|
|
@@ -376,12 +361,12 @@ export default {
|
|
|
if (selectVal === "isTrue") {
|
|
|
map2DViewer.polygons[str].setStyle({
|
|
|
color: `rgb(${caseColorChange["isPointColor"][0]},${caseColorChange["isPointColor"][1]},${caseColorChange["isPointColor"][2]})`,
|
|
|
- weight: 4,
|
|
|
+ weight: 4
|
|
|
});
|
|
|
} else {
|
|
|
map2DViewer.polygons[str].setStyle({
|
|
|
color: `rgb(${caseColorChange["notPointColor"][0]},${caseColorChange["notPointColor"][1]},${caseColorChange["notPointColor"][2]})`,
|
|
|
- weight: 4,
|
|
|
+ weight: 4
|
|
|
});
|
|
|
}
|
|
|
console.log(map2DViewer.polygons[str]);
|
|
|
@@ -394,42 +379,32 @@ export default {
|
|
|
// 修改人员名称
|
|
|
c_editor_name: localStorage.getItem("USER_NAME"),
|
|
|
// 修改人员ID
|
|
|
- c_editorid: localStorage.getItem("USER_ID"),
|
|
|
+ c_editorid: localStorage.getItem("USER_ID")
|
|
|
};
|
|
|
|
|
|
let modifyParams = new FormData();
|
|
|
modifyParams = {
|
|
|
columnId: columnId,
|
|
|
modelId: modelId,
|
|
|
- content: JSON.stringify(obj),
|
|
|
+ content: JSON.stringify(obj)
|
|
|
};
|
|
|
- this.$Post(this.urlsCollection.updateContent, modifyParams).then(
|
|
|
- (res) => {
|
|
|
- if (res.code === 200) {
|
|
|
- this.$message.success("数据修改成功");
|
|
|
- map2DViewer.map.closePopup();
|
|
|
+ this.$Post(this.urlsCollection.updateContent, modifyParams).then(res => {
|
|
|
+ if (res.code === 200) {
|
|
|
+ this.$message.success("数据修改成功");
|
|
|
+ map2DViewer.map.closePopup();
|
|
|
|
|
|
- switch (selectVal) {
|
|
|
- case "isTrue":
|
|
|
- this.$store.state.mapMethodsCollection
|
|
|
- .get("METHODS")
|
|
|
- .changeCaseBoolean(str, "疑点");
|
|
|
- this.$store.state.mapMethodsCollection
|
|
|
- .get("METHODS")
|
|
|
- .changeSortMethod("疑点");
|
|
|
- break;
|
|
|
- case "isFalse":
|
|
|
- this.$store.state.mapMethodsCollection
|
|
|
- .get("METHODS")
|
|
|
- .changeCaseBoolean(str, "非疑点");
|
|
|
- this.$store.state.mapMethodsCollection
|
|
|
- .get("METHODS")
|
|
|
- .changeSortMethod("非疑点");
|
|
|
- break;
|
|
|
- }
|
|
|
+ switch (selectVal) {
|
|
|
+ case "isTrue":
|
|
|
+ this.$store.state.mapMethodsCollection.get("METHODS").changeCaseBoolean(str, "疑点");
|
|
|
+ this.$store.state.mapMethodsCollection.get("METHODS").changeSortMethod("疑点");
|
|
|
+ break;
|
|
|
+ case "isFalse":
|
|
|
+ this.$store.state.mapMethodsCollection.get("METHODS").changeCaseBoolean(str, "非疑点");
|
|
|
+ this.$store.state.mapMethodsCollection.get("METHODS").changeSortMethod("非疑点");
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
- );
|
|
|
+ });
|
|
|
},
|
|
|
cancelBtnEvent() {
|
|
|
map2DViewer.map.closePopup();
|
|
|
@@ -454,13 +429,7 @@ export default {
|
|
|
} else {
|
|
|
geoName = $(`#${str}_id input`).eq(0).val();
|
|
|
let coordinates = [data.points];
|
|
|
- let geometry = publicFun.generateGeoJSON(
|
|
|
- title,
|
|
|
- des,
|
|
|
- geoType,
|
|
|
- coordinates,
|
|
|
- geoName
|
|
|
- );
|
|
|
+ let geometry = publicFun.generateGeoJSON(title, des, geoType, coordinates, geoName);
|
|
|
let params = new FormData();
|
|
|
let newGeojson = JSON.stringify(geometry);
|
|
|
myLabelNameMap.set(geoName, newGeojson);
|
|
|
@@ -468,11 +437,11 @@ export default {
|
|
|
geojson: newGeojson,
|
|
|
type: geoType,
|
|
|
userId: Number(localStorage.getItem("USER_ID")),
|
|
|
- sourceId: 0,
|
|
|
+ sourceId: 0
|
|
|
};
|
|
|
|
|
|
this.$Post(this.urlsCollection.addConllection, params).then(
|
|
|
- (res) => {
|
|
|
+ res => {
|
|
|
if (res.code == 200) {
|
|
|
// 标记成功后删除保存的原有名称
|
|
|
myLabelNameMap.delete(geoName);
|
|
|
@@ -482,36 +451,33 @@ export default {
|
|
|
paramData = {
|
|
|
userId: Number(localStorage.getItem("USER_ID")),
|
|
|
sourceId: 0,
|
|
|
- pageSize: 10,
|
|
|
+ pageSize: 10
|
|
|
};
|
|
|
// 暂存map中刚刚保存的数据
|
|
|
- this.$Post(this.urlsCollection.selectByUser, paramData).then(
|
|
|
- (userRes) => {
|
|
|
- if (userRes.code === 200) {
|
|
|
- if (userRes.content.length > 0) {
|
|
|
- this.$store.state.myLabelPointsArr = [];
|
|
|
- this.$store.state.myLabelPointsArr =
|
|
|
- userRes.content.map((v) => {
|
|
|
- if (JSON.stringify(geometry) === v.geojson) {
|
|
|
- sessionStorage.setItem("myLabelPointsId", v.id);
|
|
|
- }
|
|
|
- return {
|
|
|
- id: v.id,
|
|
|
- geojson: v.geojson,
|
|
|
- type: v.type,
|
|
|
- };
|
|
|
- });
|
|
|
- // 判断刚刚暂存的数据，并调用小眼睛的方法
|
|
|
- }
|
|
|
+ this.$Post(this.urlsCollection.selectByUser, paramData).then(userRes => {
|
|
|
+ if (userRes.code === 200) {
|
|
|
+ if (userRes.content.length > 0) {
|
|
|
+ this.$store.state.myLabelPointsArr = [];
|
|
|
+ this.$store.state.myLabelPointsArr = userRes.content.map(v => {
|
|
|
+ if (JSON.stringify(geometry) === v.geojson) {
|
|
|
+ sessionStorage.setItem("myLabelPointsId", v.id);
|
|
|
+ }
|
|
|
+ return {
|
|
|
+ id: v.id,
|
|
|
+ geojson: v.geojson,
|
|
|
+ type: v.type
|
|
|
+ };
|
|
|
+ });
|
|
|
+ // 判断刚刚暂存的数据，并调用小眼睛的方法
|
|
|
}
|
|
|
- // 更新时调用一次搜索接口
|
|
|
}
|
|
|
- );
|
|
|
+ // 更新时调用一次搜索接口
|
|
|
+ });
|
|
|
}
|
|
|
// 保存后需要删除地图上的标记
|
|
|
this.reStartLabelCase();
|
|
|
},
|
|
|
- (error) => {
|
|
|
+ error => {
|
|
|
console.log("标记疑点保存失败！", error);
|
|
|
this.reStartLabelCase();
|
|
|
}
|
|
|
@@ -526,13 +492,9 @@ export default {
|
|
|
// map2DViewer.jlMap = L.tileLayer(
|
|
|
// "http://t0.tianditu.gov.cn/DataServer?T=img_w&X={x}&Y={y}&L={z}&tk=f331ba0b9ab96fb21c56d91de868935d"
|
|
|
// ).addTo(map2DViewer.map);
|
|
|
- map2DViewer.jlMap = this.addTiledMapLayer(
|
|
|
- systemConfig.imageryLayerSat2022s2.url
|
|
|
- ).addTo(map2DViewer.map);
|
|
|
+ map2DViewer.jlMap = this.addTiledMapLayer(systemConfig.imageryLayerSat2022s2.url).addTo(map2DViewer.map);
|
|
|
|
|
|
- map2DViewer.jlControl = L.control
|
|
|
- .sideBySide(map2DViewer.map, map2DViewer.jlMap)
|
|
|
- .addTo(map2DViewer.map);
|
|
|
+ map2DViewer.jlControl = L.control.sideBySide(map2DViewer.map, map2DViewer.jlMap).addTo(map2DViewer.map);
|
|
|
} else if (map2DViewer.map.hasLayer(map2DViewer.jlMap)) {
|
|
|
map2DViewer.map.removeControl(map2DViewer.jlControl);
|
|
|
map2DViewer.map.removeLayer(map2DViewer.jlMap);
|
|
|
@@ -570,7 +532,7 @@ export default {
|
|
|
initDraw() {
|
|
|
if (!map2DViewer.measureTool) {
|
|
|
// 引入疑点标记绘制方法
|
|
|
- map2DViewer.drawToolFire = (data) => {
|
|
|
+ map2DViewer.drawToolFire = data => {
|
|
|
// 纬经度
|
|
|
if (data && data.points.length >= 1) {
|
|
|
let geoType = null;
|
|
|
@@ -609,7 +571,7 @@ export default {
|
|
|
color: "red",
|
|
|
font_size: "14px",
|
|
|
closeButton: true,
|
|
|
- iconUrl: "../../static/plugins/draw-plugin/images/marker-icon.png",
|
|
|
+ iconUrl: "../../static/plugins/draw-plugin/images/marker-icon.png"
|
|
|
});
|
|
|
}
|
|
|
},
|
|
|
@@ -622,7 +584,7 @@ export default {
|
|
|
{
|
|
|
resolutions: systemConfig.imageryLayer.resolutions,
|
|
|
origin: [-66000, 75000],
|
|
|
- bounds: L.bounds([-65000, -76000], [75000, 72000]),
|
|
|
+ bounds: L.bounds([-65000, -76000], [75000, 72000])
|
|
|
}
|
|
|
);
|
|
|
|
|
|
@@ -632,15 +594,13 @@ export default {
|
|
|
minZoom: systemConfig.imageryLayer.minZoom,
|
|
|
maxZoom: systemConfig.imageryLayer.maxZoom,
|
|
|
attributionControl: false,
|
|
|
- zoomControl: false,
|
|
|
+ zoomControl: false
|
|
|
// preferCanvas: true,
|
|
|
}).setView(systemConfig.mapViewer.center, systemConfig.mapViewer.zoom);
|
|
|
|
|
|
//添加默认图层
|
|
|
let guid = publicFun.buildGuid("baseLayer");
|
|
|
- let layer = this.addTiledMapLayer(systemConfig.blueBlackMap.url).addTo(
|
|
|
- map2DViewer.map
|
|
|
- );
|
|
|
+ let layer = this.addTiledMapLayer(systemConfig.blueBlackMap.url).addTo(map2DViewer.map);
|
|
|
map2DViewer.layers["darkmap"] = layer;
|
|
|
|
|
|
let imageryLayer = this.addTiledMapLayer(systemConfig.imageryLayer.url);
|
|
|
@@ -654,16 +614,14 @@ export default {
|
|
|
map2DViewer.groups["浦东新区_polygon"].remove();
|
|
|
}
|
|
|
// 请求并渲染新的区域图层
|
|
|
- get("./static/json/simplified_pdgeojson.json", "").then((geoJson) => {
|
|
|
+ get("./static/json/simplified_pdgeojson.json", "").then(geoJson => {
|
|
|
// 存放所有的面数据
|
|
|
map2DViewer.groups["浦东新区_polygon"] = L.featureGroup();
|
|
|
map2DViewer.groups["浦东新区_label"] = L.featureGroup();
|
|
|
map2DViewer.groups["浦东新区_polygon"].addTo(map2DViewer.map);
|
|
|
map2DViewer.groups["浦东新区_label"].addTo(map2DViewer.map);
|
|
|
- geoJson.features.map((feature) => {
|
|
|
- let correctCordArr = JSON.parse(
|
|
|
- JSON.stringify(feature.geometry.coordinates)
|
|
|
- );
|
|
|
+ geoJson.features.map(feature => {
|
|
|
+ let correctCordArr = JSON.parse(JSON.stringify(feature.geometry.coordinates));
|
|
|
let newCorrectCoordArr = publicFun.latLngsCorrection(correctCordArr);
|
|
|
feature.geometry.coordinates = newCorrectCoordArr;
|
|
|
// if (
|
|
|
@@ -704,10 +662,7 @@ export default {
|
|
|
this.getJSonDataToStreet("", "");
|
|
|
// 切换到首页时需定位到当前图层
|
|
|
if (this.$store.state.homeSpecialTown === "全部") {
|
|
|
- this.setView(
|
|
|
- townLocationMap.get(this.$store.state.homeSpecialTown),
|
|
|
- 0
|
|
|
- );
|
|
|
+ this.setView(townLocationMap.get(this.$store.state.homeSpecialTown), 0);
|
|
|
} else {
|
|
|
let polygon = townPolygonMap.get(this.$store.state.homeSpecialTown);
|
|
|
map2DViewer.map.fitBounds(polygon.getBounds());
|
|
|
@@ -739,7 +694,7 @@ export default {
|
|
|
weight: 3,
|
|
|
fillColor: this.getColor(name),
|
|
|
opacity: 1,
|
|
|
- fillOpacity: 0.4,
|
|
|
+ fillOpacity: 0.4
|
|
|
}).addTo(map2DViewer.groups["浦东新区_polygon"]);
|
|
|
|
|
|
center = JSON.parse(JSON.stringify(center)).geometry.coordinates;
|
|
|
@@ -752,25 +707,25 @@ export default {
|
|
|
radius: 10,
|
|
|
weight: 1,
|
|
|
fillOpacity: 0,
|
|
|
- color: "#e6d273",
|
|
|
+ color: "#e6d273"
|
|
|
});
|
|
|
wmarker.bindLabel(feature.properties.NAME, {
|
|
|
noHide: true,
|
|
|
clickable: true,
|
|
|
- offset: [-25, 10],
|
|
|
+ offset: [-25, 10]
|
|
|
});
|
|
|
wmarker.addTo(map2DViewer.groups["浦东新区_label"]);
|
|
|
let circle1 = L.circleMarker(center, {
|
|
|
radius: 8,
|
|
|
weight: 1,
|
|
|
fillOpacity: 0,
|
|
|
- color: "#e6d273",
|
|
|
+ color: "#e6d273"
|
|
|
}).addTo(map2DViewer.groups["浦东新区_polygon"]);
|
|
|
let circle2 = L.circleMarker(center, {
|
|
|
radius: 5,
|
|
|
weight: 1,
|
|
|
fillOpacity: 1,
|
|
|
- color: "#e6d273",
|
|
|
+ color: "#e6d273"
|
|
|
}).addTo(map2DViewer.groups["浦东新区_polygon"]);
|
|
|
}
|
|
|
},
|
|
|
@@ -809,32 +764,20 @@ export default {
|
|
|
* @modelId -- modelId
|
|
|
* @columnId -- columnId
|
|
|
*/
|
|
|
- addSinglePolygon(
|
|
|
- geometry,
|
|
|
- cid,
|
|
|
- color,
|
|
|
- uniqueId,
|
|
|
- mainType,
|
|
|
- sourceType,
|
|
|
- defaultStatus,
|
|
|
- modelId,
|
|
|
- columnId
|
|
|
- ) {
|
|
|
+ addSinglePolygon(geometry, cid, color, uniqueId, mainType, sourceType, defaultStatus, modelId, columnId) {
|
|
|
let uniqueIdList = [];
|
|
|
if (this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId]) {
|
|
|
- uniqueIdList =
|
|
|
- this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId];
|
|
|
+ uniqueIdList = this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId];
|
|
|
}
|
|
|
|
|
|
let singlePolygonItem = {
|
|
|
uniqueId: uniqueId,
|
|
|
geometry: geometry,
|
|
|
cid: cid,
|
|
|
- color: color,
|
|
|
+ color: color
|
|
|
};
|
|
|
uniqueIdList.push(singlePolygonItem);
|
|
|
- this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId] =
|
|
|
- uniqueIdList;
|
|
|
+ this.$store.state.selectSelectDataMap["singlePolygon"][uniqueId] = uniqueIdList;
|
|
|
// 当前数据坐标系为WGS84
|
|
|
let targetGeometry = JSON.parse(geometry).geometry;
|
|
|
// 预设模型与所有图层层级不同
|
|
|
@@ -846,12 +789,12 @@ export default {
|
|
|
weight: 3,
|
|
|
fillColor: color,
|
|
|
opacity: 1,
|
|
|
- fillOpacity: 0,
|
|
|
+ fillOpacity: 0
|
|
|
}).addTo(map2DViewer.analysisGroups[uniqueId]);
|
|
|
|
|
|
map2DViewer.polygons[cid] = polygon;
|
|
|
|
|
|
- polygon.on("click", (e) => {
|
|
|
+ polygon.on("click", e => {
|
|
|
console.log(this.defaultValue, "点击面后显示默认的标记状态");
|
|
|
let geojsonData = geometry;
|
|
|
// 所有图层下的疑点图层 -- 常规展示
|
|
|
@@ -862,7 +805,7 @@ export default {
|
|
|
镇域名称: geoProperties["镇域名称"] || "--",
|
|
|
"面积(平方米)": geoProperties["面积"] || "--",
|
|
|
图层构成: geoProperties["图层构成"] || "--",
|
|
|
- 性质: geoProperties["性质"] || "--",
|
|
|
+ 性质: geoProperties["性质"] || "--"
|
|
|
};
|
|
|
this.defaultStatus = defaultStatus;
|
|
|
|
|
|
@@ -872,17 +815,9 @@ export default {
|
|
|
this.currentSourceType = sourceType;
|
|
|
this.currentModelId = modelId;
|
|
|
this.currentColumnId = columnId;
|
|
|
- let domItem = this.createAuditDiv(
|
|
|
- cid,
|
|
|
- geojsonData,
|
|
|
- sourceType,
|
|
|
- modelId,
|
|
|
- columnId
|
|
|
- );
|
|
|
+ let domItem = this.createAuditDiv(cid, geojsonData, sourceType, modelId, columnId);
|
|
|
this.auditPopupShow = true;
|
|
|
- this.popup = L.popup({ maxWidth: 700, maxHeight: 600 })
|
|
|
- .setLatLng(e.latlng)
|
|
|
- .setContent(domItem);
|
|
|
+ this.popup = L.popup({ maxWidth: 700, maxHeight: 600 }).setLatLng(e.latlng).setContent(domItem);
|
|
|
this.auditPopupShow = false;
|
|
|
this.popup.openOn(map2DViewer.map);
|
|
|
});
|
|
|
@@ -892,15 +827,13 @@ export default {
|
|
|
镇域名称: geoProperties["镇域名称"] || "--",
|
|
|
"面积(平方米)": geoProperties["面积"] || "--",
|
|
|
土地类型: geoProperties["土地类型"] || "--",
|
|
|
- 图斑编号: geoProperties["图斑编号"] || "--",
|
|
|
+ 图斑编号: geoProperties["图斑编号"] || "--"
|
|
|
};
|
|
|
|
|
|
this.$refs.normalRef.$nextTick(() => {
|
|
|
let domItem = this.createNormalDiv(cid, geojsonData, sourceType);
|
|
|
this.normalAttrPopupShow = true;
|
|
|
- this.normalPopup = L.popup({ maxWidth: 700, maxHeight: 600 })
|
|
|
- .setLatLng(e.latlng)
|
|
|
- .setContent(domItem);
|
|
|
+ this.normalPopup = L.popup({ maxWidth: 700, maxHeight: 600 }).setLatLng(e.latlng).setContent(domItem);
|
|
|
this.normalAttrPopupShow = false;
|
|
|
this.normalPopup.openOn(map2DViewer.map);
|
|
|
});
|
|
|
@@ -921,7 +854,7 @@ export default {
|
|
|
//综合分析 - 标记疑点 - 删除面
|
|
|
deletePolygonLayer(layer) {
|
|
|
console.log(layer, "layer");
|
|
|
- map2DViewer.polygons[layer].forEach((polygon) => {
|
|
|
+ map2DViewer.polygons[layer].forEach(polygon => {
|
|
|
map2DViewer.map.removeLayer(polygon);
|
|
|
});
|
|
|
},
|
|
|
@@ -929,7 +862,7 @@ export default {
|
|
|
drawPoints(data) {
|
|
|
if (!map2DViewer.myLabels[`label_${data.id}`]) {
|
|
|
let point = L.marker(data.coord, {
|
|
|
- opacity: 1,
|
|
|
+ opacity: 1
|
|
|
}).addTo(map2DViewer.groups["我的标记图层组"]);
|
|
|
map2DViewer.myLabels[`label_${data.id}`] = point;
|
|
|
}
|
|
|
@@ -942,7 +875,7 @@ export default {
|
|
|
weight: 3,
|
|
|
fillOpacity: color,
|
|
|
opacity: 1,
|
|
|
- fillOpacity: 0.4,
|
|
|
+ fillOpacity: 0.4
|
|
|
}).addTo(map2DViewer.groups["我的标记图层组"]);
|
|
|
// zoom the map to the polyline
|
|
|
map2DViewer.myLabels[`label_${data.id}`] = polyline;
|
|
|
@@ -956,7 +889,7 @@ export default {
|
|
|
weight: 3,
|
|
|
fillOpacity: color,
|
|
|
opacity: 1,
|
|
|
- fillOpacity: 0.4,
|
|
|
+ fillOpacity: 0.4
|
|
|
}).addTo(map2DViewer.groups["我的标记图层组"]);
|
|
|
|
|
|
map2DViewer.myLabels[`label_${data.id}`] = polygon;
|
|
|
@@ -978,7 +911,7 @@ export default {
|
|
|
fillOpacity: color,
|
|
|
opacity: 1,
|
|
|
fillOpacity: 0.4,
|
|
|
- radius: Number(distance),
|
|
|
+ radius: Number(distance)
|
|
|
}).addTo(map2DViewer.groups["我的标记图层组"]);
|
|
|
map2DViewer.myLabels[`label_${data.id}`] = circle;
|
|
|
}
|
|
|
@@ -1009,8 +942,8 @@ export default {
|
|
|
if (geometry) {
|
|
|
geometry.removeFrom(map2DViewer.map);
|
|
|
}
|
|
|
- },
|
|
|
- },
|
|
|
+ }
|
|
|
+ }
|
|
|
};
|
|
|
</script>
|
|
|
<style lang="less" scoped>
|
DESKTOP-6LTVLN7\Liumouren