From 5278e235a6feadce27b729a7ccd3a6352c638e24 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Wed, 21 Jun 2023 17:01:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  4 +-
 .../components/sensitive.vue                  | 66 +++++++++++++------
 .../pidu/AppSensitive/AppSensitive.vue        |  1 -
 3 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index d1aafa78..133a51d8 100644
--- a/package.json
+++ b/package.json
@@ -50,14 +50,14 @@
     "core-js": "^3.11.0",
     "dayjs": "^1.10.6",
     "echarts": "^4.9.0",
+    "echarts-wordcloud": "^1.1.3",
     "recorder-core": "^1.1.21080800",
     "regenerator-runtime": "^0.12.1",
     "vue": "^2.6.11",
     "vuedraggable": "^2.24.3",
     "vuex": "^3.2.0",
     "vuex-persistedstate": "^4.0.0-beta.3",
-    "wangeditor": "^4.7.10",
-    "wordcloud": "^1.2.2"
+    "wangeditor": "^4.7.10"
   },
   "devDependencies": {
     "@babel/runtime": "~7.12.0",
diff --git a/src/project/pidu/AppDataStatistics/components/sensitive.vue b/src/project/pidu/AppDataStatistics/components/sensitive.vue
index 6864509d..a1c1fe96 100644
--- a/src/project/pidu/AppDataStatistics/components/sensitive.vue
+++ b/src/project/pidu/AppDataStatistics/components/sensitive.vue
@@ -41,15 +41,15 @@
     </div>
 
     <div class="groups_box" v-if="wordData">
-      <canvas id="main"></canvas>
+      <div id="main"></div>
     </div>
-   
   </div>
 </template>
 
 <script>
 import echarts from "echarts";
-import WordCloud from 'wordcloud';
+import "echarts-wordcloud";
+
 export default {
   name: "sensitive",
   props: {
@@ -60,7 +60,7 @@ export default {
       info: {},
       groupData: [],
       userData: [],
-      wordData: []
+      wordData: [],
     };
   },
   created() {
@@ -68,7 +68,6 @@ export default {
   },
   methods: {
     getData() {
-      // 居民好友
       this.$http
         .post(
           `/app/appsessionarchivekeywordrecord/getKeywordRecordStatistic?departmentId=${this.departmentId}`
@@ -83,14 +82,14 @@ export default {
             this.userData = res.data.personRecordListMap.map((e) => e.cnt);
 
             res.data.wordNames.map((item) => {
-              var i = [item.wordName, item.wordCount*8]
-              this.wordData.push(i)
-            })
+              var i = { name: item.wordName, value: item.wordCount };
+              this.wordData.push(i);
+            });
             this.$nextTick(() => {
               this.getGroupEcharts(groupMonth, this.groupData);
               this.getUserEcharts(userMonth, this.userData);
-              if(this.wordData) {
-                this.getKeyWordEcharts(this.wordData)
+              if (this.wordData) {
+                this.getKeyWordEcharts(this.wordData);
               }
             });
           }
@@ -222,15 +221,44 @@ export default {
       };
       option && userChart.setOption(option);
     },
-    getKeyWordEcharts(list) {
-      WordCloud(document.getElementById('main'), {
-        list: list 
-        // [
-        //   ['foo', 50],
-        //   ['bar', 6],
-        //   // ...
-        // ],
-        // 其他自定义选项
+    getKeyWordEcharts(data) {
+      var chart = echarts.init(document.getElementById("main"));
+
+      chart.setOption({
+        series: [
+          {
+            type: "wordCloud",
+            sizeRange: [15, 80],
+            rotationRange: [0, 0],
+            rotationStep: 45,
+            gridSize: 8,
+            shape: "pentagon",
+            width: "100%",
+            height: "100%",
+            textStyle: {
+              normal: {
+                color: function () {
+                  return (
+                    "rgb(" +
+                    [
+                      Math.round(Math.random() * 160),
+                      Math.round(Math.random() * 160),
+                      Math.round(Math.random() * 160),
+                    ].join(",") +
+                    ")"
+                  );
+                },
+                fontFamily: "sans-serif",
+                fontWeight: "normal",
+              },
+              emphasis: {
+                shadowBlur: 10,
+                shadowColor: "#333",
+              },
+            },
+            data,
+          },
+        ],
       });
     },
   },
diff --git a/src/project/pidu/AppSensitive/AppSensitive.vue b/src/project/pidu/AppSensitive/AppSensitive.vue
index 98e483ec..ed11ea36 100644
--- a/src/project/pidu/AppSensitive/AppSensitive.vue
+++ b/src/project/pidu/AppSensitive/AppSensitive.vue
@@ -84,7 +84,6 @@ export default {
             }else {
               item.text = this.changeKeyRed(item.content, item.wordName)
             }
-            
           })
           this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
           this.pages = res.data.pages