diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 120aec352..d277ba116 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -14340,7 +14340,7 @@ }, "node-sass": { "version": "4.14.1", - "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz", + "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { @@ -20727,7 +20727,7 @@ }, "webpack-bundle-analyzer": { "version": "2.13.1", - "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz", + "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz", "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==", "dev": true, "requires": { diff --git a/nezha-fronted/src/assets/css/components/chart/chart.scss b/nezha-fronted/src/assets/css/components/chart/chart.scss index 0a1564981..e3094f8fd 100644 --- a/nezha-fronted/src/assets/css/components/chart/chart.scss +++ b/nezha-fronted/src/assets/css/components/chart/chart.scss @@ -412,6 +412,9 @@ .nz-icon{ color: $--background-color-1 !important; } + .nz-icon-override{ + color: $--color-text-regular !important; + } } } .nz-icon-override{ @@ -419,6 +422,7 @@ font-size: 15px; margin-left: 5px; vertical-align: middle; + color: $--color-text-regular !important; } .legend-item:hover { background-color: $--background-color-1; diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss index 8e98db7fe..fb50e2eb3 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/dashboardTab.scss @@ -229,7 +229,7 @@ color: #F0BF84; } } -.dashboard-tab-temp { +.dashboard-tab-template { .el-tabs__item{ width: 175px !important; } diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss index d6fd145db..94127f8fd 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertSilenceBox.scss @@ -48,7 +48,7 @@ left: 0; } .el-form-item__error{ - left: 126px; + left: 0px; padding-top: 5px; } .matchers-type{ diff --git a/nezha-fronted/src/components/chart/chart.vue b/nezha-fronted/src/components/chart/chart.vue index 20a22f901..8d7bd52cf 100644 --- a/nezha-fronted/src/components/chart/chart.vue +++ b/nezha-fronted/src/components/chart/chart.vue @@ -190,6 +190,7 @@ :panelLock="panelLock" :chart-data="chartData" :chart-info="chartInfo" + :showTool="showTool" :is-fullscreen="isFullscreen" @chartIsNoData="chartIsNoData" :chart-option="chartOption" @@ -345,6 +346,10 @@ export default { type: Boolean, default: false }, + showTool: { + type: Boolean, + default: true + }, globalVariables: {} }, data () { diff --git a/nezha-fronted/src/components/chart/chart/chartGroup.vue b/nezha-fronted/src/components/chart/chart/chartGroup.vue index ae522151e..f48ab278b 100644 --- a/nezha-fronted/src/components/chart/chart/chartGroup.vue +++ b/nezha-fronted/src/components/chart/chart/chartGroup.vue @@ -12,6 +12,7 @@ :from="from" :panel-lock="panelLock" :isGroup="true" + :showTool="showTool" :time-range="searchTime" :groupInfo="chartInfo" @on-refresh-time="refreshTime" @@ -29,7 +30,11 @@ export default { props: { panelLock: Boolean, from: String, - filter: {} + filter: {}, + showTool: { + type: Boolean, + default: true + } }, mixins: [chartMixin, chartFormat], computed: { diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index c58148b39..435d443a2 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -261,9 +261,31 @@ export default { } myChart.on('mouseover', (params) => { + if (this.chartInfo.type !== 'point') { + if (this.tooltip.activeIndex != params.seriesIndex) { + const option = myChart.getOption() + option.series[params.seriesIndex].symbol = 'circle' + option.series[params.seriesIndex].emphasis.itemStyle = { + opacity: 1, + borderColor: this.hexToRgb(params.color, 0.4), + borderWidth: 6 + } + myChart.setOption(option, true) + } + } this.tooltip.activeIndex = params.seriesIndex }) - myChart.on('mouseout', () => { + myChart.on('mouseout', (params) => { + if (this.chartInfo.type !== 'point') { + const option = myChart.getOption() + option.series.forEach(item => { + item.symbol = 'emptyCircle' + item.emphasis.itemStyle = { + opacity: 1 + } + }) + myChart.setOption(option, true) + } this.tooltip.activeIndex = undefined }) @@ -484,7 +506,7 @@ export default { // 鼠标悬浮 series data symbol 时,tooltip 中相应的legend 高亮显示 str += ` -