From d09bf8ccf9e27e3c332a6ad76e34ce6f0783a8be Mon Sep 17 00:00:00 2001 From: yaoyuhao Date: Thu, 29 Aug 2024 16:50:20 +0800 Subject: [PATCH] 1 --- src/assets/images/map/j7_map.png | Bin 0 -> 5141 bytes src/view/dialog/dialogMapDp.vue | 9 +- src/view/sy_map.vue | 224 ++++++++++++++++++++++--------- vite.config.js | 4 +- 4 files changed, 167 insertions(+), 70 deletions(-) create mode 100644 src/assets/images/map/j7_map.png diff --git a/src/assets/images/map/j7_map.png b/src/assets/images/map/j7_map.png new file mode 100644 index 0000000000000000000000000000000000000000..00ec73045dda4210c86a00760eff3250dc897867 GIT binary patch literal 5141 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 { - console.log(row,'sxt'); - + console.log(row, "sxt"); + // row 是当前行的数据 emit("openMessage", { nm: row.nm, identNo: row.identNo }); // router.push({ @@ -225,6 +226,7 @@ const handle = (current) => { :deep(.el-dialog) { --el-dialog-bg-color: none; --el-dialog-width: 76% !important; + margin: 11vh auto !important; } .my-header { @@ -234,6 +236,7 @@ const handle = (current) => { .tabelPart { padding: 16px; + padding-bottom: 5px; background: linear-gradient( 270deg, rgba(0, 77, 131, 0.69) 0%, @@ -334,7 +337,7 @@ const handle = (current) => { } .custom-table-font { - font-size: 10px; + font-size: 15px; } :deep(.el-table:not(.el-table--border) .el-table__cell) { padding: 3px 0px; diff --git a/src/view/sy_map.vue b/src/view/sy_map.vue index df37d58..4487aa9 100644 --- a/src/view/sy_map.vue +++ b/src/view/sy_map.vue @@ -111,7 +111,7 @@
-
+
基本公共服务圈
@@ -363,6 +363,7 @@ import j8 from "@/assets/images/map/j8.png"; import j9 from "@/assets/images/map/j9.png"; import j10 from "@/assets/images/map/j10.png"; import j11 from "@/assets/images/map/j11.png"; +import j7_map from "@/assets/images/map/j7_map.png"; import j10_map from "@/assets/images/map/j10_map.png"; import j11_map from "@/assets/images/map/j11_map.png"; import dwd from "@/assets/images/map/dwd.png"; @@ -795,6 +796,7 @@ const yaosuTotal = ref([ id: 7, name: "养老机构", img: j7, + img_map: j7_map, wz: false, }, { @@ -849,6 +851,84 @@ const yaosuIcon = ref({ 卫生服务中心: { sj: [] }, AED: { sj: [] }, }); +//养老机构数据 +const ylCount = reactive([ + { + name: "龙游县湖镇镇养老服务中心（龙游县湖镇中心敬老院）", + value: 34, + center: [119.290573, 29.05917], + }, + { + name: "龙游县模环敬老院（龙游县模环乡钱江缘颐养院）", + value: 73, + center: [119.245178, 29.11824], + }, + { + name: "龙游县小南海敬老院(龙游县小南海销钱江缘颐养院）", + value: 29, + center: [119.116203, 29.078722], + }, + { + name: "龙游县广和长青养老服务中心", + value: 310, + center: [119.15457, 29.01811], + }, + { + name: "龙游县泽随敬老院(龙游泽随养老中心)", + value: 57, + center: [119.102493, 29.14036], + }, + { + name: "龙游县龙南中心敬老院(龙游龙南养老中心)", + value: 73, + center: [119.157143, 28.833012], + }, + { + name: "龙游县詹家敬老院(龙游詹家养老中心)", + value: 33, + center: [119.078972, 29.026592], + }, + { + name: "龙游县龙洲敬老院(龙游龙洲养老中心)", + value: 23, + center: [119.164062, 28.984661], + }, + { + name: "龙游县横山镇敬老院(龙游横山养老中心)", + value: 58, + center: [119.237015, 29.240862], + }, + { + name: "龙游骨科医院(六顺颐养院)", + value: 247, + center: [119.171921, 29.01895], + }, + { + name: "龙游石佛敬老院(龙游县石佛乡六顺养老中心)", + value: 61, + center: [119.11557, 29.187431], + }, + { + name: "龙游县国华养老服务有限公司", + value: 25, + center: [119.125282, 29.098713], + }, + { + name: "龙游县社会养老和儿童福利院", + value: 0, + center: [119.17602, 29.03358], + }, + { + name: "龙游荷庄养老院", + value: 0, + center: [119.211021, 29.174171], + }, + { + name: "龙游县湖镇中心卫生院(天禾康养)", + value: 0, + center: [119.299393, 29.059999], + }, +]); // 鼠标点击添加点位 let currentMarker = null; // 用于保存当前标记的引用 // 详情弹框 @@ -923,7 +1003,7 @@ const pagination = reactive({ //--------定义方法---------------------------------------- //地图初始化 const initMap = () => { - map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 16 }); + map = new BMapGL.Map("map", { minZoom: 8, maxZoom: 18 }); map.setMapType(BMAP_SATELLITE_MAP); map.enableScrollWheelZoom(true); goMapCenter([119.178783, 29.034583], 11); @@ -959,7 +1039,6 @@ const movemode = () => { var selectedOverlay = null; var sceneMove; var movepoy; -var select; const normalStyle = { fillColor: "#ad9ff8", strokeColor: "#4f2ff1", @@ -986,17 +1065,12 @@ const clickHandler = (e) => { let target = polyLayer.pickOverlays(e.target); if (target && target[0]) { selectedOverlay = target[0]; - console.log("5-1", selectedOverlay); // setActiveStyle(selectedOverlay); - movepoy.open(selectedOverlay, call()); + movepoy.open(selectedOverlay); } else { - console.log("5-2"); polyLayer.resetStyle(); } }; -const call = () => { - console.log("执行"); -}; //开始平移 const moveEdit = () => { console.log(11111, cs_choose_arr.value[0]); @@ -1008,7 +1082,6 @@ const moveEdit = () => { selectedOverlay = null; sceneMove = null; movepoy = null; - select = null; map.addGeoJSONLayer(polyLayer); polyLayer.addOverlay(cs_choose_arr.value[0]); sceneMove = new DrawScene(map); @@ -1052,9 +1125,11 @@ const moveSave = () => { }; //退出移动模式 const moveBack = () => { - // select.close(); - // movepoy.close(); - // sceneMove.removeEventListener(OperateEventType.CLICK, clickHandler); + //如果进入移动模式，但不点击移动，直接退出，movepoy为空，不执行取消监听 + if (movepoy) { + movepoy.close(); + sceneMove.removeEventListener(OperateEventType.CLICK, clickHandler); + } polyLayer.removeOverlay(cs_choose_arr.value[0]); map.removeGeoJSONLayer(polyLayer); cs_choose_arr.value.forEach((item, index) => { @@ -1167,27 +1242,11 @@ const backEdit = () => { }; //批量修改村社位置 const shangchuan = async () => { - for (const item of xkzDk) { - let a = []; - a.push(item.point); - // console.log(JSON.stringify(a)); - let sj = { - id: item.id, - data: JSON.stringify(a), - }; - await http.post(`/api/ggfwyth/regionalDivision/edit`, sj).then((res) => { - if (res.code == 200) { - ElMessage.success({ - message: "保存成功", - }); - } - }); - await new Promise((resolve) => setTimeout(resolve, 1000)); - } - // xkzDk.forEach(async (item, index) => { + //上传地块0.00328 + // for (const item of xkzDk) { // let a = []; // a.push(item.point); - // console.log(JSON.stringify(a)); + // // console.log(JSON.stringify(a)); // let sj = { // id: item.id, // data: JSON.stringify(a), @@ -1199,7 +1258,26 @@ const shangchuan = async () => { // }); // } // }); - // }); + // await new Promise((resolve) => setTimeout(resolve, 1000)); + // } + //上传中心点 + for (const item of xkzCenter) { + let sj = { + id: item.id, + data: JSON.stringify(item.center), + }; + console.log(sj); + await http + .post(`/api/ggfwyth/regionalDivision/updateCsCenter`, sj) + .then((res) => { + if (res.code == 200) { + ElMessage.success({ + message: "保存成功", + }); + } + }); + await new Promise((resolve) => setTimeout(resolve, 1000)); + } }; //上传编辑的地块 const saveDK = async () => { @@ -1208,28 +1286,28 @@ const saveDK = async () => { id: changeCsqkId.value, data: JSON.stringify(arrJWD), }; - console.log(sj.data); + // console.log(sj.data); - // await http.post(`/api/ggfwyth/regionalDivision/edit`, sj).then((res) => { - // if (res.code == 200) { - // ElMessage.success({ - // message: "保存成功", - // }); - // } - // }); - // await getCssj(); - // await loadCs(cfJd.value); - // cs_choose_arr.value.forEach((item, index) => { - // map.removeOverlay(cs_choose_arr.value[index]); - // }); - // chooseCsList.value.length = 0; - // xkzDk.forEach((itemm, indexx) => { - // if (itemm.name == cfCs.value) { - // chooseCsList.value.push(itemm); - // addCsChoose(); - // } - // }); - // loadingss.value = false; + await http.post(`/api/ggfwyth/regionalDivision/edit`, sj).then((res) => { + if (res.code == 200) { + ElMessage.success({ + message: "保存成功", + }); + } + }); + await getCssj(); + await loadCs(cfJd.value); + cs_choose_arr.value.forEach((item, index) => { + map.removeOverlay(cs_choose_arr.value[index]); + }); + chooseCsList.value.length = 0; + xkzDk.forEach((itemm, indexx) => { + if (itemm.name == cfCs.value) { + chooseCsList.value.push(itemm); + addCsChoose(); + } + }); + loadingss.value = false; }; //修改村名 const nameEdit = () => { @@ -1240,14 +1318,12 @@ const centerEdit = () => { }; const csName = async () => { let n = input1.value; - let regionalDivisionEditDTO = { + let regionalDivisionEditDTO = { id: changeCsqkId.value, data: input1.value, }; await http - .post( - `/api/ggfwyth/regionalDivision/updateCsName`,regionalDivisionEditDTO - ) + .post(`/api/ggfwyth/regionalDivision/updateCsName`, regionalDivisionEditDTO) .then((res) => { if (res.code == 200) { ElMessage.success({ @@ -2364,8 +2440,12 @@ const changeys = (name) => { if (name == "摄像头" || name == "AED") { getZyys(url, name, img, img_map); } + if (name == "养老机构") { + getZyys2(name, img, img_map); + } } }; +//线上接口资源要素 const getZyys = (url, name, img, img_map) => { http.get(url).then((res) => { if (res.code == 200) { @@ -2399,9 +2479,20 @@ const getZyys = (url, name, img, img_map) => { } }); }; -// const handleItemClick = (item, index, name) => { -// console.log("Item clicked:", item, index, name); -// }; +//本地存储资源要素 +const getZyys2 = (name, img, img_map) => { + if (name == "养老机构") { + yaosuIcon.value[name].sj = ylCount; + yaosuIcon.value[name].sj.forEach((item, index) => { + item.img = img; + item.img_map = img_map; + item.overlay = null; + }); + yaosuIcon.value[name].sj.forEach((itemm, indexx) => { + createZyys(itemm, indexx, name); + }); + } +}; // 添加资源要素的图标(overlay存放标记点) const createZyys = (polygon, indexx, name) => { @@ -2425,7 +2516,9 @@ const createZyys = (polygon, indexx, name) => { { point: new BMapGL.Point(...polygon.center), opacity: 0.5, - offsetY: -10, + // offsetY: -10, + offsetX: 10, + offsetY: -15, properties: { imgSrc2: polygon.img_map, type: "customOverlay", @@ -3469,8 +3562,9 @@ const addCsUnChoose = () => { //创建村社 const addCs = () => { xkzCenter.map((item, index) => { - console.log(item.name,typeof item.center); - + // item.center[0] = item.center[0] + 0.01; + // item.center[1] = item.center[1] + 0.00328; + console.log(item.center); createCs(item, index); }); }; @@ -3777,7 +3871,7 @@ const reset_font2 = () => { "scale(" + width / 1920 + "," + height / 1080 + ")"; }; onMounted(async () => { - // tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); + tools.data.set("token", "6b0e380b4a8f46baae4923f83faf670d"); loadingss.value = true; reset_font(); initMap(); diff --git a/vite.config.js b/vite.config.js index 99753df..7708875 100644 --- a/vite.config.js +++ b/vite.config.js @@ -15,8 +15,8 @@ export default defineConfig({ // 第一个代理 "/api": { // 匹配到啥来进行方向代理 - // target: "http://10.0.0.65:8095/", //刘进 - target: "http://220.191.238.50:996/", //线上 + target: "http://10.0.0.65:8095/", //刘进 + // target: "http://220.191.238.50:996/", //线上 changeOrigin: true, //是否支持跨域 //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个 },