Merge branch 'dev'

src/components/v-tab-group-control/index.vue

@@ -20,7 +20,7 @@ export default {
     name: "v-tab-group",
     props: {
         value: {
-            type: Number,
+            type: [Number, String],
             default: 0
         },
         btns: {
@@ -28,7 +28,7 @@ export default {
             default: () => []
         },
         active: {
-            type: Number,
+            type: [Number,String],
             default: 0,
         }
     },

src/views/KeyMediaHome/spreadTOPbrands/index.vue

@@ -8,7 +8,7 @@
 -->
 <template>
     <div class="stm-outter" v-loading="load">
-        <v-label-div title="传播声量TOP品牌" :showLine="false" :eStyle="{'border-style': 'none'}"></v-label-div>
+        <v-label-div title="传播声量TOP品牌" :showLine="false" :eStyle="{ 'border-style': 'none' }"></v-label-div>
         <div class="stm-inner">
             <v-echarts :opt="opt" @getData="clickEchars"></v-echarts>
         </div>
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import {getHomeBrandGroupBy} from "@/api/KeyMediaHome/index.js"
+import { getHomeBrandGroupBy } from "@/api/KeyMediaHome/index.js"
 import createOpt from "./opt"
 export default {
     name: "spreadTOPmodels",
@@ -32,33 +32,33 @@ export default {
     },
     created() {
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
-        this.form.ilimitType = 1;
+        if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
+            this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
-        this.form.ilimitType = 2;
+            this.form.ilimitType = 2;
         }
         this.getData();
     },
     methods: {
-       getData() {
-          let obj = Object.assign({},this.getCtime2, this.form); 
-          this.load = true;
-          getHomeBrandGroupBy(obj).then(res => {
-              let data = res.data || [];
-              let dx = [];
-              let ds = [];
-              data.forEach(ele => {
-                  dx.push(ele.Key)
-                  ds.push(ele.Value)
-              })
-              this.opt = createOpt(dx, ds); 
-              this.load = false;
-          })
-       },
-       clickEchars(data) {
+        getData() {
+            let obj = Object.assign({}, this.getCtime2, this.form);
+            this.load = true;
+            getHomeBrandGroupBy(obj).then(res => {
+                let data = res.data || [];
+                let dx = [];
+                let ds = [];
+                data.forEach(ele => {
+                    dx.push(ele.Key)
+                    ds.push(ele.Value)
+                })
+                this.opt = createOpt(dx, ds);
+                this.load = false;
+            })
+        },
+        clickEchars(data) {
             let ele = data;
             let brand = ele.axisValueLabel;
-            this.setBrand({brandname: brand});
+            this.setBrand({ brandname: brand });
             this.$router.push("/brandInsight");
         }
     }
@@ -69,6 +69,7 @@ export default {
     width: 936px;
     height: 412px;
     border: 2px solid #0f2a4d;
+
     .stm-inner {
         width: 100%;
         height: calc(100% - 48px);

src/views/KeyMediaHome/spreadTOPmodels/index.vue

@@ -8,7 +8,7 @@
 -->
 <template>
     <div class="stm-outter" v-loading="load">
-        <v-label-div title="传播声量TOP车型" :showLine="false" :eStyle="{'border-style': 'none'}"></v-label-div>
+        <v-label-div title="传播声量TOP车型" :showLine="false" :eStyle="{ 'border-style': 'none' }"></v-label-div>
         <div class="stm-inner">
             <v-echarts :opt="opt" @getData="clickEchars"></v-echarts>
         </div>
@@ -16,7 +16,7 @@
 </template>
 
 <script>
-import {getHomeCartypeTop10} from "@/api/KeyMediaHome/index.js"
+import { getHomeCartypeTop10 } from "@/api/KeyMediaHome/index.js"
 import createOpt from "./opt"
 export default {
     name: "spreadTOPmodels",
@@ -32,33 +32,33 @@ export default {
     },
     created() {
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
-        this.form.ilimitType = 1;
+        if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
+            this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
-        this.form.ilimitType = 2;
+            this.form.ilimitType = 2;
         }
         this.getData();
     },
     methods: {
-       getData() {
-          let obj = Object.assign({},this.getCtime2, this.form); 
-          this.load = true;
-          getHomeCartypeTop10(obj).then(res => {
-              let data = res.data || {};
-              let dx = [];
-              let ds = [];
-              for(let key in data) {
-                  dx.push(key);
-                  ds.push(data[key])
-              }
-              this.opt = createOpt(dx, ds); 
-              this.load = false;
-          })
-       },
-       clickEchars(data) {
+        getData() {
+            let obj = Object.assign({}, this.getCtime2, this.form);
+            this.load = true;
+            getHomeCartypeTop10(obj).then(res => {
+                let data = res.data || {};
+                let dx = [];
+                let ds = [];
+                for (let key in data) {
+                    dx.push(key);
+                    ds.push(data[key])
+                }
+                this.opt = createOpt(dx, ds);
+                this.load = false;
+            })
+        },
+        clickEchars(data) {
             let ele = data;
             let model = ele.axisValueLabel;
-            this.setModel({name: model});
+            this.setModel({ name: model });
             this.$router.push("/modelInsight");
         }
     }
@@ -70,6 +70,7 @@ export default {
     height: 412px;
     border: 2px solid #0f2a4d;
     margin-left: 16px;
+
     .stm-inner {
         width: 100%;
         height: calc(100% - 48px);

src/views/KeyMediaHome/weiboCommunicationTrend/index.vue

@@ -59,7 +59,7 @@ export default {
     },
     created() {
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
+        if(this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
         this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
         this.form.ilimitType = 2;

src/views/KeyMediaHome/weiboCommunicationTrendLong/index.vue

@@ -25,30 +25,30 @@
 </template>
 
 <script>
-import {getHomeTimeCount} from "@/api/KeyMediaHome/index.js"
-import {doStr} from "@/utils/gol/dataTool"
+import { getHomeTimeCount } from "@/api/KeyMediaHome/index.js"
+import { doStr } from "@/utils/gol/dataTool"
 import createOpt from "./opt"
 export default {
     name: "weibo-communication-trend",
     data() {
         return {
             //弹出框//
-            modelStyle:{
+            modelStyle: {
                 left: '',
                 top: ''
             },
             modelShow: false,
-            ecbox:{//图表宽高
-                width:618,
-                height:490
+            ecbox: {//图表宽高
+                width: 618,
+                height: 490
             },
-            ecmodel:{//弹框宽高
-                width:300,
-                height:280
+            ecmodel: {//弹框宽高
+                width: 300,
+                height: 280
             },
             activeCol: 0,
             //-*-//
-            load: false, 
+            load: false,
             form: {
                 token: "",
                 sSource: '',
@@ -61,10 +61,10 @@ export default {
     created() {
         this.form.token = this.getToken;
         this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
-        this.form.ilimitType = 1;
+        if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
+            this.form.ilimitType = 1;
         } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
-        this.form.ilimitType = 2;
+            this.form.ilimitType = 2;
         }
         this.getData();
     },
@@ -93,7 +93,7 @@ export default {
             this.load = true;
             let obj = Object.assign({}, this.getCtime2, this.form);
             getHomeTimeCount(obj).then(res => {
-                let data = res.data || [];               
+                let data = res.data || [];
                 let dx = []; //time
                 let ds = []; //value
                 data.forEach(ele => {
@@ -113,16 +113,19 @@ export default {
     width: 1887px;
     height: 460px;
     border: 2px solid #0f2a4d;
+
     .wct-inner {
         width: 100%;
         height: calc(100% - 48px);
     }
 }
-.vshow{
-  position: absolute;
+
+.vshow {
+    position: absolute;
     width: 300px;
     background: rgb(3, 18, 36);
     border: 4px solid #0f2a4d;
+
     .vshow-item {
         padding: 11px;
         width: 100%;

src/views/KeyMediaHome/weiboContentTOPVolume/index.vue

@@ -10,11 +10,11 @@
   <div class="wct-outter" v-loading="load">
     <v-label-div title="内容TOP声量"> </v-label-div>
     <div class="wct-inner">
-      <div class="wct-d1" v-for="(item,index) in list" :key="index">
+      <div class="wct-d1" v-for="(item, index) in list" :key="index">
         <v-echarts :opt="item.opt"></v-echarts>
         <div class="wct-d1-dd1">
-          <span>排名：<span class="ss1">0{{index+1}}</span></span>
-          <span>声量：<span class="ss1">{{item.value}}</span></span>
+          <span>排名：<span class="ss1">0{{ index + 1 }}</span></span>
+          <span>声量：<span class="ss1">{{ item.value }}</span></span>
         </div>
       </div>
     </div>
@@ -22,52 +22,52 @@
 </template>
 
 <script>
-import {comparePig} from "@/utils/gol/dataTool"
+import { comparePig } from "@/utils/gol/dataTool"
 import createOpt from "./opt"
-import {getHomeDirectWeiBo0528} from "@/api/KeyMediaHome/index.js"
+import { getHomeDirectWeiBo0528 } from "@/api/KeyMediaHome/index.js"
 export default {
-    name: "weiboContentTOPVolume",
-    data() {
-        return {
-            load: false, 
-            form: {
-                sSource: '',
-                ilimitType: 0,
-            },
-            list: [],
-            colors: ['#3373CC', '#63AECC', '#54BF93', '#CC9D12', '#3373CC', '#63AECC', '#54BF93', '#CC9D12']
-        };
-    },
-    created() {
-        this.form.sSource = this.$route.query.source || "抖音";
-        if(this.form.sSource == '汽车之家') {
-          this.form.ilimitType = 1;
-        } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
-          this.form.ilimitType = 2;
-        }
-        this.getData();
-    },
-    methods: {
-        getData() {
-            // this.load = true;
-            let obj = Object.assign({}, this.getCtime2, this.form);
-            getHomeDirectWeiBo0528(obj).then(res => {
-                let data = res.data || [];
-                let arr = [];
-                data.sort(comparePig('value'));
-                let maxVal = data[0].value
-                data.forEach((ele,index) => {
-                    let obj = {
-                        value: ele.value,
-                        opt: createOpt(ele.key,this.colors[index],ele.value, maxVal)
-                    }
-                    arr.push(obj)
-                })
-                this.list = arr;
-                this.load = false;
-            });
-        }
+  name: "weiboContentTOPVolume",
+  data() {
+    return {
+      load: false,
+      form: {
+        sSource: '',
+        ilimitType: 0,
+      },
+      list: [],
+      colors: ['#3373CC', '#63AECC', '#54BF93', '#CC9D12', '#3373CC', '#63AECC', '#54BF93', '#CC9D12']
+    };
+  },
+  created() {
+    this.form.sSource = this.$route.query.source || "抖音";
+    if (this.form.sSource == '汽车之家' && this.getCarCircle == 1) {
+      this.form.ilimitType = 1;
+    } else if (this.form.sSource == '懂车帝' && this.getCarCircle == 1) {
+      this.form.ilimitType = 2;
+    }
+    this.getData();
+  },
+  methods: {
+    getData() {
+      // this.load = true;
+      let obj = Object.assign({}, this.getCtime2, this.form);
+      getHomeDirectWeiBo0528(obj).then(res => {
+        let data = res.data || [];
+        let arr = [];
+        data.sort(comparePig('value'));
+        let maxVal = data[0].value
+        data.forEach((ele, index) => {
+          let obj = {
+            value: ele.value,
+            opt: createOpt(ele.key, this.colors[index], ele.value, maxVal)
+          }
+          arr.push(obj)
+        })
+        this.list = arr;
+        this.load = false;
+      });
     }
+  }
 }
 </script>
 
@@ -79,15 +79,18 @@ export default {
   margin-left: 16px;
   overflow: hidden;
 }
+
 .wct-inner {
   width: 100%;
   margin-top: 16px;
   height: calc(100% - 48px);
+
   .wct-d1 {
     position: relative;
     width: 233px;
     height: 206px;
     display: inline-block;
+
     .wct-d1-dd1 {
       position: absolute;
       padding: 0px 16px;
@@ -97,9 +100,11 @@ export default {
       justify-content: space-between;
       top: 140px;
       left: 0px;
+
       span {
         color: #d8d8d8;
         font-size: 12px;
+
         .ss1 {
           font-family: Bebas;
           font-size: 16px;