diff --git a/src/api/EventDetails/index.js b/src/api/EventDetails/index.js index ce77ca7..a23d7bc 100644 --- a/src/api/EventDetails/index.js +++ b/src/api/EventDetails/index.js @@ -49,7 +49,7 @@ export function getEventsSourceTypeByEventsType0528(params) { } // 品牌数据-数据传播总量 export function getBrandOverviewCount0528(params) { - let obj = Object.assign({action: 'getBrandOverviewCount0528', sType: 'BrandOverview'}, params) + let obj = Object.assign({action: 'getBrandOverviewCount0528', sType: 'HotEvent0528'}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', diff --git a/src/api/ModelEventdetails/index.js b/src/api/ModelEventdetails/index.js index d9bff40..cab24cf 100644 --- a/src/api/ModelEventdetails/index.js +++ b/src/api/ModelEventdetails/index.js @@ -49,7 +49,7 @@ export function getEventsSourceTypeByEventsType0528(params) { } // 品牌数据-数据传播总量 export function getBrandOverviewCount0528(params) { - let obj = Object.assign({action: 'getBrandOverviewCount0528', sType: 'BrandOverview'}, params) + let obj = Object.assign({action: 'getBrandOverviewCount0528', sType: 'HotEvent0528'}, params) return httpService({ url: `/api/v6.ashx`, method: 'post', diff --git a/src/views/BrandInsight/brandTop/index.vue b/src/views/BrandInsight/brandTop/index.vue index dcc0792..809928e 100644 --- a/src/views/BrandInsight/brandTop/index.vue +++ b/src/views/BrandInsight/brandTop/index.vue @@ -10,7 +10,7 @@
- +
@@ -28,7 +28,7 @@ export default { token: "", sBrand: '奥迪', }, - opt: {} + opt: {}, } }, created() { @@ -51,6 +51,12 @@ export default { this.opt = createOpt(dx,ds); this.load = false; }) + }, + clickEchars(data) { + let ele = data[0]; + let model = ele.axisValueLabel; + this.setModel({name: model}); + this.$router.push("/modelInsight"); } } } diff --git a/src/views/BrandInsight/forumCommunicationTrend/opt.js b/src/views/BrandInsight/forumCommunicationTrend/opt.js index 8fb08c5..1cad94e 100644 --- a/src/views/BrandInsight/forumCommunicationTrend/opt.js +++ b/src/views/BrandInsight/forumCommunicationTrend/opt.js @@ -11,10 +11,10 @@ import { bigNumberTransform } from "@/utils/gol/dataTool" export default function createOpt(dx = [], ds = []) { return { grid: { - top: "16px", - left: "16px", - right: "16px", - bottom: "16px", + top: "15%", + left: "3%", + right: "5%", + bottom: "3%", containLabel: true, }, tooltip: { @@ -42,11 +42,19 @@ export default function createOpt(dx = [], ds = []) { axisLabel : { formatter: (value) => { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i
- +
@@ -51,7 +51,13 @@ export default { this.opt = createOpt(dx, ds); this.load = false; }) - } + }, + clickEchars(data) { + let ele = data[0]; + let model = ele.axisValueLabel; + this.setModel({name: model}); + this.$router.push("/modelInsight"); + } } } diff --git a/src/views/BrandInsight/titsopo/opt.js b/src/views/BrandInsight/titsopo/opt.js index 023819c..bfc3630 100644 --- a/src/views/BrandInsight/titsopo/opt.js +++ b/src/views/BrandInsight/titsopo/opt.js @@ -52,7 +52,7 @@ export default function createOpt(dx = [], ds = []) { return { grid: { left: '3%', - right: '2%', + right: '5%', bottom: '3%', top: '15%', containLabel: true @@ -94,11 +94,19 @@ export default function createOpt(dx = [], ds = []) { axisLabel: { formatter: (value) => { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i
- - + + + + + + +
diff --git a/src/views/BrandInsight/weiboVolumeTrend/opt.js b/src/views/BrandInsight/weiboVolumeTrend/opt.js index 1098d0b..90be915 100644 --- a/src/views/BrandInsight/weiboVolumeTrend/opt.js +++ b/src/views/BrandInsight/weiboVolumeTrend/opt.js @@ -11,10 +11,10 @@ import { bigNumberTransform } from "@/utils/gol/dataTool" export default function createOpt(dx = [], ds = []) { return { grid: { - top: "16px", - left: "16px", - right: "16px", - bottom: "16px", + top: "15%", + left: "3%", + right: "5%", + bottom: "3%", containLabel: true, }, tooltip: { @@ -42,11 +42,19 @@ export default function createOpt(dx = [], ds = []) { axisLabel : { formatter: (value) => { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i { + let str = bigNumberTransform(value); + return str; + } + }, splitLine: { lineStyle: { type: "dashed", // y轴分割线类型 diff --git a/src/views/ForumDetails/index.vue b/src/views/ForumDetails/index.vue index 8203d9e..42cf385 100644 --- a/src/views/ForumDetails/index.vue +++ b/src/views/ForumDetails/index.vue @@ -18,7 +18,7 @@ {{this.form.sBrand}}
- 洞察分析:在{{msg}} + 洞察分析:在
diff --git a/src/views/ForumDetails/optD1.js b/src/views/ForumDetails/optD1.js index 891a7dd..8713368 100644 --- a/src/views/ForumDetails/optD1.js +++ b/src/views/ForumDetails/optD1.js @@ -13,7 +13,7 @@ export default function createOptD1(dx = [], ds = []) { grid: { top: "16px", left: "16px", - right: "16px", + right: "20px", bottom: "16px", containLabel: true, }, @@ -42,11 +42,19 @@ export default function createOptD1(dx = [], ds = []) { axisLabel: { formatter: (value) => { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i
- +
+ +

{{ ModalText }}

+
@@ -33,7 +36,10 @@ export default { sQueryType: 1 }, opt: {}, - pdata: [] + pdata: [], + + visible: false, + ModalText: "" } }, created() { @@ -67,7 +73,30 @@ export default { ds.push(value) }); this.opt = createOpt(dy,ds); - } + }, + handleCancel() { + this.visible = false; + }, + handleOk() { + this.$router.push('/login') + }, + clickEchars(data) { + if (!this.getToken) { + this.visible = true; + this.ModalText = "您还未登录,是否前往登录" + return; + } + let ele = data[0]; + if(this.type === 1) { + let model = ele.axisValueLabel + this.setModel({name: model}); + this.$router.push("/modelInsight"); + } else { + let brand = ele.axisValueLabel; + this.setBrand({brandname: brand}); + this.$router.push("/brandInsight"); + } + } } }; diff --git a/src/views/MarketingAnalysis/brandSalesRankingTOP10Ranking/index.vue b/src/views/MarketingAnalysis/brandSalesRankingTOP10Ranking/index.vue index dea1cd7..4a95c80 100644 --- a/src/views/MarketingAnalysis/brandSalesRankingTOP10Ranking/index.vue +++ b/src/views/MarketingAnalysis/brandSalesRankingTOP10Ranking/index.vue @@ -11,7 +11,7 @@
- +
@@ -53,6 +53,12 @@ export default { this.load = false; }); }, + clickEchars(data) { + let ele = data[0]; + let brand = ele.axisValueLabel; + this.setBrand({brandname: brand}); + this.$router.push("/brandInsight"); + } }, }; diff --git a/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue b/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue index c9e7659..8d7744d 100644 --- a/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue +++ b/src/views/MarketingAnalysis/brandVolumeTOP10/index.vue @@ -12,7 +12,7 @@ 营销对比
- +
@@ -57,6 +57,12 @@ export default { goPath() { this.$router.push({path: "/mcIndex"}) }, + clickEchars(data) { + let ele = data[0]; + let brand = ele.axisValueLabel; + this.setBrand({brandname: brand}); + this.$router.push("/brandInsight"); + } }, }; diff --git a/src/views/ModelForumDetails/mfdCommunicationTrend/opt.js b/src/views/ModelForumDetails/mfdCommunicationTrend/opt.js index 4656b5c..991a155 100644 --- a/src/views/ModelForumDetails/mfdCommunicationTrend/opt.js +++ b/src/views/ModelForumDetails/mfdCommunicationTrend/opt.js @@ -36,11 +36,19 @@ export default function createOpt(dx = [], ds = []) { axisLabel: { formatter: (value) => { let rex = "00:00:00"; - let str = ""; - if(value.indexOf(rex) === -1) { + let isCont = false; + let str = value; + for(let i = 0;i
- {{this.form.sBrand|doStr(4)}} + {{this.form.sSeriesName|doStr(8)}}
- {{this.form.sSeriesName|doStr(8)}} +
diff --git a/src/views/ModelInsight/ml-brand-data/index.vue b/src/views/ModelInsight/ml-brand-data/index.vue index 03950c9..bb88dcd 100644 --- a/src/views/ModelInsight/ml-brand-data/index.vue +++ b/src/views/ModelInsight/ml-brand-data/index.vue @@ -9,7 +9,7 @@