From 9f3535ad8ddddd1cf17d6e46014992918640b6cd Mon Sep 17 00:00:00 2001 From: liuyongli <1598631486@qq.com> Date: Tue, 6 Dec 2022 16:24:59 +0800 Subject: [PATCH] no message --- components/indexCom/atlasChild/index.js | 2 +- components/indexCom/atlasChild/index.json | 2 +- components/indexCom/atlasChild/index.wxml | 2 +- components/indexCom/barometerChild/index.js | 2 +- components/indexCom/barometerChild/index.json | 2 +- components/indexCom/barometerChild/index.wxml | 2 +- components/indexCom/dataChild/index.js | 2 +- components/indexCom/dataChild/index.json | 2 +- components/indexCom/dataChild/index.wxml | 2 +- components/indexCom/eventChild/index.js | 2 +- components/indexCom/eventChild/index.json | 2 +- components/indexCom/eventChild/index.wxml | 2 +- components/indexCom/insightChild/index.js | 2 +- components/indexCom/insightChild/index.json | 2 +- components/indexCom/insightChild/index.wxml | 2 +- components/indexCom/mediaChild/index.js | 2 +- components/indexCom/mediaChild/index.json | 2 +- components/indexCom/mediaChild/index.wxml | 39 ++- components/indexCom/portraitChild/index.js | 2 +- components/indexCom/portraitChild/index.json | 2 +- components/indexCom/portraitChild/index.wxml | 2 +- components/indexCom/rankingChild/index.json | 2 +- components/indexCom/soundChild/index.js | 2 +- components/indexCom/soundChild/index.json | 2 +- components/indexCom/soundChild/index.wxml | 2 +- components/timeCustom/index.js | 18 +- components/timeCustom/index.wxml | 12 +- components/timeCustom/index.wxss | 17 +- contrastPackages/brandRatio/index.js | 279 +++++++++--------- contrastPackages/brandRatio/index.wxml | 6 +- contrastPackages/brandRatio/index.wxss | 7 +- contrastPackages/brandRatio/weibo/index.wxml | 2 +- pages/brandCrisis/index.js | 8 +- pages/brandCrisis/index.json | 2 +- pages/brandCrisis/index.wxml | 2 +- pages/insight/pages/addTheme/index.js | 23 +- pages/insight/pages/addTheme/index.wxml | 2 +- .../pages/brandInsight/TailInsight/index.wxml | 4 +- .../pages/brandInsight/TailInsight/index.wxss | 5 + .../brandInsight/brandDataList/index.wxml | 2 +- .../brandInsight/weiboInsight/index.wxml | 6 +- pages/insight/pages/editTheme/index.js | 6 +- .../pages/eventInsight/evDatalist/index.wxml | 2 +- .../pages/eventInsight/evWeibo/index.wxss | 2 +- .../modalInsight/modalDataList/index.wxml | 2 +- .../modalInsight/weiboInsight/index.wxml | 6 +- pages/insight/pages/themeBoard/index.wxml | 10 +- pages/insight/pages/themeBoard/index.wxss | 2 +- pages/insight/pages/themeList/index.wxml | 2 +- pages/insight/pages/themeList/index.wxss | 3 +- pages/insight/themeChild/index.js | 133 +++++---- pages/varComm/index.js | 62 ++-- pages/varComm/index.wxml | 22 +- pages/varComm/pages/theme/index.wxml | 3 +- 54 files changed, 388 insertions(+), 349 deletions(-) diff --git a/components/indexCom/atlasChild/index.js b/components/indexCom/atlasChild/index.js index 6a9a174..718d321 100644 --- a/components/indexCom/atlasChild/index.js +++ b/components/indexCom/atlasChild/index.js @@ -18,7 +18,7 @@ Component({ }, lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/atlasChild/index.json b/components/indexCom/atlasChild/index.json index 2f6ec18..bd10865 100644 --- a/components/indexCom/atlasChild/index.json +++ b/components/indexCom/atlasChild/index.json @@ -2,6 +2,6 @@ "usingComponents": { "word-cloud": "../../word-cloud/index", "word-cloud-car":"../../wdCloudCar/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/atlasChild/index.wxml b/components/indexCom/atlasChild/index.wxml index 2210f23..c52c945 100644 --- a/components/indexCom/atlasChild/index.wxml +++ b/components/indexCom/atlasChild/index.wxml @@ -1,6 +1,6 @@ - + 热门词云 diff --git a/components/indexCom/barometerChild/index.js b/components/indexCom/barometerChild/index.js index 969403b..efa5037 100644 --- a/components/indexCom/barometerChild/index.js +++ b/components/indexCom/barometerChild/index.js @@ -17,7 +17,7 @@ Component({ }, lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/barometerChild/index.json b/components/indexCom/barometerChild/index.json index 9f1abaa..3ebbc29 100644 --- a/components/indexCom/barometerChild/index.json +++ b/components/indexCom/barometerChild/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "c-echars": "/components/c-echars/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/barometerChild/index.wxml b/components/indexCom/barometerChild/index.wxml index b324d76..bc8b9b0 100644 --- a/components/indexCom/barometerChild/index.wxml +++ b/components/indexCom/barometerChild/index.wxml @@ -1,6 +1,6 @@ - + 正负调性 diff --git a/components/indexCom/dataChild/index.js b/components/indexCom/dataChild/index.js index 0c2e15e..e85ff1d 100644 --- a/components/indexCom/dataChild/index.js +++ b/components/indexCom/dataChild/index.js @@ -18,7 +18,7 @@ Component({ }, lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/dataChild/index.json b/components/indexCom/dataChild/index.json index 8e4b31d..32f8512 100644 --- a/components/indexCom/dataChild/index.json +++ b/components/indexCom/dataChild/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "c-echars": "../../c-echars/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/dataChild/index.wxml b/components/indexCom/dataChild/index.wxml index 7248a3b..3ad862c 100644 --- a/components/indexCom/dataChild/index.wxml +++ b/components/indexCom/dataChild/index.wxml @@ -1,6 +1,6 @@ - + 入库数据趋势 diff --git a/components/indexCom/eventChild/index.js b/components/indexCom/eventChild/index.js index 03237ec..bd09a1e 100644 --- a/components/indexCom/eventChild/index.js +++ b/components/indexCom/eventChild/index.js @@ -9,7 +9,7 @@ Component({ lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/eventChild/index.json b/components/indexCom/eventChild/index.json index 78a0d45..d89cc35 100644 --- a/components/indexCom/eventChild/index.json +++ b/components/indexCom/eventChild/index.json @@ -1,6 +1,6 @@ { "component": true, "usingComponents": { - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/eventChild/index.wxml b/components/indexCom/eventChild/index.wxml index ab81bb8..3b40c87 100644 --- a/components/indexCom/eventChild/index.wxml +++ b/components/indexCom/eventChild/index.wxml @@ -1,6 +1,6 @@ - + 热点事件 diff --git a/components/indexCom/insightChild/index.js b/components/indexCom/insightChild/index.js index 03e334d..bfe11c7 100644 --- a/components/indexCom/insightChild/index.js +++ b/components/indexCom/insightChild/index.js @@ -9,7 +9,7 @@ Component({ }, lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/insightChild/index.json b/components/indexCom/insightChild/index.json index 8e4b31d..32f8512 100644 --- a/components/indexCom/insightChild/index.json +++ b/components/indexCom/insightChild/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "c-echars": "../../c-echars/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/insightChild/index.wxml b/components/indexCom/insightChild/index.wxml index 8e64e41..dcb2d7b 100644 --- a/components/indexCom/insightChild/index.wxml +++ b/components/indexCom/insightChild/index.wxml @@ -1,6 +1,6 @@ - + 品牌传播声量 diff --git a/components/indexCom/mediaChild/index.js b/components/indexCom/mediaChild/index.js index c0ddb4a..39afff6 100644 --- a/components/indexCom/mediaChild/index.js +++ b/components/indexCom/mediaChild/index.js @@ -6,7 +6,7 @@ Component({ }, lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/mediaChild/index.json b/components/indexCom/mediaChild/index.json index 78a0d45..d89cc35 100644 --- a/components/indexCom/mediaChild/index.json +++ b/components/indexCom/mediaChild/index.json @@ -1,6 +1,6 @@ { "component": true, "usingComponents": { - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/mediaChild/index.wxml b/components/indexCom/mediaChild/index.wxml index 0681fd3..cea62fc 100644 --- a/components/indexCom/mediaChild/index.wxml +++ b/components/indexCom/mediaChild/index.wxml @@ -1,24 +1,23 @@ - - - - 传播重点媒体排行 - - 排名 - 媒体 - 传播量 - - - - - - - - {{index >= 9 ? index + 1 : '0' + (index + 1)}} - - {{item.name}} - {{item.value}} - + + + 传播重点媒体排行 + + 排名 + 媒体 + 传播量 + + + + + + + + {{index >= 9 ? index + 1 : '0' + (index + 1)}} + {{item.name}} + {{item.value}} + + \ No newline at end of file diff --git a/components/indexCom/portraitChild/index.js b/components/indexCom/portraitChild/index.js index 4d6288a..0a52e7c 100644 --- a/components/indexCom/portraitChild/index.js +++ b/components/indexCom/portraitChild/index.js @@ -11,7 +11,7 @@ Component({ }, lifetimes:{ attached(){ - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/portraitChild/index.json b/components/indexCom/portraitChild/index.json index 8e4b31d..32f8512 100644 --- a/components/indexCom/portraitChild/index.json +++ b/components/indexCom/portraitChild/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "c-echars": "../../c-echars/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/portraitChild/index.wxml b/components/indexCom/portraitChild/index.wxml index 7be26f0..69d1894 100644 --- a/components/indexCom/portraitChild/index.wxml +++ b/components/indexCom/portraitChild/index.wxml @@ -1,7 +1,7 @@ - + 性别 diff --git a/components/indexCom/rankingChild/index.json b/components/indexCom/rankingChild/index.json index 8e4b31d..32f8512 100644 --- a/components/indexCom/rankingChild/index.json +++ b/components/indexCom/rankingChild/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "c-echars": "../../c-echars/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/soundChild/index.js b/components/indexCom/soundChild/index.js index 7992eb0..d293152 100644 --- a/components/indexCom/soundChild/index.js +++ b/components/indexCom/soundChild/index.js @@ -11,7 +11,7 @@ Component({ }, lifetimes: { attached() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; this.getData(sTimeType, sStartTime, sEndTime); diff --git a/components/indexCom/soundChild/index.json b/components/indexCom/soundChild/index.json index 8e4b31d..32f8512 100644 --- a/components/indexCom/soundChild/index.json +++ b/components/indexCom/soundChild/index.json @@ -2,6 +2,6 @@ "component": true, "usingComponents": { "c-echars": "../../c-echars/index", - "time-component":"/components/timecomponent/index" + "time-component-home":"/components/timecomponentHome/index" } } \ No newline at end of file diff --git a/components/indexCom/soundChild/index.wxml b/components/indexCom/soundChild/index.wxml index 3a80047..e331d8f 100644 --- a/components/indexCom/soundChild/index.wxml +++ b/components/indexCom/soundChild/index.wxml @@ -1,6 +1,6 @@ - + 品牌传播声量 diff --git a/components/timeCustom/index.js b/components/timeCustom/index.js index 3abcff5..d19677f 100644 --- a/components/timeCustom/index.js +++ b/components/timeCustom/index.js @@ -8,7 +8,7 @@ Component({ sTimeType: '34', intervalSel: 0, show: false, - start: moment().format("YYYY-MM-DD HH:mm:ss"), + start: moment().format('YYYY-MM-DD HH:mm:ss'), startTime: moment().valueOf(), end: moment().format("YYYY-MM-DD HH:mm:ss"), endTime: moment().valueOf(), @@ -26,6 +26,14 @@ Component({ this.setData({ intervalSel: n }) + if(st == '4') { + this.setData({ + show: true, + start:moment(wx.getStorageSync('sStartTime')).format('YYYY-MM-DD HH:mm:ss'), + end:moment(wx.getStorageSync('sEndTime')).format('YYYY-MM-DD HH:mm:ss'), + + }) + } } else { wx.setStorageSync('sTimeType', 34); wx.setStorageSync('sStartTime', ''); @@ -43,12 +51,14 @@ Component({ let start = ""; let end = ""; if(this.data.intervalSel === 3) { - wx.setStorageSync('sStartTime', this.data.start); + let st = moment().subtract(1, 'day').format('YYYY-MM-DD HH:mm:ss') + wx.setStorageSync('sStartTime', st); wx.setStorageSync('sEndTime', this.data.end); - start = this.data.start; + start = st; end = this.data.end; this.setData({ - show: true + show: true, + start: st, }) } else { wx.setStorageSync('sStartTime', ''); diff --git a/components/timeCustom/index.wxml b/components/timeCustom/index.wxml index 84bf193..039b043 100644 --- a/components/timeCustom/index.wxml +++ b/components/timeCustom/index.wxml @@ -1,17 +1,15 @@ - {{item}} - + {{item}} + - + - + - + 结束时间不能小于开始时间 diff --git a/components/timeCustom/index.wxss b/components/timeCustom/index.wxss index 90b622b..dc99914 100644 --- a/components/timeCustom/index.wxss +++ b/components/timeCustom/index.wxss @@ -1,14 +1,15 @@ .timelist { - width: 672rpx; + width: calc(100% - 32px); + padding: 0px 16px; height: 80rpx; line-height: 80rpx; - margin:0 auto; + margin: 0 auto; display: flex; flex-wrap: nowrap; background: white; - justify-content:space-between; - padding-left: 8rpx; - padding-right: 8rpx; + justify-content: space-between; + /* padding-left: 8rpx; + padding-right: 8rpx; */ margin-top: 32rpx; /* border-radius: 8rpx; */ } @@ -30,9 +31,15 @@ margin-top: 8rpx; border-radius: 4rpx; } + .tc-d-t { font-size: 14px; padding: 15px 0px; color: #909497; text-align: center; +} + +.t-list { + width: 100%; + /* padding: 0px 16px; */ } \ No newline at end of file diff --git a/contrastPackages/brandRatio/index.js b/contrastPackages/brandRatio/index.js index a078246..7f2b5b5 100644 --- a/contrastPackages/brandRatio/index.js +++ b/contrastPackages/brandRatio/index.js @@ -2,143 +2,148 @@ import Dialog from '../../miniprogram_npm/@vant/weapp/dialog/dialog'; const app = getApp() Page({ - /** - * 页面的初始数据 - */ - data: { - boxArr: new Array(6), - tabActive: 0, - result: [], - sonCom: true, - popupShow: false, - mockData:[], - tempLate:['一','二','三','四','五','六',] - }, + /** + * 页面的初始数据 + */ + data: { + boxArr: new Array(6), + tabActive: 0, + result: [], + sonCom: true, + popupShow: false, + mockData: [], + tempLate: ['一', '二', '三', '四', '五', '六', ] + }, - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - this.setData({ - boxArr: wx.getStorageSync('brandData'), - result:wx.getStorageSync('brandData').map(ele=>{ - return JSON.stringify(ele) - }) - }) - wx.setStorageSync('brandRatioTime', { - sTimeType: '34' - }) - this.brandReq() - }, - onUnload(){ - wx.setStorageSync('brandRatioTime', { - sTimeType: '34' - }) - }, - onChange(event) { - const {detail} = event - const result = [] - for(let i=0;i<=detail.length;i++){ - if(detail[i]=='null') detail.splice(i,1),i-- - } - if(detail.length>6){ - Dialog.alert({ - message: '至多六个', - context:this - }) - return - } - for(let i of detail){ - result.push(JSON.parse(i)) - } - result.length = 6 - this.setData({ - result:detail, - boxArr:result - }) - }, - changeTab(val) { - let n = val.detail.index; - this.setData({ - tabActive: n - }) - }, - addBrand() { - this.setData({ - popupShow: true - }) - }, - popupClose() { - this.setData({ - popupShow: false - }) - wx.setStorageSync('brandData', this.data.boxArr) - this.reLoad() - }, - del(e) { - let filter = this.data.result.filter(ele=>{ - return ele!= "null" - }) - if(filter.length==2){ - Dialog.alert({ - message: '至少需要两个品牌才可以对比哦！', - context:this - }) - return - } - let index = e.currentTarget.dataset.index - let result = [...this.data.result] - let boxArr = [] - result.splice(index, 1) - for (let i of result) { - boxArr.push(JSON.parse(i)) - } - boxArr.length = 6 - this.setData({ - result: result, - boxArr: boxArr - }) - wx.setStorageSync('brandData', this.data.boxArr) - this.reLoad() - }, - changeTime(event) { - let { - detail - } = event - wx.setStorageSync('brandRatioTime', detail) - this.reLoad() - }, - //获取品牌 - brandReq() { - app.globalData.request({ - action: 'getUserBrand', - token: wx.getStorageSync('token'), - }).then(res => { - let arr = [] - for (let i = 65; i <= 90; i++) { - arr.push({ - name: String.fromCharCode(i), - data: [] - }); - } - for (let i of res) { - for (let j of arr) { - if (i.firstword == j.name) { - j.data.push(i) - } - } - } - this.setData({ - mockData: arr - }) - }) - }, - reLoad() { - this.setData({ - sonCom: false - }) - this.setData({ - sonCom: true - }) + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + this.setData({ + boxArr: wx.getStorageSync('brandData'), + result: wx.getStorageSync('brandData').map(ele => { + return JSON.stringify(ele) + }) + }) + wx.setStorageSync('brandRatioTime', { + sTimeType: '34' + }) + this.brandReq() + }, + onUnload() { + wx.setStorageSync('brandRatioTime', { + sTimeType: '34' + }) + }, + onChange(event) { + + this.triggerEvent('hide') + const { + detail + } = event + const result = [] + for (let i = 0; i <= detail.length; i++) { + if (detail[i] == 'null') detail.splice(i, 1), i-- } + if (detail.length > 6) { + Dialog.alert({ + message: '至多六个', + context: this + }) + return + } + for (let i of detail) { + result.push(JSON.parse(i)) + } + result.length = 6 + this.setData({ + result: detail, + boxArr: result + }) + }, + changeTab(val) { + let n = val.detail.index; + this.setData({ + tabActive: n + }) + }, + addBrand() { + this.setData({ + popupShow: true + }) + }, + popupClose() { + this.setData({ + popupShow: false + }) + wx.setStorageSync('brandData', this.data.boxArr) + this.reLoad() + }, + del(e) { + this.triggerEvent('hide') + let filter = this.data.result.filter(ele => { + return ele != "null" + }) + if (filter.length == 2) { + Dialog.alert({ + message: '至少需要两个品牌才可以对比哦！', + context: this + }) + return + } + let index = e.currentTarget.dataset.index + let result = [...this.data.result] + let boxArr = [] + result.splice(index, 1) + for (let i of result) { + boxArr.push(JSON.parse(i)) + } + boxArr.length = 6 + this.setData({ + result: result, + boxArr: boxArr + }) + wx.setStorageSync('brandData', boxArr) + this.reLoad() + }, + changeTime(event) { + let { + detail + } = event + wx.setStorageSync('brandRatioTime', detail) + this.reLoad() + }, + //获取品牌 + brandReq() { + app.globalData.request({ + action: 'getUserBrand', + token: wx.getStorageSync('token'), + }).then(res => { + let arr = [] + for (let i = 65; i <= 90; i++) { + arr.push({ + name: String.fromCharCode(i), + data: [] + }); + } + for (let i of res) { + for (let j of arr) { + if (i.firstword == j.name) { + j.data.push(i) + } + } + } + this.setData({ + mockData: arr + }) + }) + }, + reLoad() { + this.setData({ + sonCom: false + }) + this.setData({ + sonCom: true + }) + } }) \ No newline at end of file diff --git a/contrastPackages/brandRatio/index.wxml b/contrastPackages/brandRatio/index.wxml index 46747df..d7fb69d 100644 --- a/contrastPackages/brandRatio/index.wxml +++ b/contrastPackages/brandRatio/index.wxml @@ -1,5 +1,6 @@ + @@ -11,7 +12,7 @@ 添加品牌{{ tempLate[index]}} - + × 删除 @@ -21,8 +22,9 @@ {{item.brandname}} - + + diff --git a/contrastPackages/brandRatio/index.wxss b/contrastPackages/brandRatio/index.wxss index 59f7f28..9512408 100644 --- a/contrastPackages/brandRatio/index.wxss +++ b/contrastPackages/brandRatio/index.wxss @@ -11,7 +11,8 @@ page { .add1 { width: 750rpx; - margin-top: 16rpx; + margin-top: 8rpx; + padding: 16rpx 0; overflow-x: scroll; white-space: nowrap; } @@ -194,4 +195,8 @@ page { .my_cell text { font-size: 28rpx; margin-left: 24rpx; +} +.top-brand-switch { + background: #006BFF; + /* padding: 2rpx 32rpx rpx 32rpx */ } \ No newline at end of file diff --git a/contrastPackages/brandRatio/weibo/index.wxml b/contrastPackages/brandRatio/weibo/index.wxml index a08c249..97ff45d 100644 --- a/contrastPackages/brandRatio/weibo/index.wxml +++ b/contrastPackages/brandRatio/weibo/index.wxml @@ -107,7 +107,7 @@ - + 微博用户性别对比 diff --git a/pages/brandCrisis/index.js b/pages/brandCrisis/index.js index 3e61c23..9b16415 100644 --- a/pages/brandCrisis/index.js +++ b/pages/brandCrisis/index.js @@ -70,7 +70,7 @@ Page({ }) }, getData() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; let sSeriesName = wx.getStorageSync("sSeriesName") || ''; @@ -128,7 +128,7 @@ Page({ }) }, getCrisis() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; let sCrisis = wx.getStorageSync("sCrisis") || '1,2,3'; @@ -157,7 +157,7 @@ Page({ }) }, getHotEventsList() { - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; let sSeriesName = wx.getStorageSync("sSeriesName") || ''; @@ -184,7 +184,7 @@ Page({ this.setData({ showChart: false }) - let sTimeType = wx.getStorageSync("sTimeType") || 34; + let sTimeType = wx.getStorageSync("sTimeType2") || 34; let sStartTime = wx.getStorageSync("sStartTime") || ''; let sEndTime = wx.getStorageSync("sEndTime") || ''; let sSeriesName = wx.getStorageSync("sSeriesName") || ''; diff --git a/pages/brandCrisis/index.json b/pages/brandCrisis/index.json index 3e35b61..5efa40c 100644 --- a/pages/brandCrisis/index.json +++ b/pages/brandCrisis/index.json @@ -1,6 +1,6 @@ { "usingComponents": { "c-echars": "../../components/c-echars/index", - "time-component": "../../components/timecomponent/index" + "time-component-home":"../../components/timecomponentHome/index" } } \ No newline at end of file diff --git a/pages/brandCrisis/index.wxml b/pages/brandCrisis/index.wxml index bea1f25..39268ca 100644 --- a/pages/brandCrisis/index.wxml +++ b/pages/brandCrisis/index.wxml @@ -55,7 +55,7 @@ - + 品牌信息 diff --git a/pages/insight/pages/addTheme/index.js b/pages/insight/pages/addTheme/index.js index 0b2d351..49d3676 100644 --- a/pages/insight/pages/addTheme/index.js +++ b/pages/insight/pages/addTheme/index.js @@ -150,19 +150,19 @@ Page({ }); }, onConfirm(event) { - var time = moment(event.detail).format("YYYY-MM-DD HH:mm:ss") + var time = event.detail this.setData({ show1: false, StartTime: time, - start: time + start: moment(time).format('YYYY-MM-DD HH:mm:ss') //显示 }); }, onConfirm2(event) { - var time = moment(event.detail).format("YYYY-MM-DD HH:mm:ss") + var time = event.detail this.setData({ show2: false, EndTime: time, - end: time + end: moment(time).format('YYYY-MM-DD HH:mm:ss') //显示 }); }, onDisplay() { @@ -303,7 +303,6 @@ Page({ }, // 分析词设置 bindAnalyzeWord(event) { - this.setData({ AnalyzeWord: event.detail.value }) @@ -325,7 +324,6 @@ Page({ }, // 定向监测 bindSource(event) { - console.log('vf',this.data.AnalyzeWord) this.setData({ Source: event.detail.value }) @@ -357,19 +355,20 @@ Page({ let Statu = this.data.Statu if (Statu == 0) { let dtData = { - "AnalyzeWord": this.data.totalMode == 1 ? this.data.highAnalizeWord : this.data.AnalyzeWord, + "AnalyzeWord": this.data.totalMode == 1 ? this.data.highAnalizeWord.replace("+","%2B") : this.data.AnalyzeWord.replace("+","%2B"), "HuoWord": this.data.HuoWord, "PaiChu": this.data.PaiChu, "IsAdvancedQuery": this.data.totalMode == 0 && this.data.currWordType == '必选词和的关系' ? 0 : this.data.totalMode == 1 ? 1 : 2, "Source": this.data.Source, "UserAuthor": this.data.UserAuthor }; + let jsonObj = { "Guids": null, "Name": this.data.Name, "Classify": 0, - "StartTime": this.data.StartTime, - "EndTime": this.data.EndTime, + "StartTime": this.data.start, + "EndTime": this.data.end, "Types": "theme_v6", "DetailsData": [dtData], "Warning": { @@ -385,7 +384,7 @@ Page({ var dtJson = JSON.stringify(jsonObj) }else{ let dtData = { - "AnalyzeWord": this.data.totalMode == 1 ? this.data.highAnalizeWord : this.data.AnalyzeWord, + "AnalyzeWord": this.data.totalMode == 1 ? this.data.highAnalizeWord.replace("+","%2B") : this.data.AnalyzeWord.replace("+","%2B"), "HuoWord": this.data.HuoWord, "PaiChu": this.data.PaiChu, "IsAdvancedQuery": this.data.totalMode == 0 && this.data.currWordType == '必选词和的关系' ? 0 : this.data.totalMode == 1 ? 1 : 2, @@ -396,8 +395,8 @@ Page({ "Guids": null, "Name": this.data.Name, "Classify": 0, - "StartTime": this.data.StartTime, - "EndTime": this.data.EndTime, + "StartTime": this.data.start, + "EndTime": this.data.end, "Types": "theme_v6", "DetailsData": [dtData], } diff --git a/pages/insight/pages/addTheme/index.wxml b/pages/insight/pages/addTheme/index.wxml index ae18f25..b4fa6f5 100644 --- a/pages/insight/pages/addTheme/index.wxml +++ b/pages/insight/pages/addTheme/index.wxml @@ -88,7 +88,7 @@ 必选词（必选词逗号间是和的关系） - + 可选词（可选词与必选词是或的关系） diff --git a/pages/insight/pages/brandInsight/TailInsight/index.wxml b/pages/insight/pages/brandInsight/TailInsight/index.wxml index 7aefaca..3509e99 100644 --- a/pages/insight/pages/brandInsight/TailInsight/index.wxml +++ b/pages/insight/pages/brandInsight/TailInsight/index.wxml @@ -20,8 +20,8 @@ 尾翼整体调性 - - + + diff --git a/pages/insight/pages/brandInsight/TailInsight/index.wxss b/pages/insight/pages/brandInsight/TailInsight/index.wxss index 8335f9f..1bfb983 100644 --- a/pages/insight/pages/brandInsight/TailInsight/index.wxss +++ b/pages/insight/pages/brandInsight/TailInsight/index.wxss @@ -33,6 +33,11 @@ padding: 0 32rpx; height: 360rpx; } +.ta-chart-item2{ + width: calc(100% - 32rpx); + /* padding: 0 32rpx; */ + height: 360rpx; +} .ranking{ display: flex; justify-content: space-between; diff --git a/pages/insight/pages/brandInsight/brandDataList/index.wxml b/pages/insight/pages/brandInsight/brandDataList/index.wxml index 528673a..24ba257 100644 --- a/pages/insight/pages/brandInsight/brandDataList/index.wxml +++ b/pages/insight/pages/brandInsight/brandDataList/index.wxml @@ -78,7 +78,7 @@ - 生成数据 + 所有数据 diff --git a/pages/insight/pages/brandInsight/weiboInsight/index.wxml b/pages/insight/pages/brandInsight/weiboInsight/index.wxml index 7ee207b..97c374f 100644 --- a/pages/insight/pages/brandInsight/weiboInsight/index.wxml +++ b/pages/insight/pages/brandInsight/weiboInsight/index.wxml @@ -26,7 +26,7 @@ 微博KOL - + @@ -50,7 +50,7 @@ 微博内容类型 - + @@ -83,7 +83,7 @@ - + diff --git a/pages/insight/pages/editTheme/index.js b/pages/insight/pages/editTheme/index.js index 9249d54..35df17c 100644 --- a/pages/insight/pages/editTheme/index.js +++ b/pages/insight/pages/editTheme/index.js @@ -95,7 +95,6 @@ Page({ token: wx.getStorageSync('token') || 't%2BrswgjvzGM=', Guids: this.data.Guid, }).then(res => { - // todo: 回显预警信息 let warning = res.Warning.Es || {}; let that = this; @@ -152,10 +151,7 @@ Page({ startShow: new Date(res.StartTime).valueOf(), endShow: new Date(res.EndTime).valueOf(), Statu:res.Warning.Statu - - }) - console.log('xf',res.Warning.Statu) }); }, @@ -427,7 +423,7 @@ Page({ } }); let dtData = { - "AnalyzeWord": this.data.AnalyzeWord, + "AnalyzeWord": this.data.AnalyzeWord.replace("+","%2B"), "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/eventInsight/evDatalist/index.wxml b/pages/insight/pages/eventInsight/evDatalist/index.wxml index 2e2a9ed..30ea4b9 100644 --- a/pages/insight/pages/eventInsight/evDatalist/index.wxml +++ b/pages/insight/pages/eventInsight/evDatalist/index.wxml @@ -81,7 +81,7 @@ - 生成数据 + 所有数据 diff --git a/pages/insight/pages/eventInsight/evWeibo/index.wxss b/pages/insight/pages/eventInsight/evWeibo/index.wxss index 987ad1c..fb14fde 100644 --- a/pages/insight/pages/eventInsight/evWeibo/index.wxss +++ b/pages/insight/pages/eventInsight/evWeibo/index.wxss @@ -56,7 +56,7 @@ .circle-chart { width: 50%; height: 340rpx; - margin-left: 24rpx; + /* margin-left: 24rpx; */ } .circle-data { width: 50%; diff --git a/pages/insight/pages/modalInsight/modalDataList/index.wxml b/pages/insight/pages/modalInsight/modalDataList/index.wxml index fdd8f49..b98fe03 100644 --- a/pages/insight/pages/modalInsight/modalDataList/index.wxml +++ b/pages/insight/pages/modalInsight/modalDataList/index.wxml @@ -78,7 +78,7 @@ - 生成数据 + 所有数据 diff --git a/pages/insight/pages/modalInsight/weiboInsight/index.wxml b/pages/insight/pages/modalInsight/weiboInsight/index.wxml index bd79a0b..5e5760f 100644 --- a/pages/insight/pages/modalInsight/weiboInsight/index.wxml +++ b/pages/insight/pages/modalInsight/weiboInsight/index.wxml @@ -26,7 +26,7 @@ 微博KOL - + @@ -50,7 +50,7 @@ 微博内容类型 - + @@ -83,7 +83,7 @@ - + diff --git a/pages/insight/pages/themeBoard/index.wxml b/pages/insight/pages/themeBoard/index.wxml index 6257403..a6bd2f8 100644 --- a/pages/insight/pages/themeBoard/index.wxml +++ b/pages/insight/pages/themeBoard/index.wxml @@ -121,8 +121,8 @@ 调性分布占比 - - + + @@ -170,7 +170,7 @@ - + @@ -252,8 +252,8 @@ 调性分布占比 - - + + diff --git a/pages/insight/pages/themeBoard/index.wxss b/pages/insight/pages/themeBoard/index.wxss index 31361c5..7452416 100644 --- a/pages/insight/pages/themeBoard/index.wxss +++ b/pages/insight/pages/themeBoard/index.wxss @@ -179,7 +179,7 @@ .circle-data { width: 50%; height: 340rpx; - padding: 0 10rpx ; + padding: 10rpx 20rpx ; } .circle-data-item { color: #999999; diff --git a/pages/insight/pages/themeList/index.wxml b/pages/insight/pages/themeList/index.wxml index b053497..b3facda 100644 --- a/pages/insight/pages/themeList/index.wxml +++ b/pages/insight/pages/themeList/index.wxml @@ -115,7 +115,7 @@ - 生成数据 + 所有数据 数据看板 diff --git a/pages/insight/pages/themeList/index.wxss b/pages/insight/pages/themeList/index.wxss index 0af6cf0..685b3d0 100644 --- a/pages/insight/pages/themeList/index.wxss +++ b/pages/insight/pages/themeList/index.wxss @@ -60,7 +60,8 @@ } .top-time .van-checkbox{ display: inline-block !important; - margin-bottom: -3px + margin-bottom: -3px; + font-size: 10px; } /* 筛选项 */ .filter { diff --git a/pages/insight/themeChild/index.js b/pages/insight/themeChild/index.js index ef54d99..71f3a4e 100644 --- a/pages/insight/themeChild/index.js +++ b/pages/insight/themeChild/index.js @@ -1,73 +1,78 @@ const app = getApp(); Component({ - data: { - tabActive: 0, - themeData: [], + data: { + tabActive: 0, + themeData: [], + }, + methods: { + toAddTheme() { + this.triggerEvent('hide') + wx.navigateTo({ + url: "/pages/insight/pages/addTheme/index" + }) }, - methods: { - toAddTheme() { - wx.navigateTo({ - url: "/pages/insight/pages/addTheme/index" - }) - }, - changeTab(event) { - this.setData({ tabActive: event.detail.index}); - this.getData() - }, - getData() { + changeTab(event) { + this.setData({ + tabActive: event.detail.index + }); + this.getData() + }, + getData() { + app.globalData.request({ + action: 'getSchemeDataToTheme', + token: wx.getStorageSync('token') || 't%2BrswgjvzGM=', + pageIndex: 1, + pageSize: 100, + sType: this.data.tabActive == 0 ? 'now' : 'former' + }).then(res => { + let data = res; + let nd = new Date().valueOf(); + data.forEach(ele => { + if (new Date(ele.EndTime).valueOf() < nd) { + ele.Classify = 1 + } + }) + this.setData({ + themeData: data + }) + }); + }, + toThemeDataList(event) { + let id = event.currentTarget.dataset.id.Guids; + let start = event.currentTarget.dataset.id.StartTime; + let end = event.currentTarget.dataset.id.EndTime; + let Name = event.currentTarget.dataset.id.Name; + wx.navigateTo({ + url: '/pages/insight/pages/themeList/index' + '?Guid=' + id + '&StartTime=' + start + '&EndTime=' + end + '&Name=' + Name, + }) + }, + editTheme(event) { + let id = event.currentTarget.dataset.id + this.triggerEvent('hide') + wx.navigateTo({ + url: '/pages/insight/pages/editTheme/index' + '?Guid=' + id, + }) + }, + deleteTheme(event) { + wx.showModal({ + title: '是否要删除该主题？', + success: (result) => { + if (result.cancel == false) { app.globalData.request({ - action: 'getSchemeDataToTheme', - token: wx.getStorageSync('token') || 't%2BrswgjvzGM=', - pageIndex: 1, - pageSize: 100, - sType: this.data.tabActive == 0 ? 'now' : 'former' + action: 'delCarBigDataByGuid', + token: wx.getStorageSync('token') || 't%2BrswgjvzGM=', + Guids: event.currentTarget.dataset.id }).then(res => { - let data = res; - let nd = new Date().valueOf(); - data.forEach(ele => { - if(new Date(ele.EndTime).valueOf() < nd) { - ele.Classify = 1 - } - }) - this.setData({themeData: data}) + this.getData() }); - }, - toThemeDataList(event) { - let id = event.currentTarget.dataset.id.Guids; - let start = event.currentTarget.dataset.id.StartTime; - let end = event.currentTarget.dataset.id.EndTime; - let Name = event.currentTarget.dataset.id.Name; - wx.navigateTo({ - url: '/pages/insight/pages/themeList/index' + '?Guid=' + id +'&StartTime='+start+'&EndTime='+end+'&Name='+Name, - }) - }, - editTheme(event) { - let id = event.currentTarget.dataset.id - this.triggerEvent('hide') - wx.navigateTo({ - url: '/pages/insight/pages/editTheme/index' + '?Guid=' + id, - }) - }, - deleteTheme(event) { - wx.showModal({ - title: '是否要删除该主题？', - success: (result) => { - if(result.cancel == false) { - app.globalData.request({ - action: 'delCarBigDataByGuid', - token: wx.getStorageSync('token') || 't%2BrswgjvzGM=', - Guids: event.currentTarget.dataset.id - }).then(res => { - this.getData() - }); - } - } - }); - } - }, - lifetimes: { - attached() { - this.getData() + } } + }); + } + }, + lifetimes: { + attached() { + this.getData() } + } }) \ No newline at end of file diff --git a/pages/varComm/index.js b/pages/varComm/index.js index 4451498..95befca 100644 --- a/pages/varComm/index.js +++ b/pages/varComm/index.js @@ -1,36 +1,36 @@ // index.js Page({ - data: { - active: 0, - showChart: true, - wshow: true, - }, - onShow() { - if (!wx.getStorageSync('token')) { - wx.navigateTo({ - url: "/pages/mine/pages/bindUser/index?isHome=1", - }) - } else { - this.getTabBar().init(); - if (this.data.active == 2 || this.data.active == 3 ||this.data.active == 1) { - this.reLoad() - } - } - - }, - changeTab(val) { - let n = val.detail.index; - this.setData({ - active: n - }) - }, - reLoad() { - this.setData({ - wshow: false - }) - this.setData({ - wshow: true - }) + data: { + active: 0, + showChart: true, + wshow: true, + }, + onShow() { + if (!wx.getStorageSync('token')) { + wx.navigateTo({ + url: "/pages/mine/pages/bindUser/index?isHome=1", + }) + } else { + this.getTabBar().init(); + if (this.data.active == 2 || this.data.active == 3 || this.data.active == 1) { + this.reLoad() + } } + this.setData({ + wshow: true + }) + + }, + themeHide() { + this.setData({ + wshow: false + }) + }, + changeTab(val) { + let n = val.detail.index; + this.setData({ + active: n + }) + }, }); \ No newline at end of file diff --git a/pages/varComm/index.wxml b/pages/varComm/index.wxml index 154b329..1772a22 100644 --- a/pages/varComm/index.wxml +++ b/pages/varComm/index.wxml @@ -1,9 +1,17 @@ - - - - - - - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pages/varComm/pages/theme/index.wxml b/pages/varComm/pages/theme/index.wxml index 129aabf..0cd8c30 100644 --- a/pages/varComm/pages/theme/index.wxml +++ b/pages/varComm/pages/theme/index.wxml @@ -10,7 +10,6 @@ 添加主题{{tempLate[index]}} - @@ -42,7 +41,7 @@ - + {{item.AddTime}}