From 80e3bd60042f39c73bc0015547b71259c5cfa798 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Fri, 12 Nov 2021 16:07:16 +0800
Subject: [PATCH] cxw-010203

---
 src/utils/gol/sideSingleColumn.js             | 10 +++++-
 .../brandCompateHeader/index.vue              | 33 +++++--------------
 .../ModelComparison/informationTrend/opt.js   |  2 +-
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/src/utils/gol/sideSingleColumn.js b/src/utils/gol/sideSingleColumn.js
index a6ab9e4..1814aa4 100644
--- a/src/utils/gol/sideSingleColumn.js
+++ b/src/utils/gol/sideSingleColumn.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-15 17:52:59
- * @LastEditTime: 2021-11-12 14:09:59
+ * @LastEditTime: 2021-11-12 15:09:00
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/utils/gol/sideSingleColumn.js
@@ -18,6 +18,7 @@
  */
 import * as echarts from "echarts";
 import { bigNumberTransform } from "@/utils/gol/dataTool"
+import {doStr} from "./dataTool"
 export function createSideSingleColumn(dx=[], ds=[], color='#51bc91') {
     return {
         grid: {
@@ -64,6 +65,13 @@ export function createSideSingleColumn(dx=[], ds=[], color='#51bc91') {
             axisTick: {
                 show: false,
             },
+            axisLabel :{  
+                interval:0,
+                formatter: (value) => {
+                    let str = doStr(value, 8);
+                    return str;
+                  }  
+            }, 
             axisLine: {
                 show: false,
                 lineStyle: {
diff --git a/src/views/ModelComparison/brandCompateHeader/index.vue b/src/views/ModelComparison/brandCompateHeader/index.vue
index 5e32435..545c413 100644
--- a/src/views/ModelComparison/brandCompateHeader/index.vue
+++ b/src/views/ModelComparison/brandCompateHeader/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-03 11:54:08
- * @LastEditTime: 2021-11-11 11:22:08
+ * @LastEditTime: 2021-11-12 15:06:54
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/MarketingComparison/mcChooseModel/index.vue
@@ -32,7 +32,6 @@
 </template>
 
 <script>
-import moment from "moment";
 import { getUserSeriesName } from "@/api/comm";
 export default {
     name: "brandCompateHeader",
@@ -138,39 +137,25 @@ export default {
             let row = this.list[n];
             row.brand = "";
             row.model = "";
-            row.startTime = "";
-            row.endTime = "";
             row.isDel = false;
             let filterArr = this.list.filter((ele) => {
-                return ele.brand && ele.model && ele.startTime && ele.endTime;
+                return ele.brand && ele.model;
             });
             this.$emit("del", n);
             this.$emit("change", filterArr);
-             
         },
         // 获取切换车型的数据
         handlerBrand(arr) {
-           let n = this.list.findIndex(ele => ele.model === arr[1].name);
-           if(n != -1) return;
-           let row = this.list[this.chooseIndex];
+            let n = this.list.findIndex((ele) => ele.model === arr[1].name);
+            if (n != -1) return;
+            let row = this.list[this.chooseIndex];
             row.brand = arr[0].brandname;
             row.model = arr[1].name;
             row.isDel = true;
-        },
-        // 选择时间的判断
-        handlerTime(item) {
-            if (item.startTime && item.endTime) {
-                let isBefore = moment(item.startTime).isBefore(item.endTime);
-                if (!isBefore) {
-                    item.endTime = "";
-                    this.$message.warning("结束时间必须大于开始时间");
-                } else {
-                    let filterArr = this.list.filter((ele) => {
-                        return ele.brand && ele.model;
-                    });
-                    this.$emit("change", filterArr);
-                }
-            }
+            let filterArr = this.list.filter((ele) => {
+                return ele.brand && ele.model;
+            });
+            this.$emit("change", filterArr);
         },
     },
 };
diff --git a/src/views/ModelComparison/informationTrend/opt.js b/src/views/ModelComparison/informationTrend/opt.js
index 06dfe3a..24fe048 100644
--- a/src/views/ModelComparison/informationTrend/opt.js
+++ b/src/views/ModelComparison/informationTrend/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 10:11:24
- * @LastEditTime: 2021-11-11 14:47:26
+ * @LastEditTime: 2021-11-12 15:49:35
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js