Parcourir la source

修改道路交互

bill il y a 2 ans
Parent
commit
b0dcc094c6

Fichier diff supprimé car celui-ci est trop grand
+ 1 - 1
server/test/a0k4xu045_202305311600080410/attach/sceneStore


+ 1 - 1
src/sdk/types/measure.ts

@@ -2,7 +2,7 @@ import { Pos3D } from '..'
 import { DataSetAtom } from './dataset'
 
 // export type MeasureType =  "line" | "area" | "l-line" | "l-area" | "l-rectangle" | "v-line" | "v-area" | "v-rectangle"
-export type MeasureType = 'AREA' | 'LINE' | 'L_AREA' | 'L_LINE' | 'L_RECTANGLE' | 'V_AREA' | 'V_LINE' | 'V_RECTANGLE' | 'SERIES' | 'L_SERIES' | 'V_SERIES'
+export type MeasureType = 'AREA' | 'LINE' | 'BASE_LINE' | 'L_AREA' | 'L_LINE' | 'L_RECTANGLE' | 'V_AREA' | 'V_LINE' | 'V_RECTANGLE' | 'SERIES' | 'L_SERIES' | 'V_SERIES'
 
 export enum MeasureUnit {
     meter = 1,

+ 1 - 1
src/views/graphic/childMenus.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="graphic-child-menus">
     <div class="header">
-      <ui-icon type="left" class="icon" ctrl @click="$emit('quit')" />
+      <ui-icon type="return" class="icon" ctrl @click="$emit('quit')" />
       <p>{{ title }}</p>
     </div>
     <div class="menu-list">

+ 2 - 2
src/views/graphic/imageLabel.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="graphic-child-menus">
     <div class="header">
-      <ui-icon type="left" class="icon" ctrl @click="$emit('quit')" />
+      <ui-icon type="return" class="icon" ctrl @click="$emit('quit')" />
       <p>图例</p>
     </div>
     <ui-input type="text" width="100%" v-model="keyword">
@@ -152,4 +152,4 @@ defineEmits<{ (e: "quit") }>();
   }
   border-bottom: 1px solid rgba(255,255,255,0.1);
 }
-</style>
+</style>

+ 7 - 3
src/views/graphic/index.vue

@@ -9,7 +9,11 @@
         :menus="store.child.value as any"
         @quit="store.child.value = null"
     />
-    <ImageLabel v-if="store.activeMenuKey.value === UITypeExtend.image" />
+    {{store.activeMenuKey.value}}
+    <ImageLabel
+        v-if="store.activeMenuKey.value === UITypeExtend.image"
+        @quit="uiType.change(null)"
+    />
 
     <GraphicAction class="full-action">
       <ui-icon
@@ -36,7 +40,7 @@ import {router} from '@/router'
 import {computed} from "vue";
 import {customMap} from '@/hook'
 import {focusMenuRaw, generateMixMenus, mainMenusRaw, photoMenusRaw, Mode, UITypeExtend} from './menus'
-import {currentVector, graphicState} from "@/hook/useGraphic";
+import {currentVector, graphicState, uiType} from "@/hook/useGraphic";
 import geos, {GlobalComp} from "./geos/index";
 
 const menusRaws = computed(() => {
@@ -74,4 +78,4 @@ const isFull = computed(() => customMap.sysView === 'full' )
   font-size: 22px;
   justify-content: center;
 }
-</style>
+</style>

+ 1 - 1
src/views/scene/menus/actions.ts

@@ -131,7 +131,7 @@ const menuActions = {
   },
   [menuEnum.BASE_LINE]: (menu, onComplete) => {
     return trackMeasureMenuAction(
-      'L_LINE',
+      'BASE_LINE',
       menu,
       (data) => baseLines.value.push(data),
       onComplete,