Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/views/mediaStatistics/modules/salesfunnel.vue

@@ -80,6 +80,8 @@ export default {
           },
         },
         conversionTag: {
+          offsetX: -40,
+          offsetY:10,
           formatter: (datum) => {
             console.log(datum,'conversionTag')
             return `${datum.stagename} 项目数:${datum.projectqty} 转化率:${((datum[Funnel.CONVERSATION_FIELD][1] / datum[Funnel.CONVERSATION_FIELD][0]) * 100).toFixed(2)}%`;