From ad47f6836276b0aecb517c76e66e3a8a7ddc642a Mon Sep 17 00:00:00 2001
From: zx <604444282@qq.com>
Date: Wed, 17 Aug 2022 10:20:05 +0800
Subject: [PATCH] zx

---
 src/api/BrandInsight/index.js                 |  4 +-
 src/api/EventdEC/index.js                     |  4 +-
 src/api/MarketingAnalysis/index.js            |  2 +-
 src/api/ModelInsight/index.js                 |  4 +-
 src/styles/antd.less                          | 10 +++
 .../Index/keyCommunicationPositions/index.vue |  2 +-
 src/views/KeyMediaBrand/index.vue             |  2 +-
 src/views/KeyMediaEvent/index.vue             |  2 +-
 src/views/KeyMediaHome/index.vue              |  2 +-
 src/views/KeyMediaSeries/index.vue            |  2 +-
 src/views/KeyMediaTheme/index.vue             |  2 +-
 src/views/SaleRank/MarketComp/index.vue       | 68 ++++++++++++++++---
 src/views/SaleRank/MarketComp/opt.js          |  6 +-
 .../MarketSaleChina/mscCompChart/index.vue    | 43 ++++++++++--
 .../MarketSaleChina/mscCompChart/opt.js       |  6 +-
 .../MarketSaleChina/mscEnergyType/index.vue   | 21 +++++-
 .../MarketSaleNE/mneCountryPercent/index.vue  |  2 +-
 .../mneMainPrice/seriesTotal/index.vue        |  2 +-
 .../mneMainPrice/seriesTotal/opt.js           |  1 -
 .../precAutoPercent/index.vue                 |  2 +-
 .../mnePrecisionType/precMpvPercent/index.vue |  2 +-
 .../mnePrecisionType/precPercent/index.vue    |  2 +-
 .../mnePrecisionType/precSuvPercent/index.vue |  2 +-
 .../mstCountryPercent/index.vue               |  2 +-
 .../mstMPPercent/index.vue                    |  2 +-
 .../mstMainPrice/mainBrand/index.vue          |  2 +-
 .../mstMainPrice/mainCountry/index.vue        |  2 +-
 .../precAutoPercent/index.vue                 |  2 +-
 .../mstPrecisionType/precMpvPercent/index.vue |  2 +-
 .../mstPrecisionType/precPercent/index.vue    |  2 +-
 .../mstPrecisionType/precSuvPercent/index.vue |  2 +-
 .../mstSeriesType/seriesTotal/index.vue       |  2 +-
 .../mstSeriesType/seriesTotal/opt.js          |  1 -
 33 files changed, 160 insertions(+), 52 deletions(-)

diff --git a/src/api/BrandInsight/index.js b/src/api/BrandInsight/index.js
index 484e567..0689412 100644
--- a/src/api/BrandInsight/index.js
+++ b/src/api/BrandInsight/index.js
@@ -47,7 +47,7 @@ export function getSourcetypeTime(params) {
 
 //品牌洞察-重点媒体
 export function getWebsiteBrand(params) {
-    let obj =  Object.assign({action: 'getWebsite', sType: 'BrandOverview'}, params)
+    let obj =  Object.assign({action: 'getSourceTop', sType: 'BrandOverview'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
@@ -200,7 +200,7 @@ export function getWeiYiVolumeTime(params) {
 
 // 尾翼洞察-重点媒体
 export function getWebsite(params) {
-    let obj =  Object.assign({action: 'getWebsite', sType: 'BrandWeiYi'}, params)
+    let obj =  Object.assign({action: 'getSourceTop', sType: 'BrandWeiYi'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
diff --git a/src/api/EventdEC/index.js b/src/api/EventdEC/index.js
index cc6d10d..053b90f 100644
--- a/src/api/EventdEC/index.js
+++ b/src/api/EventdEC/index.js
@@ -38,7 +38,7 @@ export function toExcel(params) {
 
 // 事件详情-重点媒体
 export function getWebsiteEvent(params) {
-    let obj =  Object.assign({action: 'getWebsite', sType: 'HotEvent'}, params)
+    let obj =  Object.assign({action: 'getSourceTop', sType: 'HotEvent'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
@@ -184,7 +184,7 @@ export function getWeiYiVolumeTime(params) {
 }
 // 尾翼分析-重点媒体分布
 export function getWebsite(params) {
-    let obj =  Object.assign({action: 'getWebsite', sType: 'BrandWeiYi'}, params)
+    let obj =  Object.assign({action: 'getSourceTop', sType: 'BrandWeiYi'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
diff --git a/src/api/MarketingAnalysis/index.js b/src/api/MarketingAnalysis/index.js
index 8e85899..3664d10 100644
--- a/src/api/MarketingAnalysis/index.js
+++ b/src/api/MarketingAnalysis/index.js
@@ -21,7 +21,7 @@ export function getBrandSourceType0528(params) {
 }
 // 重点活跃媒体TOP10排行
 export function getWebsite(params) {
-    let obj =  Object.assign({action: 'getWebsite',sType: 'Marketing'}, params)
+    let obj =  Object.assign({action: 'getSourceTop',sType: 'Marketing'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
diff --git a/src/api/ModelInsight/index.js b/src/api/ModelInsight/index.js
index 45540f1..aa58ac9 100644
--- a/src/api/ModelInsight/index.js
+++ b/src/api/ModelInsight/index.js
@@ -50,7 +50,7 @@ export function getSourcetypeTime(params) {
 
 // 车型洞察-重点媒体
 export function getWebsiteModel(params) {
-    let obj =  Object.assign({action: 'getWebsite', sType: 'BrandOverview'}, params)
+    let obj =  Object.assign({action: 'getSourceTop', sType: 'BrandOverview'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
@@ -174,7 +174,7 @@ export function getWeiYiVolumeTime(params) {
 
 // 车型重点媒体
 export function getWebsite(params) {
-    let obj =  Object.assign({action: 'getWebsite', sType: 'BrandWeiYi'}, params)
+    let obj =  Object.assign({action: 'getSourceTop', sType: 'BrandWeiYi'}, params)
     return httpService({
         url: `/api/v6.ashx`,
         method: 'post',
diff --git a/src/styles/antd.less b/src/styles/antd.less
index f0d4683..b470598 100644
--- a/src/styles/antd.less
+++ b/src/styles/antd.less
@@ -390,6 +390,11 @@ li.ant-calendar-time-picker-select-option-selected {
   color: #63AECC !important;
   background: #0F2A4D !important;
 }
+.lightSy {
+  .ant-menu-dark {
+    background: #E7F1FF !important;
+  }
+}
 .ant-menu-submenu-title {
   color: #63AECC !important;
 }
@@ -513,3 +518,8 @@ li.ant-calendar-time-picker-select-option-selected {
     color: #000000 !important;
   }
 }
+.ant-select-dropdown-menu-item-group-title { //选项分组
+  color: #63AECC !important;
+  font-weight: 600 !important;
+  font-size: 14px !important;
+}
diff --git a/src/views/Index/keyCommunicationPositions/index.vue b/src/views/Index/keyCommunicationPositions/index.vue
index c43b0da..c494ee0 100644
--- a/src/views/Index/keyCommunicationPositions/index.vue
+++ b/src/views/Index/keyCommunicationPositions/index.vue
@@ -8,7 +8,7 @@
 -->
 <template>
     <div class="kcp-outter" v-loading="load">
-        <v-label-div title="传播重点媒体"></v-label-div>
+        <v-label-div title="传播媒体"></v-label-div>
         <div class="kcp-inner">
             <div class="d1">
                 <v-ranking  v-for="(item,index) in d1" :key="index" :lineShow="index === 0 ? false : true" :num="index + 1" :label="item.label|doStr(8)" :val="item.val" @toMedia="goKeyMedia(item)"></v-ranking>
diff --git a/src/views/KeyMediaBrand/index.vue b/src/views/KeyMediaBrand/index.vue
index 4f1facf..aa1d29e 100644
--- a/src/views/KeyMediaBrand/index.vue
+++ b/src/views/KeyMediaBrand/index.vue
@@ -31,7 +31,7 @@
             <img class="dd1" src="../../assets/images/BrandInsight/ic_dvsl.png" />
             <div class="dd2">
               <span class="s1">{{ totalRep }}</span>
-              <span class="s2">评论总数</span>
+              <span class="s2">互动人数</span>
             </div>
           </div>
           <!-- <div class="d2">
diff --git a/src/views/KeyMediaEvent/index.vue b/src/views/KeyMediaEvent/index.vue
index 3efc2af..bffb535 100644
--- a/src/views/KeyMediaEvent/index.vue
+++ b/src/views/KeyMediaEvent/index.vue
@@ -31,7 +31,7 @@
             <img class="dd1" src="../../assets/images/BrandInsight/ic_dvsl.png" />
             <div class="dd2">
               <span class="s1">{{ totalRep }}</span>
-              <span class="s2">评论总数</span>
+              <span class="s2">互动人数</span>
             </div>
           </div>
           <!-- <div class="d2">
diff --git a/src/views/KeyMediaHome/index.vue b/src/views/KeyMediaHome/index.vue
index 9803435..f4a6f60 100644
--- a/src/views/KeyMediaHome/index.vue
+++ b/src/views/KeyMediaHome/index.vue
@@ -31,7 +31,7 @@
             <img class="dd1" src="../../assets/images/BrandInsight/ic_dvsl.png" />
             <div class="dd2">
               <span class="s1">{{ totalRep }}</span>
-              <span class="s2">评论总数</span>
+              <span class="s2">互动人数</span>
             </div>
           </div>
           <!-- <div class="d2">
diff --git a/src/views/KeyMediaSeries/index.vue b/src/views/KeyMediaSeries/index.vue
index 7c92cd4..cdbbff9 100644
--- a/src/views/KeyMediaSeries/index.vue
+++ b/src/views/KeyMediaSeries/index.vue
@@ -31,7 +31,7 @@
             <img class="dd1" src="../../assets/images/BrandInsight/ic_dvsl.png" />
             <div class="dd2">
               <span class="s1">{{ totalRep }}</span>
-              <span class="s2">评论总数</span>
+              <span class="s2">互动人数</span>
             </div>
           </div>
           <!-- <div class="d2">
diff --git a/src/views/KeyMediaTheme/index.vue b/src/views/KeyMediaTheme/index.vue
index 47865ac..2eaffb0 100644
--- a/src/views/KeyMediaTheme/index.vue
+++ b/src/views/KeyMediaTheme/index.vue
@@ -31,7 +31,7 @@
             <img class="dd1" src="../../assets/images/BrandInsight/ic_dvsl.png" />
             <div class="dd2">
               <span class="s1">{{ totalRep }}</span>
-              <span class="s2">评论总数</span>
+              <span class="s2">互动人数</span>
             </div>
           </div>
           <!-- <div class="d2">
diff --git a/src/views/SaleRank/MarketComp/index.vue b/src/views/SaleRank/MarketComp/index.vue
index 15c6f31..04e6f52 100644
--- a/src/views/SaleRank/MarketComp/index.vue
+++ b/src/views/SaleRank/MarketComp/index.vue
@@ -6,13 +6,24 @@
         <v-label-div-light v-else title="中国汽车市场竞争格局图" class="lightSy">
             <a-button type="primary" @click="report">导出报告</a-button>
         </v-label-div-light>
-        <div class="d2">
+        <div :class="getIsLight?'lightSy':'dark'">
+            <a-menu mode="inline" style="width: 15%" @openChange="handlerMenu" theme="dark">
+                <a-sub-menu title="筛选项" key="sub1">
+                </a-sub-menu>
+            </a-menu>
+        </div>
+        <div class="d2" v-if="filterActive.length!=0">
             <a-form-model layout="inline">
                 <a-form-model-item :class="getIsLight?'lightSy':'dark'" label="数据筛选">
                     <a-select style="width: 200px" mode="multiple" v-model="countries" placeholder="选择国别" allowClear>
                         <a-select-option v-for="(item) in countryList" :value="item.key" :key="item.value">
                             {{item.value}}
                         </a-select-option>
+                        <a-select-opt-group v-for="(it,id) in countryList" :key="id*10" :label="it.value">
+                            <a-select-option v-for="(item) in it.data" :value="item.key" :key="item.value">
+                                {{item.value}}
+                            </a-select-option>
+                        </a-select-opt-group>
                     </a-select>
                     <a-select style="width: 200px" mode="multiple" v-model="energies" placeholder="选择能源" allowClear>
                         <a-select-option v-for="(item) in energyList" :value="item.key" :key="item.value">
@@ -28,6 +39,11 @@
                         <a-select-option v-for="(item) in specList" :value="item.key" :key="item.value">
                             {{item.value}}
                         </a-select-option>
+                        <a-select-opt-group v-for="(it,id) in specList" :key="id*10" :label="it.value">
+                            <a-select-option v-for="(item) in it.data" :value="item.key" :key="item.value">
+                                {{item.value}}
+                            </a-select-option>
+                        </a-select-opt-group>
                     </a-select>
                     <a-select style="width: 200px" mode="multiple" v-model="displacements" placeholder="选择排量" allowClear>
                         <a-select-option v-for="(item) in displacementList" :value="item.key" :key="item.value">
@@ -43,7 +59,7 @@
                 </a-form-model-item>
             </a-form-model>
         </div>
-        <div class="d2">
+        <div class="d2" v-if="filterActive.length!=0">
             <a-form-model :class="getIsLight?'lightSy':'dark'" layout="inline">
                 <a-form-model-item label="选择日期">
                     <a-month-picker style="width: 146px" :allowClear="false" v-model="selTime[0]" valueFormat="YYYY-MM" placeholder="开始日期"></a-month-picker>
@@ -51,14 +67,14 @@
                 </a-form-model-item>
             </a-form-model>
         </div>
-        <div class="d2">
+        <div class="d2" v-if="filterActive.length!=0">
             <div :class="getIsLight?'lightSy':'dark'">
                 <span v-for="(item, index) in stableList" :key="index">
-                    <a-button style="margin-left: 12px" @click="onDelete(index)" ghost type="primary" disabled>{{item}}</a-button>
+                    <a-button style="margin-left: 12px" @click="onDeleteStable(index)" ghost type="primary">{{item.Name}}<a-icon type="close" /></a-button>
                 </span>
             </div>
         </div>
-        <div class="d2" :class="getIsLight?'lightSy':'dark'">
+        <div class="d2" :class="getIsLight?'lightSy':'dark'" v-if="filterActive.length!=0">
             <a-button style="margin-left: 12px" type="primary" icon="plus" @click="hanlderAddSeries">本品车型</a-button>
             <span v-for="(item, index) in seriesList" :key="index">
                 <a-button style="margin-left: 12px" @click="onDelete(index)" type="primary">{{item}}<a-icon type="close" /></a-button>
@@ -125,6 +141,8 @@ export default {
             modelShow: false,
             brand: '奥迪',
             model: '',
+            //筛选框
+            filterActive: []
         }
     },
     created() {
@@ -175,16 +193,16 @@ export default {
                 let data = res.data;
                 // [ [车长，售价，销量，车名，'total'],[] ]
                 let arr = [];
-                let sList = []
+                // let sList = []
                 data.forEach(ele => {
                     if(ele.CheChang * 1 != 0) {
                         let item = [ele.CheChang * 1, ele.MainPrice, ele.Count, ele.Name, 'total'];
                         // let item = [ele.Count, ele.MainPrice, ele.CheChang * 1, ele.Name, 'total'];
                         arr.push(item);
                     };
-                    sList.push(ele.Name)
+                    // sList.push(ele.Name)
                 });
-                this.stableList = sList;
+                this.stableList = data;
                 this.totalData = arr;
                 this.opt = createOpt(this.totalData, this.extraData);
                 this.opt2 = createOptLight(this.totalData, this.extraData)
@@ -195,7 +213,14 @@ export default {
             this.modelShow = true;
         },
         handlerBrand(val) {
-            if(val) { this.seriesList.push(val[1].name) };
+            if(val) {
+                if(this.seriesList.indexOf(val[1].name) != -1) {
+                    this.$message.error('该车型已存在')
+                    return false
+                } else {
+                    this.seriesList.push(val[1].name) 
+                }
+            };
             let obj = {
                 token: this.form.token,
                 sSeriesName: this.seriesList.join(','),
@@ -246,6 +271,21 @@ export default {
                 })
             }
         },
+        onDeleteStable(index) {
+            this.stableList.splice(index,1);
+            let data = this.stableList;
+            let arr = [];
+            data.forEach(ele => {
+                if(ele.CheChang * 1 != 0) {
+                    let item = [ele.CheChang * 1, ele.MainPrice, ele.Count, ele.Name, 'total'];
+                    // let item = [ele.Count, ele.MainPrice, ele.CheChang * 1, ele.Name, 'total'];
+                    arr.push(item);
+                };
+            });
+            this.totalData = arr;
+            this.opt = createOpt(this.totalData, this.extraData);
+            this.opt2 = createOptLight(this.totalData, this.extraData)
+        },
         report() {
             let obj = {
                 token: this.form.token,
@@ -266,6 +306,9 @@ export default {
                 let data = res.data;
                 window.open(data);
             })
+        },
+        handlerMenu(value) {
+            this.filterActive = value
         }
     }
 }
@@ -280,11 +323,16 @@ export default {
         display: flex;
         justify-content: flex-start;
         padding: 8px 16px 0px 16px;
+        animation:fadenum 0.5s;
+        @keyframes fadenum{ /*设置内容由显示变为隐藏*/
+            0%{opacity: 0;}
+            100%{opacity: 1;}
+        }
     }
     .d3 {
         // padding: 0px 16px 16px 16px;
         width: 100%;
-        height: 1060px;
+        height: 670px;
     }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/SaleRank/MarketComp/opt.js b/src/views/SaleRank/MarketComp/opt.js
index 7f3cf72..0b57b9b 100644
--- a/src/views/SaleRank/MarketComp/opt.js
+++ b/src/views/SaleRank/MarketComp/opt.js
@@ -1,10 +1,10 @@
-import * as echarts from "echarts";
-import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(data = [],extraData = []) {
     return {
         grid: {
             left: '6%',
-            // top: '10%'
+            top: '8%',
+            right: '7%',
+            bottom: '8%'
         },
           xAxis: {
             splitLine: false,
diff --git a/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue b/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue
index 98cabb7..44fdfe0 100644
--- a/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue
+++ b/src/views/SaleRank/MarketSaleChina/mscCompChart/index.vue
@@ -6,13 +6,24 @@
         <v-label-div-light v-else title="全车型竞争关系图谱" class="lightSy">
             <a-button type="primary" @click="report">导出报告</a-button>
         </v-label-div-light>
-        <div class="d2">
+        <div :class="getIsLight?'lightSy':'dark'">
+            <a-menu mode="inline" style="width: 15%" @openChange="handlerMenu" theme="dark">
+                <a-sub-menu title="筛选项" key="sub1">
+                </a-sub-menu>
+            </a-menu>
+        </div>
+        <div class="d2" v-if="filterActive.length!=0">
             <a-form-model layout="inline">
                 <a-form-model-item :class="getIsLight?'lightSy':'dark'" label="数据筛选">
                     <a-select style="width: 200px" mode="multiple" v-model="countries" placeholder="选择国别" allowClear>
                         <a-select-option v-for="(item) in countryList" :value="item.key" :key="item.value">
                             {{item.value}}
                         </a-select-option>
+                        <a-select-opt-group v-for="(it,id) in countryList" :key="id*10" :label="it.value">
+                            <a-select-option v-for="(item) in it.data" :value="item.key" :key="item.value">
+                                {{item.value}}
+                            </a-select-option>
+                        </a-select-opt-group>
                     </a-select>
                     <a-select style="width: 200px" mode="multiple" v-model="energies" placeholder="选择能源" allowClear>
                         <a-select-option v-for="(item) in energyList" :value="item.key" :key="item.value">
@@ -28,6 +39,11 @@
                         <a-select-option v-for="(item) in specList" :value="item.key" :key="item.value">
                             {{item.value}}
                         </a-select-option>
+                        <a-select-opt-group v-for="(it,id) in specList" :key="id*10" :label="it.value">
+                            <a-select-option v-for="(item) in it.data" :value="item.key" :key="item.value">
+                                {{item.value}}
+                            </a-select-option>
+                        </a-select-opt-group>
                     </a-select>
                     <a-select style="width: 200px" mode="multiple" v-model="displacements" placeholder="选择排量" allowClear>
                         <a-select-option v-for="(item) in displacementList" :value="item.key" :key="item.value">
@@ -43,7 +59,7 @@
                 </a-form-model-item>
             </a-form-model>
         </div>
-        <div class="d2">
+        <div class="d2" v-if="filterActive.length!=0">
             <a-form-model layout="inline">
                 <a-form-model-item label="选择日期" :class="getIsLight?'lightSy':'dark'">
                     <a-month-picker style="width: 146px" :allowClear="false" v-model="selTime[0]" valueFormat="YYYY-MM" placeholder="开始日期"></a-month-picker>
@@ -51,7 +67,7 @@
                 </a-form-model-item>
             </a-form-model>
         </div>
-        <div class="d2">
+        <div class="d2" v-if="filterActive.length!=0">
             <div :class="getIsLight?'lightSy':'dark'">
                 <span v-for="(item, index) in seriesList" :key="index">
                     <a-button style="margin-left: 12px" @click="onDelete(index)" type="primary">{{item}}<a-icon type="close" /></a-button>
@@ -117,6 +133,8 @@ export default {
             modelShow: false,
             brand: '奥迪',
             model: '',
+            //筛选框
+            filterActive: []
         }
     },
     created() {
@@ -183,7 +201,14 @@ export default {
             this.modelShow = true;
         },
         handlerBrand(val) {
-            if(val) { this.seriesList.push(val[1].name) };
+            if(val) {
+                if(this.seriesList.indexOf(val[1].name) != -1) {
+                    this.$message.error('该车型已存在')
+                    return false
+                } else {
+                    this.seriesList.push(val[1].name) 
+                }
+            };
             let obj = {
                 token: this.form.token,
                 sSeriesName: this.seriesList.join(','),
@@ -253,6 +278,9 @@ export default {
                 let data = res.data;
                 window.open(data);
             })
+        },
+        handlerMenu(value) {
+            this.filterActive = value
         }
     }
 }
@@ -267,11 +295,16 @@ export default {
         display: flex;
         justify-content: flex-start;
         padding: 8px 16px 0px 16px;
+        animation:fadenum 0.5s;
+        @keyframes fadenum{ /*设置内容由显示变为隐藏*/
+            0%{opacity: 0;}
+            100%{opacity: 1;}
+        }
     }
     .d3 {
         // padding: 0px 16px 16px 16px;
         width: 100%;
-        height: 1060px;
+        height: 670px;
     }
 }
 .mcomp-light {
diff --git a/src/views/SaleRank/MarketSaleChina/mscCompChart/opt.js b/src/views/SaleRank/MarketSaleChina/mscCompChart/opt.js
index 3d2b04d..68cf75b 100644
--- a/src/views/SaleRank/MarketSaleChina/mscCompChart/opt.js
+++ b/src/views/SaleRank/MarketSaleChina/mscCompChart/opt.js
@@ -1,8 +1,10 @@
 export default function createOpt(data = [],extraData = []) {
     return {
         grid: {
-            left: '6%',
-            // top: '10%'
+          left: '6%',
+          top: '8%',
+          right: '7%',
+          bottom: '8%'
         },
           xAxis: {
             splitLine: false,
diff --git a/src/views/SaleRank/MarketSaleChina/mscEnergyType/index.vue b/src/views/SaleRank/MarketSaleChina/mscEnergyType/index.vue
index 455488c..37dcffb 100644
--- a/src/views/SaleRank/MarketSaleChina/mscEnergyType/index.vue
+++ b/src/views/SaleRank/MarketSaleChina/mscEnergyType/index.vue
@@ -1,7 +1,11 @@
 <template>
     <div class="mscet-outter" :style="getIsLight?{background: '#FFF'}:{}">
-        <v-label-div v-if="!getIsLight" title="能源类型占比分布"></v-label-div>
-        <v-label-div-light v-else title="能源类型占比分布"></v-label-div-light>
+        <v-label-div v-if="!getIsLight" title="能源类型占比分布">
+            <a-button type="primary" @click="report">导出报告</a-button>
+        </v-label-div>
+        <v-label-div-light v-else title="能源类型占比分布" class="lightSy">
+            <a-button type="primary" @click="report">导出报告</a-button>
+        </v-label-div-light>
         <div class="d2">
             <a-form-model :class="getIsLight?'lightSy':'dark'" layout="inline">
                 <a-form-model-item label="选择日期">
@@ -70,6 +74,19 @@ export default {
                 this.opt2 = createOptLight(dx, ds);
             })
         },
+        report() {
+            let obj = {
+                token: this.form.token,
+                sTimeType: 4,
+                sStartTime: this.selTime[0],
+                sEndTime: this.selTime[1],
+                isExcel: 1,
+            };
+            getSalesEnergyTypes(obj).then((res) => {
+                let data = res.data;
+                window.open(data);
+            });
+        }
     }
 }
 </script>
diff --git a/src/views/SaleRank/MarketSaleNE/mneCountryPercent/index.vue b/src/views/SaleRank/MarketSaleNE/mneCountryPercent/index.vue
index 19ae9dd..62ad0bf 100644
--- a/src/views/SaleRank/MarketSaleNE/mneCountryPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleNE/mneCountryPercent/index.vue
@@ -102,7 +102,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesCountrysTypesE(obj).then(() => {
+            getSalesCountrysTypesE(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/index.vue b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/index.vue
index 9d37b8b..8f8c62f 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/index.vue
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/index.vue
@@ -104,7 +104,7 @@ export default {
                 sEndTime: this.form.sEndTime,
                 isExcel: 1,
             };
-            getSalesSpecName1TypesE(obj).then(() => {
+            getSalesSpecName1TypesE(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/opt.js b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/opt.js
index dec374b..07f511d 100644
--- a/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/opt.js
+++ b/src/views/SaleRank/MarketSaleNE/mneMainPrice/seriesTotal/opt.js
@@ -58,7 +58,6 @@ function createData(ds = []) {
                 ], false);
               }
             }
-
           },
           data: [arr1[j].Value]
         }
diff --git a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precAutoPercent/index.vue b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precAutoPercent/index.vue
index 565bdff..3b6110e 100644
--- a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precAutoPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precAutoPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesBySedanE(obj).then(() => {
+            getSalesSpecNameTypesBySedanE(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precMpvPercent/index.vue b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precMpvPercent/index.vue
index de50b0c..0b9f582 100644
--- a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precMpvPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precMpvPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesByMpvE(obj).then(() => {
+            getSalesSpecNameTypesByMpvE(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precPercent/index.vue b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precPercent/index.vue
index 93d4d15..3b27620 100644
--- a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesE(obj).then(() => {
+            getSalesSpecNameTypesE(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precSuvPercent/index.vue b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precSuvPercent/index.vue
index 0c8a699..0e46afd 100644
--- a/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precSuvPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleNE/mnePrecisionType/precSuvPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesBySuvE(obj).then(() => {
+            getSalesSpecNameTypesBySuvE(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstCountryPercent/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstCountryPercent/index.vue
index 5b50c28..188f794 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstCountryPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstCountryPercent/index.vue
@@ -102,7 +102,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesCountrysTypes(obj).then(() => {
+            getSalesCountrysTypes(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstMPPercent/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstMPPercent/index.vue
index 927ca47..027dba5 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstMPPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstMPPercent/index.vue
@@ -102,7 +102,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameByPriceRange(obj).then(() => {
+            getSalesSpecNameByPriceRange(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainBrand/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainBrand/index.vue
index e5f3fa4..7e0d931 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainBrand/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainBrand/index.vue
@@ -96,7 +96,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesPriceRangeSBrand(obj).then(() => {
+            getSalesPriceRangeSBrand(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainCountry/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainCountry/index.vue
index 1ff4540..6c19149 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainCountry/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstMainPrice/mainCountry/index.vue
@@ -104,7 +104,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesPriceRangeSTypes(obj).then(() => {
+            getSalesPriceRangeSTypes(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precAutoPercent/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precAutoPercent/index.vue
index b5d6515..f5da0a5 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precAutoPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precAutoPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesBySedan(obj).then(() => {
+            getSalesSpecNameTypesBySedan(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precMpvPercent/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precMpvPercent/index.vue
index a5305ed..2ab1deb 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precMpvPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precMpvPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesByMpv(obj).then(() => {
+            getSalesSpecNameTypesByMpv(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precPercent/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precPercent/index.vue
index 2e37a1b..e43f247 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypes(obj).then(() => {
+            getSalesSpecNameTypes(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precSuvPercent/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precSuvPercent/index.vue
index 96a20d9..73e4b99 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precSuvPercent/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstPrecisionType/precSuvPercent/index.vue
@@ -83,7 +83,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecNameTypesBySuv(obj).then(() => {
+            getSalesSpecNameTypesBySuv(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue
index ef95532..84001cf 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/index.vue
@@ -104,7 +104,7 @@ export default {
                 sEndTime: this.selTime[1],
                 isExcel: 1,
             };
-            getSalesSpecName1Types(obj).then(() => {
+            getSalesSpecName1Types(obj).then((res) => {
                 let data = res.data;
                 window.open(data);
             });
diff --git a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/opt.js b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/opt.js
index dec374b..07f511d 100644
--- a/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/opt.js
+++ b/src/views/SaleRank/MarketSaleTraditional/mstSeriesType/seriesTotal/opt.js
@@ -58,7 +58,6 @@ function createData(ds = []) {
                 ], false);
               }
             }
-
           },
           data: [arr1[j].Value]
         }