From 9c28d7101fe05da1e386d880560828e15f706a65 Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Wed, 31 Aug 2022 15:35:19 +0800 Subject: [PATCH] zx --- components/option/multiColumnsOption.js | 5 ++++- pages/insight/brandChild/index.wxml | 2 +- pages/insight/pages/addTheme/index.js | 2 +- .../pages/brandInsight/TailInsight/index.js | 6 ++++++ .../pages/brandInsight/brandDataList/index.js | 6 ++++-- .../pages/brandInsight/brandDataList/index.wxml | 8 +++++++- .../pages/brandInsight/tailDataList/index.js | 6 ++++++ .../pages/brandInsight/totalReview/index.wxml | 2 +- .../pages/brandInsight/weiboInsight/index.js | 9 +++++---- .../pages/modalInsight/EventInsight/index.js | 2 -- pages/insight/pages/themeBoard/index.js | 4 ++-- pages/insight/pages/themeBoard/index.wxml | 4 ++-- pages/insight/pages/themeBoard/index.wxss | 14 +++++++------- 13 files changed, 46 insertions(+), 24 deletions(-) diff --git a/components/option/multiColumnsOption.js b/components/option/multiColumnsOption.js index d408095..f95cf8b 100644 --- a/components/option/multiColumnsOption.js +++ b/components/option/multiColumnsOption.js @@ -27,7 +27,10 @@ export default function multiColumnsOption(dx=[], dValue=[], dName=[]) { }, xAxis: { type: 'category', - data: dx + data: dx, + axisLabel: { + interval: 0, + } }, yAxis: { type: 'value' diff --git a/pages/insight/brandChild/index.wxml b/pages/insight/brandChild/index.wxml index 746c115..ff06b9b 100644 --- a/pages/insight/brandChild/index.wxml +++ b/pages/insight/brandChild/index.wxml @@ -3,7 +3,7 @@ - + {{item.brandname}} diff --git a/pages/insight/pages/addTheme/index.js b/pages/insight/pages/addTheme/index.js index fe351d6..d49497c 100644 --- a/pages/insight/pages/addTheme/index.js +++ b/pages/insight/pages/addTheme/index.js @@ -130,7 +130,7 @@ Page({ }, themeSave() { let dtData = { - "AnalyzeWord": this.data.AnalyzeWord, + "AnalyzeWord": this.data.totalMode == 1?this.data.highAnalizeWord:this.data.AnalyzeWord, "HuoWord": this.data.HuoWord, "PaiChu": this.data.PaiChu, "IsAdvancedQuery": this.data.totalMode == 0&&this.data.currWordType == '必选词和的关系'?0:this.data.totalMode == 1 ? 1:2, diff --git a/pages/insight/pages/brandInsight/TailInsight/index.js b/pages/insight/pages/brandInsight/TailInsight/index.js index 4ad7843..8e66591 100644 --- a/pages/insight/pages/brandInsight/TailInsight/index.js +++ b/pages/insight/pages/brandInsight/TailInsight/index.js @@ -86,6 +86,12 @@ Component({ sStartTime: wx.getStorageSync('sStartTime') || '', sEndTime: wx.getStorageSync('sEndTime') || '', sBrand: wx.getStorageSync('sBrand') || '', + sUrl: '', + sSource: '', + sUserAuthor: '', + sTitle: '', + sSrcTitle: '', + sCrisis: '', iPageIndex: 1, iPageSize: 10 }).then(res => { diff --git a/pages/insight/pages/brandInsight/brandDataList/index.js b/pages/insight/pages/brandInsight/brandDataList/index.js index 02fda4d..4b2392b 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.js +++ b/pages/insight/pages/brandInsight/brandDataList/index.js @@ -6,6 +6,7 @@ Page({ sQuDao: [], sQingGan: [], sCrisis: [], + iTimeType: 0, //api affList: [], qgList: [], @@ -28,7 +29,7 @@ Page({ iPageSize: 10, sType: 'BrandData', isSourcetype: 0, //1返回渠道 0不返回 - iTimeType: 0, //0发布时间 1入库时间 + iTimeType: this.data.iTimeType, //0发布时间 1入库时间 sCrisis: (this.data.sCrisis).join(','), sBrand: wx.getStorageSync('sBrand') || '', }).then(res => { @@ -51,5 +52,6 @@ Page({ }, changeSource(event) {this.setData({ sQuDao: event.detail });this.getData()}, changeQingGan(event) {this.setData({ sQingGan: event.detail });this.getData()}, - changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()} + changeWeiJi(event) {this.setData({ sCrisis: event.detail });this.getData()}, + iTimeTypeByChange(event) {this.setData({ iTimeType: event.detail });this.getData()} }) \ No newline at end of file diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml index fbdef16..2cce021 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.wxml +++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml @@ -20,7 +20,13 @@ - 返回 + + 排序方式 + + 发布时间 + 入库时间 + + diff --git a/pages/insight/pages/brandInsight/tailDataList/index.js b/pages/insight/pages/brandInsight/tailDataList/index.js index 45107f5..72a331b 100644 --- a/pages/insight/pages/brandInsight/tailDataList/index.js +++ b/pages/insight/pages/brandInsight/tailDataList/index.js @@ -15,6 +15,12 @@ Page({ sStartTime: wx.getStorageSync('sStartTime') || '', sEndTime: wx.getStorageSync('sEndTime') || '', sBrand: wx.getStorageSync('sBrand') || '', + sUrl: '', + sSource: '', + sUserAuthor: '', + sTitle: '', + sSrcTitle: '', + sCrisis: '', iPageIndex: 1, iPageSize: 25 }).then(res => { diff --git a/pages/insight/pages/brandInsight/totalReview/index.wxml b/pages/insight/pages/brandInsight/totalReview/index.wxml index 0542155..f4af5ca 100644 --- a/pages/insight/pages/brandInsight/totalReview/index.wxml +++ b/pages/insight/pages/brandInsight/totalReview/index.wxml @@ -7,7 +7,7 @@ 舆情传播趋势 - + diff --git a/pages/insight/pages/brandInsight/weiboInsight/index.js b/pages/insight/pages/brandInsight/weiboInsight/index.js index 6ac2401..a2991a1 100644 --- a/pages/insight/pages/brandInsight/weiboInsight/index.js +++ b/pages/insight/pages/brandInsight/weiboInsight/index.js @@ -226,13 +226,14 @@ Component({ sEndTime: wx.getStorageSync('sEndTime') || '', sBrand: wx.getStorageSync('sBrand') || '', }).then(res => { + console.log(res) let dName = []; let dPositive = [];let dNegative = []; res.forEach(ele => { dName.push(ele.key); - let total = 0; - ele.value.forEach(e => { - total = total + e.value * 1 - }) + let total = ele.value[0].value*1 + ele.value[2].value*1; + // ele.value.forEach(e => { + // total = total + e.value * 1 + // }) dPositive.push((ele.value[0].value * 100 / total).toFixed(0)); dNegative.push((ele.value[2].value * 100 / total).toFixed(0)); }); diff --git a/pages/insight/pages/modalInsight/EventInsight/index.js b/pages/insight/pages/modalInsight/EventInsight/index.js index a0ca714..08b6477 100644 --- a/pages/insight/pages/modalInsight/EventInsight/index.js +++ b/pages/insight/pages/modalInsight/EventInsight/index.js @@ -1,5 +1,3 @@ -import pointOption from "../../../../../components/option/pointOption" -import singleLine from "../../../../../components/option/sgOption" import multiColumnsOption from "../../../../../components/option/multiColumnsOption" const app = getApp(); Component({ diff --git a/pages/insight/pages/themeBoard/index.js b/pages/insight/pages/themeBoard/index.js index ac58ee8..e278356 100644 --- a/pages/insight/pages/themeBoard/index.js +++ b/pages/insight/pages/themeBoard/index.js @@ -5,7 +5,7 @@ import singlePercent from '../../../../components/option/singlePercent' import pieOption from '../../../../components/option/pieOption' import splitOption from "../../../../components/option/splitOption" import pictographicOption from '../../../../components/option/percentRankOption' -const dName=['新闻', '论坛','微信', '微博','APP', '短视频', '其他'] +const dName=['新闻', '论坛','评论','微信', '微博','APP', '短视频', '其他'] const dColor=['#FF4852','#FF6E25','#FFBF00','#20CC62','#00D6D6','#00AAFF','#7257FF'] const dColor2=['#FF4852','#FF6E25','#FFBF00'] Page({ @@ -125,7 +125,7 @@ Page({ Object.assign(obj,{action: 'getSourcetypeTime'}) //渠道分布 ).then(res => { let dx = []; - let dValue = [[],[],[],[],[],[],[]]; + let dValue = [[],[],[],[],[],[],[],[]]; res.forEach(ele => { dx.push(ele.Time) for(let i=0;i 渠道分布 - + @@ -282,7 +282,7 @@ 活跃用户地区 - + diff --git a/pages/insight/pages/themeBoard/index.wxss b/pages/insight/pages/themeBoard/index.wxss index 3d47f09..380c096 100644 --- a/pages/insight/pages/themeBoard/index.wxss +++ b/pages/insight/pages/themeBoard/index.wxss @@ -71,17 +71,17 @@ padding-top: 16rpx; } .tb-item { - width: 88.5%; + width: calc(100% - 32px); /* height: 90%; */ margin: 0rpx 0rpx 32rpx 32rpx; - padding: 24rpx 24rpx 8rpx 0rpx; + padding: 24rpx 0rpx 8rpx 0rpx; background-color: #ffffff; border-radius: 8rpx; } .tb-item-hot { - width: 648rpx; + width: calc(100% - 32px); margin: 0rpx 0rpx 32rpx 32rpx; - padding: 24rpx 40rpx 16rpx 0rpx; + padding: 24rpx 0rpx 16rpx 0rpx; border-radius: 8rpx; background-size: cover; } @@ -237,11 +237,11 @@ } .area-item { display: flex; - width: 656rpx; + width: calc(100% - 24px); height: 410rpx; - padding: 32rpx 0 0 32rpx; + padding: 32rpx 0rpx 0rpx 0rpx; } .area-item-chart{ - width: 358rpx; + width: 50%; height: 410rpx; } \ No newline at end of file