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

src/views/proportion/index.vue

@@ -10,7 +10,7 @@
     >
       <template #icon>m</template>
     </ui-input>
-    <ui-button type="submit" width="160px" @click="scaleSet?.startMeasure()">重新选点</ui-button>
+    <ui-button type="submit" width="160px" @click="resetMeasure">重新选点</ui-button>
   </ui-editor-toolbar>
 </template>
 
@@ -37,9 +37,15 @@ let scaleSet: ScaleSet | null = null
 const length = ref<number>()
 
 watchEffect(() => {
+  console.log('--setLength--')
   length.value && scaleSet?.setLength(length.value)
 })
 
+const resetMeasure = () => {
+  console.log('--startMeasure--')
+  scaleSet?.startMeasure()
+}
+
 useViewStack(() => {
   if (sceneModel.value) {
     const model = sceneModel.value
@@ -47,6 +53,7 @@ useViewStack(() => {
     scaleSet.startMeasure()
     
     return () => {
+      console.error('???')
       model.leaveAlignment()
       scaleSet = null
     }
@@ -54,7 +61,7 @@ useViewStack(() => {
     leave()
   }
 })
-useViewStack(Message.show({ msg: '请选择两点标记一段已知长度，并输入真实长度' }))
+useViewStack(() => Message.show({ msg: '请选择两点标记一段已知长度，并输入真实长度' }))
 useViewStack(autoSaveFuseModels)
 </script>