From d71d8eab17e0c2dfc7c6f798ecbf2a4c1c37d761 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Tue, 16 Nov 2021 18:26:57 +0800
Subject: [PATCH] cxw-010203

---
 src/lycomponents/iHeaderBrand/index.vue       |  15 ++-
 src/views/EventComparison/CWIEC/opt.js        |   8 --
 .../comparisonOfEventpp/index.vue             | 127 ++++++++++++------
 src/views/EventComparison/uadEc/opt1.js       |   4 +-
 src/views/EventComparison/wbcEc/opt.js        |  10 +-
 .../EventDEC/incidentSpreadSituation/opt.js   |   4 +-
 src/views/EventDEC/index.vue                  |   5 +-
 .../EventDEC/tonalCommunicationPosture/opt.js |   4 +-
 8 files changed, 115 insertions(+), 62 deletions(-)
 delete mode 100644 src/views/EventComparison/CWIEC/opt.js

diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index 9947e95..447aa0e 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -24,7 +24,7 @@
             </a-dropdown>
             <span class="iH-left-s1">菜单</span>
 
-            <a-select :default-value="1" :size="$vuiSize" class="selHead" v-model="form.sTimeType" @change="handleChange">
+            <a-select :default-value="1" :size="$vuiSize" class="selHead" v-model="form.sTimeType" @change="handleChange" v-if="timeShow">
                 <a-select-option :style="{ color: '#fff' }" v-for="item in selDatas" :value="item.key" :key="item.key">
                     {{ item.value }}
                 </a-select-option>
@@ -83,7 +83,20 @@ export default {
             },
             selDatas: [],
             offsetDays: 86400000 * 30, //最多选择7天
+            timeShow: true
         };
+    },
+     watch: {
+        $route: {
+            handler(val) {
+                if (val.path === "/eventDEC") {
+                    this.timeShow = false;
+                } else {
+                    this.timeShow = true;
+                }
+            },
+            immediate: true,
+        },
     },
     created() {
         this.form = Object.assign(this.form, this.getCtime2);
diff --git a/src/views/EventComparison/CWIEC/opt.js b/src/views/EventComparison/CWIEC/opt.js
deleted file mode 100644
index 35e47af..0000000
--- a/src/views/EventComparison/CWIEC/opt.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * @Author: your name
- * @Date: 2021-10-19 09:55:35
- * @LastEditTime: 2021-10-19 09:55:36
- * @LastEditors: Please set LastEditors
- * @Description: In User Settings Edit
- * @FilePath: /data-show/src/views/EventComparison/CWIEC/opt.js
- */
diff --git a/src/views/EventComparison/comparisonOfEventpp/index.vue b/src/views/EventComparison/comparisonOfEventpp/index.vue
index 3e7ccba..5df39c7 100644
--- a/src/views/EventComparison/comparisonOfEventpp/index.vue
+++ b/src/views/EventComparison/comparisonOfEventpp/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-18 16:03:35
- * @LastEditTime: 2021-11-15 19:20:39
+ * @LastEditTime: 2021-11-16 18:25:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventComparison/comparisonOfEventpp/index.vue
@@ -11,75 +11,122 @@
         <v-label-div title="事件传播历程对比" :showLine="false" :eStyle="{'border-style': 'none'}">
         </v-label-div>
         <div class="coe-ts" v-for="(item,index) in list" :key="index">
-            <div class="coe-ts-d1"><img src="../../../assets/images/EventInsight/img_zuo.png" /></div>
+            <div class="coe-ts-d1" @click="goL('vs'+(index+1))"><img src="../../../assets/images/EventInsight/img_zuo.png" /></div>
             <span class="coe-ts-s1" :style="{color: colors[index]}">{{item.Name|doStr(10)}}传播历程</span>
             <div class="coe-ts-d2">
-                <vue-scroll>
+                <vue-scroll :ref="'vs'+(index+1)">
                     <div class="dd1-label">
                         <div class="d1">{{getEComparison[index].events_type}}</div>
                         <div class="d2">状态：事件发生</div>
                         <div class="d3">{{getEComparison[index].minSourcetime}}</div>
                     </div>
                     <template v-for="(it,n) in item.Data">
-                    <div class="dd1-item"  :key="it._id">
-                        <img class="m1" :src="n%2 != 0 ? m1 : m2" :style="n%2 != 0 ? 'transform:rotate(180deg);margin-top: 9rem' : 'transform:rotate(180deg)'" />
-                        <div class="dd1-fen"></div>
-                        <div class="dt-d1" :style="n%2 != 0 ? 'margin-top: 9.1rem' : ''">
-                            <div class="d1" :style="n%2 != 0 ? 'color: #CC7733' : 'color: #3373CC'" @click="openUrl(it._source.url)">{{it._source.title|doStr(30)}}</div>
-                            <div class="d2">{{it._source.firstweb}}</div>
-                            <div class="d3">{{it._source.firsttime}}</div>
+                        <div class="dd1-item" :key="it._id">
+                            <img class="m1" :src="n%2 != 0 ? m1 : m2" :style="n%2 != 0 ? 'transform:rotate(180deg);margin-top: 9rem' : 'transform:rotate(180deg)'" />
+                            <div class="dd1-fen"></div>
+                            <div class="dt-d1" :style="n%2 != 0 ? 'margin-top: 9.1rem' : ''">
+                                <div class="d1" :style="n%2 != 0 ? 'color: #CC7733' : 'color: #3373CC'" @click="openUrl(it._source.url)">{{it._source.title|doStr(30)}}</div>
+                                <div class="d2">{{it._source.firstweb}}</div>
+                                <div class="d3">{{it._source.firsttime}}</div>
+                            </div>
                         </div>
-                    </div>
                     </template>
                 </vue-scroll>
             </div>
-            <div class="coe-ts-d1"><img src="../../../assets/images/EventInsight/img_xan.png" /></div>
+            <div class="coe-ts-d1" @click="goR('vs'+(index+1))"><img src="../../../assets/images/EventInsight/img_xan.png" /></div>
         </div>
 
-       
     </div>
 </template>
 
 <script>
-import {getListC} from "@/api/EventComparison"
+import { getListC } from "@/api/EventComparison";
 export default {
     name: "comparisonOfEventpp",
     data() {
         return {
             form: {
-               token: "",
-               sRele: ""
-           },
-           colors: ['#3373CC','#54BF93'],
+                token: "",
+                sRele: "",
+            },
+            colors: ["#3373CC", "#54BF93"],
             m1: require("../../../assets/images/EventInsight/img_ct.png"),
             m2: require("../../../assets/images/EventInsight/img_lt.png"),
-            list: []
+            list: [],
+            x1: 0,
+            x2: 0
         };
     },
     created() {
-        this.initData()
+        this.initData();
     },
     methods: {
-         initData() {
-           this.form.token = this.getToken;
-           let arr = [];
-           this.getEComparison.forEach(ele => {
-               arr.push(ele.events_id);
-           })
-           this.form.sRele = arr.toString();
-           this.getData()
-       },
-       getData() {
-           let obj = Object.assign({}, this.getCtime2, this.form);
-           getListC(obj).then(res => {
-               let data = res.data || [];
-               this.list = data;
-           })
-       },
-       openUrl(url) {
-           window.open(url);  
-       }
-    }
+        initData() {
+            this.form.token = this.getToken;
+            let arr = [];
+            this.getEComparison.forEach((ele) => {
+                arr.push(ele.events_id);
+            });
+            this.form.sRele = arr.toString();
+            this.getData();
+        },
+        getData() {
+            let obj = Object.assign({}, this.getCtime2, this.form);
+            getListC(obj).then((res) => {
+                let data = res.data || [];
+                this.list = data;
+            });
+        },
+        openUrl(url) {
+            window.open(url);
+        },
+        goL(name) {
+            let l = 0;
+            const { scrollLeft } = this.$refs[name][0].getPosition();
+            const {h} = this.$refs[name][0].getScrollProcess();
+            if(h === 0) {
+                return
+            }
+            if(parseInt(name) === 2) {
+                this.x2 = scrollLeft;
+                this.x2 -= 150
+                l = this.x2
+            } else {
+                this.x1 = scrollLeft;
+                this.x1 -= 150
+                l = this.x1
+            }
+            this.$refs[name][0].scrollTo(
+                {
+                    x: l,
+                },
+                300
+            );
+        },
+        goR(name) {
+            let r = 0;
+            const { scrollLeft } = this.$refs[name][0].getPosition();
+             const {h} = this.$refs[name][0].getScrollProcess();
+            if(h === 1) {
+                return
+            }
+            if(parseInt(name) === 2) {
+                this.x2 = scrollLeft;
+                this.x2 += 150
+                r = this.x2
+            } else {
+                this.x1 = scrollLeft;
+                this.x1 += 150
+                r = this.x1
+            }
+            this.$refs[name][0].scrollTo(
+                {
+                    x: r,
+                },
+                300
+            );
+        },
+    },
 };
 </script>
 
diff --git a/src/views/EventComparison/uadEc/opt1.js b/src/views/EventComparison/uadEc/opt1.js
index 928e2b1..556425e 100644
--- a/src/views/EventComparison/uadEc/opt1.js
+++ b/src/views/EventComparison/uadEc/opt1.js
@@ -3,7 +3,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 12:38:34
- * @LastEditTime: 2021-10-14 11:48:19
+ * @LastEditTime: 2021-11-16 17:55:26
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/tailInsight/opt.js
@@ -68,7 +68,7 @@ export default function createOptD1(dx = [],ds = []) {
             {
                 name: '2011',
                 type: 'bar',
-                barWidth: 24,
+                barWidth: 18,
                 data: ds,
                 color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [{
                     offset: 0,
diff --git a/src/views/EventComparison/wbcEc/opt.js b/src/views/EventComparison/wbcEc/opt.js
index cab6ea5..a8278a5 100644
--- a/src/views/EventComparison/wbcEc/opt.js
+++ b/src/views/EventComparison/wbcEc/opt.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-09 11:01:19
- * @LastEditTime: 2021-10-19 10:19:28
+ * @LastEditTime: 2021-11-16 17:59:22
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/spreadTheSound/opt.js
@@ -38,10 +38,10 @@ export default function createOpt(dx = [], dataList = []) {
     let info = createData(dataList, dx);
     return {
         grid: {
-            left: 16,
+            left: 10,
             right: 16,
-            bottom: 16,
-            top: 56,
+            bottom: 10,
+            top: 35,
             containLabel: true
         },
         tooltip: {
@@ -58,7 +58,7 @@ export default function createOpt(dx = [], dataList = []) {
             textStyle: { //图例文字的样式
                 color: '#fff'
             },
-            y: 10,
+            y: 0,
             x: 16,
             itemWidth: 12,
             itemHeight: 12,
diff --git a/src/views/EventDEC/incidentSpreadSituation/opt.js b/src/views/EventDEC/incidentSpreadSituation/opt.js
index 0d4ce89..65cd781 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:13:35
+ * @LastEditTime: 2021-11-16 17:43:46
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/BrandInsight/titsopo/opt.js
@@ -52,7 +52,7 @@ export default function createOpt(dx=[], ds=[]) {
     return {
         grid: {
             left: 10,
-            right: '5%',
+            right: 20,
             bottom: 10,
             top: 44,
             containLabel: true
diff --git a/src/views/EventDEC/index.vue b/src/views/EventDEC/index.vue
index 4d9c32f..b309ef1 100644
--- a/src/views/EventDEC/index.vue
+++ b/src/views/EventDEC/index.vue
@@ -29,7 +29,7 @@
                     <div class="d1">
                         <img class="m1" src="../../assets/images/EventInsight/ic_yxl.png" />
                         <span class="s1">影响力指数：</span>
-                        <span class="s2">38.89</span>
+                        <span class="s2">{{eventObj.Effect}}</span>
                     </div>
                     <div class="d1">
                         <img class="m1" src="../../assets/images/EventInsight/ic_cbl.png" />
@@ -91,7 +91,8 @@ export default {
                 events_title: "",
                 description: "",
                 source_time: "",
-                events_count: 0
+                events_count: 0,
+                Effect: ""
             },
             form: {
                 sRele: "",
diff --git a/src/views/EventDEC/tonalCommunicationPosture/opt.js b/src/views/EventDEC/tonalCommunicationPosture/opt.js
index 7d67061..8029df6 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:25:40
+ * @LastEditTime: 2021-11-16 17:43:30
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/Index/barometer/opt.js
@@ -56,7 +56,7 @@ export default function createOpt(dx = [], ds = []) {
     return {
         grid: {
             left: 10,
-            right: 10,
+            right: 20,
             bottom: 10,
             top: 46,
             containLabel: true