From ed20bb56a39a0884b76a4c68af75b4946f3a94bb Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Fri, 19 Nov 2021 18:09:18 +0800
Subject: [PATCH] cxw-010203

---
 src/lycomponents/iHeader/index.vue            |  2 +-
 src/lycomponents/iHeaderBrand/index.vue       |  2 +-
 src/utils/gol/singleColumnar.js               | 13 ++++++------
 src/views/EventComparison/CWIEC/index.vue     |  4 ++--
 src/views/EventComparison/cotwiEc/index.vue   |  6 +++---
 src/views/EventDEC/wbUserEDE/opt.js           | 10 ++++-----
 .../mcChooseModel/index.vue                   | 21 +++++++++++++++++--
 7 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/lycomponents/iHeader/index.vue b/src/lycomponents/iHeader/index.vue
index cd5e0fc..47998a0 100644
--- a/src/lycomponents/iHeader/index.vue
+++ b/src/lycomponents/iHeader/index.vue
@@ -79,7 +79,7 @@ export default {
     watch: {
         $route: {
             handler(val) {
-                if (val.path === "/eventDEC") {
+                if (val.path === "/eventDEC" || val.path === "/industryDataExport") {
                     this.timeShow = false;
                 } else {
                     this.timeShow = true;
diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index ea13221..2dd6d43 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -89,7 +89,7 @@ export default {
      watch: {
         $route: {
             handler(val) {
-                if (val.path === "/eventDEC" || val.path === "/eventComparison") {
+                if (val.path === "/eventDEC" || val.path === "/eventComparison" || val.path === "/industryDataExport") {
                     this.timeShow = false;
                 } else {
                     this.timeShow = true;
diff --git a/src/utils/gol/singleColumnar.js b/src/utils/gol/singleColumnar.js
index 7a935e0..4c8b844 100644
--- a/src/utils/gol/singleColumnar.js
+++ b/src/utils/gol/singleColumnar.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-08 10:13:32
- * @LastEditTime: 2021-11-18 11:29:41
+ * @LastEditTime: 2021-11-19 17:57:49
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/utils/gol/index.js
@@ -9,7 +9,7 @@
 import * as echarts from "echarts";
 import { bigNumberTransform } from "@/utils/gol/dataTool"
 // import {doStr} from "./dataTool"
-export function createSingleColumnar(dx=[], ds=[], color='#3373CC') {
+export function createSingleColumnar(dx=[], ds=[], color='#3373CC', n = 4) {
     return {
         grid: {
             top: 20,
@@ -41,10 +41,11 @@ export function createSingleColumnar(dx=[], ds=[], color='#3373CC') {
             type: "category",
             axisLabel :{  
                 interval:0,
-                with: 1 / dx.length * 100 + '%',
-                overflow: 'truncate',
-                ellipsis: '...' 
+                formatter: function (value) {
+                    return (value.length > n ? (value.slice(0,n)+"...") : value )
+                  },
             }, 
+            triggerEvent: false,
             axisTick: {
                 show: false,
             },
@@ -109,7 +110,7 @@ export function createSingleColumnar(dx=[], ds=[], color='#3373CC') {
                                 },
                                 {
                                     offset: 1,
-                                    color: color, // 100% 处的颜色#3373CC
+                                    color: color ? color : '#3373CC', // 100% 处的颜色#3373CC
                                 },
                             ],
                             false
diff --git a/src/views/EventComparison/CWIEC/index.vue b/src/views/EventComparison/CWIEC/index.vue
index 2ff54ac..9f0c964 100644
--- a/src/views/EventComparison/CWIEC/index.vue
+++ b/src/views/EventComparison/CWIEC/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 09:46:17
- * @LastEditTime: 2021-10-19 09:58:01
+ * @LastEditTime: 2021-11-19 17:53:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventComparison/CWIEC/index.vue
@@ -56,7 +56,7 @@ export default {
                   dx.push(e.key);
                   ds.push(e.value);
               });
-              this.opt = createSingleColumnar(dx,ds);
+              this.opt = createSingleColumnar(dx,ds, '', 6);
               this.load = false;
           })
        }
diff --git a/src/views/EventComparison/cotwiEc/index.vue b/src/views/EventComparison/cotwiEc/index.vue
index e171bcc..28d3662 100644
--- a/src/views/EventComparison/cotwiEc/index.vue
+++ b/src/views/EventComparison/cotwiEc/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 10:01:25
- * @LastEditTime: 2021-10-19 10:09:12
+ * @LastEditTime: 2021-11-19 17:57:06
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventComparison/cotwiEc/index.vue
@@ -28,7 +28,7 @@ export default {
   name: "cotwiEc",
   data() {
     return {
-      opt: createSingleColumnar(["事件一", "事件二"], [2200, 1900], "#52bb90"),
+      opt: {},
       form: {
         token: "",
         sRele: "",
@@ -60,7 +60,7 @@ export default {
           dx.push(e.key);
           ds.push(e.value);
         });
-        this.opt = createSingleColumnar(dx, ds,"#52bb90");
+        this.opt = createSingleColumnar(dx, ds,"#52bb90", 6);
         this.load = false;
       });
     },
diff --git a/src/views/EventDEC/wbUserEDE/opt.js b/src/views/EventDEC/wbUserEDE/opt.js
index f01a8de..a1c1b08 100644
--- a/src/views/EventDEC/wbUserEDE/opt.js
+++ b/src/views/EventDEC/wbUserEDE/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 09:49:50
- * @LastEditTime: 2021-10-28 13:07:24
+ * @LastEditTime: 2021-11-19 18:06:54
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/userPortrait/opt.js
@@ -37,17 +37,17 @@ export default function createOpt(ds = [], color = []) {
       {
         name: 'Access From0',
         type: 'pie',
-        radius: ['65%', '80%'],
+        radius: ['60%', '70%'],
         avoidLabelOverlap: false,
         label: {
           show: false,
           position: 'center',
-          lineHeight: 30
+          lineHeight: 36
         },
         emphasis: {
           label: {
             show: true,
-            fontSize: '16',
+            fontSize: '20',
             color: "#ffff",
             fontWeight: 'bold',
             formatter: function (p) {
@@ -63,7 +63,7 @@ export default function createOpt(ds = [], color = []) {
       {
         name: 'Access From1',
         type: 'pie',
-        radius: ['86%', '94%'],
+        radius: ['72%', '75%'],
         avoidLabelOverlap: false,
         label: {
           show: false,
diff --git a/src/views/MarketingComparison/mcChooseModel/index.vue b/src/views/MarketingComparison/mcChooseModel/index.vue
index 173d1b5..e1d2131 100644
--- a/src/views/MarketingComparison/mcChooseModel/index.vue
+++ b/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-03 11:54:08
- * @LastEditTime: 2021-11-05 18:50:42
+ * @LastEditTime: 2021-11-19 17:31:59
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -74,6 +74,9 @@ export default {
             brand: "",
             model: "",
             chooseIndex: -1,
+            startVal: "",
+            endValue: "",
+            offsetDays: 86400000 * 30, //最多选择7天
             form: {
                 token: "",
                 sBrandName: "",
@@ -168,7 +171,6 @@ export default {
             });
             this.$emit("del", n);
             this.$emit("change", filterArr);
-             
         },
         // 获取切换车型的数据
         handlerBrand(arr) {
@@ -179,6 +181,19 @@ export default {
         },
         // 选择时间的判断
         handlerTime(item) {
+             let t1 = item.startTime ? moment(item.startTime).valueOf() : 0;
+             let t2 = item.endTime ? moment(item.endTime).valueOf() : 0;
+             let current = new Date().getTime();
+             if(t1 > current) {
+                  item.startTime = "";
+                  this.$message.warning("开始时间不能大于当前时间");
+                  return;
+             }
+             if(t2 > current) {
+                 item.endTime = "";
+                 this.$message.warning("结束时间不能大于当前时间");
+                 return;
+             }
             if (item.startTime && item.endTime) {
                 let isBefore = moment(item.startTime).isBefore(item.endTime);
                 if (!isBefore) {
@@ -192,6 +207,8 @@ export default {
                 }
             }
         },
+        
+        
     },
 };
 </script>