rindy 2 anos atrás
pai
commit
b4224738f5
3 arquivos alterados com 9 adições e 5 exclusões
  1. 6 3
      src/pages/SViewer.vue
  2. 2 2
      src/pages/Viewer.vue
  3. 1 0
      src/pages/sviewer.js

+ 6 - 3
src/pages/SViewer.vue

@@ -18,15 +18,18 @@
             </div>
         </div>
     </main>
+    <Toast v-if="showTips" type="warn" :content="showTips" :close="() => (showTips = null)" />
 </template>
 
 <script setup>
 import { ref, onMounted, computed, nextTick } from 'vue'
 import { http } from '@/utils/request'
+import Toast from '@/components/dialog/Toast'
 import browser from '@/utils/browser'
 import Calendar from '@/components/calendar/mobile.vue'
 import sync, { loadSourceScene, loadTargetScene } from '@/utils/sync'
 
+const showTips = ref(null)
 const bimChecked = ref(null)
 const sourceFrame = ref(null)
 const mode = ref(0)
@@ -52,7 +55,7 @@ const sourceURL = computed(() => {
     }
     if (source.value.type < 2) {
         let pose = ''
-        if (sourceFrame.value && sourceFrame.value.contentWindow.app) {
+        if (sourceFrame.value && sourceFrame.value.contentWindow.app && sourceFrame.value.contentWindow.app.Camera) {
             let sdk = sourceFrame.value.contentWindow.app
             pose = '&'+sdk.Camera.getPoseUrlParams()
         }
@@ -155,11 +158,11 @@ onMounted(() => {
                     source.value = project.value.sceneList[0]
                 }
             } else {
-                alert('获取数据失败')
+                showTips.value = response.message
             }
         })
         .catch(err => {
-            alert('服务器连接失败')
+            showTips.value = '服务器连接失败'
         })
 })
 </script>

+ 2 - 2
src/pages/Viewer.vue

@@ -447,11 +447,11 @@ onMounted(() => {
                     }
                 }
             } else {
-                alert('获取数据失败')
+                showTips.value = response.message
             }
         })
         .catch(() => {
-            alert('服务器连接失败')
+            showTips.value = '服务器连接失败'
         })
 })
 </script>

+ 1 - 0
src/pages/sviewer.js

@@ -1,3 +1,4 @@
+import '../assets/scss/theme.scss'
 import '../assets/index.scss'
 import 'vant/lib/index.css';
 import { createApp } from 'vue'