xiangshan
/
ggfwjsc
22
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

This commit is contained in:
duanxiaohai 2024-09-30 16:10:13 +08:00
parent 10912e65fa 3fae04a517
commit 64574d5357
2 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/view/dialog/echarts/map.vue
View File

@ -178,7 +178,8 @@ const createCustomOverlay = (polygon) => {
content.style.flexDirection = "column"; content.style.flexDirection = "column";
content.style.alignItems = "center"; content.style.alignItems = "center";
content.style.zIndex = BMapGL.Overlay.getZIndex(this.point.lat); content.style.zIndex = BMapGL.Overlay.getZIndex(this.point.lat);
content.style.height = "30px";
content.style.width = "30px";
var div = document.createElement("div"); var div = document.createElement("div");
div.style.color = "#333"; div.style.color = "#333";
div.style.padding = "6px 8px"; div.style.padding = "6px 8px";

33
src/view/sy_map.vue
View File

@ -1074,12 +1074,14 @@ const pagination = reactive({
}); });
//--------定义方法---------------------------------------- //--------定义方法----------------------------------------
//地图初始化 //地图初始化
const totalType = ref(2);
const initMap = () => { const initMap = () => {
map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 20 }); map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 20 });
let type = tools.data.get("type"); let type = tools.data.get("type");
if(type==1){ if (type == 1) {
totalType.value = 1;
}else{ } else {
totalType.value = 2;
map.setMapType(BMAP_SATELLITE_MAP); map.setMapType(BMAP_SATELLITE_MAP);
} }
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
@ -2544,7 +2546,7 @@ const getDataBqs3 = async (jd, cs, bq) => {
DGcreateCs(item, index); DGcreateCs(item, index);
}); });
} else { } else {
console.log(666666,cs_dd_arr.value); console.log(666666, cs_dd_arr.value);
cs_dd_arr.value.map((item, index) => { cs_dd_arr.value.map((item, index) => {
DGcreateCs2(item, index); DGcreateCs2(item, index);
}); });
@ -3349,8 +3351,14 @@ const createCustomOverlay = (polygon, indexx) => {
const addFwqCs = () => { const addFwqCs = () => {
fwq_dk.value.length = 0; fwq_dk.value.length = 0;
fwq_jzdk.value.map((item, index) => { fwq_jzdk.value.map((item, index) => {
let num = index % 9; // let num = index % 9;
let fillColor = "#ffffff"; let fillColor = "#ffffff";
if (totalType.value == 1) {
fillColor = "#7d7c7c";
} else {
fillColor = "#ffffff";
}
let points = []; let points = [];
item.point[0].map((p) => points.push(new BMapGL.Point(...p))); item.point[0].map((p) => points.push(new BMapGL.Point(...p)));
if (points.length) { if (points.length) {
@ -3360,7 +3368,7 @@ const addFwqCs = () => {
strokeWeight: 2, strokeWeight: 2,
strokeOpacity: 0.8, strokeOpacity: 0.8,
fillColor: fillColor, fillColor: fillColor,
fillOpacity: 0.6, fillOpacity: 0.7,
name: item.name, name: item.name,
}); });
map.addOverlay(fwq_dk.value[index]); map.addOverlay(fwq_dk.value[index]);
@ -3589,6 +3597,12 @@ const isclick = ref("");
const addPolygonCounty = () => { const addPolygonCounty = () => {
map.clearOverlays(); map.clearOverlays();
let fillColor = "#ffffff"; let fillColor = "#ffffff";
if (totalType.value == 1) {
fillColor = "#7d7c7c";
} else {
fillColor = "#ffffff";
}
mapTownDataDK.map((item) => { mapTownDataDK.map((item) => {
// item.leg = 0; // item.leg = 0;
//地区的坐标范围 //地区的坐标范围
@ -3664,8 +3678,7 @@ const addPolygonCounty = () => {
} else { } else {
setTimeout(() => { setTimeout(() => {
title_jd.value = item.name; title_jd.value = item.name;
},1000) }, 1000);
} }
} }
}); });
@ -3874,8 +3887,8 @@ const addPolygonCountyCs = () => {
if (drawing.value) { if (drawing.value) {
return; return;
} }
if(!title_jd.value){ if (!title_jd.value) {
return return;
} }
loadingss.value = true; loadingss.value = true;
cs_dd_arr.value = []; cs_dd_arr.value = [];