Merge remote-tracking branch 'origin/build' into build

packages/bigscreen/dv/AppQxnDv.vue

@@ -443,35 +443,7 @@
             }
           })
         },
-        lineData9: [
-          {
-            "name": "宣传群",
-            "标签数": 198
-          },
-          {
-            "name": "学校",
-            "标签数": 66
-          },
-          {
-            "name": "临街商行",
-            "标签数": 118
-          },
-          {
-            "name": "建筑工程",
-            "标签数": 6
-          },
-          {
-            "name": "建筑工程",
-            "标签数": 6
-          },
-          {
-            "name": "物流快递",
-            "标签数": 14
-          },
-          {
-            "name": "餐饮美食",
-            "标签数": 116
-        }],
+        lineData9: [],
         barChart9: {
           legend: {
             show: false,
@@ -698,6 +670,7 @@
         wxGroupOverview: {},
         wjwqgkGMFBInfo: {},
         wjwqgkInfo: {},
+        wxGroupTagInfo: {},
         colConfigs: [
           { slot: 'index' },
           { prop: 'ownerName',  label: '姓名', align: 'left', width: 58 },
@@ -726,16 +699,15 @@
       },
 
       qbqlData () {
-        return [{key: '已打标签', value: 2938}, {key: '未打标签', value: 2283}]
+        return [{key: '已打标签', value: this.wxGroupTagInfo['已打标签']}, {key: '未打标签', value: this.wxGroupTagInfo['未打标签']}]
       },
 
       qbqRate () {
-        return 56.27
-        if (!this.cyActivityInfo['已激活']) {
+        if (!this.wxGroupTagInfo['已打标签']) {
           return 0
         }
 
-        return Number(((this.cyActivityInfo['已激活'] / (this.cyActivityInfo['已激活'] + this.cyActivityInfo['未激活'])) * 100).toFixed(2))
+        return Number(((this.wxGroupTagInfo['已打标签'] / (this.wxGroupTagInfo['已打标签'] + this.wxGroupTagInfo['未打标签'])) * 100).toFixed(2))
       },
       fglData () {
         return [{key: '已关联人数', value: 726079}, {key: '地区户籍数', value: 3015112}]
@@ -920,6 +892,27 @@
           }
         })
 
+        this.instance.post(`/api/wxgridinfo/wxGroupTag`, null, {
+          params: {
+            corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA'
+          }
+        }).then(res => {
+          if (res.code === 0) {
+            this.wxGroupTagInfo = res.data
+
+            if (res.data.tagInfo) {
+              this.lineData9 = res.data.tagInfo.map(v => {
+                return {
+                  name: v.name,
+                  '标签数': v.c
+                }
+              })
+            }
+
+            this.lineData9 = res.data.tagInfo
+          }
+        })
+
         this.instance.post(`/api/wxgridinfo/wxGroupOverview`, null, {
           params: {
             corpId: 'wpytYEDgAA5zwi8Ak2mwFh3PwBKwwlWA',