Merge branch 'dev' of https://git.oa00.com/SWS/carInsightSystem into dev

# Conflicts:
#	src/views/BrandComparison/keyMediaCommunicationComparison/index.vue

src/mixins/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 13:56:13
- * @LastEditTime: 2021-11-11 10:12:10
+ * @LastEditTime: 2021-11-11 10:44:35
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/mixins/index.js
@@ -39,7 +39,6 @@ export default {
                 'loading': Loading,
                  resize: { // 指令的名称
                     bind(el, binding) { // el为绑定的元素，binding为绑定给指令的对象
-                        // console.log(el, "绑定", binding);
                         let width = '', height = '';
                         function isReize() {
                             const style = document.defaultView.getComputedStyle(el);
@@ -52,7 +51,6 @@ export default {
                         el.__vueSetInterval__ = setInterval(isReize, 300);
                     },
                     unbind(el) {
-                        // console.log(el, "解绑");
                         clearInterval(el.__vueSetInterval__);
                     }
                 },
@@ -83,7 +81,6 @@ export default {
                     //     adaptive(el, binding.value)
                     // },
                     unbind(el) {
-                        // console.log(el, "解绑");
                         clearInterval(el.__vueSetInterval__);
                     }
                 }

src/permission.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-08 09:26:42
- * @LastEditTime: 2021-11-09 11:06:03
+ * @LastEditTime: 2021-11-11 10:44:05
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/permission.js
@@ -11,7 +11,7 @@ import NProgress from "nprogress"
 import "nprogress/nprogress.css"
 
 const whitePath = ['/', '/login', '/industryDataExport','/index']
-// console.log(token)
+
 router.beforeEach((to, from, next) => {
     NProgress.start()
     const token = sessionStorage.getItem('token');

src/request/index.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-13 09:28:02
- * @LastEditTime: 2021-10-28 14:00:32
+ * @LastEditTime: 2021-11-11 10:45:00
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/request/index.js
@@ -70,7 +70,6 @@ httpService.interceptors.response.use(response => {
 },err => {
 	// TODO:具体的code对应的处理可继续添加修改
     if(err.response.Code === 301){
-        // console.log('登录过期');
          //登录过期跳转登录页面，并将要浏览的页面fullPath传过去，登录成功后跳转需要访问的页面 ---主页(index) 或者 退出到登录前的浏览的页面
         //这样登录页面登录接口成功之后可以进行跳转 主页(index) 或者 退出到登录前的页面： let path = this.$route.query.redirect || '/index.js';   this.$router.push(path);
         setTimeout(() => {

src/utils/gol/dataTool.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-29 13:29:26
- * @LastEditTime: 2021-10-29 20:58:56
+ * @LastEditTime: 2021-11-11 10:45:13
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/utils/gol/dataTool.js
@@ -19,7 +19,6 @@ export function bigNumberTransform(value) {
   while (value / fr >= 1) {
     fr *= 10
     num += 1
-    // console.log('数字', value / fr, 'num:', num)
   }
   if (num <= 4) { // 千
     newValue[0] = parseInt(value / 1000) + ''

src/views/BrandComparison/BrandComparison.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-05 13:49:05
- * @LastEditTime: 2021-11-08 09:40:06
+ * @LastEditTime: 2021-11-11 10:45:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandComparison/BrandComparison.vue
@@ -131,7 +131,7 @@ export default {
         };	
     },
     beforeMount() {
-        console.log('请等待')
+       
     },
     methods: {
         handlerChangeBrand(arr) {

src/views/BrandComparison/keyMediaCommunicationComparison/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-15 15:34:26
- * @LastEditTime: 2021-10-15 15:43:55
+ * @LastEditTime: 2021-11-11 10:45:28
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandComparison/keyMediaCommunicationComparison/index.vue
@@ -46,6 +46,7 @@ export default {
     getData() {
       let obj = Object.assign({}, this.getCtime2, this.form);
       getSourceCount0528C(obj).then((res) => {
+        
          let data = res.data;
          this.opt = createOpt(data);
       })

src/views/IndustryDataExport/tableEvent.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-27 15:29:37
- * @LastEditTime: 2021-10-28 20:55:12
+ * @LastEditTime: 2021-11-11 10:45:41
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/IndustryDataExport/tableEvent.js
@@ -10,17 +10,14 @@ import moment from "moment";
 function rowSelection(that) {
     return {
         onChange: (selectedRowKeys, selectedRows) => {
-            //   console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
             that.selectedRowKeys = selectedRowKeys.toString();
             that.selectedRows = selectedRows;
             that.secIds = selectedRowKeys;
 
         },
         // onSelect: (record, selected, selectedRows) => {
-        //   console.log(record, selected, selectedRows);
         // },
         // onSelectAll: (selected, selectedRows, changeRows) => {
-        //   console.log(selected, selectedRows, changeRows);
         // },
     }
 }

src/views/ModelComparison/BrandComparison.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-05 13:49:05
- * @LastEditTime: 2021-11-09 18:48:33
+ * @LastEditTime: 2021-11-11 10:46:12
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandComparison/BrandComparison.vue
@@ -131,7 +131,6 @@ export default {
         };	
     },
     beforeMount() {
-        console.log('请等待')
     },
     methods: {
         handlerChangeBrand(arr) {

src/views/ModelComparison/keyMediaCommunicationComparison/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-15 15:34:26
- * @LastEditTime: 2021-10-15 15:43:55
+ * @LastEditTime: 2021-11-11 10:46:19
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandComparison/keyMediaCommunicationComparison/index.vue
@@ -46,7 +46,6 @@ export default {
     getData() {
       let obj = Object.assign({}, this.getCtime2, this.form);
       getSourceCount0528C(obj).then(() => {
-          //console.log(res);
       })
     }
   },

src/views/ModelEventDetails/MEDEventCorrelation/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-13 11:31:08
- * @LastEditTime: 2021-11-08 18:15:07
+ * @LastEditTime: 2021-11-11 10:49:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDetails/eventCorrelation/index.vue
@@ -9,7 +9,7 @@
 <template>
     <div class="ec-outter">
         <div class="ec-top" align="center">
-            <v-btn @click="goback">返回品牌洞察</v-btn>
+            <v-btn @click="goback">返回洞察详情</v-btn>
         </div>
         <div class="ec-inner">
             <span class="ec-label">{{this.form.sSeriesName}}</span>

src/views/ModelInsight/mlWeiboPortraits/opt.js

@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 15:14:58
- * @LastEditTime: 2021-11-10 09:38:52
+ * @LastEditTime: 2021-11-11 10:46:30
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/weiboPortraits/opt.js
@@ -9,7 +9,6 @@
 import * as echarts from "echarts";
 function createData(ds=[], colors=[]) {
   let arr = [];
-  console.log(ds)
   for(let i = 0; i < ds.length; i++) {
      let ele = ds[i];
      if(ele.value*1 > 0) {

src/views/ModelWeiboDetails/MWDweiboContentType/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 10:24:56
- * @LastEditTime: 2021-11-10 17:52:05
+ * @LastEditTime: 2021-11-11 10:46:38
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboContentType/index.vue
@@ -82,7 +82,6 @@ export default {
         let data = res.data || [];
         this.doVal(data);
       });
-      console.log();
     },
     doVal(arr = []) {
       let total = 0;

src/views/ModelWeiboDetails/MWDweiboSpreadFission/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 19:15:58
- * @LastEditTime: 2021-11-10 20:09:57
+ * @LastEditTime: 2021-11-11 10:46:45
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboSpreadFission/index.vue
@@ -17,7 +17,6 @@
 </template>
 
 <script>
-import { getGraphData } from "@/api/getEchars";
 import { getDiffuseZhuTi } from "@/api/WeiboDetails";
 import createOpt from "./opt";
 export default {
@@ -50,13 +49,6 @@ export default {
         this.getData();
     },
     methods: {
-        drawGraph() {
-            let obj = Object.assign({}, this.getCtime2, this.form);
-            getGraphData(obj).then((res) => {
-                console.log(res.data);
-                this.opt = createOpt(res.data);
-            });
-        },
         getData() {
             let obj = Object.assign({}, this.getCtime2, this.form);
             getDiffuseZhuTi(obj).then((res) => {