rindy 2 年之前
父节点
当前提交
9decd7c524
共有 2 个文件被更改,包括 24 次插入5 次删除
  1. 16 2
      src/components/header/index.vue
  2. 8 3
      src/pages/Viewer.vue

+ 16 - 2
src/components/header/index.vue

@@ -14,9 +14,9 @@
                     <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="">个人信息</a></li>
+                            <li><a href="/">个人信息</a></li>
                             <li class="split"></li>
-                            <li><span>退出登录</span></li>
+                            <li><a href="javascript:;" @click="onLogout">退出登录</a></li>
                         </ul>
                     </div>
                 </li>
@@ -54,6 +54,20 @@ const getUserInfo = () => {
         })
         .catch(() => {})
 }
+const onLogout = ()=>[
+    http.post(`smart-site/fdLogout`)
+        .then(response => {
+            if (response.success) {
+                localStorage.removeItem('token')
+                localStorage.removeItem('remember')
+                localStorage.removeItem('username')
+                localStorage.removeItem('password')
+                user.value = null
+            }
+        })
+        .catch(() => {})
+    
+]
 onMounted(() => {
     if (localStorage.getItem('token')) {
         getUserInfo()

+ 8 - 3
src/pages/Viewer.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script setup>
-import { ref, onMounted, computed } from 'vue'
+import { ref, onMounted, computed, nextTick } from 'vue'
 import { http } from '@/utils/request'
 import browser from '@/utils/browser'
 import AppHeader from '@/components/header'
@@ -63,6 +63,7 @@ const mode = ref(0)
 const source = ref(null)
 const target = ref(null)
 const project = ref(null)
+const adjust = ref(browser.urlHasValue('adjust'))
 
 const scenes = computed(() => {
     if (!project.value) {
@@ -148,7 +149,7 @@ const targetDays = computed(() => {
 })
 
 const onLoadSource = () => {
-    if (bimChecked.value) {
+    if (bimChecked.value && !dbsChecked.value) {
         // BIM单屏模式
         return
     }
@@ -159,7 +160,7 @@ const onLoadTarget = () => {
     if (bimChecked.value) {
         loadTargetScene(targetFrame, 'bim')
     } else {
-        loadTargetScene(targetFrame, target.value.type < 2 ? 'kankan' : 'laser',mode.value)
+        loadTargetScene(targetFrame, target.value.type < 2 ? 'kankan' : 'laser', mode.value)
     }
 }
 
@@ -351,6 +352,10 @@ onMounted(() => {
                 project.value = response.data
                 if (project.value.sceneList.length) {
                     source.value = project.value.sceneList[0]
+                    if (adjust.value) {
+                        onBimChecked()
+                        nextTick(() => onDbsChecked())
+                    }
                 }
             } else {
                 alert('获取数据失败')