jinx 2 лет назад
Родитель
Сommit
d055251358

+ 1 - 0
src/views/scene/TrackMeasure.vue

@@ -54,6 +54,7 @@ watchEffect(() => {
   transform: translateY(-50%);
   top: 50%;
   left: 15px;
+  z-index: 1000;
 
   .item {
     position: static;

+ 10 - 3
src/views/scene/index.vue

@@ -14,7 +14,7 @@
         <div class="info-top-left" :class="{ full: viewStatus }">
           <Container @loaded="loaded = true" />
           <template v-if="loaded && !trackMode">
-            <Menus v-if="viewStatus"  @enter-child="childPage = true" @leave-child="childPage = false" />
+            <Menus v-if="viewStatus" @enter-child="childPage = true" @leave-child="childPage = false" />
             <BasePoints v-if="currentView" />
             <FixPoints />
             <Measures />
@@ -73,7 +73,7 @@ import ButtonPane from '@/components/button-pane/index.vue';
 import { customMap, disabledMap, useSDK } from '@/hook';
 import customSetup from '../../hook/custom';
 import UiIcon from '@/components/base/components/icon/index.vue';
-import { ref, watchEffect, computed, onMounted } from 'vue';
+import { ref, watchEffect, computed, onMounted, onActivated, nextTick } from 'vue';
 import { back } from '@/store/sync';
 import { trackMode } from '@/views/scene/trackMeasureWidth';
 import { currentView } from './currentScene';
@@ -108,7 +108,6 @@ const stopReg = watchEffect(() => {
 });
 const viewStatus = ref(false);
 const onScale = () => {
-  console.error(123)
   viewStatus.value = !viewStatus.value;
 };
 const goItem = (item) => {
@@ -164,6 +163,14 @@ onMounted(() => {
   layoutRef.value.style.height = screenHeight + 'px';
   document.body.style.height = screenHeight + 'px';
 });
+onActivated(async () => {
+  await nextTick();
+  let full = router.currentRoute.value.query.full;
+  console.error('active', full);
+  if (full) {
+    viewStatus.value = true;
+  }
+});
 </script>
 
 <style scoped lang="scss">

+ 2 - 1
src/views/scene/trackMeasureWidth.ts

@@ -13,7 +13,8 @@ export const trackMode = ref(false);
 
 export const trackMeasureWidth = async () => {
   trackMode.value = true;
-  await router.push({ name: writeRouteName.scene });
+  // await router.push({ name: writeRouteName.scene });
+  await router.push('/scene?full=1');
   const sdk = await useAsyncSDK();
 
   laserModeStack.push(ref(Mode.cloud));