diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index 7023fd74a..f2af07328 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -800,7 +800,6 @@ export default { }, // chartSite用于区分是全屏显示还是局部显示 initChart (chartInfo, dataArg, ele, legend) { - // console.log(123123132) const self = this let minTime = null let maxTime = null diff --git a/nezha-fronted/src/components/charts/diagram-chart.vue b/nezha-fronted/src/components/charts/diagram-chart.vue index a28b0492e..2dad1e46d 100644 --- a/nezha-fronted/src/components/charts/diagram-chart.vue +++ b/nezha-fronted/src/components/charts/diagram-chart.vue @@ -212,7 +212,6 @@ export default { this.firstShow = true // 展示操作按键 this.panelIdInner = panelId - // console.log(chartItem) this.data = chartItem this.text = chartItem.param.text this.screenText = chartItem.param.text diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue index 850906065..5fdd20fc9 100644 --- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue +++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue @@ -20,7 +20,7 @@ @command="changeDetailType"> {{$t('asset.detail.list')}} diff --git a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue index 3ec6fbea8..42cf5d6cc 100644 --- a/nezha-fronted/src/components/common/labelFilter/clickSearch.vue +++ b/nezha-fronted/src/components/common/labelFilter/clickSearch.vue @@ -131,7 +131,6 @@ export default { if (this.changeMoreNum) { let height = 2 this.$refs.searchContentBox.forEach(item => { - console.log(item.offsetHeight) height += item.offsetHeight }) return height diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index b1d2101a9..71c1b667f 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -718,8 +718,8 @@ const en = { type: 'Types', pingInfo: 'Ping', detail: { - list: 'List', - detail: 'View', + list: 'List view', + detail: 'Detail view', orderBy: 'OrderBy', orderByLabel: 'Order by {label}' } diff --git a/nezha-fronted/src/components/common/mixin/detailViewMixin.js b/nezha-fronted/src/components/common/mixin/detailViewMixin.js index e53d62079..087577476 100644 --- a/nezha-fronted/src/components/common/mixin/detailViewMixin.js +++ b/nezha-fronted/src/components/common/mixin/detailViewMixin.js @@ -16,9 +16,8 @@ export default { if (this.detailType === flag) { return } - if (this.$refs.dataList) { - this.$refs.dataList.bottomBox.showSubList = false - } + this.$refs.dataList.bottomBox.showSubList = false + this.detailViewRightObj = '' this.detailType = flag let dataList = '' localStorage.setItem('detail-view-' + this.tableId, this.detailType) @@ -67,7 +66,6 @@ export default { this.$refs[dataList].$refs.searchInput.sreach_num = 0 this.searchMsg.searchLabelList.forEach(searchLabel => { if (this.searchLabel[searchLabel.label]) { - console.log(searchLabel.label, this.searchLabel[searchLabel.label]) this.$refs[dataList].$refs.searchInput.select_list.push({ ...searchLabel, val: this.searchLabel[searchLabel.label] @@ -88,7 +86,7 @@ export default { orderBy = this.orderBy orderType = 'ascending' } - // this.$refs.dataTable.$refs.dataTable.sort(orderBy, orderType) + this.$refs.dataTable.$refs.dataTable.sort(orderBy, orderType) } }, 100) }, diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 3dc17a1a3..6fc9275f4 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -119,7 +119,6 @@ export default { if (this.editDc.id) { const param = { ...this.editDc } const attr = this.$refs.latlngPicker.getAttribute() - console.log(attr) param.latitude = attr.latitude param.longitude = attr.longitude this.$put('/dc', param).then(response => { diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index 299161670..72ed338d9 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -25,7 +25,7 @@ @command="changeDetailType"> {{$t('asset.detail.list')}} diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 59c57a5dc..8f0cc486e 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -1,5 +1,73 @@ - - - - - - - { this.tools.loading = false if (response.code === 200) { - console.log(response) if (response.statistics && this.$route.path === '/asset') { this.setSearchData(response.statistics) } @@ -700,8 +699,8 @@ export default { this.detailSearchList.model.show = true }) } else { - this.titleSearchList[key].children = statistics[keys] - this.detailSearchList[key].children = statistics[keys] + this.titleSearchList[key].children = statistics[keys].map(d => { return { ...d, value: d.id } }) + this.detailSearchList[key].children = statistics[keys].map(d => { return { ...d, value: d.id } }) } this.titleSearchList[key].show = true this.detailSearchList[key].show = true