Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/attractFlowLink/info.vue

@@ -196,19 +196,14 @@ export default {
       statisticsChart(para).then(res => {
         const { result } = res.data;
         this.charData = result || [];
+
         // this.charData = [
-        //   { addNum: 1, bizDate: '2021-07', clickNum: 3, clickTimes: 0 },
-        //   { addNum: 2, bizDate: '2021-08', clickNum: 2, clickTimes: 10 },
-        //   { addNum: 3, bizDate: '2021-09', clickNum: 4, clickTimes: 0 },
-        //   { addNum: 4, bizDate: '2021-10', clickNum: 3, clickTimes: 40 },
-        //   { addNum: 5, bizDate: '2021-11', clickNum: 3, clickTimes: 0 },
-        //   { addNum: 6, bizDate: '2021-12', clickNum: 3, clickTimes: 20 },
-        //   { addNum: 0, bizDate: '2022-01', clickNum: 2, clickTimes: 20 },
-        //   { addNum: 6, bizDate: '2022-02', clickNum: 5, clickTimes: 0 },
-        //   { addNum: 4, bizDate: '2022-03', clickNum: 20, clickTimes: 30 },
-        //   { addNum: 4, bizDate: '2022-04', clickNum: 1, clickTimes: 0 },
-        //   { addNum: 4, bizDate: '2022-05', clickNum: 3, clickTimes: 10 },
-        //   { addNum: 4, bizDate: '2022-06', clickNum: 3, clickTimes: 10 }
+        //   { addNum: 0, bizDate: '2022-07-22', clickNum: 0, clickTimes: 0 },
+        //   { addNum: 0, bizDate: '2022-07-23', clickNum: 0, clickTimes: 0 },
+        //   { addNum: 0, bizDate: '2022-07-24', clickNum: 0, clickTimes: 0 },
+        //   { addNum: 0, bizDate: '2022-07-25', clickNum: 1, clickTimes: 2 },
+        //   { addNum: 0, bizDate: '2022-07-26', clickNum: 3, clickTimes: 1 },
+        //   { addNum: 0, bizDate: '2022-07-27', clickNum: 1, clickTimes: 2 }
         // ];
       });
     },

src/views/salesleads/actCodeManage/attractFlowLink/newAddChart.vue

@@ -18,7 +18,9 @@ import * as G2 from '@antv/g2';
 export default {
   data() {
     return {
-      chart: null
+      chart: null,
+      maxNum: 0,
+      maxTimes: 0
     };
   },
   props: {
@@ -73,12 +75,14 @@ export default {
         },
         num: {
           min: 0,
-          tickCount: 5,
+          tickCount: this.maxNum > 2 ? 5 : this.maxNum + 1,
+          tickMethod: 'wilkinson-extended',
           nice: true
         },
         times: {
           min: 0,
-          tickCount: 5,
+          tickCount: this.maxTimes > 2 ? 5 : this.maxTimes + 1,
+          tickMethod: 'wilkinson-extended',
           nice: true
         }
       });
@@ -97,7 +101,7 @@ export default {
         },
         label: {
           formatter: text => {
-            let num = Number(text);
+            let num = Math.floor(text);
             return num + '人次';
           }
         }
@@ -114,7 +118,7 @@ export default {
         },
         label: {
           formatter: text => {
-            let num = text >= 1 ? text : 0;
+            let num = Math.floor(text);
             return num + '人';
           }
         }
@@ -139,23 +143,30 @@ export default {
     },
     handleData(data) {
       let arr = [];
+      let maxNum = 0;
+      let maxTimes = 0;
       data.forEach(item => {
+        item.clickNum > maxNum ? (maxNum = item.clickNum) : '';
+        item.clickTimes > maxTimes ? (maxTimes = item.clickTimes) : '';
         arr.push({
           date: item.bizDate,
-          type: '今日添加人数',
+          type: '添加人数',
           num: item.addNum
         });
         arr.push({
           date: item.bizDate,
-          type: '今日点击人数',
+          type: '点击人数',
           num: item.clickNum
         });
         arr.push({
           date: item.bizDate,
-          type: '今日点击人次',
+          type: '点击人次',
           times: item.clickTimes
         });
       });
+      this.maxNum = maxNum;
+      this.maxTimes = maxTimes;
+      console.log(maxNum, maxTimes);
       return arr;
     }
   }