From 2c9a5cde0dfeec8ded0e6c54c62c5e48411918f3 Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Tue, 7 Dec 2021 17:20:02 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AA=A8=E6=9E=B6=E5=B1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 15 ++ package.json | 1 + src/lycomponents/iHeaderBrand/index.vue | 2 +- src/views/BrandComparison/BrandComparison.vue | 150 +++++++++++------- .../brandEventComparisonStoken/index.vue | 23 +-- .../index.vue | 11 +- .../index.vue | 6 +- .../userAreaDistributionStoken/index.vue | 4 +- .../weiboUserPortraitStoken/index.vue | 46 +----- src/views/ModelComparison/BrandComparison.vue | 144 +++++++++++------ .../brandCompateHeaderStoken/index.vue | 24 +-- .../userAreaDistributionStoken/index.vue | 14 +- .../weiboUserPortraitStoken/index.vue | 26 +-- 13 files changed, 217 insertions(+), 249 deletions(-) diff --git a/package-lock.json b/package-lock.json index ebfe589..d6599e8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,6 +15,7 @@ "compression-webpack-plugin": "^9.0.0", "core-js": "^3.6.5", "echarts": "^5.2.1", + "echarts-wordcloud": "^2.0.0", "less": "^4.1.2", "less-loader": "^5.0.0", "moment": "^2.29.1", @@ -5417,6 +5418,14 @@ "zrender": "5.2.1" } }, + "node_modules/echarts-wordcloud": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz", + "integrity": "sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==", + "peerDependencies": { + "echarts": "^5.0.1" + } + }, "node_modules/echarts/node_modules/tslib": { "version": "2.3.0", "license": "0BSD" @@ -17757,6 +17766,12 @@ } } }, + "echarts-wordcloud": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/echarts-wordcloud/-/echarts-wordcloud-2.0.0.tgz", + "integrity": "sha512-K7l6pTklqdW7ZWzT/1CS0KhBSINr/cd7c5N1fVMzZMwLQHEwT7x+nivK7g5hkVh7WNcAv4Dn6/ZS5zMKRozC1g==", + "requires": {} + }, "ee-first": { "version": "1.1.1", "dev": true diff --git a/package.json b/package.json index 6fc3866..f1b9d32 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "compression-webpack-plugin": "^9.0.0", "core-js": "^3.6.5", "echarts": "^5.2.1", + "echarts-wordcloud": "^2.0.0", "less": "^4.1.2", "less-loader": "^5.0.0", "moment": "^2.29.1", diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue index fef611e..536893c 100644 --- a/src/lycomponents/iHeaderBrand/index.vue +++ b/src/lycomponents/iHeaderBrand/index.vue @@ -30,7 +30,7 @@ - + diff --git a/src/views/BrandComparison/BrandComparison.vue b/src/views/BrandComparison/BrandComparison.vue index 180a054..3cd1904 100644 --- a/src/views/BrandComparison/BrandComparison.vue +++ b/src/views/BrandComparison/BrandComparison.vue @@ -21,93 +21,131 @@ - +
- - - - - - + + + + + + + + + + + +
-
+ - - + + - +
- - - - + + + + + + + +
-
+ - - + + - - + + - - + + - +
- - - - - - + + + + + + + + + + + +
- - - - + + + + + + + +
- - - - + + + + + + + +
-
- + +
- - - - + + + + + + + +
- - - - - - + + + + + + + + + + + +
-
- + +
- - + + + +
- - + + + +
-
+ diff --git a/src/views/BrandComparison/brandEventComparisonStoken/index.vue b/src/views/BrandComparison/brandEventComparisonStoken/index.vue index 95c7e62..1a5fe8f 100644 --- a/src/views/BrandComparison/brandEventComparisonStoken/index.vue +++ b/src/views/BrandComparison/brandEventComparisonStoken/index.vue @@ -7,28 +7,7 @@ * @FilePath: /data-show/src/views/BrandComparison/brandEventComparison/index.vue -->