Merge branch 'dev' of http://192.168.0.115:3000/bill/fuse-code into dev

src/model/app.vue

@@ -38,7 +38,6 @@ export const Model = defineComponent({
       if (newURL !== url.value) {
         setTimeout(() => {
           const hook = (iframeRef.value?.contentWindow as any)?.beforeDestroy
-          console.error("当前iframe的beforeDestroy", hook,iframeRef.value?.contentWindow.winIndex )
           if (hook) {
             try {
               hook()
@@ -87,7 +86,6 @@ export const Model = defineComponent({
         let result: any = null, error = null
         try {
           result = await Promise.race([typePromise, modelPromise])
-          console.error(result)
         } catch (err: any) {
           error = err
         }
@@ -101,7 +99,10 @@ export const Model = defineComponent({
     watch(
       () => scene.value && scene.value.type, 
       (type, oldType, onCleanup) => {
-        if (type === false) return;
+        if (type === false) {
+          // 手动渲染融合场景
+          (window as any).viewer.setDisplay(true)
+        };
 
         const interval = setInterval(async () => {
           const target = iframeRef.value?.contentWindow?.document?.head