admin/Mars3D-screen_web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-11-18 18:39:57 +08:00
parent 0b1fa274c8
commit f3ce81fc67
3 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/goverment/frontLargeScreen/components/spaceAnalysis.vue
View File

@ -360,8 +360,8 @@ onMounted(() => {
// 地形开挖 // 地形开挖
terrainClip = new mars3d.thing.TerrainClip({ terrainClip = new mars3d.thing.TerrainClip({
diffHeight: allProperty.value.diffHeight, // 井的深度 diffHeight: allProperty.value.diffHeight, // 井的深度
image: "@/assets/images/Mars3DImg/textures/poly-stone.jpg", image: new URL("../../../assets/images/Mars3DImg/textures/poly-stone.jpg", import.meta.url).href,
imageBottom: "@/assets/images/Mars3DImg/textures/poly-soil.jpg", imageBottom: new URL("../../../assets/images/Mars3DImg/textures/poly-soil.jpg", import.meta.url).href,
splitNum: 80, // 井边界插值数 splitNum: 80, // 井边界插值数
enabled: true enabled: true
}); });

5
src/views/goverment/largeScreen/components/spaceAnalysis.vue
View File

@ -365,8 +365,8 @@ onMounted(() => {
// 地形开挖 // 地形开挖
terrainClip = new mars3d.thing.TerrainClip({ terrainClip = new mars3d.thing.TerrainClip({
diffHeight: allProperty.value.diffHeight, // 井的深度 diffHeight: allProperty.value.diffHeight, // 井的深度
image: "@/assets/images/Mars3DImg/textures/poly-stone.jpg", image: new URL("../../../../assets/images/Mars3DImg/textures/poly-stone.jpg", import.meta.url).href,
imageBottom: "@/assets/images/Mars3DImg/textures/poly-soil.jpg", imageBottom: new URL("../../../../assets/images/Mars3DImg/textures/poly-soil.jpg", import.meta.url).href,
splitNum: 80, // 井边界插值数 splitNum: 80, // 井边界插值数
enabled: true enabled: true
}); });
@ -410,6 +410,7 @@ const saveJson = async () => {
}); });
arr = arr.concat(graphicLayer.getGraphics()); arr = arr.concat(graphicLayer.getGraphics());
clearBool.value = false; clearBool.value = false;
console.log(arr);
emits("saveJson", arr); emits("saveJson", arr);
}; };
// 限定高度--绘制面 // 限定高度--绘制面

17
src/views/goverment/largeScreen/index.vue
View File

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