From c9d682e03862859c35c4dae67522d834abe5430f Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 25 Aug 2023 15:01:41 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-3142=20fix=EF=BC=9A=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E5=9B=BE=E8=A1=A8=E5=BC=95=E7=94=A8dashboard=E5=8F=98=E9=87=8F?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=80=BC=E5=90=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=88=B7=E6=96=B0=E6=8C=89=E9=92=AE=EF=BC=8Cgroup?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chart/legend.vue | 1 - nezha-fronted/src/components/chart/chartList.vue | 8 +++----- nezha-fronted/src/components/chart/renderChart.js | 4 ---- nezha-fronted/src/components/cli/consoleNew.vue | 5 ----- .../src/components/common/alert/terminalLogInfo.vue | 1 - .../components/common/bottomBox/tabs/scrapeEndpoint.vue | 1 - .../common/bottomBox/tabs/terminalLogMonitorTab.vue | 2 -- .../src/components/common/popBox/selectDashboard.vue | 3 +-- .../src/components/common/popBox/topToolMoreOptions.vue | 2 -- .../components/common/project/meta2d/js/meta2dMainCalc.js | 1 - .../src/components/common/rightBox/profileBox.vue | 1 - .../src/components/common/rightBox/recordRuleBox.vue | 1 - .../common/rightBox/software/softwareTypeBox.vue | 1 - nezha-fronted/src/components/common/timePicker.vue | 2 -- nezha-fronted/src/components/layout/leftMenu.vue | 1 - nezha-fronted/src/components/page/alert/alertMessage.vue | 2 -- .../src/components/page/dashboard/explore/exploreItem.vue | 1 - nezha-fronted/src/store/timePicker.js | 1 - 18 files changed, 4 insertions(+), 34 deletions(-) diff --git a/nezha-fronted/src/components/chart/chart/legend.vue b/nezha-fronted/src/components/chart/chart/legend.vue index 7dc086e99..e7f6f7593 100644 --- a/nezha-fronted/src/components/chart/chart/legend.vue +++ b/nezha-fronted/src/components/chart/chart/legend.vue @@ -198,7 +198,6 @@ export default { const series = this.$lodash.cloneDeep(this.series) const dataArg = series.filter((seriesItem, seriesIndex) => !this.isGrey[seriesIndex]) const option = this.renderYAxis(dataArg, chartInfo, 'legend') - console.log(option) getChart(this.chartId) && getChart(this.chartId).setOption({ yAxis: [ ...option.yAxis diff --git a/nezha-fronted/src/components/chart/chartList.vue b/nezha-fronted/src/components/chart/chartList.vue index 8d2c44b99..05b28f89f 100644 --- a/nezha-fronted/src/components/chart/chartList.vue +++ b/nezha-fronted/src/components/chart/chartList.vue @@ -594,7 +594,6 @@ export default { }) this.onScroll(this.scrollTop) }, - // group设置repeat 便利变量重复渲染图表 repeatVariableFn () { // 防止group中的chartList执行 @@ -742,7 +741,6 @@ export default { handler (newVal, oldVal) { // 比较变量 图表是否显示/隐藏 this.compareVariables() - this.repeatVariableFn() } }, @@ -785,7 +783,8 @@ export default { const position = getLayoutPosition(n) this.$store.commit('setChartLastPosition', position) } - const tempList = n.map(item => { + const cloneDataList = this.$lodash.cloneDeep(n) + const tempList = cloneDataList.map(item => { let param = '' let height = item.height || '' if (this.isPhone && item.type !== 'group') { @@ -848,11 +847,10 @@ export default { }) } this.$nextTick(() => { - this.copyDataList = JSON.parse(JSON.stringify(tempList)) + this.copyDataList = this.$lodash.cloneDeep(tempList) this.tempList = JSON.parse(JSON.stringify(this.copyDataList)) // 比较变量 图表是否显示/隐藏 this.compareVariables() - this.repeatVariableFn() setTimeout(() => { this.gridLayoutShow = true diff --git a/nezha-fronted/src/components/chart/renderChart.js b/nezha-fronted/src/components/chart/renderChart.js index cdd5a44c6..f529d70c9 100644 --- a/nezha-fronted/src/components/chart/renderChart.js +++ b/nezha-fronted/src/components/chart/renderChart.js @@ -6,7 +6,6 @@ export default { methods: { renderYAxis (chartDatas, chartInfo, type) { let chartData = lodash.cloneDeep(chartDatas) - console.log(chartData) if (type === 'legend') { chartData.forEach(item => { item.values = item.data @@ -32,7 +31,6 @@ export default { // 左y轴 const leftData = chartData.filter(item => item[0] && !item[0].yAxisIndex) const leftInfo = this.getMinMaxFromData(leftData, chartInfo.unit, chartInfo.param) // - console.log(leftData, leftInfo) chartOption.yAxis[0].minInterval = chartDataFormat.Interval(leftInfo.maxValue, leftInfo.copies, leftInfo.unit.type, 'min') chartOption.yAxis[0].maxInterval = chartDataFormat.Interval(leftInfo.maxValue, leftInfo.copies, leftInfo.unit.type, 'max') * Math.ceil(this.series.length / 5) if (chartInfo.param.stack) { @@ -65,7 +63,6 @@ export default { const allRight = this.series.every(item => item.yAxisIndex == 1) chartOption.yAxis[1].splitLine.show = allRight const rightData = chartData.filter(item => item[0] && item[0].yAxisIndex) - console.log(rightData, unit) const rightInfo = this.getMinMaxFromData(rightData, lodash.get(chartInfo, 'param.rightYAxis.unit', 2), lodash.get(chartInfo, 'param.rightYAxis', {}))// chartOption.yAxis[1].minInterval = chartDataFormat.Interval(rightInfo.maxValue, rightInfo.copies, rightInfo.unit.type, 'min') chartOption.yAxis[1].maxInterval = chartDataFormat.Interval(rightInfo.maxValue, rightInfo.copies, rightInfo.unit.type, 'max') * Math.ceil(this.series.length / 5) @@ -95,7 +92,6 @@ export default { delete chartOption.yAxis[1].max } } - console.log(chartOption) return chartOption }, getMinMaxFromData (originalDatas, chartUnit = 2, params) { diff --git a/nezha-fronted/src/components/cli/consoleNew.vue b/nezha-fronted/src/components/cli/consoleNew.vue index 70ad70fd9..1c536163f 100644 --- a/nezha-fronted/src/components/cli/consoleNew.vue +++ b/nezha-fronted/src/components/cli/consoleNew.vue @@ -114,9 +114,6 @@ export default { const consoleBox = document.getElementById('ternimalContainer' + this.idIndex) const width = document.body.clientWidth - 10// 可视宽度 const height = parseInt(consoleBox.offsetHeight) - 10 - console.log(width, height) - console.log(this.term.cols) - console.log(this.term.rows) const winStyle = { width: width, height: height, @@ -367,14 +364,12 @@ export default { // } }, renderTerminalSetting () { - console.log('renderTerminalSetting') this.showWatermark = this.terminalSetting.watermark this.wordSeparator = this.terminalSetting.wordSeparator this.term.options = { scrollback: this.terminalSetting.scrollbackLines, wordSeparator: this.terminalSetting.wordSeparator } - console.log(this.term) }, copySelection () { let str = this.term.getSelection() diff --git a/nezha-fronted/src/components/common/alert/terminalLogInfo.vue b/nezha-fronted/src/components/common/alert/terminalLogInfo.vue index 5ffe7e462..281cd9d95 100644 --- a/nezha-fronted/src/components/common/alert/terminalLogInfo.vue +++ b/nezha-fronted/src/components/common/alert/terminalLogInfo.vue @@ -160,7 +160,6 @@ export default { methods: { init () { this.loading = false - console.log(this.alertLabelData) }, getRemoteText (record) { return `${record.loginUser}@${record.host}:${record.port}` diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue index 825ccb965..0782f0517 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/scrapeEndpoint.vue @@ -221,7 +221,6 @@ export default { if (simpleTemp.indexOf(',') !== -1) { simpleTemp = simpleTemp.substr(0, simpleTemp.length - 1) } - console.log(simpleTemp) tableData.tableDateAll = simpleTemp tableDates.push(tableData) } diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue index 00b178320..ff503b899 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/terminalLogMonitorTab.vue @@ -81,7 +81,6 @@ export default { methods: { // 创建连接 create () { - console.log('create') const that = this if (this.terminalSocket) { this.terminalSocket.close() @@ -206,7 +205,6 @@ export default { }, consoleResize () { - console.log('consoleResize') this.$nextTick(() => { this.termFitAddon.fit() }) diff --git a/nezha-fronted/src/components/common/popBox/selectDashboard.vue b/nezha-fronted/src/components/common/popBox/selectDashboard.vue index bf6bd825d..c3919f9f4 100644 --- a/nezha-fronted/src/components/common/popBox/selectDashboard.vue +++ b/nezha-fronted/src/components/common/popBox/selectDashboard.vue @@ -383,8 +383,7 @@ export default { this.$set(this.$parent.showPanel, 'starred', this.starredList.some(item => item.id === this.showPanel.id) ? 1 : 0) } }) - }, - 300, true), + }, 300, true), // 删除收藏 delStarred: bus.debounceFn(function (data) { this.$delete('/sys/user/starred?type=dashboard&tid=' + data.id).then(async response => { diff --git a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue index d03e25cc6..38ab8824a 100644 --- a/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue +++ b/nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue @@ -459,7 +459,6 @@ export default { reader.onload = (evt) => { // 读取完文件之后会回来这里 let fileString = evt.target.result // 读取文件内容 fileString = JSON.parse(fileString) - console.log(fileString) if (!fileString.topo) { this.$message.error(this.$t('IMPORT_FORMAT_ERROR', { 0: '' })) return @@ -468,7 +467,6 @@ export default { fileString.topo.pens.forEach(item => { item.imageId = '' }) - console.log(fileString) this.$post(this.importUrl, fileString).then(response => { if (response.code == 200 && response.msg == 'success') { this.$message.success(this.$t('overall.result.success')) diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index c1ea5eabb..fce470116 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -332,7 +332,6 @@ export default { this.renderTopology() }, renderTopology () { - console.log('render') getTopology(this.meta2dId).render() }, penEnter (pen, e) { // 移入节点 diff --git a/nezha-fronted/src/components/common/rightBox/profileBox.vue b/nezha-fronted/src/components/common/rightBox/profileBox.vue index 4df4c3ebf..b62aa9fe4 100644 --- a/nezha-fronted/src/components/common/rightBox/profileBox.vue +++ b/nezha-fronted/src/components/common/rightBox/profileBox.vue @@ -145,7 +145,6 @@ export default { } else { this.$emit('clickProfile', false) } - console.log(this.editProfile) localStorage.setItem('nz-userInfo', JSON.stringify(this.editProfile)) bus.$emit('login') } else { diff --git a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue index 5cb6bbead..d3659eba2 100644 --- a/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/recordRuleBox.vue @@ -281,7 +281,6 @@ export default { changeInr () { if (!this.editRecordRule.inr) { setTimeout(() => { - console.log(123123) this.editRecordRule.inr = undefined }, 100) } diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue index 20c208def..fb196fe2f 100644 --- a/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue +++ b/nezha-fronted/src/components/common/rightBox/software/softwareTypeBox.vue @@ -187,7 +187,6 @@ export default { this.esc(false) }, iconActive (subItem) { - console.log(subItem, this.editSoftwareType.icon) if (this.editSoftwareType.icon === subItem.value) { this.editSoftwareType.icon = undefined this.$set(this.editSoftwareType, 'icon', '') diff --git a/nezha-fronted/src/components/common/timePicker.vue b/nezha-fronted/src/components/common/timePicker.vue index cde2088cf..9c099b0b2 100644 --- a/nezha-fronted/src/components/common/timePicker.vue +++ b/nezha-fronted/src/components/common/timePicker.vue @@ -226,7 +226,6 @@ export default { if (timePickerLocked) { const timePickerRange = localStorage.getItem('nz-time-picker-range') ? JSON.parse(localStorage.getItem('nz-time-picker-range')) : {} this.$store.dispatch('dispatchTimePickerRange', timePickerRange) - console.log('mounted', timePickerRange, this.timePickerLocked) } this.$store.dispatch('dispatchTimePickerLocked', timePickerLocked) }, @@ -353,7 +352,6 @@ export default { localStorage.setItem('nz-time-picker-locked', JSON.stringify(this.timePickerLocked)) this.$store.dispatch('dispatchTimePickerLocked', this.timePickerLocked) if (this.timePickerLocked) { - console.log(this.searchTime, this.nowTimeType) this.$store.dispatch('dispatchTimePickerRange', { time: this.searchTime, nowTimeType: this.nowTimeType diff --git a/nezha-fronted/src/components/layout/leftMenu.vue b/nezha-fronted/src/components/layout/leftMenu.vue index ec224c746..66db7e80d 100644 --- a/nezha-fronted/src/components/layout/leftMenu.vue +++ b/nezha-fronted/src/components/layout/leftMenu.vue @@ -155,7 +155,6 @@ export default { if (timePickerLocked) { const timePickerRange = localStorage.getItem('nz-time-picker-range') ? JSON.parse(localStorage.getItem('nz-time-picker-range')) : {} this.$store.dispatch('dispatchTimePickerRange', timePickerRange) - console.log('mounted', timePickerRange, this.timePickerLocked) } this.$store.dispatch('dispatchTimePickerLocked', timePickerLocked) } diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 3b793749f..aea38b1d2 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -457,7 +457,6 @@ export default { if (!q.startAt) { this.searchTime[2] = 'all' } - console.log(this.searchTime[2], this.searchTime[0], this.searchTime[1]) switch (this.searchTime[2]) { case '5m' : this.defaultPick = 1 @@ -864,7 +863,6 @@ export default { const path = this.fromRoute.alertMessage const routePathParams = this.$lodash.cloneDeep(param) delete routePathParams.statistics - console.log(this.searchTime) routePathParams.body.startAt = this.searchTime[0] ? this.momentStrToTimestamp(this.searchTime[0]) : '' routePathParams.body.endAt = this.searchTime[1] ? this.momentStrToTimestamp(this.searchTime[1]) : '' routePathParams.body.timeType = this.searchTime[2] diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index 7426b8439..e14666535 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -3658,7 +3658,6 @@ export default { }, setTimePickerRange () { this.$nextTick(() => { - console.log(this.timePickerLocked, !this.timePickerRange.nowTimeType) if (!this.timePickerLocked || !this.timePickerRange.nowTimeType) { return } diff --git a/nezha-fronted/src/store/timePicker.js b/nezha-fronted/src/store/timePicker.js index 18f904cf6..a66fff520 100644 --- a/nezha-fronted/src/store/timePicker.js +++ b/nezha-fronted/src/store/timePicker.js @@ -25,7 +25,6 @@ const timePicker = { store.commit('setTimePickerLocked', flag) }, dispatchTimePickerRange (store, range) { - console.log('dispatchTimePickerRange', range) store.commit('setTimePickerRange', range) } }