zx

3 years ago · 9c28d7101f
parent d3a67fc093
commit 9c28d7101f
13 changed files with 46 additions and 24 deletions
--- 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'
--- a/pages/insight/brandChild/index.wxml
+++ b/pages/insight/brandChild/index.wxml
@ -3,7 +3,7 @@
        <van-search style="width: 100%;" background="#006BFF" model:value="{{ brandForm.brand }}" placeholder="请输入品牌名称" bind:search="handlerSearch" />
        <view class="bs-tabs">
            <scroll-view class="bs-tab-sv" scroll-x="true">
-                <view class="bs-tab-sv-item" wx:for="{{recommandBrand}}" wx:key="index" data-id="{{it.brandname}}" bindtap="toBrandInsight">
+                <view class="bs-tab-sv-item" wx:for="{{recommandBrand}}" wx:key="index" data-id="{{item.brandname}}" bindtap="toBrandInsight">
                    <image class="userAvatar" src="{{item.img}}" />
                    <view class="bs-tab-title">{{item.brandname}}</view>
                </view>
--- 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,
--- 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 => {
--- 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()}
 })
--- a/pages/insight/pages/brandInsight/brandDataList/index.wxml
+++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml
@ -20,7 +20,13 @@
                </view>
            </van-dropdown-item>
            <van-dropdown-item id="back" title="更多筛选">
-                返回
+                <view style="padding: 0rpx 32rpx 32rpx 32rpx;">
+                    <view>排序方式</view>
+                    <van-radio-group value="{{ iTimeType }}" bind:change="iTimeTypeByChange">
+                        <van-radio name="0">发布时间</van-radio>
+                        <van-radio name="1">入库时间</van-radio>
+                    </van-radio-group>
+                </view>
            </van-dropdown-item>
        </van-dropdown-menu>
    </view>
--- 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 => {
--- a/pages/insight/pages/brandInsight/totalReview/index.wxml
+++ b/pages/insight/pages/brandInsight/totalReview/index.wxml
@ -7,7 +7,7 @@
    </view>
    <view class="tr-item">
        <view class="tr-chart-title">舆情传播趋势</view>
-        <view class="tr-chart-item" style="width: 100%;margin-left: 18rpx;">
+        <view class="tr-chart-item" style="width: 100%;">
            <c-echars showChart="{{showChart}}" canvasId="eventbar-canvas" chartId="eventbar" chartOption="{{transformOption}}" height="100%"></c-echars>
        </view>
    </view>
--- 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));
                });
--- 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({
--- 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<ele.Data.length;i++) {
--- a/pages/insight/pages/themeBoard/index.wxml
+++ b/pages/insight/pages/themeBoard/index.wxml
@ -107,7 +107,7 @@
            </view>
            <view class="tb-item">
                <view class="tb-chart-title">渠道分布</view>
-                <view class="tb-chart-item" style="width: 100%;margin-left: 18rpx;">
+                <view class="tb-chart-item" style="width: 100%;">
                    <c-echars showChart="{{showChart}}" canvasId="eventbar-canvas" chartId="eventbar" chartOption="{{transformOption}}" height="100%"></c-echars>
                </view>
            </view>
@ -282,7 +282,7 @@
            </view>
            <view class="tb-item">
                <view class="tb-chart-title">活跃用户地区</view>
-                <view class="area-item" style="padding-left: 16rpx;">
+                <view class="area-item">
                    <view class="area-item-chart">
                        <c-echars showChart="{{showChart}}" canvasId="aua-canvas" chartId="aua" chartOption="{{wbActiveUserArea1}}" height="100%"></c-echars>
                    </view>
--- 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;
 }