Merge branch 'dev-timebug-20210421' into 'release'

数据分析时间修改

数据分析时间修改

See merge request !9

config/index.js

@@ -23,7 +23,7 @@ module.exports = {
     },
     dev: {
         env: require('./dev.env'),
-        port: 8100,
+        port: 8800,
         autoOpenBrowser: true,
         assetsSubDirectory: 'static',
         assetsPublicPath: '/',

src/main.js

@@ -9,6 +9,7 @@ import 'element-ui/lib/theme-chalk/index.css';    // 默认主题
 import {getAddress, loadCommonFilter} from './common/env'
 import vueFilter from './common/filter';
 import vViewer from 'v-viewer';
+import echarts from 'echarts';
 import 'viewerjs/dist/viewer.css';
 
 
@@ -17,6 +18,7 @@ getAddress();
 loadCommonFilter();
 //加载elementUi
 Vue.use(ElementUI);
+Vue.prototype.$echarts = echarts;
 Vue.use(vViewer, {
 	button: false
 });

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

@@ -129,12 +129,15 @@ export default {
         let date1 = new Date();
         let date2 = new Date(date1);
         let date3 = new Date(date1);
+        let dt, dt1, month, month1
         date2.setDate(date1.getDate() - 7);
         date3.setDate(date1.getDate() - 1);
-        let dt = date2.getDate() > 10 ? date2.getDate() : '0' + date2.getDate();
-        let dt1 = date3.getDate() > 10 ? date3.getDate() : '0' + date3.getDate();
-        this.searchParam.startDate = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + dt;
-        this.searchParam.endDate = date3.getFullYear() + "-" + (date3.getMonth() + 1) + "-" + dt1;
+        dt = date2.getDate() > 10 ? date2.getDate() : '0' + date2.getDate();
+        dt1 = date3.getDate() > 10 ? date3.getDate() : '0' + date3.getDate();
+        month = (date2.getMonth() + 1) > 10 ? (date2.getMonth() + 1) : '0' + (date2.getMonth() + 1);
+        month1 = (date3.getMonth() + 1) > 10 ? (date3.getMonth() + 1) : '0' + (date3.getMonth() + 1);
+        this.searchParam.startDate = date2.getFullYear() + "-" + month + "-" + dt;
+        this.searchParam.endDate = date3.getFullYear() + "-" + month1 + "-" + dt1;
         this.beginTime = date2.getFullYear() + "-" + (date2.getMonth() + 1) + "-" + dt;
         this.endTime = date3.getFullYear() + "-" + (date3.getMonth() + 1) + "-" + dt1;
         this.getVersionData();