Merge branch 'dev' of git.oa00.com:xiaowen/swsWecat into dev

* 'dev' of git.oa00.com:xiaowen/swsWecat: zx - 词云
3 years ago · 3074a9a990
parent c54dc2acf5 572b6069f3
commit 3074a9a990
24 changed files with 122 additions and 64 deletions
--- a/app.js
+++ b/app.js
@ -100,6 +100,22 @@ App({
                    }
                })
            })
+        },
+        requestImg: function(data) {
+            let obj = {version: '1', data};
+            return new Promise((resolve, reject) => {
+                wx.request({
+                    url: 'https://saas.kaidalai.cn/word_cloud/wordCloud/getWordCloud',
+                    data: obj,
+                    method: 'post',
+                    success: function (res) {
+                        resolve(res)
+                    },
+                    fail: function (err) {
+                        reject(err);
+                    }
+                })
+            })
        }
    },
  
--- a/components/wdCloudCar/index.js
+++ b/components/wdCloudCar/index.js
@ -0,0 +1,44 @@
+const app = getApp();
+Component({
+    properties: {
+        list: {
+            type: Object,
+            value: {},
+        },
+        height: {
+            type: Number,
+            value: 484
+        },
+    },
+    data: {
+        wdUrl: '',
+    },
+    lifetimes: {
+        attached: function () {
+           
+        },
+    },
+    methods: {
+
+    },
+    observers: {
+        list(newVal) {
+          if (!newVal || newVal == {}) return
+          let arr = [];
+          for(let key in newVal) {
+                let obj = {
+                    name: key,
+                    num: newVal[key]
+                };
+                arr.push(obj)
+          }
+          setTimeout(() => {
+            app.globalData.requestImg(arr).then(res => {
+                var imgData = res.data.replace(/[\r\n]/g, '')
+                var base64Img = 'data:image/png;base64,' + imgData;
+                this.setData({wdUrl: base64Img})
+            });
+          }, 500)
+        }
+      },
+})
--- a/components/wdCloudCar/index.json
+++ b/components/wdCloudCar/index.json
@ -0,0 +1,4 @@
+{
+    "component": true,
+    "usingComponents": {}
+}
--- a/components/wdCloudCar/index.wxml
+++ b/components/wdCloudCar/index.wxml
@ -0,0 +1,3 @@
+<view class="img-container" style="height: {{ height }}rpx;">
+    <image src="{{wdUrl}}" style="width: 100%; height: 120px;" />
+</view>
--- a/components/wdCloudCar/index.wxss
+++ b/components/wdCloudCar/index.wxss
@ -0,0 +1,12 @@
+.img-container {
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    width: calc(100% - 32px);
+    height: 484rpx;
+    background-color: #fff;
+    border-radius: 4rpx;
+    margin: 32rpx 0 0 32rpx;
+    overflow: hidden;
+}
--- a/pages/insight/pages/brandInsight/TailInsight/index.js
+++ b/pages/insight/pages/brandInsight/TailInsight/index.js
@ -31,6 +31,7 @@ Component({
        ],
        copyShow: false,
        copyData: {},
+        wordCloudObject: {},
    },
    methods: {
        getData() {
@ -122,12 +123,13 @@ Component({
                sEndTime: wx.getStorageSync('sEndTime') || '',
                sBrand: wx.getStorageSync('sBrand') || '',
            }).then(res => {
-                let arr1 = [];
-                Object.keys(res).forEach(key => {
-                    let o = [key, res[key]]
-                    arr1.push(o)
-                });
-                this.setData({wordCloudData: arr1, wShow: true})
+                this.setData({wordCloudObject: res})
+                // let arr1 = [];
+                // Object.keys(res).forEach(key => {
+                //     let o = [key, res[key]]
+                //     arr1.push(o)
+                // });
+                // this.setData({wordCloudData: arr1, wShow: true})
            });
        },
        toEventDetail(e) {
--- a/pages/insight/pages/brandInsight/TailInsight/index.json
+++ b/pages/insight/pages/brandInsight/TailInsight/index.json
@ -1,7 +1,8 @@
 {
    "usingComponents": {
        "c-echars": "../../../../../components/c-echars/index",
-        "word-cloud": "../../../../../components/word-cloud/index"
+        "word-cloud": "../../../../../components/word-cloud/index",
+        "word-cloud-car": "../../../../../components/wdCloudCar/index"
    },
    "component": true
 }
--- a/pages/insight/pages/brandInsight/TailInsight/index.wxml
+++ b/pages/insight/pages/brandInsight/TailInsight/index.wxml
@ -52,10 +52,10 @@
                </van-tabs>
            </view>
        </view>
-        <view class="wd-cloud">
+        <word-cloud-car height="{{484}}" list="{{wordCloudObject}}"></word-cloud-car>
+        <!-- <view class="wd-cloud">
            <word-cloud wx:if="{{wShow}}"  canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20" lvl="{{wlvl}}"></word-cloud>
-            <!-- <c-echars showChart="{{showChart}}" canvasId="wdcd-canvas" chartId="wdcd" chartOption="{{wordCloudData}}" height="100%"></c-echars> -->
-        </view>
+        </view> -->
    </view>
    <view class="ta-item">
        <view class="ta-chart-title" style="display: flex;justify-content: space-between;">
--- a/pages/insight/pages/brandInsight/weiboInsight/index.js
+++ b/pages/insight/pages/brandInsight/weiboInsight/index.js
@ -35,6 +35,7 @@ Component({

        ],
        imageUrl: getApp().globalData.imageUrl,
+        wordCloudObject: {},
        showChart: true,
        weiboData: {},
        weiboAff: {},
@ -470,14 +471,7 @@ Component({
                sEndTime: wx.getStorageSync('sEndTime') || '',
                sBrand: wx.getStorageSync('sBrand') || '',
            }).then(res => {
-                let arr1 = [];
-                Object.keys(res).forEach(key => {
-                    let o = [key, res[key]]
-                    arr1.push(o)
-                });
-                this.setData({
-                    wordCloudData: arr1
-                })
+                this.setData({wordCloudObject: res})
            });
        },
        getKol() {
--- a/pages/insight/pages/brandInsight/weiboInsight/index.json
+++ b/pages/insight/pages/brandInsight/weiboInsight/index.json
@ -1,7 +1,8 @@
 {
    "usingComponents": {
        "c-echars": "../../../../../components/c-echars/index",
-        "word-cloud": "../../../../../components/word-cloud/index"
+        "word-cloud": "../../../../../components/word-cloud/index",
+        "word-cloud-car": "../../../../../components/wdCloudCar/index"
    },
    "component": true
 }
--- a/pages/insight/pages/brandInsight/weiboInsight/index.wxml
+++ b/pages/insight/pages/brandInsight/weiboInsight/index.wxml
@ -168,9 +168,7 @@
                </van-tabs>
            </view>
        </view>
-        <view class="brand">
-            <word-cloud canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
-        </view>
+        <word-cloud-car height="{{484}}" list="{{wordCloudObject}}"></word-cloud-car>
    </view>
    <view class="wb-item">
        <view class="wb-chart-title">调性分布</view>
--- a/pages/insight/pages/brandInsight/weiboInsight/index.wxss
+++ b/pages/insight/pages/brandInsight/weiboInsight/index.wxss
@ -141,11 +141,12 @@
 }
 /* 词云 */
 .brand{
-    position: relative;
+    display: flex;
+    justify-content: center;
+    align-items: center;
    width: calc(100% - 32px);
    height: 484rpx;
    background-color: #fff;
-    margin-top: 32rpx;
    border-radius: 4rpx;
    margin: 32rpx 0 0 32rpx;
    overflow: hidden;
--- a/pages/insight/pages/eventInsight/evTailwing/index.js
+++ b/pages/insight/pages/eventInsight/evTailwing/index.js
@ -13,6 +13,7 @@ Component({
        //热门词云
        wordCloudActive: 0,
        wordCloudData: [],
+        wordCloudObject: {},
    },
    methods: {
        getData() {
@ -59,12 +60,7 @@ Component({
                sEndTime: wx.getStorageSync('sEndTime') || '',
                sRele: wx.getStorageSync('sRele') || '',
            }).then(res => {
-                let arr1 = [];
-                Object.keys(res).forEach(key => {
-                    let o = [key, res[key]]
-                    arr1.push(o)
-                });
-                this.setData({wordCloudData: arr1})
+                this.setData({wordCloudObject: res})
            });
        },
        changeWordCloud(event) {
--- a/pages/insight/pages/eventInsight/evTailwing/index.json
+++ b/pages/insight/pages/eventInsight/evTailwing/index.json
@ -1,7 +1,7 @@
 {
    "usingComponents": {
        "c-echars": "../../../../../components/c-echars/index",
-        "word-cloud": "../../../../../components/word-cloud/index"
+        "word-cloud-car": "../../../../../components/wdCloudCar/index"
    },
    "component": true
 }
--- a/pages/insight/pages/eventInsight/evTailwing/index.wxml
+++ b/pages/insight/pages/eventInsight/evTailwing/index.wxml
@ -21,8 +21,6 @@
                </van-tabs>
            </view>
        </view>
-        <view class="wd-cloud">
-            <word-cloud canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
-        </view>
+        <word-cloud-car height="{{484}}" list="{{wordCloudObject}}"></word-cloud-car>
    </view>
 </view>
--- a/pages/insight/pages/modalInsight/TailInsight/index.js
+++ b/pages/insight/pages/modalInsight/TailInsight/index.js
@ -17,6 +17,7 @@ Component({
        wordCloudData: [],
        copyShow: false,
        copyData: {},
+        wordCloudObject: {},
    },
    methods: {
        getData() {
@ -90,12 +91,7 @@ Component({
                sBrand: wx.getStorageSync('sBrand') || '',
                sSeriesName: wx.getStorageSync('sSeriesName') || ''
            }).then(res => {
-                let arr1 = [];
-                Object.keys(res).forEach(key => {
-                    let o = [key, res[key]]
-                    arr1.push(o)
-                });
-                this.setData({wordCloudData: arr1})
+                this.setData({wordCloudObject: res})
            });
        },
        toEventDetail(e) {
--- a/pages/insight/pages/modalInsight/TailInsight/index.json
+++ b/pages/insight/pages/modalInsight/TailInsight/index.json
@ -1,7 +1,7 @@
 {
    "usingComponents": {
        "c-echars": "../../../../../components/c-echars/index",
-        "word-cloud": "../../../../../components/word-cloud/index"
+        "word-cloud-car": "../../../../../components/wdCloudCar/index"
    },
    "component": true
 }
--- a/pages/insight/pages/modalInsight/TailInsight/index.wxml
+++ b/pages/insight/pages/modalInsight/TailInsight/index.wxml
@ -52,9 +52,7 @@
                </van-tabs>
            </view>
        </view>
-        <view class="wd-cloud">
-            <word-cloud canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
-        </view>
+        <word-cloud-car height="{{484}}" list="{{wordCloudObject}}"></word-cloud-car>
    </view>
    <view class="ta-item">
        <view class="ta-chart-title" style="display: flex;justify-content: space-between;">
--- a/pages/insight/pages/modalInsight/weiboInsight/index.js
+++ b/pages/insight/pages/modalInsight/weiboInsight/index.js
@ -34,6 +34,7 @@ Component({
        //词云
        wordCloudActive: 0,
        wordCloudData: [],
+        wordCloudObject: {},
        //kol观点
        kolActive: 0,
        kolData: [],
@ -312,12 +313,13 @@ Component({
                sBrand: wx.getStorageSync('sBrand') || '',
                sSeriesName: wx.getStorageSync('sSeriesName') || ''
            }).then(res => {
-                let arr1 = [];
-                Object.keys(res).forEach(key => {
-                    let o = [key, res[key]]
-                    arr1.push(o)
-                });
-                this.setData({wordCloudData: arr1})
+                // let arr1 = [];
+                // Object.keys(res).forEach(key => {
+                //     let o = [key, res[key]]
+                //     arr1.push(o)
+                // });
+                // this.setData({wordCloudData: arr1})
+                this.setData({wordCloudObject: res})
            });
        },
        getKol() {
--- a/pages/insight/pages/modalInsight/weiboInsight/index.json
+++ b/pages/insight/pages/modalInsight/weiboInsight/index.json
@ -1,7 +1,7 @@
 {
    "usingComponents": {
        "c-echars": "../../../../../components/c-echars/index",
-        "word-cloud": "../../../../../components/word-cloud/index"
+        "word-cloud-car": "../../../../../components/wdCloudCar/index"
    },
    "component": true
 }
--- a/pages/insight/pages/modalInsight/weiboInsight/index.wxml
+++ b/pages/insight/pages/modalInsight/weiboInsight/index.wxml
@ -132,9 +132,7 @@
                </van-tabs>
            </view>
        </view>
-        <view class="brand">
-            <word-cloud canvasId="ta-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
-        </view>
+        <word-cloud-car height="{{484}}" list="{{wordCloudObject}}"></word-cloud-car>
    </view>
    <view class="wb-item">
        <view class="wb-chart-title">微博传播裂变</view>
--- a/pages/insight/pages/themeBoard/index.js
+++ b/pages/insight/pages/themeBoard/index.js
@ -37,6 +37,7 @@ Page({
        //词云
        wordCloudActive: 0,
        wordCloudData: [],
+        wordCloudObject: {},
        //大V分析
        bigvActive: 0,
        rowData: [],
@ -318,12 +319,7 @@ Page({
        app.globalData.request(
            Object.assign(obj,{action: this.data.wordCloudActive == 0 ? 'getPositive':this.data.wordCloudActive == 1 ?'getNegative':'getHotWord'})
        ).then(res => {
-            let arr1 = [];
-            Object.keys(res).forEach(key => {
-                let o = [key, res[key]]
-                arr1.push(o)
-            });
-            this.setData({wordCloudData: arr1})
+            this.setData({wordCloudObject: res})
        });
    },
    getBigv() {
--- a/pages/insight/pages/themeBoard/index.json
+++ b/pages/insight/pages/themeBoard/index.json
@ -2,6 +2,6 @@
    "navigationBarTitleText": "主题数据看板",
    "usingComponents": {
        "c-echars": "../../../../../components/c-echars/index",
-        "word-cloud": "../../../../../components/word-cloud/index"
+        "word-cloud-car": "../../../../../components/wdCloudCar/index"
    }
 }
--- a/pages/insight/pages/themeBoard/index.wxml
+++ b/pages/insight/pages/themeBoard/index.wxml
@ -201,9 +201,7 @@
                        </van-tabs>
                    </view>
                </view>
-                <view class="brand">
-                    <word-cloud canvasId="tb-wc" list="{{wordCloudData}}" width="100%" height="200" color="#FF1C20"></word-cloud>
-                </view>
+                <word-cloud-car height="{{484}}" list="{{wordCloudObject}}"></word-cloud-car>
            </view>
        </view>
        <view class="tb-content" wx:if="{{tabActive == 1}}">