yuhao 2 lat temu
rodzic
commit
8e78080c5d

+ 4 - 2
src/views/BprogramAmount/BprogramAmount.vue

@@ -44,11 +44,12 @@ export default {
44
               show: false,
44
               show: false,
45
             },
45
             },
46
             data: [
46
             data: [
47
+              "美妆购买总用户数",
47
               "单次三个项目",
48
               "单次三个项目",
48
               "单次两个项目",
49
               "单次两个项目",
49
               "三次到店用户数",
50
               "三次到店用户数",
50
               "两次到店用户数",
51
               "两次到店用户数",
51
-              "美妆购买总用户数",
52
+              '总付费用户数',
52
               "总用户数",
53
               "总用户数",
53
             ],
54
             ],
54
           },
55
           },
@@ -78,11 +79,12 @@ export default {
78
               },
79
               },
79
             },
80
             },
80
             data: [
81
             data: [
82
+              this.listData.beauty_products,
81
               this.listData.three_project,
83
               this.listData.three_project,
82
               this.listData.two_project,
84
               this.listData.two_project,
83
               this.listData.user_three,
85
               this.listData.user_three,
84
               this.listData.user_two,
86
               this.listData.user_two,
85
-              this.listData.beauty_products,
87
+              this.listData.total_consumer_users,
86
               this.listData.total_user,
88
               this.listData.total_user,
87
             ],
89
             ],
88
           },
90
           },

+ 3 - 2
src/views/demo02.vue

@@ -2,7 +2,7 @@
2
   <!-- <Resize> -->
2
   <!-- <Resize> -->
3
   <div class="boxx">
3
   <div class="boxx">
4
     <!-- 标题 -->
4
     <!-- 标题 -->
5
-    <div class="title">jolijoli实时数据大屏</div>
5
+    <div class="title">Jolijoli实时数据大屏</div>
6
     <div class="box">
6
     <div class="box">
7
       <!-- 图表 -->
7
       <!-- 图表 -->
8
       <div class="pic">
8
       <div class="pic">
@@ -114,7 +114,8 @@
114
                   v-if="listData"
114
                   v-if="listData"
115
                   :listData="listData.product_ratio"
115
                   :listData="listData.product_ratio"
116
                 ></product-ratio
116
                 ></product-ratio
117
-                ><project-ratio
117
+                >
118
+                <project-ratio
118
                   v-if="listData"
119
                   v-if="listData"
119
                   :listData="listData.project_proportion"
120
                   :listData="listData.project_proportion"
120
                 ></project-ratio></div
121
                 ></project-ratio></div

+ 6 - 0
src/views/productRatio/productRatio.vue

@@ -15,6 +15,10 @@ export default {
15
   methods: {
15
   methods: {
16
     // 保存项目top10信息
16
     // 保存项目top10信息
17
     getTopList() {
17
     getTopList() {
18
+      this.topList = [];
19
+      if(this.listData==''){
20
+        return
21
+      }
18
       this.listData.forEach((item) => {
22
       this.listData.forEach((item) => {
19
         let arr = {};
23
         let arr = {};
20
         arr.value = item.num;
24
         arr.value = item.num;
@@ -66,8 +70,10 @@ export default {
66
   watch: {
70
   watch: {
67
     listData: {
71
     listData: {
68
       handler(val) {
72
       handler(val) {
73
+        this.getTopList();
69
         this.myEcharts();
74
         this.myEcharts();
70
       },
75
       },
76
+      deep: true, // 深度监听父组件传过来对象变化
71
     },
77
     },
72
   },
78
   },
73
   mounted() {
79
   mounted() {

+ 7 - 6
src/views/programAmount/programAmount.vue

@@ -32,9 +32,10 @@ export default {
32
           },
32
           },
33
         },
33
         },
34
         grid: {
34
         grid: {
35
-          left: "3%",
35
+          left: "4%",
36
           right: "4%",
36
           right: "4%",
37
-          bottom: "3%",
37
+          bottom: "2%",
38
+          top:'19%',
38
           containLabel: true,
39
           containLabel: true,
39
         },
40
         },
40
         xAxis: [
41
         xAxis: [
@@ -50,9 +51,9 @@ export default {
50
             },
51
             },
51
             data: [
52
             data: [
52
               "总测肤用户数",
53
               "总测肤用户数",
53
-              "付费用户数",
54
-              "充值用户数",
55
-              "多次卡购买用户数",
54
+              "付费用户数",
55
+              "充值用户数",
56
+              "多次卡购买用户数",
56
               "新注册用户数",
57
               "新注册用户数",
57
               "新测肤用户数",
58
               "新测肤用户数",
58
             ],
59
             ],
@@ -119,7 +120,7 @@ export default {
119
 .map {
120
 .map {
120
   width: 96%;
121
   width: 96%;
121
   /* height: 280px; */
122
   /* height: 280px; */
122
-  height: 31vh;
123
+  height: 26vh;
123
   /* border: 1px solid saddlebrown; */
124
   /* border: 1px solid saddlebrown; */
124
 }
125
 }
125
 </style>
126
 </style>

+ 13 - 7
src/views/projectRatio/projectRatio.vue

@@ -15,12 +15,16 @@ export default {
15
   methods: {
15
   methods: {
16
     // 保存项目top10信息
16
     // 保存项目top10信息
17
     getTopList() {
17
     getTopList() {
18
-      this.listData.forEach(item=>{
19
-        let arr = {}
20
-        arr.value = item.num
21
-        arr.name = item.project_name
22
-        this.topList.push(arr)
23
-      })
18
+      this.topList = [];
19
+      if (this.listData == "") {
20
+        return;
21
+      }
22
+      this.listData.forEach((item) => {
23
+        let arr = {};
24
+        arr.value = item.num;
25
+        arr.name = item.project_name;
26
+        this.topList.push(arr);
27
+      });
24
     },
28
     },
25
     //先定义个方法
29
     //先定义个方法
26
     myEcharts() {
30
     myEcharts() {
@@ -44,7 +48,7 @@ export default {
44
             // name: "Access From",
48
             // name: "Access From",
45
             type: "pie",
49
             type: "pie",
46
             radius: "50%",
50
             radius: "50%",
47
-            data:this.topList,
51
+            data: this.topList,
48
             // data: [
52
             // data: [
49
             //   {
53
             //   {
50
             //     name: this.listData[0].project_name,
54
             //     name: this.listData[0].project_name,
@@ -80,8 +84,10 @@ export default {
80
   watch: {
84
   watch: {
81
     listData: {
85
     listData: {
82
       handler(val) {
86
       handler(val) {
87
+        this.getTopList();
83
         this.myEcharts();
88
         this.myEcharts();
84
       },
89
       },
90
+      deep: true, // 深度监听父组件传过来对象变化
85
     },
91
     },
86
   },
92
   },
87
   mounted() {
93
   mounted() {