From fb207b8eec40b5111018db0ae38c3e9fef56f0aa Mon Sep 17 00:00:00 2001
From: Surpriseplus <845948745@qq.com>
Date: 星期二, 28 二月 2023 11:39:56 +0800
Subject: [PATCH] 综合展示水淹没效果修改，分屏切换优化
---
src/components/MapDiv.vue | 12 ++++++++++--
src/components/mapol.vue | 1 +
src/views/Synthesis/LeftMenu.vue | 2 +-
src/views/maintenance/mochaitmo.vue | 2 +-
src/views/datamanage/bankController.vue | 2 +-
public/SmartEarthSDK/Workers/image/33.gif | 0
src/views/maintenance/opexController.vue | 2 +-
src/views/Tools/LayerTree.vue | 22 +++++++++++++++++++++-
src/views/maintenance/systemController.vue | 2 +-
src/views/datamanage/dataController.vue | 2 +-
src/components/navMenu.vue | 4 ++--
src/views/datamanage/projectController.vue | 2 +-
src/views/maintenance/empowerController.vue | 2 +-
13 files changed, 42 insertions(+), 13 deletions(-)
diff --git a/public/SmartEarthSDK/Workers/image/33.gif b/public/SmartEarthSDK/Workers/image/33.gif
new file mode 100644
index 0000000..f6bc039
--- /dev/null
+++ b/public/SmartEarthSDK/Workers/image/33.gif
Binary files differ
diff --git a/src/components/MapDiv.vue b/src/components/MapDiv.vue
index b5149b3..0454d57 100644
--- a/src/components/MapDiv.vue
+++ b/src/components/MapDiv.vue
@@ -10,7 +10,10 @@
>
<mapsdk></mapsdk>
</div>
- <div id="ds" v-show="isShowDs"></div>
+ <div
+ id="ds"
+ v-show="isShowDs"
+ ></div>
<!--openLayers鏄剧ず鐣岄潰-->
<div
v-show="isOlMapFlag"
@@ -192,7 +195,12 @@
},
mounted() {
this.$bus.$on("changemap", e => {
- this.changeMap(e)
+ if (this.isSplitFlag == 1) {
+ this.changeMap(3)
+ } else {
+ this.changeMap(e)
+ }
+
})
},
}
diff --git a/src/components/mapol.vue b/src/components/mapol.vue
index 55ca4b7..27fd561 100644
--- a/src/components/mapol.vue
+++ b/src/components/mapol.vue
@@ -112,6 +112,7 @@
center: [105.02, 34.9],
zoom: 4,
projection: "EPSG:4326",
+ minZoom: 4,
}),
controls: defaultControls().extend([
new FullScreen(),
diff --git a/src/components/navMenu.vue b/src/components/navMenu.vue
index 45fd142..2d9d7aa 100644
--- a/src/components/navMenu.vue
+++ b/src/components/navMenu.vue
@@ -266,8 +266,8 @@
setLiClick(res, index) {
sessionStorage.removeItem('hanleselectmochaitmo')
sessionStorage.removeItem('hanleselectindex')
-
- this.signInsertOpLog(this.listMenu[index].cnName, res.cnName)
+ debugger
+ // this.signInsertOpLog(this.listMenu[index].cnName, res.cnName)
setTimeout(() => {
this.changeliSelect = res.cnName;
diff --git a/src/views/Synthesis/LeftMenu.vue b/src/views/Synthesis/LeftMenu.vue
index 29729e9..30b063b 100644
--- a/src/views/Synthesis/LeftMenu.vue
+++ b/src/views/Synthesis/LeftMenu.vue
@@ -1450,7 +1450,7 @@
pointSelect: true,
spood: 20,
GroupID: 0,
- url: "/SmartEarthSDK/Workers/image/waterNormals.jpg",
+ url: "/SmartEarthSDK/Workers/image/33.gif",
};
window.AnalysisFlood = sgworld.Command.execute(
2,
diff --git a/src/views/Tools/LayerTree.vue b/src/views/Tools/LayerTree.vue
index c4bfd4f..d9411be 100644
--- a/src/views/Tools/LayerTree.vue
+++ b/src/views/Tools/LayerTree.vue
@@ -618,12 +618,32 @@
})
);
- tileset.readyPromise.then(function (tileset) {
+ tileset.readyPromise.then((tileset0) => {
tileset.id = res.cnName;
+
+ this.tileSet(tileset, parseFloat(res.elev))
+
+
+
Viewer.flyTo(tileset);
});
}
},
+
+
+ tileSet(tileset, height) {
+ //3dtile妯″瀷鐨勮竟鐣岀悆浣�
+ var boundingSphere = tileset.boundingSphere;
+ //杩崱灏旂┖闂寸洿瑙掑潗鏍�=>鍦扮悊鍧愭爣锛堝姬搴﹀埗锛�
+ var cartographic_original = Cesium.Cartographic.fromCartesian(boundingSphere.center);
+ //鍦扮悊鍧愭爣锛堝姬搴﹀埗锛�=>杩崱灏旂┖闂寸洿瑙掑潗鏍�
+ var Cartesian3_original = Cesium.Cartesian3.fromRadians(cartographic_original.longitude, cartographic_original.latitude, cartographic_original.height);
+ var Cartesian3_offset = Cesium.Cartesian3.fromRadians(cartographic_original.longitude, cartographic_original.latitude, height);
+ //鑾峰緱鍦伴潰鍜宱ffset鐨勮浆鎹�
+ var translation = Cesium.Cartesian3.subtract(Cartesian3_offset, Cartesian3_original, new Cesium.Cartesian3());
+ //淇敼妯″瀷鐭╅樀
+ tileset.modelMatrix = Cesium.Matrix4.fromTranslation(translation);
+ },
setTreeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
return cloneData.filter((father) => {
diff --git a/src/views/datamanage/bankController.vue b/src/views/datamanage/bankController.vue
index 7d268a0..f9d2fc9 100644
--- a/src/views/datamanage/bankController.vue
+++ b/src/views/datamanage/bankController.vue
@@ -198,7 +198,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
diff --git a/src/views/datamanage/dataController.vue b/src/views/datamanage/dataController.vue
index 752f4a9..97d877c 100644
--- a/src/views/datamanage/dataController.vue
+++ b/src/views/datamanage/dataController.vue
@@ -197,7 +197,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
diff --git a/src/views/datamanage/projectController.vue b/src/views/datamanage/projectController.vue
index bb2ab15..908c4b3 100644
--- a/src/views/datamanage/projectController.vue
+++ b/src/views/datamanage/projectController.vue
@@ -201,7 +201,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
treeData(source) {
let cloneData = JSON.parse(JSON.stringify(source)); // 瀵规簮鏁版嵁娣卞害鍏嬮殕
diff --git a/src/views/maintenance/empowerController.vue b/src/views/maintenance/empowerController.vue
index 71339ba..9dea572 100644
--- a/src/views/maintenance/empowerController.vue
+++ b/src/views/maintenance/empowerController.vue
@@ -238,7 +238,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
diff --git a/src/views/maintenance/mochaitmo.vue b/src/views/maintenance/mochaitmo.vue
index c691baf..6cf7811 100644
--- a/src/views/maintenance/mochaitmo.vue
+++ b/src/views/maintenance/mochaitmo.vue
@@ -237,7 +237,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
diff --git a/src/views/maintenance/opexController.vue b/src/views/maintenance/opexController.vue
index 64b9d8b..a2333cb 100644
--- a/src/views/maintenance/opexController.vue
+++ b/src/views/maintenance/opexController.vue
@@ -239,7 +239,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
diff --git a/src/views/maintenance/systemController.vue b/src/views/maintenance/systemController.vue
index 67e8b69..1481ba2 100644
--- a/src/views/maintenance/systemController.vue
+++ b/src/views/maintenance/systemController.vue
@@ -239,7 +239,7 @@
m1: m1,
m2: m2,
}
- const data = await sign_insertOpLog(obj);
+ // const data = await sign_insertOpLog(obj);
},
--
Gitblit v1.9.3