Merge branch 'dev-project' into dev

.env

@@ -1,9 +1,10 @@
 # 静态资源地址
 VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
 # sdk文件地址
-VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4-test/www/sdk/
+VUE_APP_SDK_DIR=https://4dkk.4dage.com/v4/www/sdk/
 # 激光接口地址
 VUE_APP_LASER_URL=https://laser.4dkankan.com/backend/
+
 # 静态资源目录
 VUE_APP_STATIC_DIR=static
 # 场景资源地址

.env.development

@@ -1,9 +1,8 @@
 VUE_APP_TEST=1
-VUE_APP_CDN_URL=https://oss.4dkankan.jp/v4-test/www/
-VUE_APP_RESOURCE_URL=https://oss.4dkankan.jp/
+VUE_APP_CDN_URL=https://4dkk.4dage.com/v4/www/
+VUE_APP_RESOURCE_URL=https://4dkk.4dage.com/
 # 激光接口地址
-VUE_APP_DEV_PROXY=https://test-jp.4dkankan.com/
-#VUE_APP_LASER_URL=https://uat-laser.4dkankan.com/
-  VUE_APP_LASER_URL=https://testlaser-jp.4dkankan.com/backend/
+VUE_APP_DEV_PROXY=https://test.4dkankan.com/
+VUE_APP_LASER_URL=https://uat-laser.4dkankan.com/
 #环境区分
 #VUE_APP_ENV=jp

src/components/header/index.vue

@@ -8,7 +8,7 @@
     </header>
     <header v-else>
         <div v-if="project">{{ project.projectName }}</div>
-        <div class="user">
+        <div class="user" v-if="!isClear">
             <ul>
                 <li>
                     <div class="language">
@@ -72,7 +72,7 @@ import CopyLink from './CopyLink'
 import sync from '@/utils/sync'
 import { useI18n, getLocale } from '@/i18n'
 import math from '@/utils/math.js'
-
+const isClear = ref(browser.urlHasValue('clear'))
 const { t } = useI18n({ useScope: 'global' })
 const props = defineProps({
     project: Object,
@@ -254,7 +254,7 @@ watchEffect(() => {
         if (props.project && props.project.panos) {
             points.value.p1 = props.project.panos.p1
             points.value.p2 = props.project.panos.p2
-            console.log('------load---------',points.value)
+            console.log('------load---------', points.value)
         }
     }
 })

src/pages/SViewer.vue

@@ -1,7 +1,7 @@
 <template>
     <main>
         <iframe ref="sourceFrame" v-if="sourceURL" :src="sourceURL" frameborder="0" @load="onLoadSource"></iframe>
-        <div class="model" v-show="!showAdjust">
+        <div class="model" v-show="!showAdjust && !isClear">
             <div class="bim" :class="{ active: bimChecked, disable: project && !project.bimData }">
                 <div @click="onBimChecked">
                     <i class="iconfont icon-BIM"></i>
@@ -49,6 +49,7 @@ let panoData
 
 // 是否BIM模式
 const showBim = ref(browser.urlHasValue('bim'))
+const isClear = ref(browser.urlHasValue('clear'))
 const showBimTips = ref(false)
 const showTips = ref(null)
 const showDensity = ref(false)

src/pages/Viewer.vue

@@ -6,7 +6,7 @@
         <main>
             <div class="split">
                 <iframe ref="sourceFrame" v-if="sourceURL" :src="sourceURL" frameborder="0" @load="onLoadSource"></iframe>
-                <div class="tools" v-if="source && !showRules && !ruleChecked" v-show="showWidget && !showAdjust && !fscChecked && (dbsChecked || (!target && !bimChecked))">
+                <div class="tools" v-if="source && !showRules && !ruleChecked && !isClear" v-show="showWidget && !showAdjust && !fscChecked && (dbsChecked || (!target && !bimChecked))">
                     <div class="item-date">
                         <calendar
                             name="source"
@@ -71,7 +71,7 @@
                     </div>
                 </div>
             </div>
-            <div class="model" v-show="showWidget && !showAdjust && !showRules">
+            <div class="model" v-show="showWidget && !showAdjust && !showRules && !isClear">
                 <div class="rule" :class="{ active: ruleChecked, disable: fileDisable }" v-show="!fscChecked && !showBim && !dbsChecked && !bimChecked">
                     <div @click="onRuleChecked">
                         <i class="iconfont icon-measurement"></i>
@@ -156,6 +156,7 @@ const closeRules = () => {
 
 // 是否BIM模式
 const showBim = ref(browser.urlHasValue('bim'))
+const isClear = ref(browser.urlHasValue('clear'))
 // 是否校准模式
 const showSplit = ref(browser.urlHasValue('split'))
 const showAdjust = ref(browser.urlHasValue('adjust'))
@@ -762,6 +763,7 @@ const getInfo = () => {
                     project.value = response.data
                     if (showBim.value) {
                         onBimChecked()
+                        onDbsChecked()
                     } else if (project.value.sceneList.length) {
                         if (num) {
                             source.value = project.value.sceneList.find(c => c.num == num)