From 7dcb139de4cfa187aeb75bae7cd671ad4c8ebd69 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Mon, 22 Nov 2021 10:13:39 +0800
Subject: [PATCH] cxw-010203

---
 src/views/EventDEC/incidentSpreadSituation/index.vue   | 4 ++--
 src/views/EventDEC/incidentSpreadSituation/opt.js      | 9 ++++-----
 src/views/EventDEC/tailAnalysisED/index.vue            | 4 ++--
 src/views/EventDEC/tailAnalysisED/opt.js               | 9 ++++-----
 src/views/EventDEC/tonalCommunicationPosture/index.vue | 6 +++---
 src/views/EventDEC/tonalCommunicationPosture/opt.js    | 9 ++++-----
 6 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/views/EventDEC/incidentSpreadSituation/index.vue b/src/views/EventDEC/incidentSpreadSituation/index.vue
index e2bea72..b742b93 100644
--- a/src/views/EventDEC/incidentSpreadSituation/index.vue
+++ b/src/views/EventDEC/incidentSpreadSituation/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 19:05:36
- * @LastEditTime: 2021-11-19 13:55:47
+ * @LastEditTime: 2021-11-22 10:04:53
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/incidentSpreadSituation/index.vue
@@ -71,7 +71,7 @@ export default {
                     dx.push(key);
                     ds.push(value);
                 });
-                this.opt = createOpt(dx, ds);
+                this.opt = createOpt(dx, ds, this.form.sTimeType);
                 this.load = false;
             });
         },
diff --git a/src/views/EventDEC/incidentSpreadSituation/opt.js b/src/views/EventDEC/incidentSpreadSituation/opt.js
index e1f5b24..5e8575b 100644
--- a/src/views/EventDEC/incidentSpreadSituation/opt.js
+++ b/src/views/EventDEC/incidentSpreadSituation/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 10:11:24
- * @LastEditTime: 2021-11-19 19:48:35
+ * @LastEditTime: 2021-11-22 10:11:55
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js
@@ -47,12 +47,12 @@ function createData(ds = []) {
     }
     return arr;
 }
-export default function createOpt(dx=[], ds=[]) {
+export default function createOpt(dx=[], ds=[], sTimeType = 20) {
     let data = createData(ds)
     return {
         grid: {
             left: 10,
-            right: 20,
+            right: '3%',
             bottom: 10,
             top: 36,
             containLabel: true
@@ -92,9 +92,8 @@ export default function createOpt(dx=[], ds=[]) {
             },
             axisLabel: {
                 formatter: (value) => {
-                    let rex = "00:00:00";
                     let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    if(sTimeType === 34) {
                         str = value.substring(10, 16)
                     } else {
                         str = value.substring(0, 10)
diff --git a/src/views/EventDEC/tailAnalysisED/index.vue b/src/views/EventDEC/tailAnalysisED/index.vue
index ec9d65d..ba98b82 100644
--- a/src/views/EventDEC/tailAnalysisED/index.vue
+++ b/src/views/EventDEC/tailAnalysisED/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-20 11:19:00
- * @LastEditTime: 2021-11-19 13:56:28
+ * @LastEditTime: 2021-11-22 10:09:34
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/tailAnalysisED/index.vue
@@ -74,7 +74,7 @@ export default {
                     dx.push(key);
                     ds.push(value);
                 });
-                this.opt = createOpt(dx, ds);
+                this.opt = createOpt(dx, ds, this.form.sTimeType);
                 this.load = false;
             });
         },
diff --git a/src/views/EventDEC/tailAnalysisED/opt.js b/src/views/EventDEC/tailAnalysisED/opt.js
index 6b636d6..ad467ab 100644
--- a/src/views/EventDEC/tailAnalysisED/opt.js
+++ b/src/views/EventDEC/tailAnalysisED/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-12 10:11:24
- * @LastEditTime: 2021-11-19 19:48:41
+ * @LastEditTime: 2021-11-22 10:10:55
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js
@@ -47,12 +47,12 @@ function createData(ds = []) {
     }
     return arr;
 }
-export default function createOpt(dx=[], ds=[]) {
+export default function createOpt(dx=[], ds=[],sTimeType = 20) {
     let data = createData(ds)
     return {
         grid: {
             left: 10,
-            right: '1%',
+            right: '3%',
             bottom: 10,
             top: 36,
             containLabel: true
@@ -92,9 +92,8 @@ export default function createOpt(dx=[], ds=[]) {
             },
             axisLabel: {
                 formatter: (value) => {
-                    let rex = "00:00:00";
                     let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    if(sTimeType === 34) {
                         str = value.substring(10, 16)
                     } else {
                         str = value.substring(0, 10)
diff --git a/src/views/EventDEC/tonalCommunicationPosture/index.vue b/src/views/EventDEC/tonalCommunicationPosture/index.vue
index 5fd927f..48c5afb 100644
--- a/src/views/EventDEC/tonalCommunicationPosture/index.vue
+++ b/src/views/EventDEC/tonalCommunicationPosture/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-19 19:35:25
- * @LastEditTime: 2021-11-19 13:56:00
+ * @LastEditTime: 2021-11-22 10:13:01
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/tonalCommunicationPosture/index.vue
@@ -9,7 +9,7 @@
 <template>
     <div class="tcp-outter">
         <v-label-div title="调性传播态势">
-            <a-select v-model="form.sTimeType" :size="$vuiSize" style="width: 120px; margin-left: 40px; margin-right: 8px" @change="handleChange">
+            <a-select v-model="form.sTimeType" :size="$vuiSize" style="width: 7rem; margin-left: 2.2rem; margin-right: 0.5rem" @change="handleChange">
                 <a-select-option :style="{ color: '#fff' }" v-for="item in selDatas" :value="item.key" :key="item.key">
                     {{ item.value }}
                 </a-select-option>
@@ -71,7 +71,7 @@ export default {
                     dx.push(key);
                     ds.push(value);
                 });
-                this.opt = createOpt(dx, ds);
+                this.opt = createOpt(dx, ds, this.form.sTimeType);
                 this.load = false;
             });
         },
diff --git a/src/views/EventDEC/tonalCommunicationPosture/opt.js b/src/views/EventDEC/tonalCommunicationPosture/opt.js
index 80a3769..c912e6c 100644
--- a/src/views/EventDEC/tonalCommunicationPosture/opt.js
+++ b/src/views/EventDEC/tonalCommunicationPosture/opt.js
@@ -2,7 +2,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 11:38:06
- * @LastEditTime: 2021-11-19 19:48:47
+ * @LastEditTime: 2021-11-22 10:11:27
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/barometer/opt.js
@@ -51,12 +51,12 @@ function createData(ds = []) {
     }
     return arr;
 }
-export default function createOpt(dx = [], ds = []) {
+export default function createOpt(dx = [], ds = [], sTimeType = 20) {
     const data = createData(ds);
     return {
         grid: {
             left: 10,
-            right: '1%',
+            right: '3%',
             bottom: 10,
             top: 36,
             containLabel: true
@@ -104,9 +104,8 @@ export default function createOpt(dx = [], ds = []) {
             },
             axisLabel: {
                 formatter: (value) => {
-                    let rex = "00:00:00";
                     let str = "";
-                    if(value.indexOf(rex) === -1) {
+                    if(sTimeType === 34) {
                         str = value.substring(10, 16)
                     } else {
                         str = value.substring(0, 10)