From 25a255380a172a5fab1ce1b941ad89ce2efe9d34 Mon Sep 17 00:00:00 2001 From: liuyongli <1598631486@qq.com> Date: Mon, 19 Sep 2022 18:08:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8D=E4=BA=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/indexCom/atlasChild/index.js | 80 ++++++++++--------- components/indexCom/atlasChild/index.json | 1 + components/indexCom/atlasChild/index.wxml | 6 +- contrastPackages/brandRatio/survey/index.json | 3 +- contrastPackages/brandRatio/survey/index.wxml | 1 + .../carModelsRatio/survey/index.js | 2 +- .../carModelsRatio/survey/index.json | 3 +- .../carModelsRatio/survey/index.wxml | 3 +- .../pages/eventInsight/evTotal/index.js | 14 ++-- .../pages/eventInsight/evTotal/index.json | 3 +- .../pages/eventInsight/evTotal/index.wxml | 3 +- project.private.config.json | 7 ++ 12 files changed, 74 insertions(+), 52 deletions(-) diff --git a/components/indexCom/atlasChild/index.js b/components/indexCom/atlasChild/index.js index 163be6b..6a9a174 100644 --- a/components/indexCom/atlasChild/index.js +++ b/components/indexCom/atlasChild/index.js @@ -10,8 +10,11 @@ Component({ 4: 50000 }, showTu1: false, - showTu2: false + showTu2: false, // words: + HotWords: {}, + PositiveWords: {}, + NegativeWords: {}, }, lifetimes: { attached() { @@ -29,18 +32,18 @@ Component({ this.getData(sTimeType, sStartTime, sEndTime); }, getData(sTimeType, sStartTime, sEndTime) { - wx.showToast({ - title: '加载中', - icon: 'loading', - duration: 300000 - }), + // wx.showToast({ + // title: '加载中', + // icon: 'loading', + // duration: 3000 + // }), Promise.all([this.getData1(sTimeType, sStartTime, sEndTime), this.getData2(sTimeType, sStartTime, sEndTime), this.getData3(sTimeType, sStartTime, sEndTime) ]).then(() => { - setTimeout(() => { - wx.hideToast(); - }, 500) + // setTimeout(() => { + // wx.hideToast(); + // }, 500) }) // this.getData1(sTimeType, sStartTime, sEndTime), // this.getData2(sTimeType, sStartTime, sEndTime), @@ -61,17 +64,16 @@ Component({ sEndTime: sEndTime } app.globalData.request(obj).then(res => { - const data = res - const arr1 = [] - Object.keys(data).forEach(key => { - let o = [key, data[key]] - arr1.push(o) - }) + // const data = res + // const arr1 = [] + // Object.keys(data).forEach(key => { + // let o = [key, data[key]] + // arr1.push(o) + // }) this.setData({ - HotWords: arr1, - showTu: true + HotWords: res, }) - resolve(true) + // resolve(true) }) }) }, @@ -89,17 +91,20 @@ Component({ sEndTime: sEndTime } app.globalData.request(obj).then(res => { - const data = res - const arr2 = [] - Object.keys(data).forEach(key => { - let list = [key, data[key]] - arr2.push(list) - }) this.setData({ - PositiveWords: arr2, - showTu1: true + PositiveWords: res, }) - resolve(true) + // const data = res + // const arr2 = [] + // Object.keys(data).forEach(key => { + // let list = [key, data[key]] + // arr2.push(list) + // }) + // this.setData({ + // PositiveWords: arr2, + // showTu1: true + // }) + // resolve(true) }) }) @@ -118,17 +123,20 @@ Component({ sEndTime: sEndTime } app.globalData.request(obj).then(res => { - const data = res - const arr3 = [] - Object.keys(data).forEach(key => { - let list = [key, data[key]] - arr3.push(list) - }) this.setData({ - NegativeWords: arr3, - showTu2: true + NegativeWords: res, }) - resolve(true) + // const data = res + // const arr3 = [] + // Object.keys(data).forEach(key => { + // let list = [key, data[key]] + // arr3.push(list) + // }) + // this.setData({ + // NegativeWords: arr3, + // showTu2: true + // }) + // resolve(true) }) }) diff --git a/components/indexCom/atlasChild/index.json b/components/indexCom/atlasChild/index.json index 0b4502a..2f6ec18 100644 --- a/components/indexCom/atlasChild/index.json +++ b/components/indexCom/atlasChild/index.json @@ -1,6 +1,7 @@ { "usingComponents": { "word-cloud": "../../word-cloud/index", + "word-cloud-car":"../../wdCloudCar/index", "time-component":"/components/timecomponent/index" } } \ No newline at end of file diff --git a/components/indexCom/atlasChild/index.wxml b/components/indexCom/atlasChild/index.wxml index 29b0891..98c690d 100644 --- a/components/indexCom/atlasChild/index.wxml +++ b/components/indexCom/atlasChild/index.wxml @@ -3,16 +3,16 @@ 热门词云 - + 正面词云 - + 负面词云 - + \ No newline at end of file diff --git a/contrastPackages/brandRatio/survey/index.json b/contrastPackages/brandRatio/survey/index.json index 19af129..3e05414 100644 --- a/contrastPackages/brandRatio/survey/index.json +++ b/contrastPackages/brandRatio/survey/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 } \ No newline at end of file diff --git a/contrastPackages/brandRatio/survey/index.wxml b/contrastPackages/brandRatio/survey/index.wxml index 0d6b3f3..f6f303c 100644 --- a/contrastPackages/brandRatio/survey/index.wxml +++ b/contrastPackages/brandRatio/survey/index.wxml @@ -119,6 +119,7 @@ {{item.name}} + diff --git a/contrastPackages/carModelsRatio/survey/index.js b/contrastPackages/carModelsRatio/survey/index.js index 7db6cea..fc2500c 100644 --- a/contrastPackages/carModelsRatio/survey/index.js +++ b/contrastPackages/carModelsRatio/survey/index.js @@ -278,7 +278,7 @@ Component({ }).then(res=>{ let positiveWord = [] let negativeWord = [] - console.log(res); + for(let i of res){ let pobj = {} let nobj = {} diff --git a/contrastPackages/carModelsRatio/survey/index.json b/contrastPackages/carModelsRatio/survey/index.json index 19af129..4f7642e 100644 --- a/contrastPackages/carModelsRatio/survey/index.json +++ b/contrastPackages/carModelsRatio/survey/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 } \ No newline at end of file diff --git a/contrastPackages/carModelsRatio/survey/index.wxml b/contrastPackages/carModelsRatio/survey/index.wxml index 45549ad..7a59814 100644 --- a/contrastPackages/carModelsRatio/survey/index.wxml +++ b/contrastPackages/carModelsRatio/survey/index.wxml @@ -119,7 +119,8 @@ {{item.name}} - + + diff --git a/pages/insight/pages/eventInsight/evTotal/index.js b/pages/insight/pages/eventInsight/evTotal/index.js index 4bec533..25a1065 100644 --- a/pages/insight/pages/eventInsight/evTotal/index.js +++ b/pages/insight/pages/eventInsight/evTotal/index.js @@ -24,7 +24,7 @@ Component({ mediaData: [], //热门词云 wordCloudActive: 0, - wordCloudData: [], + wordCloudData: {}, eventTransActive: 0, affActive: 0, }, @@ -132,12 +132,12 @@ 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}) + // let arr1 = []; + // Object.keys(res).forEach(key => { + // let o = [key, res[key]] + // arr1.push(o) + // }); + this.setData({wordCloudData: res}) }); }, changeWordCloud(event) { diff --git a/pages/insight/pages/eventInsight/evTotal/index.json b/pages/insight/pages/eventInsight/evTotal/index.json index 3598f02..5b70c66 100644 --- a/pages/insight/pages/eventInsight/evTotal/index.json +++ b/pages/insight/pages/eventInsight/evTotal/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 } \ No newline at end of file diff --git a/pages/insight/pages/eventInsight/evTotal/index.wxml b/pages/insight/pages/eventInsight/evTotal/index.wxml index b261b05..f14fa1d 100644 --- a/pages/insight/pages/eventInsight/evTotal/index.wxml +++ b/pages/insight/pages/eventInsight/evTotal/index.wxml @@ -81,7 +81,8 @@ - + + \ No newline at end of file diff --git a/project.private.config.json b/project.private.config.json index ae5b5fc..7d08662 100644 --- a/project.private.config.json +++ b/project.private.config.json @@ -28,6 +28,13 @@ "query": "", "launchMode": "default", "scene": null + }, + { + "name": "", + "pathName": "contrastPackages/brandRatio/index", + "query": "", + "launchMode": "default", + "scene": null } ] }