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

chenyabin

2021-05-18 7f6291e80073c0c29f9d24bfdd3ac2602a059e70

 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;
          }