Merge branch 'dev' of http://192.168.0.115:3000/4dkankan/4dkankan_bim into dev

src/components/header/index.vue

@@ -20,7 +20,7 @@
                     <img :src="user.head + '&x-oss-process=image/resize,m_fill,w_64,h_64/quality,q_70'" alt="" />
                     <div class="menu">
                         <ul>
-                            <li><a href="/smarts">个人信息</a></li>
+                            <li><a href="/smarts/#/personal">个人信息</a></li>
                             <li class="split"></li>
                             <li><a href="javascript:;" @click="onLogout">退出登录</a></li>
                         </ul>

src/pages/SViewer.vue

@@ -30,6 +30,9 @@ import browser from '@/utils/browser'
 import Calendar from '@/components/calendar/mobile.vue'
 import sync, { loadSourceScene, loadTargetScene } from '@/utils/sync'
 
+// 点位信息
+let panoInfo = null
+
 const showBimTips = ref(false)
 
 const showTips = ref(null)
@@ -40,6 +43,7 @@ const source = ref(null)
 const target = ref(null)
 const project = ref(null)
 
+
 const scenes = computed(() => {
     if (!project.value) {
         return []
@@ -58,9 +62,11 @@ const sourceURL = computed(() => {
     }
     if (source.value.type < 2) {
         let pose = ''
+        // 获取当前点位旋转值
         if (sourceFrame.value && sourceFrame.value.contentWindow.app && sourceFrame.value.contentWindow.app.Camera) {
             let sdk = sourceFrame.value.contentWindow.app
-            pose = '&' + sdk.Camera.getPoseUrlParams()
+            panoInfo = sdk.Camera.getPose()
+            pose = '&'+sdk.Camera.getPoseUrlParams()
         }
         // 看看、看见场景
         return `smart-kankan.html?m=${source.value.num}${pose}`
@@ -99,6 +105,15 @@ const sourceDays = computed(() => {
     return outDays
 })
 
+const onLoadSource = () => {
+    if (panoInfo) {
+        let sdk = sourceFrame.value.contentWindow.app
+        sdk.Scene.on('loaded', () => {
+           
+        })
+    }
+}
+
 const onModeChange = targetMode => {
     if (sourceFrame.value && sourceFrame.value.contentWindow.loaded) {
         sourceFrame.value.contentWindow.loaded.then(sdk => sdk.scene.changeMode(targetMode))
@@ -144,12 +159,11 @@ const onNextDate = name => {
 
 // bim点击
 const onBimChecked = () => {
-
-    showBimTips.value = true;
+    showBimTips.value = true
 
     setTimeout(() => {
         showBimTips.value = false
-    }, 2000);
+    }, 2000)
 
     if (!project.value || !project.value.bimData) {
         showTips.value = '未发现BIM文件'
@@ -244,13 +258,13 @@ main {
             background: rgba(27, 27, 28, 0.8);
             padding: 4px;
             border-radius: 4px;
-            color:#fff;
+            color: #fff;
             &::before {
                 content: '';
                 position: absolute;
                 right: 100%;
                 top: 50%;
-                margin-top:-7px;
+                margin-top: -7px;
                 width: 0;
                 height: 0;
                 border-top: 7px solid transparent;