diff --git a/nezha-fronted/src/components/chart/ChartScreenHeader.vue b/nezha-fronted/src/components/chart/ChartScreenHeader.vue index c61eed4d9..1145957b6 100644 --- a/nezha-fronted/src/components/chart/ChartScreenHeader.vue +++ b/nezha-fronted/src/components/chart/ChartScreenHeader.vue @@ -73,7 +73,6 @@ export default { this.setSearchTime(nowTimeType.type, nowTimeType.value, nowTimeType) this.filter.start_time = bus.timeFormate(this.searchTime[0], 'yyyy-MM-dd hh:mm:ss') this.filter.end_time = bus.timeFormate(this.searchTime[1], 'yyyy-MM-dd hh:mm:ss') - console.log(this.filter) this.filter.value = this.searchTime[2] this.filter.id = this.$refs.pickTime.$refs.timePicker.showTime.id setTimeout(() => { diff --git a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue index 38b435245..d597c3b3d 100644 --- a/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue +++ b/nezha-fronted/src/components/chart/chart/chartTimeSeries.vue @@ -69,7 +69,6 @@ export default { }, methods: { initChart (chartOption = this.chartOption) { - console.log(123) this.legends = [] chartOption.series = this.handleTimeSeries(this.chartInfo, chartOption.series[0], this.chartData) // 生成series和legends if (this.isNoData) { diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue index 17c1ee7c1..9f583d324 100644 --- a/nezha-fronted/src/components/chart/chartHeader.vue +++ b/nezha-fronted/src/components/chart/chartHeader.vue @@ -13,7 +13,7 @@ - + item.id == group.id) if (group && groupFind) { @@ -300,7 +298,6 @@ export default { let top = dom.style.transform.split(',')[1] top = top.substring(0, top.length - 2) const mainOffsetTop = top - this.stepWidth + 14// transform: grid组件 通过 tranfrom 控制位置 中间的为y的值 通过截取获得 - 父元素 marginTop的 值。 - console.log(mainOffsetTop) // 2.元素的高度 const mainHeight = itemHeight // ele.offsetHeight;//itemHeight; // 3.页面滚动的距离 diff --git a/nezha-fronted/src/components/chart/chartMixin.js b/nezha-fronted/src/components/chart/chartMixin.js index 3fe36c118..53323d747 100644 --- a/nezha-fronted/src/components/chart/chartMixin.js +++ b/nezha-fronted/src/components/chart/chartMixin.js @@ -44,7 +44,6 @@ export default { let colorIndex = 0 originalDatas.forEach((originalData, expressionIndex) => { originalData.forEach((data, dataIndex) => { - console.log(this.showAllData) if (colorIndex >= 20 && !this.showAllData) { colorIndex++ return @@ -114,6 +113,9 @@ export default { if (!alias) { alias = legend } + if (alias == 'Previous ') { + alias += legend + } // proj_status_ const name = alias + '-' + dataIndex @@ -130,6 +132,7 @@ export default { this.colorList.push(colorRandom) this.chartOption.color.push(colorRandom) } + // console.log(name, alias, statistics) this.legends.push({ name, alias, statistics, color: this.colorList[colorIndex] }) return { name, @@ -150,6 +153,9 @@ export default { }) return labelValue } else { + if (!aliasExpression) { + return '' + } return aliasExpression } }, diff --git a/nezha-fronted/src/components/chart/panelChart.vue b/nezha-fronted/src/components/chart/panelChart.vue index 467c6030f..46e251500 100644 --- a/nezha-fronted/src/components/chart/panelChart.vue +++ b/nezha-fronted/src/components/chart/panelChart.vue @@ -100,7 +100,6 @@ export default { methods: { isGroup, dateChange (filter, multipleTime) { - console.log(filter, multipleTime) this.loading = true // TODO assetInfo、endpointInfo、echarts等进行不同的处理 let startTime = filter.start_time @@ -174,7 +173,6 @@ export default { return this.$get(query) }) if (this.multipleTime) { - console.log(123) const multipleRequests = elements.map((element) => { if (this.from === fromRoute.chartTemp) { return chartTempData @@ -190,7 +188,6 @@ export default { return this.$get(query) }) requests = requests.concat(multipleRequests) - console.log(requests) } const chartData = [] axios.all(requests).then((res) => { @@ -207,7 +204,6 @@ export default { } } else { if (r.status === 'success') { - console.log(r.data.result) r.data.result.forEach(item => { this.allDataLength++ item.values.forEach(values => { diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js index 980c2b271..7483a3c67 100644 --- a/nezha-fronted/src/components/common/mixin/routerPathParams.js +++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js @@ -12,7 +12,6 @@ export default { setTimeout(() => { this.setSearchInput(val, qv) }, 200) - console.log() qv && this.$set(val.target, val.propertyName, qv) }) }, diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue index cb0385c0b..a2bf97539 100644 --- a/nezha-fronted/src/components/page/dashboard/panel.vue +++ b/nezha-fronted/src/components/page/dashboard/panel.vue @@ -34,11 +34,11 @@
- + + + + +