From 9ffd59224620893e587ce1a57d1e1a1a7985f969 Mon Sep 17 00:00:00 2001 From: zx <604444282@qq.com> Date: Mon, 15 Aug 2022 10:48:11 +0800 Subject: [PATCH 1/2] zx --- src/api/SaleRankMarket/index.js | 14 +- src/views/SaleRank/MarketComp/index.vue | 87 ++++++---- src/views/SaleRank/MarketComp/opt.js | 4 +- src/views/SaleRank/MarketComp/optLight.js | 2 +- .../MarketSaleChina/mscCompChart/index.vue | 69 ++++++-- .../MarketSaleChina/mscCompChart/opt.js | 4 +- .../MarketSaleChina/mscCompChart/optLight.js | 2 +- .../MarketSaleChina/mscTotal/index.vue | 5 +- .../mscTotal/totalNewEnergyCar/index.vue | 98 +++++++++++ .../mscTotal/totalNewEnergyCar/opt.js | 156 ++++++++++++++++++ .../mscTotal/totalNewEnergyCar/optLight.js | 156 ++++++++++++++++++ .../mscTotal/totalPassengerVehicle/index.vue | 23 ++- .../mscTotal/totalTop20/index.vue | 26 ++- .../mscTotal/totalTraditionCar/index.vue | 21 ++- .../MarketSaleNE/mneCountryPercent/index.vue | 7 +- .../MarketSaleNE/mneEnergyType/index.vue | 9 +- .../mneMainPrice/seriesAuto/index.vue | 11 +- .../mneMainPrice/seriesMpv/index.vue | 11 +- .../mneMainPrice/seriesSuv/index.vue | 11 +- .../mneMainPrice/seriesTotal/index.vue | 11 +- .../precAutoPercent/index.vue | 7 +- .../mnePrecisionType/precMpvPercent/index.vue | 7 +- .../mnePrecisionType/precPercent/index.vue | 7 +- .../mnePrecisionType/precSuvPercent/index.vue | 7 +- .../mstCountryPercent/index.vue | 7 +- .../mstMPPercent/index.vue | 7 +- .../mstMainPrice/mainBrand/index.vue | 7 +- .../mstMainPrice/mainCountry/index.vue | 7 +- .../precAutoPercent/index.vue | 7 +- .../mstPrecisionType/precMpvPercent/index.vue | 7 +- .../mstPrecisionType/precPercent/index.vue | 7 +- .../mstPrecisionType/precSuvPercent/index.vue | 7 +- .../mstSeriesType/seriesAuto/index.vue | 11 +- .../mstSeriesType/seriesMpv/index.vue | 11 +- .../mstSeriesType/seriesSuv/index.vue | 11 +- .../mstSeriesType/seriesTotal/index.vue | 7 +- src/views/SaleRank/index.vue | 4 +- 37 files changed, 664 insertions(+), 191 deletions(-) create mode 100644 src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/index.vue create mode 100644 src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/opt.js create mode 100644 src/views/SaleRank/MarketSaleChina/mscTotal/totalNewEnergyCar/optLight.js 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/SaleRank/MarketComp/index.vue b/src/views/SaleRank/MarketComp/index.vue index be4e32a..15c6f31 100644 --- a/src/views/SaleRank/MarketComp/index.vue +++ b/src/views/SaleRank/MarketComp/index.vue @@ -1,7 +1,11 @@ @@ -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,9 +78,9 @@ 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 = { @@ -69,10 +90,15 @@ export default { sEndTime: this.form.sEndTime, isExcel: 1, }; - getSalesSpecName1TypesBySuv(obj).then(() => { + 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() } } } @@ -81,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: {