diff --git a/src/views/goverment/frontLargeScreen/components/spaceAnalysis.vue b/src/views/goverment/frontLargeScreen/components/spaceAnalysis.vue index 9f2a9f6..e2873b6 100644 --- a/src/views/goverment/frontLargeScreen/components/spaceAnalysis.vue +++ b/src/views/goverment/frontLargeScreen/components/spaceAnalysis.vue @@ -360,8 +360,8 @@ onMounted(() => { // 地形开挖 terrainClip = new mars3d.thing.TerrainClip({ diffHeight: allProperty.value.diffHeight, // 井的深度 - image: "@/assets/images/Mars3DImg/textures/poly-stone.jpg", - imageBottom: "@/assets/images/Mars3DImg/textures/poly-soil.jpg", + image: new URL("../../../assets/images/Mars3DImg/textures/poly-stone.jpg", import.meta.url).href, + imageBottom: new URL("../../../assets/images/Mars3DImg/textures/poly-soil.jpg", import.meta.url).href, splitNum: 80, // 井边界插值数 enabled: true }); diff --git a/src/views/goverment/largeScreen/components/spaceAnalysis.vue b/src/views/goverment/largeScreen/components/spaceAnalysis.vue index d8dc0cb..04c47c7 100644 --- a/src/views/goverment/largeScreen/components/spaceAnalysis.vue +++ b/src/views/goverment/largeScreen/components/spaceAnalysis.vue @@ -365,8 +365,8 @@ onMounted(() => { // 地形开挖 terrainClip = new mars3d.thing.TerrainClip({ diffHeight: allProperty.value.diffHeight, // 井的深度 - image: "@/assets/images/Mars3DImg/textures/poly-stone.jpg", - imageBottom: "@/assets/images/Mars3DImg/textures/poly-soil.jpg", + image: new URL("../../../../assets/images/Mars3DImg/textures/poly-stone.jpg", import.meta.url).href, + imageBottom: new URL("../../../../assets/images/Mars3DImg/textures/poly-soil.jpg", import.meta.url).href, splitNum: 80, // 井边界插值数 enabled: true }); @@ -410,6 +410,7 @@ const saveJson = async () => { }); arr = arr.concat(graphicLayer.getGraphics()); clearBool.value = false; + console.log(arr); emits("saveJson", arr); }; // 限定高度--绘制面 diff --git a/src/views/goverment/largeScreen/index.vue b/src/views/goverment/largeScreen/index.vue index 1fd2309..c671bf7 100644 --- a/src/views/goverment/largeScreen/index.vue +++ b/src/views/goverment/largeScreen/index.vue @@ -265,7 +265,6 @@ import * as mars3d from "mars3d"; import ConfigJson from "@/views/goverment/largeScreen/config.json"; import layoutTop from "@/components/layoutTop/index.vue"; import { ElMessage } from "element-plus"; -import { datas } from "@/enums/company/SetpsEnum"; import { initVue3Popup } from "@/utils/file-util"; import QueryPopup from "./components/query-popup.vue"; import MapMeasurement from "./components/mapMeasurement.vue"; @@ -464,10 +463,6 @@ onMounted(async () => { await initTree(); await getConfig(); }); -// 查找图片资源 -const getImageUrl = (url: string) => { - return new URL(`${url}`, import.meta.url).href; -}; // 展示保存的地图标绘配置 const showMapData = (arr: any) => { console.log(arr); @@ -477,8 +472,8 @@ const showMapData = (arr: any) => { // 地形开挖 const terrainClip = new mars3d.thing.TerrainClip({ diffHeight: item.attr.diffHeight, // 井的深度 - image: "../../../assets/images/Mars3DImg/textures/poly-stone.jpg", - imageBottom: "../../../assets/images/Mars3DImg/textures/poly-soil.jpg", + image: new URL("../../../assets/images/Mars3DImg/textures/poly-stone.jpg", import.meta.url).href, + imageBottom: new URL("../../../assets/images/Mars3DImg/textures/poly-soil.jpg", import.meta.url).href, splitNum: 80, // 井边界插值数 enabled: true }); @@ -550,7 +545,7 @@ const getConfig = async () => { console.log(result, "6666666"); if (result) { layerId.value = result.configId; - layerJsonArr.value = JSON.parse(result.configValue); + layerJsonArr.value = result.configType; console.log(layerJsonArr.value); showMapData(layerJsonArr.value); } @@ -575,9 +570,9 @@ const saveAddLayer = async (subGraphicLayer: any) => { const saveAnalysisLayer = async (subLayerData: any) => { const geojson = subLayerData; console.log(geojson); - let allArr = layerJsonArr.value.concat(geojson); - console.log(allArr); - let requestData: any = { configKey: "layerConfig", configValue: JSON.stringify(allArr) }; + // let allArr = layerJsonArr.value.concat(geojson); + // console.log(allArr); + let requestData: any = { configKey: "layerConfig", configType: geojson }; if (layerJsonArr.value.length > 0) { requestData.configId = layerId.value; }