修改时间

src/views/user-path/funnel-data.vue

@@ -16,7 +16,7 @@
                                     v-model="searchParam.startDate"
                                     style="width: 200px;"
                                     :picker-options="endDateOpt"
-                                    value-format="yyyy-MM-dd 00:00:00"
+                                    value-format="yyyy-MM-dd"
                                 >
                                 </el-date-picker>
                                 <span>-</span>
@@ -26,7 +26,7 @@
                                     v-model="searchParam.endDate"
                                     style="width: 200px;"
                                     :picker-options="endDateOpt1"
-                                    value-format="yyyy-MM-dd 23:59:59"
+                                    value-format="yyyy-MM-dd"
                                 >
                                 </el-date-picker>
                             </el-form-item>
@@ -94,8 +94,8 @@ export default {
             funnelId: '',
             name: '',
             searchParam: {
-                endDate: '2020-11-23',
-                startDate: '2020-11-20',
+                endDate: '',
+                startDate: '',
                 version: ''
             },
             versionSelect: [],  // 版本下拉数据
@@ -123,6 +123,7 @@ export default {
         this.name = this.$route.query.name;
     },
     mounted() {
+        this.searchParam.endDate = new Date();
         this.getAnalysisData();
         this.getVersionData();
     },
@@ -157,7 +158,7 @@ export default {
         getAnalysisData() {
             let req = this.searchParam;
             this.getData(
-                "get", `/session/funnel/report?endDate=${req.endDate}&funnelId=${this.funnelId}&startDate=${req.endDate}&version=${req.version}`, {},
+                "get", `/session/funnel/report?endDate=${req.endDate}&funnelId=${this.funnelId}&startDate=${req.startDate}&version=${req.version}`, {},
                 res => {
                     if(res.code == '000000') {
                         this.funnelData = res.data;
@@ -186,22 +187,37 @@ export default {
                     }],
                     global: false // 缺省为 false
                 };
-            let data1 = [], dataArr = [], valueArr = [], lineArr = [], linksArr = [], arrowTop = 0, arrowH = 0, lineCur = 0;
+            let data1 = [], dataArr = [], valueArr = [], lineArr = [], linksArr = [], arrowTop = 0, arrowH = 0, lineTop = 0, lineLeft = 0, lineHeight = 0;
             if(len == 2) {
                 arrowTop = 105;
                 arrowH = 130;
+                lineTop = 50;
+                lineLeft = 250;
+                lineHeight = 306;
             }else if(len == 3) {
                 arrowTop = 115;
                 arrowH = 130;
+                lineTop = 30;
+                lineLeft = 400;
+                lineHeight = 306;
             }else if(len == 4) {
                 arrowTop = 88;
                 arrowH = 210;
+                lineTop = 30;
+                lineLeft = 400;
+                lineHeight = 306;
             }else if(len == 5) {
                 arrowTop = 70;
                 arrowH = 260;
+                lineTop = 20;
+                lineLeft = 400;
+                lineHeight = 346;
             }else if(len == 6) {
-                arrowTop = 105;
-                arrowH = 130;
+                arrowTop = 60;
+                arrowH = 260;
+                lineTop = 20;
+                lineLeft = 500;
+                lineHeight = 306;
             }
             for (let i = 0; i < lineargroup.length; i++) {
                 let obj1 = {
@@ -236,7 +252,7 @@ export default {
                 backgroundColor: '#ffffff',
                 grid: {  
                     top: arrowTop,  // 箭头距离顶部高度  3-115  4-
-                    left: "-34%",
+                    left: "-54%",
                     right: 20,
                     height: arrowH,  // 箭头之间的距离  3-145 4-
                     bottom: '0'
@@ -256,7 +272,7 @@ export default {
                         height: 300 + len * 20,   // 块高度
                         gap: 40,  // 块间距
                         minSize: 150, // 块两边斜度
-                        left: '15%',  // 块左边距离
+                        left: '5%',  // 块左边距离
                         width: '35%', // 块宽度
                         label: {
                             show: true,
@@ -287,9 +303,9 @@ export default {
                     },
                     {  // 转化率线
                         z: 1,
-                        top: 20,
-                        left: 500,
-                        height: 306,
+                        top: lineTop,
+                        left: lineLeft,
+                        height: lineHeight,
                         type: 'graph',
                         layout: 'none',
                         symbolSize: 0,