From f7c60cb38ef1601d4c489d5b843d186cbc20f746 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Tue, 6 Sep 2022 17:00:44 +0800
Subject: [PATCH 1/2] zx
---
.../MarketSaleNE/mneMainPrice/seriesAuto/opt.js | 17 +++++++++++++++++
.../mneMainPrice/seriesAuto/optLight.js | 17 +++++++++++++++++
.../MarketSaleNE/mneMainPrice/seriesMpv/opt.js | 17 +++++++++++++++++
.../mneMainPrice/seriesMpv/optLight.js | 17 +++++++++++++++++
.../MarketSaleNE/mneMainPrice/seriesSuv/opt.js | 17 +++++++++++++++++
.../mneMainPrice/seriesSuv/optLight.js | 17 +++++++++++++++++
.../mstSeriesType/seriesAuto/opt.js | 17 +++++++++++++++++
.../mstSeriesType/seriesAuto/optLight.js | 17 +++++++++++++++++
.../mstSeriesType/seriesMpv/opt.js | 17 +++++++++++++++++
.../mstSeriesType/seriesMpv/optLight.js | 17 +++++++++++++++++
.../mstSeriesType/seriesSuv/opt.js | 17 +++++++++++++++++
.../mstSeriesType/seriesSuv/optLight.js | 17 +++++++++++++++++
12 files changed, 204 insertions(+)
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/opt.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/opt.js
index 2af1e98..089373c 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/opt.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/opt.js
@@ -16,6 +16,23 @@ export default function createOpt(firstData = [], secondData = [], percent = [],
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/optLight.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/optLight.js
index f587b41..3a00114 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/optLight.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesAuto/optLight.js
@@ -16,6 +16,23 @@ export default function createOptLight(firstData = [], secondData = [], percent
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/opt.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/opt.js
index 2af1e98..089373c 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/opt.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/opt.js
@@ -16,6 +16,23 @@ export default function createOpt(firstData = [], secondData = [], percent = [],
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/optLight.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/optLight.js
index f587b41..3a00114 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/optLight.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesMpv/optLight.js
@@ -16,6 +16,23 @@ export default function createOptLight(firstData = [], secondData = [], percent
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/opt.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/opt.js
index 2af1e98..089373c 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/opt.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/opt.js
@@ -16,6 +16,23 @@ export default function createOpt(firstData = [], secondData = [], percent = [],
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/optLight.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/optLight.js
index f587b41..3a00114 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/optLight.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesSuv/optLight.js
@@ -16,6 +16,23 @@ export default function createOptLight(firstData = [], secondData = [], percent
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/opt.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/opt.js
index 2af1e98..089373c 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/opt.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/opt.js
@@ -16,6 +16,23 @@ export default function createOpt(firstData = [], secondData = [], percent = [],
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/optLight.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/optLight.js
index f587b41..3a00114 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/optLight.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesAuto/optLight.js
@@ -16,6 +16,23 @@ export default function createOptLight(firstData = [], secondData = [], percent
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js
index 2af1e98..089373c 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/opt.js
@@ -16,6 +16,23 @@ export default function createOpt(firstData = [], secondData = [], percent = [],
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js
index f587b41..3a00114 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesMpv/optLight.js
@@ -16,6 +16,23 @@ export default function createOptLight(firstData = [], secondData = [], percent
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js
index 2af1e98..089373c 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/opt.js
@@ -16,6 +16,23 @@ export default function createOpt(firstData = [], secondData = [], percent = [],
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js
index f587b41..3a00114 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesSuv/optLight.js
@@ -16,6 +16,23 @@ export default function createOptLight(firstData = [], secondData = [], percent
textStyle: {
color: "#fff", //设置文字颜色
},
+ formatter: function(param) {
+ let htmlStr = `${param[0].name}
`;
+ for(let i = 0; i < param.length; i++) {
+ if(param[i].seriesName == '同比') {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}%
+
`
+ } else {
+ htmlStr += `
+ ${param[i].marker} ${param[i].seriesName}
+ ${param[i].value}
+
`
+ }
+ }
+ return htmlStr
+ },
extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
},
grid: {
From acf142c59d7fe623009405b62239ea301db330d2 Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Tue, 13 Sep 2022 15:22:02 +0800
Subject: [PATCH 2/2] zx
---
src/lycomponents/iSaleModelChoose/index.vue | 30 +++++++++++++++----
.../iSpecialSeriesChoose/index.vue | 20 ++++++++++---
src/lycomponents/iSwitchModel/index.vue | 30 ++++++++++++++++---
3 files changed, 67 insertions(+), 13 deletions(-)
diff --git a/src/lycomponents/iSaleModelChoose/index.vue b/src/lycomponents/iSaleModelChoose/index.vue
index daab40d..6e752d5 100644
--- a/src/lycomponents/iSaleModelChoose/index.vue
+++ b/src/lycomponents/iSaleModelChoose/index.vue
@@ -17,6 +17,16 @@
按品牌拼音首字母查找:
{{item}}
+
@@ -36,7 +46,8 @@
-
{{item.name}}
+
{{item.name}}
+
{{item.name}}
{{item.name}}
@@ -97,6 +108,7 @@ export default {
form: {
token: "",
sBrandName: "",
+ sKeyword: '',
sType: 'Marketing'
},
letterArr: [
@@ -187,12 +199,21 @@ export default {
if(!this.getToken) return;
this.form.token = this.getToken;
this.form.sBrandName = brandName;
+ this.form.sKeyword = '';
this.load = true;
getUserSeriesName(this.form).then(res => {
let data = res.data || [];
this.models = data;
this.load = false;
})
+ },
+ onSearch() {
+ this.load = true;
+ getUserSeriesName(this.form).then(res => {
+ let data = res.data || [];
+ this.models = data;
+ this.load = false;
+ })
}
},
};
@@ -260,8 +281,7 @@ export default {
}
.sb-dd {
width: 46%;
- height: 100%;
- box-shadow: 0 0 20px;
+ height: 90%;
}
.sb-bd {
padding: 0px 16px 16px 16px;
@@ -311,6 +331,7 @@ export default {
margin-left: 16px;
margin-top: 16px;
transition: all 0.3s;
+ white-space:nowrap;
cursor: pointer;
&:hover {
background: #3373CC;
@@ -324,8 +345,7 @@ export default {
}
.sb-dd-right {
width: 54%;
- height: 100%;
- box-shadow: 0 0 20px;
+ height: 90%;
}
.sb-footer {
diff --git a/src/lycomponents/iSpecialSeriesChoose/index.vue b/src/lycomponents/iSpecialSeriesChoose/index.vue
index 1b00eb9..74c7201 100644
--- a/src/lycomponents/iSpecialSeriesChoose/index.vue
+++ b/src/lycomponents/iSpecialSeriesChoose/index.vue
@@ -65,6 +65,13 @@
+
@@ -82,7 +89,8 @@
-
{{item.seriesname}}
+
{{item.name}}
+
{{item.seriesname}}
{{item.seriesname}}
@@ -151,7 +159,8 @@ export default {
load: false,
form: {
token: "",
- sBrandName: ""
+ sBrandName: "",
+ sKeyword: '宝',
},
searchForm: {
token: '',
@@ -164,6 +173,7 @@ export default {
sSeatS: '',
sEnergyType: '',
sCountryS: '',
+ sKeyword: '',
},
letterArr: [
@@ -238,6 +248,7 @@ export default {
getUserBrand(this.form)
.then((res) => {
let data = res.data;
+ console.log(data)
let arr = [];
data.forEach((ele) => {
let fk = ele.firstword;
@@ -381,7 +392,7 @@ export default {
}
.sb-dd {
width: 46%;
- height: 100%;
+ height: 95%;
box-shadow: 0 0 20px;
}
.sb-bd {
@@ -432,6 +443,7 @@ export default {
margin-left: 16px;
margin-top: 16px;
transition: all 0.3s;
+ white-space:nowrap;
cursor: pointer;
&:hover {
background: #3373CC;
@@ -445,7 +457,7 @@ export default {
}
.sb-dd-right {
width: 54%;
- height: 100%;
+ height: 95%;
box-shadow: 0 0 20px;
}
diff --git a/src/lycomponents/iSwitchModel/index.vue b/src/lycomponents/iSwitchModel/index.vue
index d3e7d9e..1ac299d 100644
--- a/src/lycomponents/iSwitchModel/index.vue
+++ b/src/lycomponents/iSwitchModel/index.vue
@@ -17,6 +17,16 @@
按品牌拼音首字母查找:
{{item}}
+
@@ -36,7 +46,8 @@
-
{{item.name}}
+
{{item.name}}
+
{{item.name}}
{{item.name}}
@@ -96,7 +107,8 @@ export default {
load: false,
form: {
token: "",
- sBrandName: ""
+ sBrandName: "",
+ sKeyword: '',
},
letterArr: [
@@ -186,12 +198,21 @@ export default {
if(!this.getToken) return;
this.form.token = this.getToken;
this.form.sBrandName = brandName;
+ this.form.sKeyword = '';
this.load = true;
getUserSeriesName(this.form).then(res => {
let data = res.data || [];
this.models = data;
this.load = false;
})
+ },
+ onSearch() {
+ this.load = true;
+ getUserSeriesName(this.form).then(res => {
+ let data = res.data || [];
+ this.models = data;
+ this.load = false;
+ })
}
},
};
@@ -259,7 +280,7 @@ export default {
}
.sb-dd {
width: 46%;
- height: 100%;
+ height: 90%;
box-shadow: 0 0 20px;
}
.sb-bd {
@@ -310,6 +331,7 @@ export default {
margin-left: 16px;
margin-top: 16px;
transition: all 0.3s;
+ white-space:nowrap;
cursor: pointer;
&:hover {
background: #3373CC;
@@ -323,7 +345,7 @@ export default {
}
.sb-dd-right {
width: 54%;
- height: 100%;
+ height: 90%;
box-shadow: 0 0 20px;
}