This commit is contained in:
duanxiaohai 2024-09-30 14:02:56 +08:00
commit fa3dfec58e
7 changed files with 46 additions and 35 deletions

BIN
dist.zip

Binary file not shown.

View File

@ -7,7 +7,8 @@ import { onMounted, reactive, nextTick, ref, defineProps, watch } from "vue";
// import mapTown from '@/assets/json/330225.json' // import mapTown from '@/assets/json/330225.json'
import m1 from "@/assets/images/map/m1.png"; import m1 from "@/assets/images/map/m1.png";
import m2 from "@/assets/images/map/m2.png"; import m2 from "@/assets/images/map/m2.png";
import mapTown from '@/assets/json/ly.json' import mapTown from '@/assets/json/ly.json';
import tools from "@/utils/tools";
let map = null; let map = null;
// //
const mapTownCount = reactive([ const mapTownCount = reactive([
@ -93,9 +94,15 @@ const mapTownDataDK = reactive([]);
const initMap = () => { const initMap = () => {
map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 16 }); map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 16 });
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
let type = tools.data.get("type");
if(type==1){
}else{
map.setMapStyleV2({ map.setMapStyleV2({
styleId: "d0acde891abd157741b71e12670ee2e6", styleId: "d0acde891abd157741b71e12670ee2e6",
}); });
}
goMapCenter([119.123203, 29.098722], 12); goMapCenter([119.123203, 29.098722], 12);
loadTown(); loadTown();

View File

@ -50,9 +50,8 @@ data.list.forEach((item) => {
legendData.push(item.name); legendData.push(item.name);
}); });
data.list.push({ data.list.push({
name: "总数", name: "",
value: sum, value: sum,
tooltip: { formatter: () => "" },
itemStyle: { normal: { color: "rgba(0, 0, 0, 0)" } }, itemStyle: { normal: { color: "rgba(0, 0, 0, 0)" } },
}); });
const colorList = [ const colorList = [
@ -151,7 +150,7 @@ const getOption = () => {
"{b|" +num + "人}", "{b|" +num + "人}",
"{c|" + value + "%}", "{c|" + value + "%}",
]; ];
if (params == "总数") { if (params == "") {
return '' return ''
}else{ }else{
return arr.join(" "); return arr.join(" ");

View File

@ -12,13 +12,19 @@ import {
defineProps, defineProps,
watch, watch,
} from "vue"; } from "vue";
import tools from "@/utils/tools";
var map = null; var map = null;
const initMap = () => { const initMap = () => {
map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 20 }); map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 20 });
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
// map.setMapStyleV2({
// styleId: "d0acde891abd157741b71e12670ee2e6", let type = tools.data.get("type");
// }); if (type == 1) {
} else {
map.setMapStyleV2({
styleId: "d0acde891abd157741b71e12670ee2e6",
});
}
goMapCenter([119.178783, 29.034583], 15); goMapCenter([119.178783, 29.034583], 15);
// //
// map.addTileLayer(new BMapGL.TrafficLayer()); // map.addTileLayer(new BMapGL.TrafficLayer());

View File

@ -59,9 +59,8 @@ data.list.forEach((item) => {
legendData.push(item.name); legendData.push(item.name);
}); });
data.list.push({ data.list.push({
name: "总数", name: "",
value: sum, value: sum,
tooltip: { formatter: () => "" },
itemStyle: { normal: { color: "rgba(0, 0, 0, 0)" } }, itemStyle: { normal: { color: "rgba(0, 0, 0, 0)" } },
}); });
const colorList = [ const colorList = [
@ -113,7 +112,8 @@ const getOption = () => {
value = data.list[i].value; value = data.list[i].value;
} }
} }
if (params == "总数") { if (params == "") {
return ''
} else { } else {
return `${params}${value}%`; return `${params}${value}%`;
} }

View File

@ -142,7 +142,7 @@ const login = () => {
// console.log( 555,res, auth__code); // console.log( 555,res, auth__code);
if (res.auth_code) { if (res.auth_code) {
http http
.post(`/api/ggfwyth/ding/one_click_login?authCode=${res.auth_code}`) .post(`/api/ggfwyth/ding/one_click_login/${res.auth_code}`)
.then((response) => { .then((response) => {
if (response.code == 200) { if (response.code == 200) {
console.log("response", response); console.log("response", response);

View File

@ -1076,10 +1076,14 @@ const pagination = reactive({
// //
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");
if(type==1){
}else{
map.setMapType(BMAP_SATELLITE_MAP); map.setMapType(BMAP_SATELLITE_MAP);
}
map.enableScrollWheelZoom(true); map.enableScrollWheelZoom(true);
goMapCenter([119.178783, 29.034583], 11); goMapCenter([119.178783, 29.034583], 11);
// //
loadTown(); loadTown();
// //
@ -1856,7 +1860,7 @@ const buten = async (item) => {
}); });
addJd(); addJd();
if (title_jd.value == "") { if (cfJd.value == "") {
} else { } else {
if (sfdd.value) { if (sfdd.value) {
// cs_dd_arr.value.forEach((item, index) => { // cs_dd_arr.value.forEach((item, index) => {
@ -1896,7 +1900,7 @@ const buten2 = async (item) => {
}); });
addJd(); addJd();
if (title_jd.value == "") { if (cfJd.value == "") {
} else { } else {
if (sfdd.value) { if (sfdd.value) {
// cs_dd_arr.value.forEach((item, index) => { // cs_dd_arr.value.forEach((item, index) => {
@ -2041,7 +2045,7 @@ const getDatasL = async (e, i) => {
cs_dd_arr.value.forEach((item, index) => { cs_dd_arr.value.forEach((item, index) => {
map.removeOverlay(cs_dd_arr.value[index]); map.removeOverlay(cs_dd_arr.value[index]);
}); });
if (title_jd.value == "") { if (cfJd.value == "") {
} else { } else {
if (cfCs.value) { if (cfCs.value) {
cs_dd_arr.value = [...xuanzhongCs.value]; cs_dd_arr.value = [...xuanzhongCs.value];
@ -2159,7 +2163,7 @@ const getDatas = async (e, i, y = true) => {
map.removeOverlay(cs_dd_arr.value[index]); map.removeOverlay(cs_dd_arr.value[index]);
}); });
if (title_jd.value == "") { if (cfJd.value == "") {
} else { } else {
if (sfdd.value) { if (sfdd.value) {
if (choose.value.person == "") { if (choose.value.person == "") {
@ -2474,7 +2478,7 @@ const getDataBqs2 = async (jd, cs, bq) => {
cs_dd_arr.value.forEach((item, index) => { cs_dd_arr.value.forEach((item, index) => {
map.removeOverlay(cs_dd_arr.value[index]); map.removeOverlay(cs_dd_arr.value[index]);
}); });
if (title_jd.value == "") { if (cfJd.value == "") {
} else { } else {
if (sfdd.value) { if (sfdd.value) {
// if (choose.value.person == "") { // if (choose.value.person == "") {
@ -2534,13 +2538,13 @@ const getDataBqs3 = async (jd, cs, bq) => {
}); });
}); });
cs_dd_arr.value = [...xuanzhongCs.value]; // cs_dd_arr.value = [...xuanzhongCs.value];
if (choose.value.person == "") { if (choose.value.person == "") {
cs_dd_arr.value.map((item, index) => { cs_dd_arr.value.map((item, index) => {
DGcreateCs(item, index); DGcreateCs(item, index);
}); });
} else { } else {
console.log(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);
}); });
@ -2584,7 +2588,7 @@ const getDataBqs4 = async (jd, cs, bq) => {
cs_dd_arr.value.forEach((item, index) => { cs_dd_arr.value.forEach((item, index) => {
map.removeOverlay(cs_dd_arr.value[index]); map.removeOverlay(cs_dd_arr.value[index]);
}); });
if (title_jd.value == "") { if (cfJd.value == "") {
} else { } else {
if (sfdd.value) { if (sfdd.value) {
if (choose.value.person == "") { if (choose.value.person == "") {
@ -3660,7 +3664,8 @@ const addPolygonCounty = () => {
} else { } else {
setTimeout(() => { setTimeout(() => {
title_jd.value = item.name; title_jd.value = item.name;
}, 1000); },1000)
} }
} }
}); });
@ -3866,17 +3871,11 @@ const addPolygonCountyCs = () => {
}); });
map.addOverlay(cs_qk_arr.value[index]); map.addOverlay(cs_qk_arr.value[index]);
cs_qk_arr.value[index].addEventListener("click", async () => { cs_qk_arr.value[index].addEventListener("click", async () => {
// if(item.name == '' || item.name == '' || item.name == '' || item.name=='' || item.name=='' || item.name==''){
// isclick.value=item.name;
// }else{
// isclick.value=item.name;
// }
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 = [];