From b3ddd1ae1752660790167ad21b391b2e7d2275c7 Mon Sep 17 00:00:00 2001 From: "lj7788@126.com" Date: Wed, 11 Jun 2025 15:06:47 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue b/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue index b2c09e1e..f51968e2 100644 --- a/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue +++ b/yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue @@ -50,8 +50,6 @@ export default { }) }, initCesium() { -<<<<<<< Updated upstream -======= window.api = new SAPI( { serverIP: `model.jhncidg.com`, //服务ip地址 @@ -98,7 +96,6 @@ export default { ); }, initCesium2() { ->>>>>>> Stashed changes // const defaults = { ...this.bimStore.defaults } let defaults = { container: 'cesiumContainer', //[必须]容器id