From 1e1d81e72a790f88ebdb95fd64bba10184e4d33e Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Sun, 14 Jul 2024 11:11:19 +0800 Subject: [PATCH] gx --- src/assets/images/map/m1.png | Bin 0 -> 5357 bytes src/assets/images/map/m2.png | Bin 0 -> 4433 bytes src/view/analyze.vue | 2 +- src/view/dialog/dialogMap.vue | 42 +----- src/view/dialog/dialogMap2.vue | 225 ++++++++++++++++++++++++++++ src/view/dialog/echarts/map.vue | 258 ++++++++++++++++++++++++++++++++ src/view/echart_analyze/map.vue | 46 ++++-- src/view/yl.vue | 13 +- 8 files changed, 533 insertions(+), 53 deletions(-) create mode 100644 src/assets/images/map/m1.png create mode 100644 src/assets/images/map/m2.png create mode 100644 src/view/dialog/dialogMap2.vue create mode 100644 src/view/dialog/echarts/map.vue diff --git a/src/assets/images/map/m1.png b/src/assets/images/map/m1.png new file mode 100644 index 0000000000000000000000000000000000000000..128800ed0b4bfa1b704c3c3cb412edf41df2e138 GIT binary patch literal 5357 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 X#Jf#Aca(4900000NkvXXu0mjfLo{%l literal 0 HcmV?d00001 diff --git a/src/view/analyze.vue b/src/view/analyze.vue index 29f47ea..4ffaa4c 100644 --- a/src/view/analyze.vue +++ b/src/view/analyze.vue @@ -50,7 +50,7 @@
-
+
diff --git a/src/view/dialog/dialogMap.vue b/src/view/dialog/dialogMap.vue index a2f924e..37f604b 100644 --- a/src/view/dialog/dialogMap.vue +++ b/src/view/dialog/dialogMap.vue @@ -45,7 +45,8 @@
- + +
@@ -63,7 +64,7 @@ import { } from "vue"; import { CircleCloseFilled } from "@element-plus/icons-vue"; import Map from "../echart_analyze/map.vue"; - +import Map2 from "./echarts/map.vue"; const props = defineProps({ dialogShowMap: { type: Boolean, @@ -77,24 +78,6 @@ const props = defineProps({ return ""; }, }, - list1: { - type: Array, - default: () => { - return []; - }, - }, - list2: { - type: Array, - default: () => { - return []; - }, - }, - year: { - type: Array, - default: () => { - return []; - }, - }, }); const emit = defineEmits(["close"]); @@ -117,29 +100,14 @@ watch( } ); watch( - () => props.list1, + () => props.title, (newVal, oldVal) => { - data.list1 = newVal; - } -); -watch( - () => props.list2, - (newVal, oldVal) => { - data.list2 = newVal; - } -); -watch( - () => props.year, - (newVal, oldVal) => { - data.year = newVal; + data.title = newVal; } ); // 使用生命钩子 onMounted(() => { data.title = props.title; - data.list1 = props.list1; - data.list2 = props.list2; - data.year = props.year; }); const closeDialog = () => { diff --git a/src/view/dialog/dialogMap2.vue b/src/view/dialog/dialogMap2.vue new file mode 100644 index 0000000..befb84e --- /dev/null +++ b/src/view/dialog/dialogMap2.vue @@ -0,0 +1,225 @@ + + + + \ No newline at end of file diff --git a/src/view/dialog/echarts/map.vue b/src/view/dialog/echarts/map.vue new file mode 100644 index 0000000..636fa62 --- /dev/null +++ b/src/view/dialog/echarts/map.vue @@ -0,0 +1,258 @@ + + + + + + diff --git a/src/view/echart_analyze/map.vue b/src/view/echart_analyze/map.vue index 7b5a579..737d627 100644 --- a/src/view/echart_analyze/map.vue +++ b/src/view/echart_analyze/map.vue @@ -9,27 +9,45 @@ import { onBeforeMount, onBeforeUnmount, computed, + defineProps, + watch, } from "vue"; -var map = null +const props = defineProps({ + center: { + type: Array, + default: () => { + return [119.178783, 29.034583]; + }, + }, +}); +var map = null; const initMap = () => { - map = new BMapGL.Map('map', { minZoom: 11, maxZoom: 20 }) - map.enableScrollWheelZoom(true) + map = new BMapGL.Map("map", { minZoom: 11, maxZoom: 20 }); + map.enableScrollWheelZoom(true); map.setMapStyleV2({ - styleId: 'd0acde891abd157741b71e12670ee2e6' - }) - goMapCenter([119.178783,29.034583], 15) -} + styleId: "d0acde891abd157741b71e12670ee2e6", + }); + goMapCenter(props.center, 15); +}; //地图中点 const goMapCenter = (point, zoom) => { - map.centerAndZoom(new BMapGL.Point(point[0], point[1]), zoom) -} + map.centerAndZoom(new BMapGL.Point(point[0], point[1]), zoom); +}; +watch( + () => props.center, + (newVal) => { + console.log(newVal); + goMapCenter(newVal, 15); + } +); onMounted(() => { - initMap() -}) + + initMap(); +}); \ No newline at end of file diff --git a/src/view/yl.vue b/src/view/yl.vue index 04cecfa..47bd4a5 100644 --- a/src/view/yl.vue +++ b/src/view/yl.vue @@ -219,7 +219,7 @@
{{ data.yljgzlzx.yljg }}个 @@ -313,6 +313,8 @@
晚餐
+ +
@@ -329,6 +331,7 @@ import ylJHSY from "./echarts_yl/ylJHSY.vue"; import ylSMFW from "./echarts_yl/ylSMFW.vue"; import ylXZZC from "./echarts_yl/ylXZZC.vue"; import Dialog from "./dialog/dialog.vue"; +import DialogMap from "./dialog/dialogMap.vue"; import { ref, onMounted, onBeforeMount, reactive, computed } from "vue"; import http from "@/utils/request.js"; const leftchoose = ref({ @@ -339,6 +342,8 @@ const leftchoose = ref({ const showEchart = ref(false); // 详情弹框 const dialogShow = ref(false); +const dialogShowMap = ref(false); +const mapTitle = ref(""); const tableType = reactive({ url: "", title: "", @@ -439,6 +444,11 @@ const showDialog = (title, url, coulumn) => { getTable(url, pagination.currentPage); }; +//养老机构地图 +const showMapDialog =(title)=>{ + mapTitle.value = title; + dialogShowMap.value = true; +} //获取表格数据 const getTable = (url, currentPage) => { http @@ -453,6 +463,7 @@ const getTable = (url, currentPage) => { }; const close = () => { dialogShow.value = false; + dialogShowMap.value = false; pagination.currentPage = 1; pagination.total = 100; };