From 0eeb715242954cca0946ddde46a2b140e1b48edb Mon Sep 17 00:00:00 2001 From: liuyongli <1598631486@qq.com> Date: Wed, 14 Sep 2022 10:04:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=AF=94=E5=9B=BE=E8=A1=A8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/option/multipleColumn.js | 6 ++--- components/option/negaposiOption2.js | 5 ++--- components/option/stackedBarChart.js | 5 ++--- contrastPackages/brandRatio/weibo/index.js | 6 ++--- .../carModelsRatio/survey/index.js | 2 +- .../carModelsRatio/weibo/index.js | 4 ++-- contrastPackages/eventRatio/survey/index.js | 2 +- contrastPackages/eventRatio/survey/index.wxss | 2 ++ contrastPackages/eventRatio/weibo/index.js | 22 ++++++++++++++----- contrastPackages/eventRatio/weibo/index.wxml | 12 +++++----- contrastPackages/eventRatio/weibo/index.wxss | 3 +++ contrastPackages/themeRatio/weibo/index.js | 2 +- 12 files changed, 43 insertions(+), 28 deletions(-) diff --git a/components/option/multipleColumn.js b/components/option/multipleColumn.js index 62876bc..2e22c43 100644 --- a/components/option/multipleColumn.js +++ b/components/option/multipleColumn.js @@ -36,9 +36,9 @@ export default function multipleColumn(columnName = [], xMsg = [], data = [],) { fontSize: 8 }, left: 20, - itemWidth: 12, - itemHeight: 12, - borderRadius: 1, //圆角半径 + itemWidth: 10, + itemHeight: 10, + // borderRadius: 1, //圆角半径 }, grid: { left: 20, diff --git a/components/option/negaposiOption2.js b/components/option/negaposiOption2.js index 6b19f86..6d70c57 100644 --- a/components/option/negaposiOption2.js +++ b/components/option/negaposiOption2.js @@ -93,9 +93,8 @@ export default function negaposiOption(dName = [], data = {}) { color: 'black', fontSize: 8 }, - itemWidth: 12, - itemHeight: 16, - borderRadius: 1, + itemWidth: 10, + itemHeight: 10, }, grid: { bottom: 20, diff --git a/components/option/stackedBarChart.js b/components/option/stackedBarChart.js index 7fd5e09..dabee00 100644 --- a/components/option/stackedBarChart.js +++ b/components/option/stackedBarChart.js @@ -25,9 +25,8 @@ export default function stack(yName=[],data=[],color=[]){ color: 'black', fontSize: 8 }, - itemWidth: 12, - itemHeight: 12, - borderRadius: 1, + itemWidth: 10, + itemHeight: 10, }, tooltip: { trigger: 'axis', diff --git a/contrastPackages/brandRatio/weibo/index.js b/contrastPackages/brandRatio/weibo/index.js index 48371ca..7607cef 100644 --- a/contrastPackages/brandRatio/weibo/index.js +++ b/contrastPackages/brandRatio/weibo/index.js @@ -13,7 +13,7 @@ Component({ brandOption: histogram([], [], [], '#0084FF'), brandOption2: histogram([], [], [], '#20cc62'), brandOption4: sHistogram(), - stackOption: stack([], [], ['#00aaff', '#20cc62', '#ff4852']), + stackOption: stack([], [], dColor), genderOption:negaposiOption([],{}), genderOptio2:negaposiOption([],{}), boxArr: new Array(6), @@ -95,7 +95,7 @@ Component({ data[2].push(i.Data['负面']) } this.setData({ - stackOption: stack(yMsg, data, ['#00aaff', '#20cc62', '#ff4852']) + stackOption: stack(yMsg, data, dColor) }) }) //微博大V @@ -126,7 +126,7 @@ Component({ console.log(data); //横轴，数据，纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, sBrand, []) + brandOption4: sHistogram(xMsg, data, sBrand, dColor) }) }) //微博内容方向对比 diff --git a/contrastPackages/carModelsRatio/survey/index.js b/contrastPackages/carModelsRatio/survey/index.js index b65eeb7..7db6cea 100644 --- a/contrastPackages/carModelsRatio/survey/index.js +++ b/contrastPackages/carModelsRatio/survey/index.js @@ -221,7 +221,7 @@ Component({ } //横轴，数据，纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, SeriesName, []) + brandOption4: sHistogram(xMsg, data, SeriesName, dColor) }) }) //品牌传播TOP媒体 diff --git a/contrastPackages/carModelsRatio/weibo/index.js b/contrastPackages/carModelsRatio/weibo/index.js index d729ea3..53f7cc4 100644 --- a/contrastPackages/carModelsRatio/weibo/index.js +++ b/contrastPackages/carModelsRatio/weibo/index.js @@ -99,7 +99,7 @@ Component({ data[2].push(i.Data['负面']) } this.setData({ - stackOption: stack(yMsg, data, ['#00aaff', '#20cc62', '#ff4852']) + stackOption: stack(yMsg, data,dColor )//['#00aaff', '#20cc62', '#ff4852'] }) }) //微博大V @@ -129,7 +129,7 @@ Component({ } //横轴，数据，纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, SeriesName, []) + brandOption4: sHistogram(xMsg, data, SeriesName, dColor) }) }) //微博内容方向对比 diff --git a/contrastPackages/eventRatio/survey/index.js b/contrastPackages/eventRatio/survey/index.js index 21881aa..20428c6 100644 --- a/contrastPackages/eventRatio/survey/index.js +++ b/contrastPackages/eventRatio/survey/index.js @@ -65,7 +65,7 @@ Component({ } // //横轴，数据，纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, ['事件一','事件二'], [],35) + brandOption4: sHistogram(xMsg, data, ['事件一','事件二'], dColor,35) }) }) //事件调性分布 diff --git a/contrastPackages/eventRatio/survey/index.wxss b/contrastPackages/eventRatio/survey/index.wxss index 7775935..007c8b7 100644 --- a/contrastPackages/eventRatio/survey/index.wxss +++ b/contrastPackages/eventRatio/survey/index.wxss @@ -9,6 +9,8 @@ font-size: 36rpx; font-weight: bold; margin-left:32rpx ; + height: 100rpx; + line-height: 100rpx; } .table{ height: 380rpx; diff --git a/contrastPackages/eventRatio/weibo/index.js b/contrastPackages/eventRatio/weibo/index.js index ebbdab2..67c32e3 100644 --- a/contrastPackages/eventRatio/weibo/index.js +++ b/contrastPackages/eventRatio/weibo/index.js @@ -25,7 +25,19 @@ Component({ area: [], weiboDist: [], sex:[], - attestation:[] + attestation:[], + pieColor: [ + 'background: rgb(244,72,85)', + 'background: rgb(245,109,47)', + 'background: rgb(248,189,32)', + 'background: rgb(75,203,100)', + 'background: rgb(75,214,213)', + 'background: rgb(244,72,85)', + 'background: rgb(245,109,47)', + 'background: rgb(248,189,32)', + 'background: rgb(75,203,100)', + 'background: rgb(75,214,213)', + ], }, lifetimes: { attached() { @@ -103,7 +115,7 @@ Component({ console.log(data); //横轴，数据，纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, ['事件一', '事件二'], []) + brandOption4: sHistogram(xMsg, data, ['事件一', '事件二'], dColor) }) }) //微博调性对比 @@ -137,7 +149,7 @@ Component({ for (let i of data) { let obj = {} obj.arr = i - obj.func = pieOption(['#0283ff', '#a8eac1', '#ffe49a'], i) + obj.func = pieOption(['#FF4852', '#FF6E25', '#FFBF00', '#20CC62', '#00D6D6', '#00AAFF', '#7257FF'], i) newData.push(obj) } console.log(newData); @@ -237,13 +249,13 @@ Component({ sex = sex.map(ele => { return { arr: ele, - func: pieOption(['#0283ff', '#a8eac1', '#ffe49a'], ele) + func: pieOption(['#FF4852', '#FF6E25', '#FFBF00', '#20CC62', '#00D6D6', '#00AAFF', '#7257FF'], ele) } }) attestation = attestation.map(ele => { return { arr: ele, - func: pieOption(['#0283ff', '#a8eac1', '#ffe49a'], ele) + func: pieOption(['#FF4852', '#FF6E25', '#FFBF00', '#20CC62', '#00D6D6', '#00AAFF', '#7257FF'], ele) } }) console.log(sex); diff --git a/contrastPackages/eventRatio/weibo/index.wxml b/contrastPackages/eventRatio/weibo/index.wxml index 4959728..bf99ccb 100644 --- a/contrastPackages/eventRatio/weibo/index.wxml +++ b/contrastPackages/eventRatio/weibo/index.wxml @@ -29,7 +29,7 @@ - + {{item.name}} @@ -51,7 +51,7 @@ - + {{item.name}} @@ -94,7 +94,7 @@ - + {{item.name}} @@ -116,7 +116,7 @@ - + {{item.name}} @@ -143,7 +143,7 @@ - + {{item.name}} @@ -165,7 +165,7 @@ - + {{item.name}} diff --git a/contrastPackages/eventRatio/weibo/index.wxss b/contrastPackages/eventRatio/weibo/index.wxss index 96c64c9..6c8ed1c 100644 --- a/contrastPackages/eventRatio/weibo/index.wxss +++ b/contrastPackages/eventRatio/weibo/index.wxss @@ -103,4 +103,7 @@ width: 60%; /* margin-left:16rpx ; */ margin-top: 32rpx; +} +.colorTags { + width: 10px;height: 10px;border-radius: 1px; } \ No newline at end of file diff --git a/contrastPackages/themeRatio/weibo/index.js b/contrastPackages/themeRatio/weibo/index.js index eb404ad..7fa5c3c 100644 --- a/contrastPackages/themeRatio/weibo/index.js +++ b/contrastPackages/themeRatio/weibo/index.js @@ -125,7 +125,7 @@ Component({ console.log('cdc',data); //横轴，数据，纵轴 this.setData({ - brandOption4: sHistogram(xMsg, data, themeName, []) + brandOption4: sHistogram(xMsg, data, themeName, dColor) }) }) //微博内容方向对比