Merge branch 'dev'

src/lycomponents/iSaleModelChoose/index.vue

@@ -17,6 +17,16 @@
                     <span class="liSn">按品牌拼音首字母查找:</span>
                     <li v-for="(item,index) in letterArr" :key="index" :class="activeLi === index ? 'lactive': ''" @click="handlerLi(index)">{{item}}</li>
                 </ul>
+                <div style="margin: 0 0 0 16px">
+                    <a-form-model layout="inline">
+                        <a-form-model-item label="关键词">
+                            <a-input v-model="form.sKeyword" style="width: 160px"></a-input>
+                        </a-form-model-item>
+                        <a-form-model-item>
+                            <a-button type="primary" @click="onSearch">搜索</a-button>
+                        </a-form-model-item>
+                    </a-form-model>
+                </div>
                 <div style="clear: both"></div>
                 <div class="sb-body">
                     <div class="sb-dd">
@@ -36,7 +46,8 @@
                        <vue-scroll>
                            <div class="sb-bd" v-loading="load">
                                <div class="sb-b-item" :class="modelName === item.name ? 'sb-b-item-active': ''" v-for="(item,index) in models" :key="index" @click="handlerModel(index, item)">
-                                   <div v-if="item.name.length > 12" style="font-size: 15px">{{item.name}}</div>
+                                   <div v-if="item.name.length > 12 && item.name.length <= 14" style="font-size: 15px">{{item.name}}</div>
+                                   <div v-if="item.name.length > 14" style="font-size: 13px">{{item.name}}</div>
                                    <div v-else>{{item.name}}</div>
                                 </div> 
                             </div>
@@ -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%;
+            height: 90%;
-            box-shadow: 0 0 20px;
         }
         .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%;
+            height: 90%;
-            box-shadow: 0 0 20px;
         }
        
         .sb-footer {

src/lycomponents/iSpecialSeriesChoose/index.vue

@@ -65,6 +65,13 @@
                         </a-form-model-item>
                     </a-form-model>
                 </div>
+                <div style="margin: 0 0 0 16px">
+                    <a-form-model layout="inline">
+                        <a-form-model-item label="关键词">
+                            <a-input v-model="searchForm.sKeyword" style="width: 167px"></a-input>
+                        </a-form-model-item>
+                    </a-form-model>
+                </div>
                 <div class="sb-body">
                     <div class="sb-dd">
                         <vue-scroll>
@@ -82,7 +89,8 @@
                        <vue-scroll>
                            <div class="sb-bd" v-loading="load">
                                <div class="sb-b-item" :class="list.indexOf(item.seriesname) != -1 ? 'sb-b-item-active': ''" v-for="(item,index) in models" :key="index" @click="handlerModel(index, item)">
-                                   <div v-if="item.seriesname.length > 12" style="font-size: 15px">{{item.seriesname}}</div>
+                                   <div v-if="item.seriesname.length > 12 && item.seriesname.length <= 14" style="font-size: 15px">{{item.name}}</div>
+                                   <div v-if="item.seriesname.length > 14" style="font-size: 13px">{{item.seriesname}}</div>
                                    <div v-else>{{item.seriesname}}</div>
                                 </div>    
                            </div>
@@ -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;
         }
        

src/lycomponents/iSwitchModel/index.vue

@@ -17,6 +17,16 @@
                     <span class="liSn">按品牌拼音首字母查找:</span>
                     <li v-for="(item,index) in letterArr" :key="index" :class="activeLi === index ? 'lactive': ''" @click="handlerLi(index)">{{item}}</li>
                 </ul>
+                <div style="margin: 0 0 0 16px">
+                    <a-form-model layout="inline">
+                        <a-form-model-item label="关键词">
+                            <a-input v-model="form.sKeyword" style="width: 160px"></a-input>
+                        </a-form-model-item>
+                        <a-form-model-item>
+                            <a-button type="primary" @click="onSearch">搜索</a-button>
+                        </a-form-model-item>
+                    </a-form-model>
+                </div>
                 <div style="clear: both"></div>
                 <div class="sb-body">
                     <div class="sb-dd">
@@ -36,7 +46,8 @@
                        <vue-scroll>
                            <div class="sb-bd" v-loading="load">
                                <div class="sb-b-item" :class="modelName === item.name ? 'sb-b-item-active': ''" v-for="(item,index) in models" :key="index" @click="handlerModel(index, item)">
-                                   <div v-if="item.name.length > 12" style="font-size: 15px">{{item.name}}</div>
+                                   <div v-if="item.name.length > 12 && item.name.length <= 14" style="font-size: 15px">{{item.name}}</div>
+                                   <div v-if="item.name.length > 14" style="font-size: 13px">{{item.name}}</div>
                                    <div v-else>{{item.name}}</div>
                                 </div>    
                            </div>
@@ -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;
         }
        

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {

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 = `<div>${param[0].name}</div>`;
+              for(let i = 0; i < param.length; i++) {
+                  if(param[i].seriesName == '同比') {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}%</span>
+                    </div>`
+                  } else {
+                    htmlStr += `<div style="display: flex;justify-content: space-between;margin-top: 4px">
+                    <span style="margin-right: 24px">${param[i].marker} ${param[i].seriesName} </span>
+                    <span> ${param[i].value}</span>
+                    </div>`
+                  }
+              }
+              return htmlStr
+            },
             extraCssText: "box-shadow: 0px 0px 10px 0px #3373CC;"
           },
           grid: {