diff --git a/src/utils/gol/bubbleWord.js b/src/utils/gol/bubbleWord.js index 8ee45b0..9fc3d57 100644 --- a/src/utils/gol/bubbleWord.js +++ b/src/utils/gol/bubbleWord.js @@ -1,12 +1,13 @@ /* * @Author: your name * @Date: 2021-10-21 11:36:36 - * @LastEditTime: 2021-11-12 16:40:03 + * @LastEditTime: 2021-11-25 11:07:14 * @LastEditors: Please set LastEditors * @Description: In User Settings Edit * @FilePath: /data-show/src/utils/gol/bubbleWord.js */ import { compare } from "./dataTool" +import * as echarts from "echarts"; // 将后台数据转成数组 function doWordCloud(data) { let arr1 = []; @@ -25,15 +26,49 @@ function bubbleChart(data = [], format = []) { maxValue = Math.max.apply(null, temp); // 气泡颜色数组 let color = [ - "#FFB600", - "#886CFF", - "#0084FF", - "#4CB690", - "#58B458", - "#6C6C6C", - "#F56161", - "#FC754C", - "#5F5EEC", + { + key: '#047ddc', + fontColor: '#8ec0ea', + value: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: 'rgba(4, 60, 135, 1)' + }, + { + offset: 1, + color: 'rgba(1, 11, 25, 1)' + } + ], false) + }, + { + key: '#a3951f', + fontColor: '#a4a27f', + value: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: 'rgba(120, 124, 14, 1)' + }, + { + offset: 1, + color: 'rgba(1, 11, 25, 1)' + } + ], false) + }, + { + key: '#01aa87', + fontColor: '#99e5d5', + value: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ + { + offset: 0, + color: 'rgba(25, 137, 129, 1)' + }, + { + offset: 1, + color: 'rgba(1, 11, 25, 1)' + } + ], false) + } + ]; // 气泡颜色备份 let bakeColor = [...color]; @@ -61,7 +96,9 @@ function bubbleChart(data = [], format = []) { if (!bakeColor.length) bakeColor = [...color]; let colorSet = new Set(bakeColor); let curIndex = Math.round(Math.random() * (colorSet.size - 1)); - let curColor = bakeColor[curIndex]; + let borderColor = bakeColor[curIndex].key; + let curColor = bakeColor[curIndex].value; + let fontColor = bakeColor[curIndex].fontColor; colorSet.delete(curColor); bakeColor = [...colorSet]; // 气泡大小设置 @@ -73,6 +110,11 @@ function bubbleChart(data = [], format = []) { value: item[format[1]], symbolSize: size, draggable: true, + label: { + show: true, + color: fontColor, + fontSize: 12 + }, itemStyle: { normal: { color: curColor, @@ -81,6 +123,9 @@ function bubbleChart(data = [], format = []) { shadowOffsetX: 0, shadowOffsetY: 0, shadowColor: "rgba(0,0,0,0.3)", + borderType : 'solid', + borderColor: borderColor, + borderWidth: 1 }, }, }); @@ -119,12 +164,6 @@ export default function createWordCloud(obj) { series: [{ type: 'graph', layout: 'force', - label: { - show: true, - color: "#FFF", - fontSize: 12, - - }, force: { gravity: 0.2, repulsion: bubble.repulsion, diff --git a/src/views/EventDetails/hotOther/index.vue b/src/views/EventDetails/hotOther/index.vue index e4673c5..0798c9c 100644 --- a/src/views/EventDetails/hotOther/index.vue +++ b/src/views/EventDetails/hotOther/index.vue @@ -1,7 +1,7 @@
@@ -34,9 +39,34 @@ export default { iPageSize: 20, }, total: 0, - config: { - }, - darr: [] + tbData: [], + columns: [ + { + title: "事件列表", + dataIndex: "events_title", + key: "events_title", + width: 200, + scopedSlots: { customRender: "events_title" }, + ellipsis: true, + }, + { + title: "影响力", + dataIndex: "events_influence", + key: "events_influence", + }, + { + title: "时间", + dataIndex: "maxSourcetime", + key: "maxSourcetime", + width: 160, + }, + { + title: "关联品牌", + dataIndex: "events_brand", + scopedSlots: { customRender: "events_brand" }, + key: "events_brand", + }, + ], }; }, created() { @@ -53,50 +83,22 @@ export default { let data = res.data || []; let totalNum = res.totalNum || 0; this.total = totalNum; - let arr = []; - let arr2 = []; - data.forEach((ele) => { - let a = [ - `${ele.events_title}`, - ele.events_influence, - ele.maxSourcetime, - ele.events_brand, - ]; - let b = [ - `${ele.events_title}`, - 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", - evenRowBGC: "rgba(69, 149, 244, 0)", - rowNum: 10, - columnWidth: [240,70,150], - header: ["事件列表", "影响力", "时间", "关联品牌"], - data: arr, - }; + this.tbData = data; this.load = false; }); }, // 分页处理 handlerPagnation(page) { this.form.iPageIndex = page; - this.getDdta() + 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}}); - } - } + // 跳转详情 + handlerEvent(row) { + this.$router.push({ + path: "/eventDEC", + query: { events_id: row.events_id }, + }); + }, }, }; @@ -130,4 +132,8 @@ export default { } } } +/deep/ .ant-table-body { + height: 432px; + overflow: auto; +} diff --git a/src/views/ModelEventDetails/MEDHotOther/index.vue b/src/views/ModelEventDetails/MEDHotOther/index.vue index 1c07464..84218cb 100644 --- a/src/views/ModelEventDetails/MEDHotOther/index.vue +++ b/src/views/ModelEventDetails/MEDHotOther/index.vue @@ -1,7 +1,7 @@