bill пре 3 година
родитељ
комит
78e867443b
3 измењених фајлова са 5 додато и 7 уклоњено
  1. 3 2
      src/sdk/association.ts
  2. 2 2
      src/sdk/sdk.ts
  3. 0 3
      src/views/measure/edit.vue

+ 3 - 2
src/sdk/association.ts

@@ -207,8 +207,9 @@ export const associationMessaure = <T extends MeasureType>(smMeasure: SceneMeasu
     unSet(() => {
       measure.positions = points.map((point, i) => ({ point, modelId: modelIds[i] }))
       measure.desc = measure.type === MeasureType.area
-        ? (smMeasure as unknown as SceneMeasure<MeasureType.area>).getArea().toString()
-        : (smMeasure as unknown as SceneMeasure<MeasureType.free>).getDistance().toString()
+        ? (smMeasure as unknown as SceneMeasure<MeasureType.area>).getArea().value.toString()
+        : (smMeasure as unknown as SceneMeasure<MeasureType.free>).getDistance().value.toString()
+      console.log('===>', (smMeasure as unknown as SceneMeasure<MeasureType.free>).getDistance())
     })
   })
 

+ 2 - 2
src/sdk/sdk.ts

@@ -91,8 +91,8 @@ export interface MeasureBase {
 
 export type Measure<T extends StoreMeasure['type'] = StoreMeasure['type']> = MeasureBase & (
   T extends MeasureType.area
-    ? { getArea: () => number }
-    : { getDistance: () => number }
+    ? { getArea: () => {value: number} }
+    : { getDistance: () => {value: number} }
 )
 
 

+ 0 - 3
src/views/measure/edit.vue

@@ -22,9 +22,6 @@ const emit = defineEmits<{
 const measure = reactive(props.measure)
 const modelMeasure = sdk.startMeasure(measure.type)
 associationMessaure(modelMeasure, measure)
-modelMeasure.bus.on('submit', () => {
-  console.log('???--------------??')
-})
 modelMeasure.bus.on('cancel', giveupLeave)
 modelMeasure.bus.on('invalidPoint', Message.error)