zx

src/views/BrandComparison/saleFormComparison/index.vue

@@ -49,7 +49,7 @@ export default {
                 data.forEach(ele => {
                     let key = ele.key;
                     let value = ele.value;
-                    dx.push(key);
+                    dx.push(key);   
                     ds.push(value);
                 });
                 this.opt = createOpt(dx, ds);

src/views/BrandInsight/weiboVolumeTrend/index.vue

@@ -116,7 +116,7 @@ export default {
                     }
                     hotTopArr.push(obj);
                     dataI = dataI + 1;
-              })
+                })
                 this.urlArr = urlArr;
                 //获取有热点信息的索引
                 for(let i = 0; i<hotTopArr.length; i++) {

src/views/Index/salesRank/opt.js

@@ -8,6 +8,7 @@
  * @FilePath: /data-show/src/views/Index/salesRank/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool";
 export default function createOpt(dx, ds) {
     return {
@@ -39,9 +40,13 @@ export default function createOpt(dx, ds) {
         },
         xAxis: {
             type: "category",
-            // axisLabel :{  
+            axisLabel :{  
-            //     interval:0, 
+                interval:0, 
-            // }, 
+                formatter: (value) => {
+                    let res = doStr(value, 4);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/Index/spreadTheSound/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/Index/spreadTheSound/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 let colors = ['rgba(84,111,197,1)', 'rgba(145,203,116,1)', 'rgba(90,203,156,1)', 'rgba(248,200,87,1)', 'rgba(237,101,101,1)', "rgba(114,191,222,1)", 'rgba(58,162,114,1)', 'rgba(251,131,81,1)']
 //['#546fc5', '#91cb74', '#f9c857', '#ed6565', '#72bfde', '#3aa272', '#fb8351']
@@ -90,6 +91,13 @@ export default function createOpt(dx = [], ds = []) {
     },
     xAxis: {
       type: 'category',
+      axisLabel :{  
+          interval:0, 
+          formatter: (value) => {
+              let res = doStr(value, 4);
+              return res
+          }
+      }, 
       axisTick: {
         show: false,
       },

src/views/SaleRank/AllEnergy/EnergyCY/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllEnergy/EnergyCY/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllEnergy/EnergyNE/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllEnergy/EnergyNE/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllEnergy/EnergyQH/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllEnergy/EnergyQH/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllEnergy/EnergyQY/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllEnergy/EnergyQY/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllEnergy/EnergyYDH/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllEnergy/EnergyYDH/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/MPVCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/MPVCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/SUVCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/SUVCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/jcCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/jcCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/wxCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/wxCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/xxCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/xxCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/zdxCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/zdxCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllLevel/zxCar/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllLevel/zxCar/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllPrice/Price10/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllPrice/Price10/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllPrice/Price1015/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllPrice/Price1015/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllPrice/Price1525/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllPrice/Price1525/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllPrice/Price2535/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllPrice/Price2535/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllPrice/Price3550/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllPrice/Price3550/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/AllPrice/Price50/index.vue

@@ -219,7 +219,7 @@ export default {
         }
     }
     .modal-table {
-        width: 1200px;
+        width: 1400px;
         height: 460px;
         .tb-inner {
             width: 100%;

src/views/SaleRank/AllPrice/Price50/opt.js

@@ -7,6 +7,7 @@
  * @FilePath: /data-show/src/views/BrandInsight/brandTop/opt.js
  */
 import * as echarts from "echarts";
+import {doStr} from "@/utils/gol/dataTool"
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 export default function createOpt(dx,ds) {
     return {
@@ -38,6 +39,13 @@ export default function createOpt(dx,ds) {
         },
         xAxis: {
             type: "category",
+            axisLabel :{  
+                interval:0, 
+                formatter: (value) => {
+                    let res = doStr(value, 7);
+                    return res
+                }
+            }, 
             axisTick: {
                 show: false,
             },

src/views/SaleRank/CitySale/index.vue

@@ -13,12 +13,12 @@
             <a-button @click="onSearch" style="margin-left: 40px" type="primary">查询</a-button>
         </div>
         <div class="d3">
-            <v-table v-if="activeIndex == 0" ref="rtable" :columns="columns" :loading="tableLoad" :pagination="pagination" :data="tbData">
+            <v-table v-if="activeIndex == 0" ref="rtable" :columns="columns" :loading="tableLoad" :pagination="pagination" @change="handlerPagnation" :data="tbData">
                 <template slot="about" slot-scope="text, record">
                     <a-button @click="onSalePro(record)">销量明细</a-button>
                 </template>
             </v-table>
-            <v-table v-if="activeIndex == 1" ref="rtable" :columns="columns2" :loading="tableLoad" :pagination="pagination" :data="tbData2">
+            <v-table v-if="activeIndex == 1" ref="rtable" :columns="columns2" :loading="tableLoad" :pagination="pagination2" @change="handlerPagnation2" :data="tbData2">
                 <template slot="about" slot-scope="text, record">
                     <a-button @click="onSaleCity(record)">销量明细</a-button>
                 </template>
@@ -83,7 +83,14 @@ export default {
             tbData: [],
             tbData2: [],
             pagination: {
-                pageSize: 20
+                total: 0,
+                current: 1,
+                pageSize: 20,
+            },
+            pagination2: {
+                total: 0,
+                current: 1,
+                pageSize: 20,
             },
             //窗口1
             visible: false,
@@ -148,11 +155,13 @@ export default {
                 }
                 getSalesType1(obj).then(res => {
                     let data = res.data;
+                    this.pagination.total = res.totalNum
                     this.tbData = data
                     this.tableLoad = false;
                 });
                 getSalesType0(obj).then(res => {
                     let data = res.data;
+                    this.pagination2.total = res.totalNum
                     this.tbData2 = data;
                     this.tableLoad = false;
                 })
@@ -180,11 +189,13 @@ export default {
             this.form.sEndTime = this.selTime[1];
             getSalesType1(this.form).then(res => {
                 let data = res.data;
+                this.pagination.total = res.totalNum
                 this.tbData = data
                 this.tableLoad = false;
             });
             getSalesType0(this.form).then(res => {
                 let data = res.data;
+                this.pagination2.total = res.totalNum
                 this.tbData2 = data;
                 this.tableLoad = false;
             })
@@ -205,6 +216,7 @@ export default {
                 this.dataProCity = data
             })
             getSalesType6(obj).then(res => {
+                console.log(res)
                 let data = res.data;
                 this.dataProBrand = data
             })
@@ -234,6 +246,31 @@ export default {
             })
             this.visible2 = true;
         },
+        //改变页面数据
+        handlerPagnation(page) {
+            this.tableLoading = true;
+            let cur = page.current;
+            this.pagination.current = cur;
+            this.form.iPageIndex = cur;
+            getSalesType1(this.form).then(res => {
+                let data = res.data;
+                this.pagination.total = res.totalNum
+                this.tbData = data;
+                this.tableLoading = false
+            })
+        },
+        handlerPagnation2(page) {
+            this.tableLoading = true;
+            let cur = page.current;
+            this.pagination.current = cur;
+            this.form.iPageIndex = cur;
+            getSalesType0(this.form).then(res => {
+                let data = res.data;
+                this.pagination2.total = res.totalNum
+                this.tbData = data;
+                this.tableLoading = false
+            })
+        },
         //改变窗口模式
         handlerProMode(activeIndex) {
             this.pValue = activeIndex

src/views/SaleRank/tableEvent.js

@@ -45,7 +45,7 @@ export default {
             let data = res.data;
             this.seriesList = data;
             this.chosenSeries = undefined;
-            this.isLoding = false
+            this.isLoding = false;
         })
     },
     //选择车型