Merge branch 'bufix/触达效果图表不展示'

src/views/ecm/touch-clue.vue

@@ -113,6 +113,7 @@ export default {
     let planName = this.$route.query.planName;
     let name;
     let planId = this.$route.query.id;
+    let createTime = this.$route.query.createTime;
     this.type = this.$route.query.type;
     this.getMarketList();
     this.getTabData();
@@ -121,7 +122,7 @@ export default {
     } else {
       name = '导购线索';
     }
-    this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: `${planName} - 触达效果`, path: `/ecm/touch/${planId}?name=${planName}` }, { name }]); // eslint-disable-line
+    this.$store.commit('mutations_breadcrumb', [{ name: '营销管理', path: '' }, { name: '智能营销', path: '/ecm' }, { name: `${planName} - 触达效果`, path: `/ecm/touch/${planId}?name=${planName}&&createTime=${createTime}` }, { name }]); // eslint-disable-line
   },
   methods: {
     handleSizeChange(val) {

src/views/ecm/touch-components/touch-charts.vue

@@ -165,7 +165,8 @@ export default {
       });
       // 过滤出从营销计划开始之后的数据
       dateArr = dateArr.filter(item => {
-        if (item.date >= this.createTime) {
+        // 设置为天24的时间，因为当天数据任意时间段都要展示
+        if (new Date(item.date).setHours(24, 0, 0, 0) >= this.createTime) {
           item.date = this.formatterTime(item.date);
           return item;
         }