From 18bf169a1df39384a3abb739257e979844cf9fed Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Wed, 17 Nov 2021 14:27:33 +0800
Subject: [PATCH] cxw-010203

---
 .../EventDEC/incidentSpreadSituation/opt.js   |  8 +++---
 src/views/EventDEC/kmdED/index.vue            | 10 +++++---
 src/views/EventDEC/tailAnalysisED/index.vue   | 25 ++++++++++++++++---
 src/views/EventDEC/tailAnalysisED/opt.js      | 19 ++++++++------
 .../EventDEC/tonalCommunicationPosture/opt.js |  8 +++---
 5 files changed, 48 insertions(+), 22 deletions(-)

diff --git a/src/views/EventDEC/incidentSpreadSituation/opt.js b/src/views/EventDEC/incidentSpreadSituation/opt.js
index 65cd781..facba86 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-16 17:43:46
+ * @LastEditTime: 2021-11-17 14:26:08
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js
@@ -54,7 +54,7 @@ export default function createOpt(dx=[], ds=[]) {
             left: 10,
             right: 20,
             bottom: 10,
-            top: 44,
+            top: 36,
             containLabel: true
         },
         tooltip: {
@@ -73,8 +73,8 @@ export default function createOpt(dx=[], ds=[]) {
                 color: '#fff',
                 fontSize: 10
             },
-            y: 12,
-            x: 16,
+            y: 0,
+            x: 10,
             itemWidth: 12,
             itemHeight: 12
         },
diff --git a/src/views/EventDEC/kmdED/index.vue b/src/views/EventDEC/kmdED/index.vue
index d8736e8..2635e9c 100644
--- a/src/views/EventDEC/kmdED/index.vue
+++ b/src/views/EventDEC/kmdED/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-20 11:39:20
- * @LastEditTime: 2021-11-17 13:45:50
+ * @LastEditTime: 2021-11-17 14:15:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/kmdED/index.vue
@@ -12,10 +12,10 @@
         </v-label-div>
         <div class="kmd-inner">
             <div class="d1">
-                <v-ranking v-for="(item,index) in d1" :key="index" :lineShow="index === 0 ? false : true" :num="index + 1" :label="item.label|doStr(8)" :val="item.val"></v-ranking>
+                <v-ranking-kmd v-for="(item,index) in d1" :key="index" :lineShow="index === 0 ? false : true" :num="index + 1" :label="item.label|doStr(8)" :val="item.val"></v-ranking-kmd>
             </div>
             <div class="d1" style="margin-left: 14px">
-                <v-ranking v-for="(item,index) in d2" :key="index" :lineShow="index === 0 ? false : true" :num="5+index + 1" :label="item.label|doStr(8)" :val="item.val"></v-ranking>
+                <v-ranking-kmd v-for="(item,index) in d2" :key="index" :lineShow="index === 0 ? false : true" :num="5+index + 1" :label="item.label|doStr(8)" :val="item.val"></v-ranking-kmd>
             </div>
         </div>
     </div>
@@ -23,8 +23,12 @@
 
 <script>
 import { getWebsite } from "@/api/BrandInsight";
+import vRankingKmd from "./v-ranking-kmd"
 export default {
     name: "kmdED",
+    components: {
+        vRankingKmd
+    },
     props: {
         id: {
             type: String,
diff --git a/src/views/EventDEC/tailAnalysisED/index.vue b/src/views/EventDEC/tailAnalysisED/index.vue
index 00a34a8..77d38f8 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-17 13:38:21
+ * @LastEditTime: 2021-11-17 14:23:06
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/tailAnalysisED/index.vue
@@ -10,6 +10,11 @@
     <div class="taed-outter">
         <div class="taed-inner">
             <v-label-div title="传播态势" :showLine="false" :eStyle="{'border-style': 'none'}">
+                <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>
+                </a-select>
             </v-label-div>
             <div class="taed-d1">
                 <v-echarts :opt="opt"></v-echarts>
@@ -33,9 +38,20 @@ export default {
         return {
             load: false,
             opt: {},
+            selDatas: [
+                {
+                    key: 34,
+                    value: "小时",
+                },
+                {
+                    key: 20,
+                    value: "天",
+                },
+            ],
             form: {
                 token: "",
                 sRele: "",
+                sTimeType: 34,
             },
         };
     },
@@ -50,12 +66,12 @@ export default {
             this.load = true;
             getSourcetypeTime1(obj).then((res) => {
                 let data = res.data || [];
-                console.log(data)
+                console.log(data);
                 let dx = [];
                 let ds = [];
                 data.forEach((ele) => {
                     let key = ele.Time;
-                    let value = ele.value;
+                    let value = ele.Data;
                     dx.push(key);
                     ds.push(value);
                 });
@@ -63,6 +79,9 @@ export default {
                 this.load = false;
             });
         },
+        handleChange() {
+            this.getDdta()
+        }
     },
 };
 </script>
diff --git a/src/views/EventDEC/tailAnalysisED/opt.js b/src/views/EventDEC/tailAnalysisED/opt.js
index af8cf40..a7fb24a 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-01 14:25:41
+ * @LastEditTime: 2021-11-17 14:25:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js
@@ -51,10 +51,10 @@ export default function createOpt(dx=[], ds=[]) {
     let data = createData(ds)
     return {
         grid: {
-            left: '3%',
-            right: '2%',
-            bottom: '3%',
-            top: '15%',
+            left: 10,
+            right: '1%',
+            bottom: 10,
+            top: 36,
             containLabel: true
         },
         tooltip: {
@@ -70,10 +70,13 @@ export default function createOpt(dx=[], ds=[]) {
         legend: {
             icon: 'roundRect',
             textStyle: { //图例文字的样式
-                color: '#fff'
+                color: '#fff',
+                fontSize: 10
             },
-            y: 12,
-            x: 16
+            y: 0,
+            x: 10,
+            itemWidth: 12,
+            itemHeight: 12
         },
         xAxis: {
             type: 'category',
diff --git a/src/views/EventDEC/tonalCommunicationPosture/opt.js b/src/views/EventDEC/tonalCommunicationPosture/opt.js
index 8029df6..2285622 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-16 17:43:30
+ * @LastEditTime: 2021-11-17 14:26:50
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/barometer/opt.js
@@ -56,9 +56,9 @@ export default function createOpt(dx = [], ds = []) {
     return {
         grid: {
             left: 10,
-            right: 20,
+            right: '1%',
             bottom: 10,
-            top: 46,
+            top: 36,
             containLabel: true
         },
         // dataZoom: [{
@@ -85,7 +85,7 @@ export default function createOpt(dx = [], ds = []) {
                 color: '#fff',
                 fontSize:10
             },
-            y: 10,
+            y: 0,
             x: 10,
             itemWidth: 10,
             itemHeight: 10