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

public/test-bim.html

@@ -57,7 +57,7 @@
     <!-- 引用BIMFACE的JavaScript显示组件库 -->
     <script src="https://static.bimface.com/api/BimfaceSDKLoader/BimfaceSDKLoader@latest-release.js"></script>
     <script>
-      let viewToken = "60a1020943254a2ca0a19b21293a1370";
+      let viewToken = "eeb852a19797490985bb3a85ba7af546";
       // 声明Viewer及App
       let viewer3D;
       let app;

src/assets/index.scss

@@ -1,3 +1,9 @@
+*,
+*::before,
+*::after{
+    box-sizing: border-box;
+}
+
 html {
     line-height: 1.15;
     -webkit-text-size-adjust: 100%;

src/pages/LaserBim.vue

@@ -6,12 +6,23 @@
         <main>
             <div class="split" v-if="source">
                 <iframe ref="sourceFrame" :src="`smart-laser.html?m=${source.num}`" frameborder="0" @load="onLoadSource"></iframe>
+                <div class="tools">
+                    <div class="item-mode">
+                        <div class="iconfont icon-show_roaming_normal" @click="onModeChange('panorama')"></div>
+                        <div class="iconfont icon-show_more" @click="onModeChange('cloud')"></div>
+                    </div>
+                    <div class="item-date" v-if="target">
+                        <span class="prev" @click="onPrevDate('source')"><i class="iconfont icon-show_back"></i></span>
+                        <span @click="onPickDate('source')">{{ source.date }}</span>
+                        <span class="next" @click="onNextDate('source')"><i class="iconfont icon-show_back"></i></span>
+                    </div>
+                </div>
             </div>
             <div class="split" v-if="target">
                 <iframe ref="targetFrame" :src="`test-bim.html?m=${target.num}`" frameborder="0" @load="onLoadTarget"></iframe>
             </div>
             <div class="tools" v-if="source">
-                <div class="item-date">
+                <div class="item-date" v-if="!target">
                     <span class="prev" @click="onPrevDate()"><i class="iconfont icon-show_back"></i></span>
                     <span @click="onPickDate('all')">{{ source.date }}</span>
                     <span class="next" @click="onNextDate()"><i class="iconfont icon-show_back"></i></span>
@@ -54,13 +65,7 @@ const scenes = reactive([
 const highlighted = computed(() => {
     let dates = []
     if (datepickName.value) {
-        if (datepickName.value == 'source') {
-            dates = scenes.filter(item => item.date != target.value.date).map(item => item.date.toDate())
-        } else if (datepickName.value == 'target') {
-            dates = scenes.filter(item => item.date != source.value.date).map(item => item.date.toDate())
-        } else {
-            dates = scenes.map(item => item.date.toDate())
-        }
+        dates = scenes.map(item => item.date.toDate())
     }
     return {
         dates: dates
@@ -106,7 +111,7 @@ const onLoadTarget = () => {
 }
 const onModeChange = mode => {
     if (sourceApp) {
-        sourceApp.Camera[mode]()
+        
     }
 }
 const onPickDate = name => {
@@ -416,7 +421,7 @@ main {
 </style>
 <style lang="scss">
 #app {
-    background-color: #fff !important;
+    background-color: rgba(0, 0, 0, 0.8);
     display: flex;
     flex-direction: column;
 }