diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index a7bae570a..ddb817633 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -366,7 +366,7 @@ td .nz-icon-gear:before{ } .chart-bar,.chart-gauge,.chart-time-series,.chart-treemap,.chart-pie,.chart-canvas-tooltip,.line-chart-block-Zindex,.alert-label,.alert-labelUp,.nz-tooltip-bac{ background-color: $--tooltip-background-color !important; - border: 3px solid $--tooltip-border-color !important; + border: 2px solid $--tooltip-border-color !important; border-color: $--tooltip-border-color !important; color: $--color-text-regular !important; box-shadow: none !important; diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss b/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss index 810810b04..004ab9ca7 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/overview/overview2.scss @@ -450,17 +450,73 @@ .leaflet-pane.leaflet-my-pane { position: absolute; top: -150px; - left: -420px; + left: -175px; .leaflet-tooltip { transform: unset !important; + border: none; + padding: 0; + .partition{ + border-bottom: 1px solid $--border-color-light; + margin-bottom: 5px; + } + .tooltip-map{ + padding: 15px 10px; + .map-asset { + display: flex; + align-items: center; + margin-bottom: 5px; + } + .progress-title{ + width: 64px; + } + .progress-content{ + width: 20px; + } + .progress-box{ + width: 56px; + height: 8px; + margin: 0 5px; + flex: 1; + position: relative; + .top-progress { + position: absolute; + height: 6px; + top: 1px; + left: 0px; + } + .bottom-progress{ + width: 100%; + height: 100%; + background: #E7EAED; + border-radius: 4px; + } + } + .success-progress{ + color: #6DCABA ; + .top-progress{ + background: #6DCABA; + border-radius: 4px; + } + //.bottom-progress{ + // border: 1px solid #0AB000; + //} + } + .error-progress { + color: #EFAD9C; + .top-progress{ + background: #EFAD9C; + border-radius: 4px; + } + } + } } } .tooltip--title { color: $--color-text-primary; font-size: 14px; font-weight: 600; - padding-bottom: 10px; + padding-bottom: 8px; } .yAxis-text-style{ white-space: nowrap; @@ -475,18 +531,9 @@ .legend-value { font-size: 12px; color: $--color-text-primary; - position: absolute; //left: 155px; //top: 35px; } - .legend-value-asset{ - top: 40px; - right: 67px; - } - .legend-value-agent{ - top: 180px; - right: 67px; - } //.legend-value + .legend-value { // left: 356px; //} diff --git a/nezha-fronted/src/components/chart/chart/chartMap.vue b/nezha-fronted/src/components/chart/chart/chartMap.vue index 5d3775d9b..5cfa7b5a8 100644 --- a/nezha-fronted/src/components/chart/chart/chartMap.vue +++ b/nezha-fronted/src/components/chart/chart/chartMap.vue @@ -4,7 +4,7 @@
-
+
@@ -84,15 +84,13 @@ export default { zoomControl: false, maxBounds: L.latLngBounds(L.latLng(-90, -180), L.latLng(90, 180)) }).setView([mapConfig.latitude, mapConfig.longitude], mapConfig.zoom) - map.createPane('myPane', document.querySelector('.my-pane')) + map.createPane('myPane', document.querySelector('.my-pane-' + this.chartId)) map.on('tooltipopen', function (param) { - setTimeout(() => { - vm.initTooltipChart(param) - }, 100) + // setTimeout(() => { + // vm.initTooltipChart(param) + // }, 100) }) map.on('tooltipclose', function (param) { - tooltipEndpointChart && tooltipEndpointChart.clear() - tooltipPrometheusChart && tooltipPrometheusChart.clear() }) this.map = map @@ -168,7 +166,7 @@ export default { this.tooltip.x = event.clientX + point.x - event.layerX - 5 this.tooltip.y = event.clientY + point.y - event.layerY if (boxWidth > this.tooltip.x) { - this.tooltip.x = this.tooltip.x + 434 + 10 + this.tooltip.x = this.tooltip.x + 175 + 10 } }) shadowMarker.addTo(this.map) @@ -180,56 +178,51 @@ export default { }, mapTooltipFormatter (dcStat) { const self = this - return `
+ return `
${dcStat.name}
-
${dcStat.asset.ok}
-
${dcStat.asset.alarm}
+
+
Asset ok
+
+
+
+
+
${dcStat.asset.ok}
+
+
+
Asset alarm
+
+
+
+
+
${dcStat.asset.alarm}
+
+
-
${dcStat.agent.up}
-
${dcStat.agent.down}
+
+
agent up
+
+
+
+
+
${dcStat.agent.up}
+
+
+
agent down
+
+
+
+
+
${dcStat.agent.down}
+
-
-
` // return tooltip; }, - initTooltipChart (param) { - const vm = this - setTimeout(() => { - const data = param.tooltip.options.data - // console.info(tooltipEndpointChart); - tooltipEndpointChart = echarts.init(document.querySelector('#tooltip-chart--endpoint-' + this.chartInfo.id)) - tooltipPrometheusChart = echarts.init(document.querySelector('#tooltip-chart--prometheus-' + this.chartInfo.id)) - const endpointOption = chartConfig.getOption('tooltipPie') - const prometheusOption = chartConfig.getOption('tooltipPie') - endpointOption.series[0].label.formatter = data.asset.total + '' - endpointOption.series[0].data = [ - { name: vm.$t('dashboard.overview.asset.ok'), value: data.asset.ok ? data.asset.ok : 0 }, - { name: vm.$t('dashboard.overview.asset.alarm'), value: data.asset.alarm ? data.asset.alarm : 0 } - // { name: vm.$t('dashboard.overview.asset.total'), value: data.asset.total ? data.asset.total : 0 } - ] - endpointOption.title.text = vm.$t('asset.asset') - endpointOption.legend.data = [vm.$t('dashboard.overview.asset.ok'), vm.$t('dashboard.overview.asset.alarm')] - prometheusOption.series[0].label.formatter = data.agent.up + '' - prometheusOption.series[0].data = [ - { name: vm.$t('config.agent.up'), value: data.agent.up ? data.agent.up : 0 }, - { name: vm.$t('config.agent.down'), value: data.agent.down ? data.agent.down : 0 } - ] - prometheusOption.title.text = vm.$t('config.agent.agent.agent') - prometheusOption.legend.data = [vm.$t('config.agent.up'), vm.$t('config.agent.down')] - tooltipEndpointChart && tooltipEndpointChart.setOption(endpointOption, true) - tooltipPrometheusChart && tooltipPrometheusChart.setOption(prometheusOption, true) - }, 100) - /* setTimeout(function() { - tooltipEndpointChart.setOption(endpointOption); - tooltipPrometheusChart.setOption(prometheusOption); - }, 100); */ - }, resize () { this.initMap() } diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 0c300d9a6..5410c3488 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -222,6 +222,7 @@