Merge branch 'local' of http://192.168.0.115:3000/bill/fuse-code into local

src/components/bill-ui/assets/scss/components/_more.scss

@@ -6,7 +6,7 @@
 .more-float {
   transition: transform .3s ease,
     opacity .3s ease;
-  margin-top: 9px;
+  margin-bottom: 9px;
   box-shadow: inset 0 0 1px rgb(255 255 255 / 90%);
   background: rgba(27, 27, 28, 0.8);
   border-radius: 4px;
@@ -33,15 +33,15 @@
   }
 
 
-  transform-origin: center top;
+  transform-origin: center bottom;
 
   &:not(.show) {
-    transform: translateY(0) translateX(-100%) scale(1, 0);
+    transform: translateY(-100%) translateX(-100%) scale(1, 0);
     opacity: 0;
   }
 
   &.show {
-    transform: translateY(0) translateX(-100%) scale(1, 1);
+    transform: translateY(-100%) translateX(-100%) scale(1, 1);
     opacity: 1;
   }
 }

src/components/bill-ui/components/more/index.vue

@@ -38,7 +38,7 @@ export default defineComponent({
     },
     dire: {
       type: String,
-      default: 'right-bottom'
+      default: 'right-top'
     }
   },
   setup(props, { attrs, emit }) {

src/components/tagging/list.vue

@@ -26,6 +26,7 @@ const isShowSign = (modelId: string) => {
 
 const positions = computed(() => {
   const positions = getTaggingPositions(props.tagging)
+  console.error(positions)
   return positions
 })
 

src/layout/model-list/sign.vue

@@ -12,7 +12,6 @@
     </div>
   </div>
   <div class="model-desc" @click="$emit('click')" v-if="custom.currentModel === model">
-  {{custom.currentModel.title}}
     <p><span>数据来源：</span>{{ ModelTypeDesc[model.type] }}</p>
     <p><span>数据大小：</span>{{ model.size }}</p>
     <p v-if="model.type === ModelType.SWSS"><span>拍摄时间：</span>{{ model.time }}</p>

src/sdk/association.ts

@@ -1,12 +1,13 @@
 import { sdk } from './sdk'
 import { models, taggings, isEdit, sysBus, getModelShowVariable, ModelType } from '@/store'
 import { toRaw, watchEffect, ref, watch } from 'vue'
-import { viewModeStack, custom, getResource } from '@/env'
+import { viewModeStack, custom, getResource, showRightCtrlPanoStack } from '@/env'
 import { 
   mount, 
   diffArrayChange, 
   shallowWatchArray, 
   arrayChildEffectScope,
+  togetherCallback,
   showLoad,
   hideLoad
 } from '@/utils'
@@ -108,7 +109,10 @@ const associationTaggings = (el: HTMLDivElement) => {
 
 
 const fullView = async (fn: () => void) => {
-  const popViewMode = viewModeStack.push(ref('full'))
+  const pop = togetherCallback([
+    viewModeStack.push(ref('full')),
+    showRightCtrlPanoStack.push(ref(false))
+  ]) 
   await document.documentElement.requestFullscreen()
   const driving = () => document.fullscreenElement || fn()
 
@@ -116,10 +120,11 @@ const fullView = async (fn: () => void) => {
   document.addEventListener('fullscreenerror', fn)
 
   return () => {
-    popViewMode()
+    pop()
     document.fullscreenElement && document.exitFullscreen()
     document.removeEventListener('fullscreenchange', driving)
     document.removeEventListener('fullscreenerror', fn)
+    
   }
 }
 

src/store/model.ts

@@ -3,6 +3,7 @@ import { autoSetModeCallback, unSetModelUpdate } from './sys'
 import { showModelsMapStack, custom } from '@/env'
 import { 
   fetchModels, 
+  ModelType, 
   postAddModel, 
   postDeleteModel,
   postUpdateModels
@@ -43,6 +44,14 @@ watchPostEffect(() => {
   const loaded = models.value.every(model => model.loaded || model.error)
   modelsLoaded.value = loaded
 })
+watchPostEffect(() => {
+  if (modelsLoaded.value && !custom.currentModel) {
+    const defaultModel = models.value.find(model => model.type === ModelType.SWSS)
+    if (defaultModel) {
+      custom.currentModel = defaultModel
+    }
+  }
+})
 
 
 let bcModels: Models = []