Merge branch 'xqc_308' into debug

src/views/report_manage/reportV2/smartReport/editReport.vue

@@ -1596,7 +1596,7 @@ div{
     width: 800px;
     flex-shrink: 0;
     margin-left: 90px;
-    margin-right: 60px;
+    margin-right: 10px;
     margin-top: 30px;
     position: relative;
     .report-comp-wrap{
@@ -1847,7 +1847,7 @@ div{
         flex: 1;
         position: relative;
         padding-top: 30px;
-        padding-left: 75px;
+        padding-left: 40px;
         padding-right: 30px;
         padding-bottom: 30px;
         &::before{