From 5f4184f072b979bff9f57a770bc614e600c4f4d5 Mon Sep 17 00:00:00 2001
From: "lily.zhang" <daylily.zhang@akuhome.com>
Date: Wed, 17 Nov 2021 16:29:44 +0800
Subject: [PATCH] cxw-010203

---
 src/lycomponents/iHeaderBrand/index.vue       |  2 +-
 .../BrandInsight/popularEventsList/index.vue  | 26 ++++++++++++++---
 .../EventDEC/mediaInterpretationED/index.vue  | 20 +++++++------
 src/views/EventDEC/tailAnalysisED/index.vue   |  3 +-
 src/views/EventDetails/hotOther/index.vue     | 26 ++++++++++++++---
 src/views/IndustryDataExport/getApiData.js    |  3 +-
 .../ModelEventDetails/MEDHotOther/index.vue   | 26 ++++++++++++++---
 .../mlPopularEventsList/index.vue             | 29 +++++++++++++++----
 .../MWDweiboSpreadFission/index.vue           | 17 ++++++-----
 .../WeiboDetails/weiboSpreadFission/index.vue | 15 +++++-----
 10 files changed, 120 insertions(+), 47 deletions(-)

diff --git a/src/lycomponents/iHeaderBrand/index.vue b/src/lycomponents/iHeaderBrand/index.vue
index 447aa0e..c9d1071 100644
--- a/src/lycomponents/iHeaderBrand/index.vue
+++ b/src/lycomponents/iHeaderBrand/index.vue
@@ -30,7 +30,7 @@
                 </a-select-option>
             </a-select>
 
-            <a-range-picker show-time v-model="selTime" :disabled-date="disabledDate" style="margin-left: 0.8rem" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD HH:mm:ss" v-if="form.sTimeType == selVal" @change="handlerChangeTime">
+            <a-range-picker show-time v-model="selTime" :disabled-date="disabledDate" style="margin-left: 0.8rem" @calendarChange="calendarPriceRangeChange" :size="$vuiSize" valueFormat="YYYY-MM-DD HH:mm:ss" v-if="form.sTimeType == selVal && timeShow" @change="handlerChangeTime">
                 <a-icon slot="suffixIcon" type="calendar" />
             </a-range-picker>
 
diff --git a/src/views/BrandInsight/popularEventsList/index.vue b/src/views/BrandInsight/popularEventsList/index.vue
index 07279ed..7645e2d 100644
--- a/src/views/BrandInsight/popularEventsList/index.vue
+++ b/src/views/BrandInsight/popularEventsList/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 10:50:44
- * @LastEditTime: 2021-11-01 09:58:55
+ * @LastEditTime: 2021-11-17 15:56:14
  * @LastEditors: Please set LastEditors
  * @Description: 热门事件列表
  * @FilePath: /data-show/src/views/BrandInsight/popularEventsList/index.vue
@@ -11,7 +11,7 @@
     <div class="pe-ouuter" v-loading="load">
         <v-label-div title="热门事件列表" :showLine="false" :eStyle="{'border-style': 'none'}"></v-label-div>
         <div class="pe-inner">
-            <dv-scroll-board :config="config" :style="{ width: '100%', height: '20rem' }" />
+            <dv-scroll-board :config="config" :style="{ width: '100%', height: '20rem' }" @click="handlerItem"/>
         </div>
     </div>
 </template>
@@ -31,6 +31,7 @@ export default {
                 iPageSize: 100,
             },
             config: {},
+            darr: []
         };
     },
     created() {
@@ -45,20 +46,30 @@ export default {
             getHotEventsList0528(obj).then((res) => {
                 let data = res.data || [];
                 let arr = [];
+                let arr2 = [];
                 data.forEach((ele) => {
                     let a = [
-                        ele.events_title,
+                        `<span style='cursor: pointer;'>${ele.events_title}</span>`,
+                        ele.count,
+                        ele.ctime,
+                        ele.events_series
+                    ];
+                    let b = [
+                        `<span style='cursor: pointer;'>${ele.events_title}</span>`,
                         ele.count,
                         ele.ctime,
                         ele.events_series,
+                        ele.events_id
                     ];
                     arr.push(a);
+                    arr2.push(b);
                 });
+                this.darr = arr2;
                 this.config = {
                     headerBGC: "#1b4062",
                     oddRowBGC: "#173b6d",
                     evenRowBGC: "rgba(69, 149, 244, 0)",
-                    columnWidth: [400],
+                    columnWidth: [300, 200, 120],
                     rowNum: 6,
                     header: ["事件列表", "影响力", "时间", "关联车型"],
                     data: arr,
@@ -66,6 +77,13 @@ export default {
                 this.load = false;
             });
         },
+         handlerItem(row) {
+            let ele = this.darr[row.rowIndex];
+            if(row.columnIndex === 0) {
+                 let id = ele[4];
+                 this.$router.push({path: '/eventDEC', query: {events_id: id}});
+            }
+        }
     },
 };
 </script>
diff --git a/src/views/EventDEC/mediaInterpretationED/index.vue b/src/views/EventDEC/mediaInterpretationED/index.vue
index 2cc0825..32c3a0e 100644
--- a/src/views/EventDEC/mediaInterpretationED/index.vue
+++ b/src/views/EventDEC/mediaInterpretationED/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-20 09:39:28
- * @LastEditTime: 2021-11-17 14:58:16
+ * @LastEditTime: 2021-11-17 16:20:52
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/mediaInterpretationED/index.vue
@@ -49,7 +49,7 @@
                 <div class="d1-inner">
                     <div class="pv-item" v-for="(item,index) in list" :key="index">
                         <div class="dm">
-                            <img class="mm1" :src="item._source.profileimgurl" width="100%" height="100%">
+                            <img class="mm1" :src="item._source.profileimgurl" width="100%" height="100%" v-if="item._source.profileimgurl">
                         </div>
                         <div class="d-f">
                             <div class="d1">{{item._source.user_author}}</div>
@@ -115,6 +115,7 @@ export default {
             let obj = Object.assign({}, this.form);
             getDiffuseZhuTi(obj).then((res) => {
                 let data = res.data;
+                console.log(data)
                 this.countObj.sum = data.sum;
                 this.countObj.volume = data.volume;
                 this.countObj.total = data.total;
@@ -126,13 +127,14 @@ export default {
                 let edges = listPid;
                 getCoreDiffuseWeiBo.forEach((ele) => {
                     let _source = ele._source;
-                    let xgmid = _source.xgmid;
-                    let row = nodes.find((e) => e.id === xgmid);
-                    if (row) {
-                        row.value = _source.volume;
-                    } else {
-                        row.value = 0;
-                    }
+                    let xgmid = _source.xgmid || "";
+                    nodes.forEach(e => {
+                        if(e.id === xgmid) {
+                            e.value = _source.volume
+                        } else {
+                            e.value = 0
+                        }
+                    })
                 });
                 nodes.forEach((ele) => {
                     let colorSet = new Set(this.colors);
diff --git a/src/views/EventDEC/tailAnalysisED/index.vue b/src/views/EventDEC/tailAnalysisED/index.vue
index 77d38f8..fb55cf9 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 14:23:06
+ * @LastEditTime: 2021-11-17 16:03:44
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDEC/tailAnalysisED/index.vue
@@ -66,7 +66,6 @@ export default {
             this.load = true;
             getSourcetypeTime1(obj).then((res) => {
                 let data = res.data || [];
-                console.log(data);
                 let dx = [];
                 let ds = [];
                 data.forEach((ele) => {
diff --git a/src/views/EventDetails/hotOther/index.vue b/src/views/EventDetails/hotOther/index.vue
index 30cd109..2f8c3a6 100644
--- a/src/views/EventDetails/hotOther/index.vue
+++ b/src/views/EventDetails/hotOther/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-13 11:54:38
- * @LastEditTime: 2021-11-09 11:56:11
+ * @LastEditTime: 2021-11-17 15:57:45
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDetails/hotOther/index.vue
@@ -10,11 +10,11 @@
     <div class="ho-outter" v-loading="load">
         <v-label-div title="热点事件传播导向" />
         <div class="ho-bd">
-            <dv-scroll-board :config="config" :style="{ width: '100%', height: '27rem' }" />
+            <dv-scroll-board :config="config" :style="{ width: '100%', height: '27rem' }" @click="handlerItem"/>
         </div>
         <div class="ho-footer">
             <span class="ho-f-s1">共 <span style="color: #2c66b5;">{{total}}</span> 条</span>
-            <a-pagination v-model="form.iPageIndex" :total="total" show-less-items  @change="handlerPagnation"/>
+            <a-pagination v-model="form.iPageIndex" :pageSize="form.iPageSize" :total="total" show-less-items  @change="handlerPagnation"/>
         </div>
     </div>
 </template>
@@ -36,6 +36,7 @@ export default {
             total: 0,
             config: {
             },
+            darr: []
         };
     },
     created() {
@@ -53,15 +54,25 @@ export default {
                 let totalNum = res.totalNum || 0;
                 this.total = totalNum;
                 let arr = [];
+                let arr2 = [];
                 data.forEach((ele) => {
                     let a = [
-                        ele.events_title,
+                        `<span style='cursor: pointer;'>${ele.events_title}</span>`,
                         ele.events_influence,
                         ele.maxSourcetime,
                         ele.events_brand,
                     ];
+                    let b = [
+                        `<span style='cursor: pointer;'>${ele.events_title}</span>`,
+                        ele.events_influence,
+                        ele.maxSourcetime,
+                        ele.events_brand,
+                        ele.events_id
+                    ];
                     arr.push(a);
+                    arr2.push(b);
                 });
+                this.darr = arr2;
                 this.config = {
                     headerBGC: "#0c203b",
                     oddRowBGC: "#173b6d",
@@ -78,6 +89,13 @@ export default {
         handlerPagnation(page) {
             this.form.iPageIndex = page;
             this.getDdta()
+        },
+        handlerItem(row) {
+            let ele = this.darr[row.rowIndex];
+            if(row.columnIndex === 0) {
+                 let id = ele[4];
+                 this.$router.push({path: '/eventDEC', query: {events_id: id}});
+            } 
         }
     },
 };
diff --git a/src/views/IndustryDataExport/getApiData.js b/src/views/IndustryDataExport/getApiData.js
index f89d6f5..2bc8b72 100644
--- a/src/views/IndustryDataExport/getApiData.js
+++ b/src/views/IndustryDataExport/getApiData.js
@@ -1,7 +1,7 @@
 /*
  * @Author: your name
  * @Date: 2021-10-27 15:26:21
- * @LastEditTime: 2021-11-16 14:03:35
+ * @LastEditTime: 2021-11-17 16:03:54
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/IndustryDataExport/getApiData.js
@@ -167,7 +167,6 @@ export default {
         return new Promise((resolve, reject) => {
             getToExcelField({sType: sType, token: token}).then(res => {
                 let data = res.data;
-                console.log(data)
                 let arr = [];
                 data.forEach((ele) => {
                     let obj = {
diff --git a/src/views/ModelEventDetails/MEDHotOther/index.vue b/src/views/ModelEventDetails/MEDHotOther/index.vue
index 7bebdda..1c07464 100644
--- a/src/views/ModelEventDetails/MEDHotOther/index.vue
+++ b/src/views/ModelEventDetails/MEDHotOther/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-13 11:54:38
- * @LastEditTime: 2021-11-08 17:52:40
+ * @LastEditTime: 2021-11-17 16:02:33
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/EventDetails/hotOther/index.vue
@@ -10,11 +10,11 @@
     <div class="ho-outter">
         <v-label-div title="热点事件传播导向" />
         <div class="ho-bd">
-            <dv-scroll-board :config="config" :style="{ width: '100%', height: '27rem' }" />
+            <dv-scroll-board :config="config" :style="{ width: '100%', height: '27rem' }" @click="handlerItem"/>
         </div>
         <div class="ho-footer">
             <span class="ho-f-s1">共 <span style="color: #2c66b5;">{{total}}</span> 条</span>
-            <a-pagination v-model="form.iPageIndex" :total="total" show-less-items  @change="handlerPagnation"/>
+            <a-pagination v-model="form.iPageIndex" :pageSize="form.iPageSize" :total="total" show-less-items  @change="handlerPagnation"/>
         </div>
     </div>
 </template>
@@ -36,6 +36,7 @@ export default {
             total: 0,
             config: {
             },
+            darr: []
         };
     },
     created() {
@@ -53,15 +54,25 @@ export default {
                 let totalNum = res.totalNum || 0;
                 this.total = totalNum;
                 let arr = [];
+                let arr2 = [];
                 data.forEach((ele) => {
                     let a = [
-                        ele.events_title,
+                        `<span style='cursor: pointer;'>${ele.events_title}</span>`,
+                        ele.events_influence,
+                        ele.maxSourcetime,
+                        ele.events_brand
+                    ];
+                    let b = [
+                        `<span style='cursor: pointer;'>${ele.events_title}</span>`,
                         ele.events_influence,
                         ele.maxSourcetime,
                         ele.events_brand,
+                        ele.events_id
                     ];
                     arr.push(a);
+                    arr2.push(b);
                 });
+                this.darr = arr2;
                 this.config = {
                     headerBGC: "#0c203b",
                     oddRowBGC: "#173b6d",
@@ -77,6 +88,13 @@ export default {
         handlerPagnation(page) {
             this.form.iPageIndex = page;
             this.getDdta()
+        },
+        handlerItem(row) {
+            let ele = this.darr[row.rowIndex];
+            if(row.columnIndex === 0) {
+                 let id = ele[4];
+                 this.$router.push({path: '/eventDEC', query: {events_id: id}});
+            } 
         }
     },
 };
diff --git a/src/views/ModelInsight/mlPopularEventsList/index.vue b/src/views/ModelInsight/mlPopularEventsList/index.vue
index 181ce9c..e4c6033 100644
--- a/src/views/ModelInsight/mlPopularEventsList/index.vue
+++ b/src/views/ModelInsight/mlPopularEventsList/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: xw
  * @Date: 2021-10-12 10:50:44
- * @LastEditTime: 2021-11-01 17:59:06
+ * @LastEditTime: 2021-11-17 16:00:09
  * @LastEditors: Please set LastEditors
  * @Description: 热门事件列表
  * @FilePath: /data-show/src/views/BrandInsight/popularEventsList/index.vue
@@ -11,7 +11,7 @@
     <div class="pe-ouuter" v-loading="load">
         <v-label-div title="热门事件列表" :showLine="false" :eStyle="{'border-style': 'none'}"></v-label-div>
         <div class="pe-inner">
-            <dv-scroll-board :config="config" :style="{ width: '100%', height: '20rem' }" />
+            <dv-scroll-board :config="config" :style="{ width: '100%', height: '20rem' }" @click="handlerItem"/>
         </div>
     </div>
 </template>
@@ -29,9 +29,9 @@ export default {
                 sSeriesName: "",
                 token: "",
             },
-            config: {
-               
+            config: {  
             },
+            darr: []
         };
     },
     watch: {
@@ -54,15 +54,25 @@ export default {
             getHotEventsList0528(obj).then((res) => {
                 let data = res.data || [];
                 let arr = [];
+                let arr2 = [];
                 data.forEach((ele) => {
                     let a = [
-                        ele.events_title,
+                       `<span style='cursor: pointer;'>${ele.events_title}</span>`,
                         ele.count,
                         ele.ctime,
-                        ele.events_series,
+                        ele.events_series
                     ];
+                    let b = [
+                       `<span style='cursor: pointer;'>${ele.events_title}</span>`,
+                        ele.count,
+                        ele.ctime,
+                        ele.events_series,
+                        ele.events_id 
+                    ]
                     arr.push(a);
+                    arr2.push(b)
                 });
+                this.darr = arr2;
                 this.config = {
                     headerBGC: "#1b4062",
                     oddRowBGC: "#173b6d",
@@ -75,6 +85,13 @@ export default {
                 this.load = false;
             });
         },
+        handlerItem(row) {
+            let ele = this.darr[row.rowIndex];
+            if(row.columnIndex === 0) {
+                 let id = ele[4];
+                 this.$router.push({path: '/eventDEC', query: {events_id: id}});
+            } 
+        }
     },
 };
 </script>
diff --git a/src/views/ModelWeiboDetails/MWDweiboSpreadFission/index.vue b/src/views/ModelWeiboDetails/MWDweiboSpreadFission/index.vue
index 5cf4d9c..c8b03e2 100644
--- a/src/views/ModelWeiboDetails/MWDweiboSpreadFission/index.vue
+++ b/src/views/ModelWeiboDetails/MWDweiboSpreadFission/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 19:15:58
- * @LastEditTime: 2021-11-11 10:46:45
+ * @LastEditTime: 2021-11-17 16:23:34
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboSpreadFission/index.vue
@@ -60,13 +60,14 @@ export default {
                 let edges = listPid;
                 getCoreDiffuseWeiBo.forEach((ele) => {
                     let _source = ele._source;
-                    let xgmid = _source.xgmid;
-                    let row = nodes.find((e) => e.id === xgmid);
-                    if (row) {
-                        row.value = _source.volume;
-                    } else {
-                        row.value = 0;
-                    }
+                    let xgmid = _source.xgmid || "";
+                    nodes.forEach(e => {
+                        if(e.id === xgmid) {
+                            e.value = _source.volume;
+                        } else {
+                            e.value = 0
+                        }
+                    })
                 });
                 nodes.forEach((ele) => {
                     let colorSet = new Set(this.colors);
diff --git a/src/views/WeiboDetails/weiboSpreadFission/index.vue b/src/views/WeiboDetails/weiboSpreadFission/index.vue
index 27e01a9..b4096ea 100644
--- a/src/views/WeiboDetails/weiboSpreadFission/index.vue
+++ b/src/views/WeiboDetails/weiboSpreadFission/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 19:15:58
- * @LastEditTime: 2021-11-11 09:45:04
+ * @LastEditTime: 2021-11-17 16:27:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: /data-show/src/views/WeiboDetails/weiboSpreadFission/index.vue
@@ -61,12 +61,13 @@ export default {
                 getCoreDiffuseWeiBo.forEach((ele) => {
                     let _source = ele._source;
                     let xgmid = _source.xgmid;
-                    let row = nodes.find((e) => e.id === xgmid);
-                    if (row) {
-                        row.value = _source.volume;
-                    } else {
-                        row.value = 0;
-                    }
+                    nodes.forEach(e => {
+                        if(e.id === xgmid) {
+                            e.value = _source.volume
+                        } else {
+                            e.value = 0
+                        }
+                    })  
                 });
                 nodes.forEach((ele) => {
                     let colorSet = new Set(this.colors);