up

src/components/charts/XLine.vue

@@ -9,7 +9,7 @@ export default {
   props: {
     value: {
       type: Object,
-      default: () => {},
+      default: () => ({}),
     },
   },
   data() {

src/config/api.js

@@ -345,6 +345,10 @@ const apis = {
           method:'get',
           url: `${commPrefix}/selectNewsUserCount`
       },
+      userBehavior: {
+          method:'get',
+          url: `${commPrefix}/selectUserBehavior`
+      },
   },
 }
 export default apis

src/store/modules/indexEcharts.js

@@ -35,8 +35,8 @@ export default {
         })
       })
     },
-    getNewsUserCount ({ commit }, payload) {
-      return new Promise((resolve, reject) => {
+    getNewsUserCount ({ commit }, payload) { // 新增用户 详情页
+      return new Promise((resolve, reject) => { 
         request({
           ...apis.indexEcharts.newsUserCount,
           params: payload,
@@ -51,34 +51,6 @@ export default {
         })
       })
     },
-    // changeExchangeStatus (_, payload) {
-    //   return new Promise((resolve, reject) => {
-    //     request({
-    //       ...apis.exchange.change,
-    //       data: payload,
-    //     }).then((data) => {
-    //       resolve(data)
-    //     }).catch((err) => {
-    //       const message = err.message || err.msg
-
-    //       if (typeof message === 'string') {
-    //         reject(message)
-    //       }
-    //     })
-    //   })
-    // },
-    // verifyById (_, payload) {
-    //   return new Promise((resolve, reject) => {
-    //     request({
-    //       ...apis.exchange.update,
-    //       urlData: payload,
-    //     }).then((data) => {
-    //       resolve(data)
-    //     }).catch((err) => {
-    //       reject(err)
-    //     })
-    //   })
-    // }
     getUserResource({ commit }, payload) { // 用户来源 详情页
       return new Promise((resolve, reject) => {
         request({
@@ -90,6 +62,18 @@ export default {
           reject(err)
         })
       })
+    },
+    getUserBehavior({ commit }, payload) { // 用户来源 详情页
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.indexEcharts.userBehavior,
+          params: payload
+        }).then((data) => {
+          resolve(data)
+        }).catch((err) => {
+          reject(err)
+        })
+      })
     }
   }
 }

src/views/indexEcharts/behaviorAnalysis.vue

@@ -50,6 +50,10 @@ import { createNamespacedHelpers } from "vuex";
 import apis from "../../config/api";
 import { mapState } from "vuex";
 import Echarts from "echarts";
+const {
+  mapState: mapIndexEchartsState,
+  mapActions: mapIndexEchartsActions
+} = createNamespacedHelpers("indexEcharts");
 
 export default {
   components: {},
@@ -73,36 +77,12 @@ export default {
         }
       ],
       value: "",
-      tableData2: [
-        {
-          num: "98",
-          name: "王晓红",
-          phone: "15742389456",
-          building: "香颂.蔚澜半岛"
-        },
-        {
-          num: "99",
-          name: "王晓红2",
-          phone: "15742389456",
-          building: "香颂.蔚澜半岛"
-        },
-        {
-          num: "88",
-          name: "王晓红3",
-          phone: "15742389456",
-          building: "香颂.蔚澜半岛"
-        },
-        {
-          num: "94",
-          name: "王晓红4",
-          phone: "15742389456",
-          building: "香颂.蔚澜半岛"
-        }
-      ]
+      tableData2: []
     };
   },
   computed: {},
   methods: {
+    ...mapIndexEchartsActions(["getUserBehavior"]),
     search() {},
     drawLine() {
       // 折线图
@@ -112,7 +92,14 @@ export default {
         title: {
           text: "访问人数"
         },
-        color: ["#000", "green", "#5793f3", "#d14a61", "#241bba", "orange"],
+        color: [
+          "#ed3a3d",
+          "#e613d2",
+          "#2ed9f7",
+          "#0ab662",
+          "#165cf8",
+          "#8854b9"
+        ],
         tooltip: {
           trigger: "axis"
         },
@@ -177,6 +164,9 @@ export default {
   },
   mounted() {
     this.drawLine();
+    this.getUserBehavior().then(x=>{
+      this.selectUserBehavior = x
+    });
   }
 };
 </script>

src/views/indexEcharts/index.vue

@@ -74,6 +74,8 @@ import { createNamespacedHelpers } from "vuex";
 import apis from "../../config/api";
 import { mapState } from "vuex";
 import Echarts from "echarts";
+import dayjs from 'dayjs';
+
 const {
   mapState: mapIndexEchartsState,
   mapActions: mapIndexEchartsActions
@@ -111,7 +113,9 @@ export default {
     initPage() {
       this.setDetailNull();
       this.getIndexEcharts().then(x => {
-        this.lineSeting.dataset.source = this.echartsInfo.selectUserBehavior
+        this.lineSeting.dataset.source = (this.echartsInfo.selectUserBehavior || []).map(x => ({ ...x, date: dayjs(x.date).format('YYYY-MM-DD') }))
+        // this.lineSeting.series = (this.echartsInfo.selectUserBehavior || []).map(x => ({ ...x, date: dayjs(x.date).format('YYYY-MM-DD') }))
+        this.lineSeting.title.text = '访问人数'
         const data = this.echartsInfo.selectNewsUserCount
         this.tableData = (data || []).reduce((acc, item, index) => {
           const { date, userCount, authorizationCount } = item

src/views/indexEcharts/newUsers.vue

@@ -21,7 +21,6 @@
 import { createNamespacedHelpers } from "vuex";
 import apis from "../../config/api";
 import { mapState } from "vuex";
-
 const {
   mapState: mapIndexEchartsState,
   mapActions: mapIndexEchartsActions