update

src/components/conversionList/marketEnrollmentConversionList.vue

 <template>
-  <div>
+  <div style="padding-top: 20px;">
     <el-form ref="searchFrom" class="searchFrom" :model="searchFrom" label-width="100px" inline>
       <el-form-item label="进量日期">
         <el-date-picker
@@ -61,8 +61,7 @@
       :data="list"
       size="mini"
       :row-class-name="tableRowClassName"
-      :span-method="arraySpanMethod"
-    >
+      :span-method="arraySpanMethod">
       <!--height="calc(100vh - 210px)"-->
       <el-table-column prop="periods_title" align="center" min-width="80" fixed label="期数名称"></el-table-column>
       <el-table-column prop="is_other" min-width="160" align="left" fixed label="渠道信息">

src/components/marketStatistics/index.vue

@@ -5,7 +5,6 @@
       align="center"
       :header-cell-style="{background:'#5f5f5f',color:'#fff'}"
       :data="list"
-      height="calc(100vh - 60px)"
       size="mini"
       :row-class-name="tableRowClassName"
       :span-method="arraySpanMethod">