fix: Merge branch 'master' of http://192.168.0.115:3000/4dkankan/4dkankan_bim

# Conflicts:
#	src/pages/Bim.vue
#	src/pages/LaserBim.vue

src/pages/Bim.vue

@@ -32,12 +32,13 @@ const successCallback = viewMetaData => {
         viewAdded = true
         // 渲染3D模型
         viewer3D.render()
-        window.loader.resolve(viewer3D)
+ 
+        window.loaded.resolve(viewer3D)
     }) 
     /*viewer3D.addEventListener(Glodon.Bimface.Viewer.Viewer3DEvent.MouseClicked, function (objectdata) {
      // 调用viewerDrawing对象的Method，可以继续扩展功能
         alert('objectId : ' + JSON.stringify(objectdata.objectId) + '\n' + 'worldPosition : ' + JSON.stringify(objectdata.worldPosition))
-    })*/
+    })*/ 
 }
 
 // 加载失败回调函数

src/pages/LaserBim.vue

@@ -110,10 +110,11 @@ const onLoadSource = () => {
 const onLoadTarget = () => { 
  
     targetApp = targetFrame.value.contentWindow
-    targetApp.loader.then(viewer=>{
+ 
+    targetApp.loaded.then(viewer=>{
         //console.log(viewer.getViewer().camera)
         window.viewer2 = targetApp.viewer
-        initConvertView()
+        initConvertView() 
     })
  
  

src/pages/bim.js

@@ -1,6 +1,6 @@
 import { createApp } from 'vue'
 import App from './Bim.vue'
 import Deferred from '@/utils/Deferred'
-window.loader = Deferred()
+window.loaded = Deferred()
 const app = (window.__app = createApp(App))
 app.mount('#app')