Merge remote-tracking branch 'origin/master'

nnnjjj123

2020-11-06 cc3cc145a8cc38dcb2fc123b671fac0c39450a33

 widgets/Measurement/Widget.js

@@ -36,6 +36,7 @@
                    terrain: !1
                });
                $('#measuerLengths').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    measureSurface.measuerLength({
                        terrain: !1,
                        unit: _type,
@@ -43,12 +44,14 @@
                })

                $('#measuerLength2').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    measureSurface.measuerLength({
                        terrain: !0,
                        unit: _type,
                    })
                })
                $('#measureArea').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    measureSurface.measureArea({
                        unit: _type
                    });
@@ -56,6 +59,7 @@


                $('#measureHeight').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    measureSurface.measureHeight({
                        isSuper: !1,
                        unit: _type,
@@ -63,6 +67,7 @@
                })

                $('#measureHeight2').click(function () {
                    window.dcViewer.contextMenu.enable=false;
                    measureSurface.measureHeight({
                        isSuper: !0,
                        unit: _type,
@@ -76,6 +81,8 @@
                $('.xx').click(function () {
                    $('.jimu-widget-Measurement').hide()
                    measureSurface.clearMeasure()
                   window.dcViewer.contextMenu.enable=true;
				

                })