diff --git a/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue b/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue
index be0f90ac..db3fbcce 100644
--- a/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue
+++ b/SuperMap iEarth/src/layout/layoutHeader/components/saveScene/index.vue
@@ -374,8 +374,8 @@ function createAndSaveScene() {
getRootUrl() +
"apps/earth/v2/index.html?id=" +
response.data.newResourceID;
- console.log("currentUrl:",currentUrl)
- // window.open(currentUrl, "_self");
+ // console.log("currentUrl:",currentUrl)
+ window.open(currentUrl, "_self");
}, 1000);
})
.catch(function (error) {
@@ -465,8 +465,8 @@ function updateScene() {
message.success("场景更新成功!");
let currentUrl =
getRootUrl() + "apps/earth/v2/index.html?id=" + state.sceneID;
- console.log("currentUrl:",currentUrl)
- // window.open(currentUrl, "_self");
+ // console.log("currentUrl:",currentUrl)
+ window.open(currentUrl, "_self");
})
.catch(function (error) {
console.log(error)
diff --git a/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue b/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue
index 687ed856..fc5d5527 100644
--- a/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue
+++ b/SuperMap iEarth/src/layout/layoutMain/components/layoutRightSider/index.vue
@@ -26,7 +26,7 @@
-
@@ -58,6 +58,11 @@ onMounted(() => {
init();
});
+let state = reactive({
+ rightToolBarList:panelStore.panelList.rightToolBarList.slice(0,4)
+})
+
+
// 初始化
function init() {
if (!viewer) return;
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue
index ed52caeb..aaeafeb9 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/index.vue
@@ -73,7 +73,7 @@
剖面信息
-->
-
剖面信息展示
+
剖面截图展示
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js
index 2bcce1a3..428264d6 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-profile/js/profile.js
@@ -187,7 +187,7 @@ class ProfileAnalysis {
text: "截面",
textStyle: {
fontSize: 15,
- color: '#fff'
+ color: '#CAE6FF'
},
top: '3%',
left:'3%',
@@ -201,7 +201,7 @@ class ProfileAnalysis {
containLabel: true
},
axisLabel: {// 设置坐标轴字的颜色
- color: '#fff'
+ color: 'color: rgba(255, 255, 255, 0.85);'
},
backgroundColor: "#000817",
tooltip: {
@@ -231,8 +231,12 @@ class ProfileAnalysis {
toolbox: {
show: true,
feature: {
- restore: {},
- saveAsImage: {}
+ restore: {
+ title:'刷新'
+ },
+ saveAsImage: {
+ title:"下载"
+ }
},
right: "3%",
iconStyle: {
@@ -276,7 +280,13 @@ class ProfileAnalysis {
data: this.LatAndLons.map(function (item) {
return item.height;
}),
- areaStyle: {},
+ areaStyle: {
+ opacity: 0
+ },
+ lineStyle: {
+ color: '#3499E5'
+ },
+ showSymbol: false
},
};
this.myChart.setOption(option);
diff --git a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue
index 397ad207..58f7bcbb 100644
--- a/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue
+++ b/SuperMap iEarth/src/package/analyse3d/analyse/analyse-shadow/index.vue
@@ -4,7 +4,7 @@
-
+
-
+
@@ -45,7 +45,18 @@ function tabsChange(value) {}
.analyse-box {
width: 100%;
height: 100%;
- padding: 0 0.12rem;
+ // padding: 0 0.12rem;
box-sizing: border-box;
+ :deep(.n-tabs-nav){
+ padding:0 0.12rem;
+ };
+ :deep(.n-tab-pane) {
+ box-sizing: border-box;
+ padding-left: 0.12rem;
+ padding-right: 0.12rem;
+ }
+ .use-scroll{
+ padding-right: 0px;
+ }
}
diff --git a/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue b/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue
index 90926eef..d17dc7fd 100644
--- a/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue
+++ b/SuperMap iEarth/src/package/analyse3d/clip/clip-plane/index.vue
@@ -34,6 +34,7 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts
new file mode 100644
index 00000000..e73893d7
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.ts
@@ -0,0 +1,3 @@
+import LayerOpration from './index.vue';
+
+export default LayerOpration;
diff --git a/SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue
new file mode 100644
index 00000000..60a19e36
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerOpration/index.vue
@@ -0,0 +1,3 @@
+
+ 图层操作
+
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts
new file mode 100644
index 00000000..46aa222f
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.ts
@@ -0,0 +1,3 @@
+import LayerStyle from './index.vue';
+
+export default LayerStyle;
diff --git a/SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue
new file mode 100644
index 00000000..1379c753
--- /dev/null
+++ b/SuperMap iEarth/src/package/layerSeries/layerStyle/index.vue
@@ -0,0 +1,3 @@
+
+ 图层风格
+
\ No newline at end of file
diff --git a/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue b/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue
index 0ec89870..53851a21 100644
--- a/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue
+++ b/SuperMap iEarth/src/package/objectPainting/draw-geomety/coms/ellipse.vue
@@ -4,7 +4,7 @@
短半轴
-
+
{{ state.semiMinorAxis }}
@@ -149,15 +149,15 @@ function clear() {
deactiveAll();
viewer.entities.removeAll();
}
-
-watch(
- () => state.semiMinorAxis, // 不起效果,而且场景会动不了,但是页面组件随便用
- (val) => {
- if (targetEntity) {
- targetEntity.ellipse['semiMinorAxis'] = val;
- }
- }
-);
+// 赋值会场景卡死不动,范例上没问题,后面再看
+// watch(
+// () => state.semiMinorAxis, // 不起效果,而且场景会动不了,但是页面组件随便用
+// (val) => {
+// if (targetEntity) {
+// targetEntity.ellipse['semiMinorAxis'] = val;
+// }
+// }
+// );
watch(
() => state.geometryMaterial,
(val) => {
diff --git a/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue b/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue
index 1568b279..032143c8 100644
--- a/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue
+++ b/SuperMap iEarth/src/package/sceneSet/fly-route/components/create-route.vue
@@ -102,8 +102,7 @@
-
-
+
diff --git a/SuperMap iEarth/src/store/panelStore/index.ts b/SuperMap iEarth/src/store/panelStore/index.ts
index 5b96bac8..8bd1bb27 100644
--- a/SuperMap iEarth/src/store/panelStore/index.ts
+++ b/SuperMap iEarth/src/store/panelStore/index.ts
@@ -52,6 +52,27 @@ export const usePanelStore = defineStore({
isSelected: false,
panelName: "ObjectPainting"
},
+ {
+ id: 7,
+ iconName: "iconhuizhi",
+ title: "图层操作",
+ isSelected: false,
+ panelName: "layerOpration"
+ },
+ {
+ id: 8,
+ iconName: "iconhuizhi",
+ title: "图层属性",
+ isSelected: false,
+ panelName: "layerAttr"
+ },
+ {
+ id: 9,
+ iconName: "iconhuizhi",
+ title: "图层风格",
+ isSelected: false,
+ panelName: "layerStyle"
+ },
]
},
rightTooPanel: false,
diff --git a/SuperMap iEarth/src/styles/index.css b/SuperMap iEarth/src/styles/index.css
index 8e9c947a..b566ef6b 100644
--- a/SuperMap iEarth/src/styles/index.css
+++ b/SuperMap iEarth/src/styles/index.css
@@ -95,6 +95,7 @@ html, body, #app {
border: 1px solid rgba(255, 255, 255, 0.85);
}
+
.n-input-number {
border: 1px solid rgba(255, 255, 255, 0.15);
}
diff --git a/SuperMap iEarth/src/styles/index.scss b/SuperMap iEarth/src/styles/index.scss
index 627cf723..4cab37e0 100644
--- a/SuperMap iEarth/src/styles/index.scss
+++ b/SuperMap iEarth/src/styles/index.scss
@@ -120,8 +120,8 @@ html, body,#app{
.btn-secondary {
- color: rgba(255, 255, 255, 0.65);
- border: 1px solid rgba(255, 255, 255, 0.65);
+ // color: rgba(255, 255, 255, 0.65);
+ // border: 1px solid rgba(255, 255, 255, 0.65);
:hover {
color: #5EB7F2 !important;
}
diff --git a/SuperMap iEarth/src/views/panel/index.vue b/SuperMap iEarth/src/views/panel/index.vue
index 49adcfd3..a8179a62 100644
--- a/SuperMap iEarth/src/views/panel/index.vue
+++ b/SuperMap iEarth/src/views/panel/index.vue
@@ -42,6 +42,21 @@
v-if="panelStore.panelList.rightToolBarList[3].isSelected"
>对象绘制
+ 图层操作
+ 图层属性
+ 图层风格
@@ -62,6 +77,16 @@
+
+
+
+
@@ -82,6 +107,13 @@ import Measure from "@/package/measure/index";
import SceneSet from "@/package/sceneSet/index";
// 对象绘制
import ObjectPainting from "@/package/objectPainting/index";
+
+
+// 图层系列操作
+import LayerOpration from "@/package/layerSeries/layerOpration/index";
+import LayerAttribute from "@/package/layerSeries/layerAttribute/index";
+import LayerStyle from "@/package/layerSeries/layerStyle/index";
+
import { usePanelStore } from "@/store/index";
const panelStore = usePanelStore();
diff --git a/SuperMap iEarth/src/views/viewer/index.vue b/SuperMap iEarth/src/views/viewer/index.vue
index fdb52c76..347eb520 100644
--- a/SuperMap iEarth/src/views/viewer/index.vue
+++ b/SuperMap iEarth/src/views/viewer/index.vue
@@ -73,7 +73,8 @@ function initViewer() {
window["viewer"] = viewer; //绑定到window
GlobalStore.isViewer = true; // viewer初始化完成标志
viewer.eventManager = new EventManager(viewer); //添加屏幕事件管理
- // viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
+ viewer.resolutionScale = window.devicePixelRatio;
+ viewer.scene.globe.depthTestAgainstTerrain = true; //开启深度检测
viewer.scene.globe.baseColor = SuperMap3D.Color.BLACK; // 没有影像图层时地球的底色
if (viewer.geocoder) {
// 请开发者自行到supermap online官网(http://www.supermapol.com/)申请key