Browse Source

添加设置

bill 2 năm trước cách đây
mục cha
commit
b4478b2e8f

+ 0 - 1
src/components/base/components/input/state.js

@@ -194,7 +194,6 @@ export const numberPropsDesc = {
 export const rangePropsDesc = {
 export const rangePropsDesc = {
     ...numberPropsDesc,
     ...numberPropsDesc,
     min: { ...numberPropsDesc.min, require: true },
     min: { ...numberPropsDesc.min, require: true },
-    min: { ...numberPropsDesc.min, require: true },
     input: { type: Boolean, default: true },
     input: { type: Boolean, default: true },
 }
 }
 
 

+ 0 - 1
src/graphic/Style1.js

@@ -66,7 +66,6 @@ const Style = {
   Lane,
   Lane,
   CurveLan,
   CurveLan,
   Point,
   Point,
-  Text,
   CurvePoint,
   CurvePoint,
   Text: {
   Text: {
     ...Text,
     ...Text,

+ 1 - 1
src/sdk/laser/index.ts

@@ -25,7 +25,7 @@ export const laserFactory = (props: LaserSDKProps, store?: Store): LaserSDK => {
 
 
   laser.scene.el = props.sceneEl;
   laser.scene.el = props.sceneEl;
   if (store) {
   if (store) {
-    store.showNavpanel = ref(true);
+    // store.showNavpanel = ref(true);
     attach(laser as unknown as LaserSDK, store);
     attach(laser as unknown as LaserSDK, store);
   }
   }
 
 

+ 4 - 3
src/views/graphic/header.vue

@@ -46,14 +46,14 @@ import UiIcon from "@/components/base/components/icon/index.vue";
 import UiButton from "@/components/base/components/button/index.vue";
 import UiButton from "@/components/base/components/button/index.vue";
 import {Mode} from './menus'
 import {Mode} from './menus'
 import {changeStore, drawRef, graphicState} from '@/hook/useGraphic'
 import {changeStore, drawRef, graphicState} from '@/hook/useGraphic'
-import {computed, watch, watchEffect} from "vue";
+import {computed, watchEffect} from "vue";
 import {router, writeRouteName} from '@/router'
 import {router, writeRouteName} from '@/router'
 import {AccidentPhoto, accidentPhotos, types} from '@/store/accidentPhotos'
 import {AccidentPhoto, accidentPhotos, types} from '@/store/accidentPhotos'
 import {useData} from './data'
 import {useData} from './data'
 import UiInput from "@/components/base/components/input/index.vue";
 import UiInput from "@/components/base/components/input/index.vue";
 import {roadPhotos} from "@/store/roadPhotos";
 import {roadPhotos} from "@/store/roadPhotos";
 import {back, uploadImage} from '@/store/sync'
 import {back, uploadImage} from '@/store/sync'
-import {genUseLoading, useLoading} from "@/hook";
+import {genUseLoading} from "@/hook";
 import {dataService} from "@/graphic/Service/DataService";
 import {dataService} from "@/graphic/Service/DataService";
 
 
 const data = useData()
 const data = useData()
@@ -73,7 +73,8 @@ watchEffect(() => {
   }
   }
 })
 })
 
 
-const menus = computed<{disable?: boolean, text: string, onClick: () => void}[]>(() => {
+type Menu = {disable?: boolean, text: string, icon: string, onClick: () => void}
+const menus = computed<Menu[]>(() => {
   const menus = [
   const menus = [
     {
     {
       text: "",
       text: "",

+ 9 - 12
src/views/scene/index.vue

@@ -1,17 +1,15 @@
 <template>
 <template>
   <Container @loaded="loaded = true" />
   <Container @loaded="loaded = true" />
 
 
-  <template v-if="loaded">
-    <template v-if="!trackMode">
-      <Menus @enter-child="childPage = true" @leave-child="childPage = false" />
-      <BasePoints />
-      <FixPoints />
-      <Measures />
-      <Photo />
-      <ButtonPane class="back fun-ctrl" size="48" @click="back" v-if="!childPage">
-        <ui-icon type="close" class="icon" />
-      </ButtonPane>
-    </template>
+  <template v-if="loaded && !trackMode">
+    <Menus @enter-child="childPage = true" @leave-child="childPage = false" />
+    <BasePoints />
+    <FixPoints />
+    <Measures />
+    <Photo />
+    <ButtonPane class="back fun-ctrl" size="48" @click="back" v-if="!childPage">
+      <ui-icon type="close" class="icon" />
+    </ButtonPane>
     <Mode />
     <Mode />
   </template>
   </template>
 </template>
 </template>
@@ -30,7 +28,6 @@ import customSetup from "../../hook/custom";
 import UiIcon from "@/components/base/components/icon/index.vue";
 import UiIcon from "@/components/base/components/icon/index.vue";
 import {ref, watchEffect} from "vue";
 import {ref, watchEffect} from "vue";
 import {back} from "@/store/sync";
 import {back} from "@/store/sync";
-import router from "@/router";
 import {trackMode} from "@/views/scene/trackMeasureWidth";
 import {trackMode} from "@/views/scene/trackMeasureWidth";
 
 
 const loaded = ref(false)
 const loaded = ref(false)

+ 1 - 1
src/views/scene/mode.vue

@@ -56,4 +56,4 @@ watch(activeKey, () => customMap.mode = activeKey.value)
 }
 }
 </style>
 </style>
 <script setup lang="ts">
 <script setup lang="ts">
-</script>
+</script>

+ 13 - 6
src/views/scene/trackMeasureWidth.ts

@@ -1,19 +1,26 @@
-import { router } from "@/router";
+import {router} from "@/router";
 import writeRouteName from "../../router/constant";
 import writeRouteName from "../../router/constant";
-import { startMeasure } from '../scene/linkage/measure'
-import {nextTick, ref} from "vue";
-import { useAsyncSDK } from '@/hook/useLaser'
+import {startMeasure} from '../scene/linkage/measure'
+import {ref, watchEffect} from "vue";
+import {useAsyncSDK} from '@/hook/useLaser'
+import {customMap, laserModeStack} from '@/hook/custom/index'
+import {Mode} from "@/sdk";
+
 
 
 export const trackMode = ref(false)
 export const trackMode = ref(false)
 
 
+watchEffect(() => console.error(customMap.mode))
 export const trackMeasureWidth = async () => {
 export const trackMeasureWidth = async () => {
   trackMode.value = true
   trackMode.value = true
   await router.push({ name: writeRouteName.scene })
   await router.push({ name: writeRouteName.scene })
-  await useAsyncSDK()
+  const sdk = await useAsyncSDK()
+  laserModeStack.push(ref(Mode.cloud))
+  sdk.enterTopView()
   const measure = await startMeasure('LINE', 'red')
   const measure = await startMeasure('LINE', 'red')
+  laserModeStack.pop()
   await router.back()
   await router.back()
-  await nextTick();
   await new Promise(resolve => setTimeout(resolve, 100))
   await new Promise(resolve => setTimeout(resolve, 100))
+  sdk.leaveTopView()
   trackMode.value = false
   trackMode.value = false
   return Number(measure.length.toFixed(2))
   return Number(measure.length.toFixed(2))
 }
 }