Merge branch 'master' of http://gitlab.oytour.com/huaguohao/crm

src/components/statistics/marriage.vue

@@ -33,7 +33,7 @@
   height: calc(100% - 2px);
 }
 .marriage .conten-box .el-card .el-card__body {
-    padding: 20px;
+    padding: 20px 20px 0 20px;
     height: calc(100% - 98px);
     max-height: calc(100% - 98px);
 }
@@ -92,7 +92,7 @@
                         <span style="color: #303133">报名统计</span>
                     </div>
                     <el-row :gutter="80" style="height: 100%;">
-                        <el-col :span="24" style="height: 100%;">
+                        <el-col :span="24" style="height: 350px;">
                             <marriageChart v-if="isShow" :chartData="chartData" :strArr="strArr"/>
                         </el-col>
                     </el-row>
@@ -103,7 +103,7 @@
                     <div slot="header" class="clearfix">
                         <span>购物统计<span class="font-size-12">（按平均计算）</span></span>
                     </div>
-                    <marriageLineChart v-if="isShow" :chartData="shopChartData" :strArr="strArr"/>
+                    <marriageLineChart style="height:350px;" v-if="isShow" :chartData="shopChartData" :strArr="strArr"/>
                 </el-card>
             </el-col>
         </el-row>