From 490ff6d1ac6f8282bc9ce11abaa6a2983b1d38b3 Mon Sep 17 00:00:00 2001 From: Cc Date: Fri, 13 Dec 2024 13:51:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Estore=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/admin/store/modules/permission.js | 8 +- src/index/views/index.vue | 2 +- src/ldmap/components/comExit/reconExit.vue | 26 +- src/ldmap/components/comLeft/sjLeft.vue | 23 +- src/ldmap/components/comRight/right.vue | 7 +- src/ldmap/components/index.vue | 63 +++- src/ldmap/store/modules/mapData.js | 45 ++- src/ldmap/utils/map/Tmap.ts | 382 ++++++++++++++------- src/ldmap/utils/map/init.js | 364 ++++++++++---------- stats.html | 2 +- vite.config.js | 5 + 11 files changed, 558 insertions(+), 369 deletions(-) diff --git a/src/admin/store/modules/permission.js b/src/admin/store/modules/permission.js index 704cafa..fc22e8d 100644 --- a/src/admin/store/modules/permission.js +++ b/src/admin/store/modules/permission.js @@ -35,19 +35,19 @@ const usePermissionStore = defineStore( }, generateRoutes(roles) { return new Promise(resolve => { - let menu = JSON.parse(Cookies.get('menu')||'{}') - if(!menu.menuId){ + let menu = JSON.parse(Cookies.get('menu')||sessionStorage.getItem("menu")||'{}') + if(!menu?.menuId){ return } + Cookies.remove("menu") + sessionStorage.setItem('menu',JSON.stringify(menu)); // 向后端请求路由数据 getRouters({menuId:menu.menuId}).then(res => { - res.data.forEach(data=>{ if(!isHttp(data.path) ){ data.path = '/'+data.path data.component = "Layout" } - }) const sdata = JSON.parse(JSON.stringify(res.data)) const rdata = JSON.parse(JSON.stringify(res.data)) diff --git a/src/index/views/index.vue b/src/index/views/index.vue index 47a0ffa..6af3639 100644 --- a/src/index/views/index.vue +++ b/src/index/views/index.vue @@ -23,7 +23,7 @@ const userStore = useUserStore() import {getDesktopRouters} from '@index/api/menu' const {proxy} = getCurrentInstance(); const openMenu =(item)=>{ - +debugger if(item.path){ if(isHttp(item.path)){ diff --git a/src/ldmap/components/comExit/reconExit.vue b/src/ldmap/components/comExit/reconExit.vue index eabad95..898383c 100644 --- a/src/ldmap/components/comExit/reconExit.vue +++ b/src/ldmap/components/comExit/reconExit.vue @@ -26,7 +26,7 @@ - + @@ -121,33 +121,9 @@ const rules=ref( { ]) const maxHouseFloors = ref('') const minHouseFloors = ref('') - onMounted(() => { - -let lineId = form.value.geometryId -let graphics =ldMap.sketchLayer.polygonLayer.sublayers.items -let garphic = graphics.filter(element => { - return element.id == lineId -})[0]; -let center = [[garphic.geometry.centroid.x,garphic.geometry.centroid.y]] -getElevation({ - layersId:props.layerId, - geoJsonData:[...center,...garphic.geometry.rings[0]] -}).then(res=>{ - const [maxNumber, minNumber] = getMaxAndMin(res.data); - maxHouseFloors.value=maxNumber - minHouseFloors.value=minNumber -console.log(`最大数: ${maxNumber}`); -console.log(`最小数: ${minNumber}`); -console.log(`楼层差: ${maxNumber}-${minNumber}`+(maxNumber-minNumber)); -form.value.houseFloors= parseInt( (maxNumber-minNumber)/3) - -}) - - -}) function getMaxAndMin(numbers) { const max = Math.max(...numbers); const min = Math.min(...numbers); diff --git a/src/ldmap/components/comLeft/sjLeft.vue b/src/ldmap/components/comLeft/sjLeft.vue index f9e6a8c..71c22f1 100644 --- a/src/ldmap/components/comLeft/sjLeft.vue +++ b/src/ldmap/components/comLeft/sjLeft.vue @@ -365,14 +365,15 @@ onMounted(() => { treeHeight.value = window.innerHeight - 258; }; tableDate.value = house.value; - $ldMap.initMap().then((e) => { - getLayerList().then(() => { - if (layerslist.value) { - selectLayer(layerslist.value[0].id); - } + getLayerList().then(() => { + let firstData =layerslist.value[0] + selectLayer(firstData.id); + getlegend(); + + }); - getlegend(); - }); + + emitter.on("loadLayer", () => { getLayerList(); }); @@ -483,10 +484,16 @@ function selectLayer(e) { console.log(item); layerId.value = item.id; layerName.value = item.layerName - $ldMap.addLayer({ + $ldMap.initMap(item.coordinateSystem.epsg).then((e) => { + + $ldMap.addLayer({ url: item.layerUrl, id: e, }); + + +}); + } }); } diff --git a/src/ldmap/components/comRight/right.vue b/src/ldmap/components/comRight/right.vue index 25dca76..2f65256 100644 --- a/src/ldmap/components/comRight/right.vue +++ b/src/ldmap/components/comRight/right.vue @@ -421,9 +421,7 @@ function addPointMap(val) { $ldMap.addDefaultByPoint(data); }); } -function getAllMapData() { - $ldMap.getAllData(); -} + function cutPolygon() { let { flag, data } = cut(); if (flag) { @@ -571,11 +569,12 @@ function setPolygonData() { $ldMap.addDeviceData(mapdata.station, "Station"); }); } + function exportCad(){ // exporGis() if(profilesId.value){ proxy.download("/pipe/recognition/exportCad?profilesId="+profilesId.value, {}, - `${layerName.value}.dxf`,{ + `${layerName.value}.dwg`,{ baseURL: "/map-api" },true); diff --git a/src/ldmap/components/index.vue b/src/ldmap/components/index.vue index a4adc2b..4d614c6 100644 --- a/src/ldmap/components/index.vue +++ b/src/ldmap/components/index.vue @@ -30,6 +30,7 @@ v-model="findValue" style="background: rgb(0, 0, 0, 0.4)" :close-on-click-modal="false" + :before-close="closeWaitDialog" width="30%" >