diff --git a/src/assets/css/components/views/report/builtinReport.scss b/src/assets/css/components/views/report/builtinReport.scss index e5bb732f..c5faf0f6 100644 --- a/src/assets/css/components/views/report/builtinReport.scss +++ b/src/assets/css/components/views/report/builtinReport.scss @@ -8,6 +8,7 @@ width: 288px; height: 100%; border-right: 1px solid #E7EAED; + position: relative; .cn-builtin-left-title { padding: 28px 0 26px 13px; font-size: 16px; diff --git a/src/components/table/report/reportTestTable.vue b/src/components/table/report/reportTestTable.vue index 562fbb6d..d0834c5f 100644 --- a/src/components/table/report/reportTestTable.vue +++ b/src/components/table/report/reportTestTable.vue @@ -6,6 +6,7 @@ :height="height" :expand-row-keys="expandedIds" row-key="id" + v-loading="toolsLoading" border tooltip-effect="light" @header-dragend="dragend" @@ -107,6 +108,11 @@ {{handleTimeRange(scope.row)}} + + + {{item.name}} + + {{$t('report.always')}} @@ -217,6 +223,10 @@ export default { Loading, chartDetectionPagination }, + props: { + categoryList: Array, + toolsLoading: Boolean + }, inject: ['reload'], data () { return { @@ -227,7 +237,12 @@ export default { label: 'ID', prop: 'id', show: true, - width: 40 + width: 50 + }, { + label: this.$t('report.categoryType'), + prop: 'categoryId', + show: true, + minWidth: 180 }, { label: this.$t('config.user.name'), prop: 'name', @@ -384,7 +399,7 @@ export default { }) } this.loadingDown = false - const showInterval = this.downDataList.find(item => item.percent !== 1) + const showInterval = this.downDataList.find(item => item.percent !== 1 && item.state !== 2) if (this.downDataList && showInterval) { this.intervalChange(param) } diff --git a/src/views/report/reportTest.vue b/src/views/report/reportTest.vue index c8f4334d..04ac48fb 100644 --- a/src/views/report/reportTest.vue +++ b/src/views/report/reportTest.vue @@ -1,6 +1,7 @@ + {{$t('report.category')}} @@ -34,9 +35,10 @@ { if (res.code === 200) { this.builtinReportLeftMenu = res.data.list.map(c => { @@ -161,6 +167,7 @@ export default { } }) } + this.builtinLeftLoading = false }) }, getTableData (params) {