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

yangdelong

2021-05-30 4adfa4774e09f3b388335bb8dee5dea518856e5b

 src/components/panel/LegendPanel.vue

@@ -182,8 +182,10 @@
          margin: 0.05208rem 0;

          img {
            width: .08333rem;
            height: .08333rem;
           // width: .08333rem;
           // height: .08333rem;
            width: 0.1rem;
            height: 0.1rem;
            margin-right: .01042rem;
          }