diff --git a/src/api/SaleRankMarket/index.js b/src/api/SaleRankMarket/index.js index 6240487..e1fcf6a 100644 --- a/src/api/SaleRankMarket/index.js +++ b/src/api/SaleRankMarket/index.js @@ -73,7 +73,7 @@ export function getSalesGrowthRatio(params) { } }) } -// 乘用车 - 总销量 - 新能源市场 +// 乘用车 - 总销量 - 传统燃油车 export function getSalesGrowthRatioByFuel(params) { let obj = Object.assign({action: 'getSalesGrowthRatioByFuel', sType: 'Marketing'}, params) return httpService({ @@ -85,6 +85,18 @@ export function getSalesGrowthRatioByFuel(params) { } }) } +// 乘用车 - 总销量 - 新能源市场 +export function getSalesGrowthRatioByFuelE(params) { + let obj = Object.assign({action: 'getSalesGrowthRatioByFuelE', sType: 'Marketing'}, params) + return httpService({ + url: `/api/v6.ashx`, + method: 'post', + data: obj, + headers: { + 'content-type': 'application/x-www-form-urlencoded' + } + }) +} // 乘用车 - 能源类型 export function getSalesEnergyTypes(params) { diff --git a/src/views/KeyMediaBrand/weiboCharacters/index.vue b/src/views/KeyMediaBrand/weiboCharacters/index.vue index 02d0663..c061849 100644 --- a/src/views/KeyMediaBrand/weiboCharacters/index.vue +++ b/src/views/KeyMediaBrand/weiboCharacters/index.vue @@ -11,6 +11,7 @@
diff --git a/src/views/KeyMediaEvent/popularEventsList/index.vue b/src/views/KeyMediaEvent/popularEventsList/index.vue index 7236589..0d2a847 100644 --- a/src/views/KeyMediaEvent/popularEventsList/index.vue +++ b/src/views/KeyMediaEvent/popularEventsList/index.vue @@ -50,7 +50,7 @@ export default { }, methods: { getData() { - let obj = Object.assign({}, this.getCtime2, this.form); + let obj = Object.assign({}, this.form); // this.load = true; getList(obj).then(res => { let data = res.data; diff --git a/src/views/KeyMediaEvent/weiboCharacters/index.vue b/src/views/KeyMediaEvent/weiboCharacters/index.vue index a948a0f..d8d162b 100644 --- a/src/views/KeyMediaEvent/weiboCharacters/index.vue +++ b/src/views/KeyMediaEvent/weiboCharacters/index.vue @@ -11,6 +11,7 @@
@@ -107,7 +108,7 @@ export default { methods: { // 获取后台数据 getData() { - let obj = Object.assign({}, this.getCtime2, this.form); + let obj = Object.assign({}, this.form); // this.load = true; getUserAttestationGroupBy(obj).then((res) => { let data = res.data || {}; @@ -141,20 +142,20 @@ export default { handlerTab(n) { switch (n) { case 0: - getUserAttestationGroupBy(Object.assign({}, this.getCtime2, this.form)).then((res) => { + getUserAttestationGroupBy(Object.assign({}, this.form)).then((res) => { let data = res.data || {}; this.doVal(data) this.load = false; }); case 1: - getIsjingGroupBy(Object.assign({}, this.getCtime2, this.form)).then((res) => { + getIsjingGroupBy(Object.assign({}, this.form)).then((res) => { let data = res.data || {}; this.doVal(data) this.load = false; }); break; case 2: - getPicboolGroupBy(Object.assign({}, this.getCtime2, this.form)).then((res) => { + getPicboolGroupBy(Object.assign({}, this.form)).then((res) => { let data = res.data || {}; this.doVal(data) this.load = false; diff --git a/src/views/KeyMediaEvent/weiboContentTOPVolume/index.vue b/src/views/KeyMediaEvent/weiboContentTOPVolume/index.vue index 82f8bdc..2dd6197 100644 --- a/src/views/KeyMediaEvent/weiboContentTOPVolume/index.vue +++ b/src/views/KeyMediaEvent/weiboContentTOPVolume/index.vue @@ -54,7 +54,7 @@ export default { methods: { getData() { // this.load = true; - let obj = Object.assign({}, this.getCtime2, this.form); + let obj = Object.assign({}, this.form); getDirectWeiBo0528(obj).then(res => { let data = res.data || []; let arr = []; diff --git a/src/views/KeyMediaEvent/weiboContentType/index.vue b/src/views/KeyMediaEvent/weiboContentType/index.vue index a4a6f79..23a3dda 100644 --- a/src/views/KeyMediaEvent/weiboContentType/index.vue +++ b/src/views/KeyMediaEvent/weiboContentType/index.vue @@ -83,7 +83,7 @@ export default { methods: { getData() { this.load = true; - let obj = Object.assign({}, this.getCtime2, this.form); + let obj = Object.assign({}, this.form); getWtypeWeiBo0528(obj).then((res) => { let data = res.data || []; this.doVal(data); diff --git a/src/views/KeyMediaEvent/weiboUserActiveArea/index.vue b/src/views/KeyMediaEvent/weiboUserActiveArea/index.vue index 73566af..72fb247 100644 --- a/src/views/KeyMediaEvent/weiboUserActiveArea/index.vue +++ b/src/views/KeyMediaEvent/weiboUserActiveArea/index.vue @@ -53,7 +53,7 @@ export default { methods: { getData() { this.load = true; - let obj = Object.assign({}, this.getCtime2, this.form); + let obj = Object.assign({}, this.form); getUserRegionGroupBy(obj).then((res) => { let data = res.data || {}; let dx = []; //省份 diff --git a/src/views/KeyMediaEvent/weiboWordCloud/index.vue b/src/views/KeyMediaEvent/weiboWordCloud/index.vue index 04b885c..2e624ca 100644 --- a/src/views/KeyMediaEvent/weiboWordCloud/index.vue +++ b/src/views/KeyMediaEvent/weiboWordCloud/index.vue @@ -57,7 +57,7 @@ export default { // 正面 getH() { return new Promise((resolve, reject) => { - let obj = Object.assign({}, this.getCtime2, this.form); + let obj = Object.assign({}, this.form); getHotWord(obj) .then((res) => { this.positiveData = res.data || {}; diff --git a/src/views/KeyMediaHome/weiboCharacters/index.vue b/src/views/KeyMediaHome/weiboCharacters/index.vue index 42c38ab..0f203cb 100644 --- a/src/views/KeyMediaHome/weiboCharacters/index.vue +++ b/src/views/KeyMediaHome/weiboCharacters/index.vue @@ -11,6 +11,7 @@
diff --git a/src/views/KeyMediaHome/weiboCommunicationTrendLong/index.vue b/src/views/KeyMediaHome/weiboCommunicationTrendLong/index.vue index 7f9564f..4dc10cc 100644 --- a/src/views/KeyMediaHome/weiboCommunicationTrendLong/index.vue +++ b/src/views/KeyMediaHome/weiboCommunicationTrendLong/index.vue @@ -25,7 +25,7 @@ @@ -250,20 +287,4 @@ export default { height: 1060px; } } -.mcomp-light { - width: 1552px; - background: #fff; - // height: 460px; - border: 2px solid #0f2a4d; - .d2 { - display: flex; - justify-content: flex-start; - padding: 8px 16px 0px 16px; - } - .d3 { - // padding: 0px 16px 16px 16px; - width: 100%; - height: 1060px; - } -} \ No newline at end of file diff --git a/src/views/SaleRank/MarketComp/opt.js b/src/views/SaleRank/MarketComp/opt.js index 3d2b04d..7f3cf72 100644 --- a/src/views/SaleRank/MarketComp/opt.js +++ b/src/views/SaleRank/MarketComp/opt.js @@ -1,3 +1,5 @@ +import * as echarts from "echarts"; +import { bigNumberTransform } from "@/utils/gol/dataTool" export default function createOpt(data = [],extraData = []) { return { grid: { @@ -64,4 +66,4 @@ export default function createOpt(data = [],extraData = []) { }, ] } -} \ No newline at end of file +} diff --git a/src/views/SaleRank/MarketComp/optLight.js b/src/views/SaleRank/MarketComp/optLight.js index 8d494fb..4506cc5 100644 --- a/src/views/SaleRank/MarketComp/optLight.js +++ b/src/views/SaleRank/MarketComp/optLight.js @@ -64,4 +64,4 @@ export default function createOptLight(data = [],extraData = []) { }, ] } -} \ No newline at end of file +} diff --git a/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue b/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue index 3487690..98cabb7 100644 --- a/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue +++ b/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue @@ -1,7 +1,11 @@ @@ -10,11 +11,13 @@ import totalTop20 from "./totalTop20" import totalPassengerVehicle from "./totalPassengerVehicle" import totalTraditionCar from "./totalTraditionCar" +import totalNewEnergyCar from "./totalNewEnergyCar" export default { components: { totalTop20, totalPassengerVehicle, - totalTraditionCar + totalTraditionCar, + totalNewEnergyCar }, name: 'mscTotal', data() { diff --git a/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/index.vue b/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/index.vue new file mode 100644 index 0000000..6679256 --- /dev/null +++ b/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/index.vue @@ -0,0 +1,124 @@ + + + + + \ No newline at end of file diff --git a/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/opt.js b/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/opt.js new file mode 100644 index 0000000..2af1e98 --- /dev/null +++ b/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/opt.js @@ -0,0 +1,156 @@ + +import { bigNumberTransform } from "@/utils/gol/dataTool" +import * as echarts from "echarts"; +export default function createOpt(firstData = [], secondData = [], percent = [], yearNumber) { + return { + tooltip: { + trigger: "axis", + backgroundColor: "#08182F", + axisPointer: { + type: 'cross', + crossStyle: { + color: '#999' + } + }, + borderColor: "#3373CC", + textStyle: { + color: "#fff", //设置文字颜色 + }, + extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;" + }, + grid: { + left: 10, + right: 10, + bottom: 10, + containLabel: true + }, + legend: { + textStyle: { //图例文字的样式 + color: '#fff', + fontSize: 10 + }, + y: 10, + x: 10, + itemWidth: 12, + itemHeight: 12, + borderRadius: 1, //圆角半径 + }, + xAxis: [ + { + type: 'category', + data: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月',], + axisPointer: { + type: 'shadow' + }, + axisLabel: { + color: '#FFF' + } + } + ], + yAxis: [ + { + type: 'value', + axisLabel: { + formatter: (value) => { + return bigNumberTransform(value); + }, + color: '#FFF' + }, + splitLine:{ + show:false + }, + }, + { + type: 'value', + axisLabel: { + formatter: '{value}%', + color: '#FFF' + }, + splitLine:{ + show:false + }, + } + ], + series: [ + { + name: yearNumber - 1, + type: 'bar', + barWidth: 20, + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + itemStyle: { + normal: { + //柱体的颜色 + //右，下，左，上（1，0，0，0）表示从正右开始向左渐变 + color: function () { + return new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#3373CC' + }, + { + offset: 1, + color: '#3E8CF940' + } + ], false); + } + } + }, + label: { + show: true, + position: 'top', + color: '#FFF' + }, + data: firstData + }, + { + name: yearNumber, + type: 'bar', + barWidth: 20, + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + itemStyle: { + normal: { + //柱体的颜色 + //右，下，左，上（1，0，0，0）表示从正右开始向左渐变 + color: function () { + return new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#54BF93' + }, + { + offset: 1, + color: '#61DDAA30' + } + ], false); + } + } + }, + label: { + show: true, + position: 'top', + color: '#FFF' + }, + data: secondData + }, + { + name: '同比', + type: 'line', + yAxisIndex: 1, + tooltip: { + valueFormatter: function (value) { + return value+'%'; + } + }, + data: percent + } + ] + } +} \ No newline at end of file diff --git a/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/optLight.js b/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/optLight.js new file mode 100644 index 0000000..f587b41 --- /dev/null +++ b/src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/optLight.js @@ -0,0 +1,156 @@ + +import { bigNumberTransform } from "@/utils/gol/dataTool" +import * as echarts from "echarts"; +export default function createOptLight(firstData = [], secondData = [], percent = [], yearNumber) { + return { + tooltip: { + trigger: "axis", + backgroundColor: "#08182F", + axisPointer: { + type: 'cross', + crossStyle: { + color: '#999' + } + }, + borderColor: "#3373CC", + textStyle: { + color: "#fff", //设置文字颜色 + }, + extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;" + }, + grid: { + left: 10, + right: 10, + bottom: 10, + containLabel: true + }, + legend: { + textStyle: { //图例文字的样式 + color: '#000', + fontSize: 10 + }, + y: 10, + x: 10, + itemWidth: 12, + itemHeight: 12, + borderRadius: 1, //圆角半径 + }, + xAxis: [ + { + type: 'category', + data: ['1月','2月','3月','4月','5月','6月','7月','8月','9月','10月','11月','12月',], + axisPointer: { + type: 'shadow' + }, + axisLabel: { + color: '#000' + } + } + ], + yAxis: [ + { + type: 'value', + axisLabel: { + formatter: (value) => { + return bigNumberTransform(value); + }, + color: '#000' + }, + splitLine:{ + show:false + }, + }, + { + type: 'value', + axisLabel: { + formatter: '{value}%', + color: '#000' + }, + splitLine:{ + show:false + }, + } + ], + series: [ + { + name: yearNumber - 1, + type: 'bar', + barWidth: 20, + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + itemStyle: { + normal: { + //柱体的颜色 + //右，下，左，上（1，0，0，0）表示从正右开始向左渐变 + color: function () { + return new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#3373CC' + }, + { + offset: 1, + color: '#3E8CF940' + } + ], false); + } + } + }, + label: { + show: true, + position: 'top', + color: '#000' + }, + data: firstData + }, + { + name: yearNumber, + type: 'bar', + barWidth: 20, + tooltip: { + valueFormatter: function (value) { + return value; + } + }, + itemStyle: { + normal: { + //柱体的颜色 + //右，下，左，上（1，0，0，0）表示从正右开始向左渐变 + color: function () { + return new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: '#54BF93' + }, + { + offset: 1, + color: '#61DDAA30' + } + ], false); + } + } + }, + label: { + show: true, + position: 'top', + color: '#000' + }, + data: secondData + }, + { + name: '同比', + type: 'line', + yAxisIndex: 1, + tooltip: { + valueFormatter: function (value) { + return value+'%'; + } + }, + data: percent + } + ] + } +} \ No newline at end of file diff --git a/src/views/SaleRank/MarketSaleChina/mscTotal/totalPassengerVehicle/index.vue b/src/views/SaleRank/MarketSaleChina/mscTotal/totalPassengerVehicle/index.vue index 686d70c..5f567e4 100644 --- a/src/views/SaleRank/MarketSaleChina/mscTotal/totalPassengerVehicle/index.vue +++ b/src/views/SaleRank/MarketSaleChina/mscTotal/totalPassengerVehicle/index.vue @@ -1,7 +1,20 @@ @@ -30,21 +39,33 @@ export default { sStartTime: '', sEndTime: '', }, + yearNumber: 0, + selTime: ['',''], opt: {}, opt2: {}, + yearList: [] } }, created() { this.form.token = this.getToken; getCheZhuLatestTime({token: this.form.token}).then(res => { - this.form.sStartTime = '2021-01'; this.form.sEndTime = res.data; + this.yearNumber = res.data.slice(0,4) * 1; + let currYear = res.data.slice(0,4) * 1; + this.yearList = [currYear, currYear-1, currYear-2 ,currYear-3 ,currYear-4] + this.form.sStartTime = (currYear-1) + '-01'; this.getData() }) }, methods: { getData() { - getSalesSpecName1TypesByMpv(this.form).then(res => { + let obj = { + token: this.form.token, + sTimeType: 4, + sStartTime: this.form.sStartTime, + sEndTime: this.form.sEndTime, + } + getSalesSpecName1TypesByMpv(obj).then(res => { let data = res.data; let firstYearData = []; //0 - 11 count let secondYearData = []; //12+ count @@ -57,25 +78,27 @@ export default { percent.push(data[i].YearOnYearGrowth) } }; - this.opt = createOpt(firstYearData,secondYearData,percent) - this.opt2 = createOptLight(firstYearData,secondYearData,percent) - }) + this.opt = createOpt(firstYearData,secondYearData,percent,this.yearNumber) + this.opt2 = createOptLight(firstYearData,secondYearData,percent,this.yearNumber) + }); }, report() { let obj = { token: this.form.token, sTimeType: 4, - sStartTime: this.selTime[0], - sEndTime: this.selTime[1], + sStartTime: this.form.sStartTime, + sEndTime: this.form.sEndTime, isExcel: 1, }; - getSalesSpecName1TypesByMpv(obj).then(() => { - this.$notification.open({ - message: `数据生成中`, - description: "请前往个人中心查看下载进度", - placement: "bottomRight", - }); - }); + getSalesSpecName1TypesByMpv(obj).then(res => { + let data = res.data; + window.open(data); + }) + }, + yearChange() { + this.form.sStartTime = (this.yearNumber-1) + '-01'; + this.form.sEndTime = (this.yearNumber) + '-12'; + this.getData() } } } @@ -84,7 +107,7 @@ export default { \ No newline at end of file diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js index fd7721b..2af1e98 100644 --- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js +++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js @@ -1,7 +1,7 @@ import { bigNumberTransform } from "@/utils/gol/dataTool" import * as echarts from "echarts"; -export default function createOpt(firstData = [], secondData = [], percent = []) { +export default function createOpt(firstData = [], secondData = [], percent = [], yearNumber) { return { tooltip: { trigger: "axis", @@ -73,7 +73,7 @@ export default function createOpt(firstData = [], secondData = [], percent = []) ], series: [ { - name: '2021', + name: yearNumber - 1, type: 'bar', barWidth: 20, tooltip: { @@ -107,7 +107,7 @@ export default function createOpt(firstData = [], secondData = [], percent = []) data: firstData }, { - name: '2022', + name: yearNumber, type: 'bar', barWidth: 20, tooltip: { diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js index b80fd6e..f587b41 100644 --- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js +++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js @@ -1,7 +1,7 @@ import { bigNumberTransform } from "@/utils/gol/dataTool" import * as echarts from "echarts"; -export default function createOptLight(firstData = [], secondData = [], percent = []) { +export default function createOptLight(firstData = [], secondData = [], percent = [], yearNumber) { return { tooltip: { trigger: "axis", @@ -73,7 +73,7 @@ export default function createOptLight(firstData = [], secondData = [], percent ], series: [ { - name: '2021', + name: yearNumber - 1, type: 'bar', barWidth: 20, tooltip: { @@ -107,7 +107,7 @@ export default function createOptLight(firstData = [], secondData = [], percent data: firstData }, { - name: '2022', + name: yearNumber, type: 'bar', barWidth: 20, tooltip: { diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/index.vue index c25431b..1906de8 100644 --- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/index.vue +++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/index.vue @@ -6,12 +6,21 @@ 导出报告 -
- +
+ + + + {{item}} + + +
-
+
+
+ +
@@ -30,21 +39,33 @@ export default { sStartTime: '', sEndTime: '', }, + yearNumber: 0, + selTime: ['',''], opt: {}, opt2: {}, + yearList: [] } }, created() { this.form.token = this.getToken; getCheZhuLatestTime({token: this.form.token}).then(res => { - this.form.sStartTime = '2021-01'; this.form.sEndTime = res.data; + this.yearNumber = res.data.slice(0,4) * 1; + let currYear = res.data.slice(0,4) * 1; + this.yearList = [currYear, currYear-1, currYear-2 ,currYear-3 ,currYear-4] + this.form.sStartTime = (currYear-1) + '-01'; this.getData() }) }, methods: { getData() { - getSalesSpecName1TypesBySuv(this.form).then(res => { + let obj = { + token: this.form.token, + sTimeType: 4, + sStartTime: this.form.sStartTime, + sEndTime: this.form.sEndTime, + } + getSalesSpecName1TypesBySuv(obj).then(res => { let data = res.data; let firstYearData = []; //0 - 11 count let secondYearData = []; //12+ count @@ -57,25 +78,27 @@ export default { percent.push(data[i].YearOnYearGrowth) } }; - this.opt = createOpt(firstYearData,secondYearData,percent) - this.opt2 = createOptLight(firstYearData,secondYearData,percent) - }) + this.opt = createOpt(firstYearData,secondYearData,percent,this.yearNumber) + this.opt2 = createOptLight(firstYearData,secondYearData,percent,this.yearNumber) + }); }, report() { let obj = { token: this.form.token, sTimeType: 4, - sStartTime: this.selTime[0], - sEndTime: this.selTime[1], + sStartTime: this.form.sStartTime, + sEndTime: this.form.sEndTime, isExcel: 1, }; - getSalesSpecName1TypesBySuv(obj).then(() => { - this.$notification.open({ - message: `数据生成中`, - description: "请前往个人中心查看下载进度", - placement: "bottomRight", - }); - }); + getSalesSpecName1TypesBySuv(obj).then(res => { + let data = res.data; + window.open(data); + }) + }, + yearChange() { + this.form.sStartTime = (this.yearNumber-1) + '-01'; + this.form.sEndTime = (this.yearNumber) + '-12'; + this.getData() } } } @@ -84,7 +107,7 @@ export default { \ No newline at end of file diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js index fd7721b..2af1e98 100644 --- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js +++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js @@ -1,7 +1,7 @@ import { bigNumberTransform } from "@/utils/gol/dataTool" import * as echarts from "echarts"; -export default function createOpt(firstData = [], secondData = [], percent = []) { +export default function createOpt(firstData = [], secondData = [], percent = [], yearNumber) { return { tooltip: { trigger: "axis", @@ -73,7 +73,7 @@ export default function createOpt(firstData = [], secondData = [], percent = []) ], series: [ { - name: '2021', + name: yearNumber - 1, type: 'bar', barWidth: 20, tooltip: { @@ -107,7 +107,7 @@ export default function createOpt(firstData = [], secondData = [], percent = []) data: firstData }, { - name: '2022', + name: yearNumber, type: 'bar', barWidth: 20, tooltip: { diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js index b80fd6e..f587b41 100644 --- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js +++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js @@ -1,7 +1,7 @@ import { bigNumberTransform } from "@/utils/gol/dataTool" import * as echarts from "echarts"; -export default function createOptLight(firstData = [], secondData = [], percent = []) { +export default function createOptLight(firstData = [], secondData = [], percent = [], yearNumber) { return { tooltip: { trigger: "axis", @@ -73,7 +73,7 @@ export default function createOptLight(firstData = [], secondData = [], percent ], series: [ { - name: '2021', + name: yearNumber - 1, type: 'bar', barWidth: 20, tooltip: { @@ -107,7 +107,7 @@ export default function createOptLight(firstData = [], secondData = [], percent data: firstData }, { - name: '2022', + name: yearNumber, type: 'bar', barWidth: 20, tooltip: { diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue index ad4d52a..ef95532 100644 --- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue +++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue @@ -105,11 +105,8 @@ export default { isExcel: 1, }; getSalesSpecName1Types(obj).then(() => { - this.$notification.open({ - message: `数据生成中`, - description: "请前往个人中心查看下载进度", - placement: "bottomRight", - }); + let data = res.data; + window.open(data); }); } } diff --git a/src/views/SaleRank/index.vue b/src/views/SaleRank/index.vue index 8089c3e..e71d4ae 100644 --- a/src/views/SaleRank/index.vue +++ b/src/views/SaleRank/index.vue @@ -144,8 +144,8 @@ export default { isLoading: false, dd: false, //下拉菜单 //左侧菜单 - rootSubmenuKeys:['sub1', 'sub2', 'sub3'], - openKeys: ['sub1'], + rootSubmenuKeys:['sub1', 'sub2', 'sub3','sub4','sub5','sub6'], + openKeys: [], form: { token: '', sStartTime: '',