diff --git a/.vscode/settings.json b/.vscode/settings.json index cbb7b3af..e8783bfe 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "liveServer.settings.port": 5502 + "liveServer.settings.port": 5505 } \ No newline at end of file diff --git a/SuperMap iEarth/public/config/serviceList.js b/SuperMap iEarth/public/config/serviceList.js index cbce482a..3c1660d0 100644 --- a/SuperMap iEarth/public/config/serviceList.js +++ b/SuperMap iEarth/public/config/serviceList.js @@ -97,21 +97,21 @@ const layerServiceData = { thumbnail: './images/baseMap/grad.png', type: 'GRIDIMAGERY', chooseType: false, - }, - { - url: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png', - name: "japanStand", - thumbnail: './images/baseMap/standard_jp.png', - type: 'UrlTemplateImageryProvider', - chooseType: false, - }, - { - url: 'https://cyberjapandata.gsi.go.jp/xyz/pale/{z}/{x}/{y}.png', - name: "japanPale", - thumbnail: './images/baseMap/tinge_jp.png', - type: 'UrlTemplateImageryProvider', - chooseType: false, - }, + } + // { + // url: 'https://cyberjapandata.gsi.go.jp/xyz/std/{z}/{x}/{y}.png', + // name: "japanStand", + // thumbnail: './images/baseMap/standard_jp.png', + // type: 'UrlTemplateImageryProvider', + // chooseType: false, + // }, + // { + // url: 'https://cyberjapandata.gsi.go.jp/xyz/pale/{z}/{x}/{y}.png', + // name: "japanPale", + // thumbnail: './images/baseMap/tinge_jp.png', + // type: 'UrlTemplateImageryProvider', + // chooseType: false, + // }, // { // url: 'https://cyberjapandata.gsi.go.jp/xyz/blank/{z}/{x}/{y}.png', // name: "japanBlank", diff --git a/SuperMap iEarth/src/App.vue b/SuperMap iEarth/src/App.vue index 46d52321..2b2ca93a 100644 --- a/SuperMap iEarth/src/App.vue +++ b/SuperMap iEarth/src/App.vue @@ -368,6 +368,13 @@ const overridesTheme = { line-height: 0.34rem; } +/* 图层列表选项 内容 避免过长 */ +.n-tree .n-tree-node-content .n-tree-node-content__text div{ + width: 140px; + overflow: hidden; + text-overflow: ellipsis; // 文字过长后使用省略号 +} + // echarts图表样式 #echartsProfile > div { left: 0.1rem; diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue index db03926c..28aa16b2 100644 --- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue +++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/profile.vue @@ -233,6 +233,12 @@ function setDataForGpuProFile(result: any) { //分析 function analysis() { + // 解决缺陷【8035】GPU剖面分析下报错崩溃问题 + profile.clear(); + if (ctx) ctx.clearRect(0, 0, canvas.width, canvas.height); + profile_GPU.destroy(); + profile_GPU = new SuperMap3D.Profile(scene); + let interValID = setInterval(() => { if (!handlerPolyline.positions) return; @@ -264,7 +270,12 @@ function analysis() { state.show = false; } }); - if (state.infoShowMode === "canvas") getCanvasImage(); + if (state.infoShowMode === "canvas") { + // getCanvasImage(); + setTimeout(()=>{ // 通过定时器延迟执行获取,还是不对,接口问题? + getCanvasImage(); + },1000) + } handlerPolyline.polylineTransparent.show = false; }, (err) => { diff --git a/SuperMap iEarth/src/package/layerTree/layerTree.vue b/SuperMap iEarth/src/package/layerTree/layerTree.vue index 07376d97..53e532d4 100644 --- a/SuperMap iEarth/src/package/layerTree/layerTree.vue +++ b/SuperMap iEarth/src/package/layerTree/layerTree.vue @@ -16,7 +16,7 @@