jiangyq
/
YZProjectCloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

解决冲突

dev_xd
lj7788@126.com 2025-06-11 15:06:47 +08:00
parent 6389311f0c
commit b3ddd1ae17
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yanzhu-ui-vue3/src/views/bim/bimModel/modelDialog.vue
View File

@ -50,8 +50,6 @@ export default {
}) })
}, },
initCesium() { initCesium() {
<<<<<<< Updated upstream
=======
window.api = new SAPI( window.api = new SAPI(
{ {
serverIP: `model.jhncidg.com`, //服务ip地址 serverIP: `model.jhncidg.com`, //服务ip地址
@ -98,7 +96,6 @@ export default {
); );
}, },
initCesium2() { initCesium2() {
>>>>>>> Stashed changes
// const defaults = { ...this.bimStore.defaults } // const defaults = { ...this.bimStore.defaults }
let defaults = { let defaults = {
container: 'cesiumContainer', //[必须]容器id container: 'cesiumContainer', //[必须]容器id