Merge remote-tracking branch 'origin/master'

src/components/charts/XLine.vue

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

src/config/api.js

@@ -370,6 +370,12 @@ const apis = {
         method:'get',
         url: `${commPrefix}/selectEventAll`
       },
+<<<<<<< HEAD
+      userBehavior: {
+          method:'get',
+          url: `${commPrefix}/selectUserBehavior`
+      },
+=======
     },
     intentionUsers: {
       method:'get',
@@ -383,6 +389,7 @@ const apis = {
       method:'get',
       url: `${commPrefix}/selectCityUser`
     },
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
   },
   bizEvent: {
     dict: {

src/store/modules/indexEcharts.js

@@ -127,8 +127,8 @@ export default {
         })
       })
     },
-    getNewsUserCount ({ commit }, payload) {
-      return new Promise((resolve, reject) => {
+    getNewsUserCount ({ commit }, payload) { // 新增用户 详情页
+      return new Promise((resolve, reject) => { 
         request({
           ...apis.indexEcharts.newUser,
           params: payload,
@@ -154,10 +154,17 @@ export default {
         })
       })
     },
+<<<<<<< HEAD
+    getUserBehavior({ commit }, payload) { // 用户来源 详情页
+      return new Promise((resolve, reject) => {
+        request({
+          ...apis.indexEcharts.userBehavior,
+=======
     getUserBehaviorSummary({ commit }, payload) {
       return new Promise((resolve, reject) => {
         request({
           ...apis.indexEcharts.userBehavior.summary,
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
           params: payload
         }).then((data) => {
           resolve(data)
@@ -165,6 +172,9 @@ export default {
           reject(err)
         })
       })
+<<<<<<< HEAD
+    }
+=======
     },
     getUserBehaviorProfile({ commit }, payload) {
       return new Promise((resolve, reject) => {
@@ -226,5 +236,6 @@ export default {
         })
       })
     },
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
   }
 }

src/views/indexEcharts/behaviorAnalysis.vue

@@ -41,10 +41,21 @@
 </template>
 
 <script>
+<<<<<<< HEAD
+import { createNamespacedHelpers } from "vuex";
+import apis from "../../config/api";
+import { mapState } from "vuex";
+import Echarts from "echarts";
+const {
+  mapState: mapIndexEchartsState,
+  mapActions: mapIndexEchartsActions
+} = createNamespacedHelpers("indexEcharts");
+=======
 import dayjs from 'dayjs'
 import { createNamespacedHelpers } from "vuex"
 
 const { mapActions } = createNamespacedHelpers("indexEcharts")
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
 
 export default {
   components: {
@@ -59,6 +70,106 @@ export default {
         buildingId: '',
         pageSize: 9999,
       },
+<<<<<<< HEAD
+      gridData: [
+        {
+          name: "未通过",
+          value: "0"
+        },
+        {
+          name: "已通过",
+          value: "1"
+        },
+        {
+          name: "已驳回",
+          value: "2"
+        }
+      ],
+      value: "",
+      tableData2: []
+    };
+  },
+  computed: {},
+  methods: {
+    ...mapIndexEchartsActions(["getUserBehavior"]),
+    search() {},
+    drawLine() {
+      // 折线图
+      let thirdChart = Echarts.init(this.$refs.thirdChart);
+      // 绘制图表
+      thirdChart.setOption({
+        title: {
+          text: "访问人数"
+        },
+        color: [
+          "#ed3a3d",
+          "#e613d2",
+          "#2ed9f7",
+          "#0ab662",
+          "#165cf8",
+          "#8854b9"
+        ],
+        tooltip: {
+          trigger: "axis"
+        },
+        legend: {
+          data: ["首页", "项目", "咨询", "名片", "活动", "资讯"]
+        },
+        grid: {
+          left: "3%",
+          right: "4%",
+          bottom: "3%",
+          containLabel: true
+        },
+        toolbox: {},
+        xAxis: {
+          type: "category",
+          boundaryGap: false,
+          data: ["周一", "周二", "周三", "周四", "周五", "周六", "周日"]
+        },
+        yAxis: {
+          type: "value"
+        },
+        series: [
+          {
+            name: "首页",
+            type: "line",
+            stack: "1",
+            data: [120, 132, 101, 134, 90, 230, 210]
+          },
+          {
+            name: "项目",
+            type: "line",
+            stack: "2",
+            data: [220, 182, 191, 234, 290, 330, 310]
+          },
+          {
+            name: "咨询",
+            type: "line",
+            stack: "3",
+            data: [150, 232, 201, 154, 190, 330, 410]
+          },
+          {
+            name: "名片",
+            type: "line",
+            stack: "4",
+            data: [320, 332, 301, 334, 390, 330, 320]
+          },
+          {
+            name: "活动",
+            type: "line",
+            stack: "5",
+            data: [820, 932, 901, 544, 1290, 1330, 1320]
+          },
+          {
+            name: "资讯",
+            type: "line",
+            stack: "6",
+            data: [400, 500, 201, 934, 1290, 1423, 777]
+          }
+        ]
+      });
+=======
       dateRange: [],
       bizEvents: [],
       bizEventTypes: [],
@@ -75,6 +186,7 @@ export default {
         this.getBizEventProperties({ eventType, buildingId }).then((dt) => (this.eventProperties = dt))
       },
       deep: true
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
     }
   },
   methods: {
@@ -95,11 +207,19 @@ export default {
     },
   },
   mounted() {
+<<<<<<< HEAD
+    this.drawLine();
+    this.getUserBehavior().then(x=>{
+      this.selectUserBehavior = x
+    });
+  }
+=======
   },
   created () {
     this.getBizEvents().then((dt) => (this.bizEvents = dt))
     this.getBizEventTypes().then((dt) => (this.bizEventTypes = dt))
   },
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
 };
 </script>
 

src/views/indexEcharts/index.vue

@@ -37,7 +37,12 @@ import { createNamespacedHelpers } from "vuex";
 import apis from "../../config/api";
 import { mapState } from "vuex";
 import Echarts from "echarts";
+<<<<<<< HEAD
+import dayjs from 'dayjs';
+
+=======
 const { mapActions: mapReportActions } = createNamespacedHelpers("report");
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
 const {
   mapState: mapIndexEchartsState,
   mapActions: mapIndexEchartsActions
@@ -75,7 +80,31 @@ export default {
     ...mapReportActions(["getReportList", "getReportCheckedList", "saveCheckedReport"]),
     initPage() {
       this.setDetailNull();
+<<<<<<< HEAD
+      this.getIndexEcharts().then(x => {
+        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
+          const row2 = {
+            ...acc[0],
+            [`${date}`]: userCount,
+          }
+          const row3 = {
+            ...acc[1],
+            [`${date}`]: authorizationCount,
+          }
+
+          this.tableTitle = this.tableTitle.concat(`${date}`)
+
+          return [row2, row3];          
+        }, this.tableData)
+      });;
+=======
       this.getIndexEcharts().then(window.console.log);;
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
     },
     toNewUsers() {
       this.$router.push({ name: "newUsers" });

src/views/indexEcharts/newUsers.vue

@@ -17,8 +17,18 @@
 </template>
 
 <script>
+<<<<<<< HEAD
+import { createNamespacedHelpers } from "vuex";
+import apis from "../../config/api";
+import { mapState } from "vuex";
+const {
+  mapState: mapIndexEchartsState,
+  mapActions: mapIndexEchartsActions
+} = createNamespacedHelpers("indexEcharts");
+=======
 import dayjs from 'dayjs'
 
+>>>>>>> 48c20b4546452ec645ebdd2c769c0cdbab4a10f2
 export default {
   components: {
     NewUsers: () => import('./components/NewUsers'),