Merge remote-tracking branch 'origin/master' into master

zengh

2020-11-13 8274f20d8093486dc3d54e074d25b6e412f4e4c7

 widgets/Tool/Widget.js

@@ -28,7 +28,6 @@
         name: 'Tool',
         layers: {},
         startup: function () {

            // 暴露在外的接口
            topic.subscribe("closeTool", lang.hitch(this, this.closeToolBox));
            this.inherited(arguments);
@@ -47,6 +46,9 @@
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.tool-y-box').toggle()
               } else if (calssName == 'Measurement-tool') {
@@ -55,27 +57,35 @@
                  $('.jimu-widget-Measurement').show();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.tool-y-box').toggle()
                  $('.tool-y-box').toggle();
                  $('.jimu-widget-Rolling').hide();
               }
               else if (calssName == 'sign-tool') {
               else if (calssName == 'Sign-tool') {
                  // 我的标记
                  topic.publish('openSign', 'Sign');
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Location').hide();
                  $('.jimu-widget-Sign').show();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.tool-y-box').toggle()
                  }
               }
               else if (calssName == 'Rolling-tool') {
                  window.dcViewer.contextMenu.enable=false;
                  window.dcViewer.contextMenu.enable = false;
                  // 卷帘对比
                  topic.publish('openRolling', 'Rolling');
                  $('.jimu-widget-Location').hide();
                  $('.jimu-widget-Rolling').show();
                  $('#widgets_Rolling_Widget_17').show();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.tool-y-box').toggle();
@@ -85,8 +95,11 @@
                  $('.jimu-widget-CoorPosition').show();
                  $('.jimu-widget-Location').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.tool-y-box').toggle()
               }
@@ -94,11 +107,14 @@
                  // 地图打印
                  $('.jimu-widget-Location').hide();
                  $('.jimu-widget-MapPrinting').show();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-CoorPosition').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.tool-y-box').toggle()
               }
               else if (calssName == 'RouteNavigate-tool') {
@@ -106,10 +122,13 @@
                  $('.jimu-widget-RouteNavigate').show();
                  $('.jimu-widget-MapPrinting').hide();
                  $('.jimu-widget-CoorPosition').hide();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.jimu-widget-Screen').hide();
                  $('.tool-y-box').toggle()
               }
               else if (calssName == 'scene-tool') {
@@ -118,10 +137,13 @@
                  $('.jimu-widget-MapPrinting').hide();
                  $('.jimu-widget-CoorPosition').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.jimu-widget-scene').show();
                  $('.jimu-widget-Screen').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.tool-y-box').toggle()
               }
               else if (calssName == 'Plot-tool') {
@@ -130,11 +152,13 @@
                  $('.jimu-widget-MapPrinting').hide();
                  $('.jimu-widget-CoorPosition').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.jimu-widget-scene').hide();
                  $('.jimu-widget-Plot').show();
                  $('.jimu-widget-Screen').hide();
                  $('.tool-y-box').toggle()
               }
               else if (calssName == 'Screen-tool') {
@@ -147,6 +171,24 @@
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.tool-y-box').toggle();
                  $('.jimu-widget-Screen').show();
                  $('.jimu-widget-Plot').hide();
               }
               else if (calssName == 'Plots-tool') {
                  window.dcViewer.contextMenu.enable = false;
                  // 要素标绘
                  $('.jimu-widget-RouteNavigate').hide();
                  $('.jimu-widget-MapPrinting').hide();
                  $('.jimu-widget-CoorPosition').hide();
                  $('.jimu-widget-Measurement').hide();
                  $('.jimu-widget-Rolling').hide();
                  $('.jimu-widget-Sign').hide();
                  $('.jimu-widget-FlyRoute').hide();
                  $('.jimu-widget-DynamicRiver').hide();
                  $('.jimu-widget-scene').hide();
                  $('.jimu-widget-Plot').hide();
                  $('.jimu-widget-Plots').show();
                  $('.jimu-widget-Screen').hide();
                  $('.tool-y-box').toggle()
               }


@@ -169,10 +211,10 @@
                  type: "GET",
                  url: "./config.json",
                  dataType: "json",
                  success: function(data){
                     for(var i =15;i<data.widgetOnScreen.widgets.length;i++){
                        var from=data.widgetOnScreen.widgets[i].uri;
                        $(".ss").append("<li><i></i><span class="+from.slice(8,-7)+"-tool>"+data.widgetOnScreen.widgets[i].name+"</span></li>");
                  success: function (data) {
                     for (var i = 15; i < data.widgetOnScreen.widgets.length; i++) {
                        var from = data.widgetOnScreen.widgets[i].uri;
                        $(".ss").append("<li><i></i><span class=" + from.slice(8, -7) + "-tool>" + data.widgetOnScreen.widgets[i].name + "</span></li>");
                     }
                  }
               });