Skip to content

C
CRM
Commit 79fbfa50 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

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

parents c1312b20 5e30ce3a
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
src/components/statistics/marriage.vue
View file @ 79fbfa50
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
height: calc(100% - 2px); height: calc(100% - 2px);
} }
.marriage .conten-box .el-card .el-card__body { .marriage .conten-box .el-card .el-card__body {
padding: 20px; padding: 20px 20px 0 20px;
height: calc(100% - 98px); height: calc(100% - 98px);
max-height: calc(100% - 98px); max-height: calc(100% - 98px);
} }
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
<span style="color: #303133">报名统计</span> <span style="color: #303133">报名统计</span>
</div> </div>
<el-row :gutter="80" style="height: 100%;"> <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"/> <marriageChart v-if="isShow" :chartData="chartData" :strArr="strArr"/>
</el-col> </el-col>
</el-row> </el-row>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<div slot="header" class="clearfix"> <div slot="header" class="clearfix">
<span>购物统计<span class="font-size-12">（按平均计算）</span></span> <span>购物统计<span class="font-size-12">（按平均计算）</span></span>
</div> </div>
<marriageLineChart v-if="isShow" :chartData="shopChartData" :strArr="strArr"/> <marriageLineChart style="height:350px;" v-if="isShow" :chartData="shopChartData" :strArr="strArr"/>
</el-card> </el-card>
</el-col> </el-col>
</el-row> </el-row>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment