diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json index 08472e66c..f63487b3c 100644 --- a/nezha-fronted/package-lock.json +++ b/nezha-fronted/package-lock.json @@ -14218,7 +14218,7 @@ }, "node-sass": { "version": "4.14.1", - "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz", + "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz", "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==", "dev": true, "requires": { @@ -20614,7 +20614,7 @@ }, "webpack-bundle-analyzer": { "version": "2.13.1", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz", + "resolved": "https://registry.npmmirror.com/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/page/config/agent.scss b/nezha-fronted/src/assets/css/components/page/config/agent.scss index 1120e21ab..b5337d957 100644 --- a/nezha-fronted/src/assets/css/components/page/config/agent.scss +++ b/nezha-fronted/src/assets/css/components/page/config/agent.scss @@ -4,6 +4,7 @@ .agent-box >.right-box-form>.el-form-item.half-form-item{ width: 220px; + } .agent-box >.right-box-form>.el-form-item.half-form-item:nth-child(odd){ width: 220px; diff --git a/nezha-fronted/src/components/common/configSync.vue b/nezha-fronted/src/components/common/configSync.vue index b6e33d867..0982a5419 100644 --- a/nezha-fronted/src/components/common/configSync.vue +++ b/nezha-fronted/src/components/common/configSync.vue @@ -94,6 +94,7 @@ export default { if (res.code === 200) { this.dialogVisible = false this.$message.success(this.$t('tip.syncSuccess')) + this.$emit('getTableData') } else { this.$message.error(res.msg) } diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue index 1867b9aa2..96b18c314 100644 --- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue +++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue @@ -94,7 +94,7 @@ ref="diagnosisTab" :diagnosisTabData ="diagnosisTabData" > - + diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index 9d68ec676..2060520da 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -116,7 +116,7 @@ ref="diagnosisTab" :diagnosisTabData ="diagnosisTabData" > - + diff --git a/nezha-fronted/src/components/page/config/agent.vue b/nezha-fronted/src/components/page/config/agent.vue index 253a7bacd..3607b19d8 100644 --- a/nezha-fronted/src/components/page/config/agent.vue +++ b/nezha-fronted/src/components/page/config/agent.vue @@ -68,7 +68,7 @@ - + {{$t('overall.downloading')}} diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 140008e0d..69fa846ce 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -4405,7 +4405,27 @@ export default { nullType: 'null', legend: { placement: 'bottom', values: [], show: true }, thresholdShow: true, - thresholds: [{ value: undefined, color: '#eeeeeeff' }] + thresholds: [{ value: undefined, color: '#eeeeeeff' }], + showHeader: 1, + visibility: { + varName: '', + operator: 'equal', + varValue: '', + result: 'show' + }, + rightYAxis: { + elementNames: [], + style: 'line', + unit: 2, + label: '', + min: undefined, + max: undefined + }, + dataLink: [], + option: { + lineWidth: 1, + pointSize: 6 + } }, elements: [], panel: '', diff --git a/nezha-fronted/src/components/page/dashboard/overview/chart.vue b/nezha-fronted/src/components/page/dashboard/overview/chart.vue index 7e2dd6496..81cf1fb4f 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/chart.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/chart.vue @@ -533,7 +533,7 @@ export default { params.forEach((item, i) => { const alias = this.queryAlias(item.seriesIndex) if (i === 0 && alias.indexOf('Previous ') === -1) { - const value = item.data[0] + const value = item.value[0] str += '
' str += bus.timeFormate(bus.computeTimezone(value)) str += '
' @@ -542,13 +542,13 @@ export default { if (i !== 0) { str += '
' } - const value = item.data[0] - this.minusTime + const value = item.value[0] - this.minusTime str += bus.timeFormate(bus.computeTimezone(value)) minusFlag = false } - showFlag = showFlag || item.data[1] - if (!isNaN(item.data[1] + '')) { - const val = Number(item.data[1]) + showFlag = showFlag || item.value[1] + if (!isNaN(item.value[1] + '')) { + const val = Number(item.value[1]) str += `
` str += `
@@ -565,7 +565,7 @@ export default { const previousItem = params.find((series) => ('Previous ' + item.seriesName) === series.seriesName) if (previousItem) { str += '' - const previousval = formatScientificNotation(previousItem.data[1], dot) + const previousval = formatScientificNotation(previousItem.value[1], dot) let minusVal = 0 if (previousval <= val) { minusVal = val - previousval @@ -759,16 +759,16 @@ export default { } const seriesName = nameArr.join('-') // title - const value = bus.computeTimezone(params.data[0]) + const value = bus.computeTimezone(params.value[0]) const tData = new Date(value) // value - let paramsDot = bus.countDecimals(params.data[1]) + let paramsDot = bus.countDecimals(params.value[1]) if (paramsDot < this.chartDot) { paramsDot = this.chartDot } else if (paramsDot > 6) { paramsDot = 6 } - const val = formatScientificNotation(params.data[1], paramsDot) + const val = formatScientificNotation(params.value[1], paramsDot) const color = this.colors[params.seriesIndex] this.tooltip.tooltipHtml = `