页面分离修改

src/Obj/Analysis/Visibility/index.js

@@ -27,9 +27,11 @@ class VisibilityAnalysis extends Tools {
     this.viewPointHeight = options.viewPointHeight
     this.Dialog = _Dialog
     this._EventBinding = new EventBinding()
+    this.tools = new Tools(this.sdk)
     YJ.Analysis.AnalysesResults.push(this)
     // VisibilityAnalysis.edit(this)
     VisibilityAnalysis.create(this)
+
   }
 
   get viewPointHeight() {
@@ -182,29 +184,33 @@ class VisibilityAnalysis extends Tools {
         that.tip.setPosition(cartesian, movement.endPosition.x, movement.endPosition.y)
       })
       that.event.mouse_right((movement, cartesian) => {
-        end()
+        that.end()
       })
       that.event.gesture_pinck_start((movement, cartesian) => {
         let startTime = new Date()
         that.event.gesture_pinck_end(() => {
           let endTime = new Date()
           if (endTime - startTime >= 500) {
-            end()
+            that.end()
           }
         })
       })
     }
     else {
-      console.log('上一次测量未结束')
+      that.tools.message({
+        text: '上一次测量未结束',
+        type: 'warning',
+      });
     }
 
-    function end() {
-      YJ.Measure.SetMeasureStatus(false)
-      that.tip.destroy()
-      that.event.destroy()
-      that.tip = null
-      that.event = null
-    }
+
+  }
+  end() {
+    YJ.Measure.SetMeasureStatus(false)
+    this.tip && this.tip.destroy()
+    this.event && this.event.destroy()
+    this.tip = null
+    this.event = null
   }
 
   // static update(that) {