Merge branch 'blueBranch' into allTestUrgent

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -101,7 +101,7 @@
       <div style="display: flex;justify-content: space-between">
         <p class="title">
           {{projectTile}}
-          <el-button type="text" size="mini" v-if="siteid == 'HY' || siteid == 'YOSTEST1'" @click="restBtn">{{$t(`重置`)}}</el-button>
+          <el-button style="margin-left: 15px" type="text" size="mini" v-if="siteid == 'HY' || siteid == 'YOSTEST1'" @click="restBtn">{{$t(`重置`)}}</el-button>
         </p>
         <exportFile :param="siteid == 'HY' || siteid == 'YOSTEST1'?transactionParam:projectParam" :columns="tablecols" :fileName="projectTile"></exportFile>
       </div>