From a8064995a912c3a7170c3784d5bb36c02c01f45a Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 11 Dec 2020 16:44:20 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E8=9C=82=E7=AA=9D=E5=9B=BE?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hexagonFigureSvg.vue} | 333 ++++++++++-------- .../src/components/common/js/common.js | 10 + .../src/components/common/js/tools.js | 2 +- .../common/overView/messageRule.vue | 129 ++++++- 4 files changed, 332 insertions(+), 142 deletions(-) rename nezha-fronted/src/components/common/{Honeycomb/hexagonFigureD3.vue => honeycomb/hexagonFigureSvg.vue} (68%) diff --git a/nezha-fronted/src/components/common/Honeycomb/hexagonFigureD3.vue b/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue similarity index 68% rename from nezha-fronted/src/components/common/Honeycomb/hexagonFigureD3.vue rename to nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue index 243c26ada..1a7271bc8 100644 --- a/nezha-fronted/src/components/common/Honeycomb/hexagonFigureD3.vue +++ b/nezha-fronted/src/components/common/honeycomb/hexagonFigureSvg.vue @@ -6,7 +6,7 @@ -
+
@@ -15,24 +15,21 @@ diff --git a/nezha-fronted/src/components/common/js/common.js b/nezha-fronted/src/components/common/js/common.js index 2fc3abc07..671fef418 100644 --- a/nezha-fronted/src/components/common/js/common.js +++ b/nezha-fronted/src/components/common/js/common.js @@ -25,7 +25,17 @@ export function getChart(key) { export function setChart(key, value) { chartCache[`chart${key}`] = value; } +const hexagonCache = {}; +export function getHexagon(key) { + return hexagonCache[`hexagon${key}`]; +} +export function setHexagon(key, value) { + hexagonCache[`hexagon${key}`] = value; +} +export function delHexagon(key) { + delete hexagonCache[`hexagon${key}`]; +} const mousePoint={ //在echart tooltip中获取不到鼠标在窗口的位置,在火狐没有window。event 在此兼容火狐 获取鼠标在窗口位置 x:'', y:'' diff --git a/nezha-fronted/src/components/common/js/tools.js b/nezha-fronted/src/components/common/js/tools.js index 94415bc3f..d490b29d5 100644 --- a/nezha-fronted/src/components/common/js/tools.js +++ b/nezha-fronted/src/components/common/js/tools.js @@ -56,7 +56,7 @@ export const clickoutside = { let path = e.path || (e.composedPath && e.composedPath()); top: for (let i = 0; i < path.length; i++) { for (let j = 0; j < exceptClassName.length; j++) { - if (path[i].className && path[i].className.indexOf(exceptClassName[j]) != -1) { + if (path[i].className && path[i].className.indexOf && path[i].className.indexOf(exceptClassName[j]) != -1) { flag = false; break top; } diff --git a/nezha-fronted/src/components/common/overView/messageRule.vue b/nezha-fronted/src/components/common/overView/messageRule.vue index 6edbc9d74..be2f44a10 100644 --- a/nezha-fronted/src/components/common/overView/messageRule.vue +++ b/nezha-fronted/src/components/common/overView/messageRule.vue @@ -1,10 +1,135 @@