diff --git a/src/assets/css/components/views/entityExplorer/entity-detail.scss b/src/assets/css/components/views/entityExplorer/entity-detail.scss index 973d314c..0a78c87a 100644 --- a/src/assets/css/components/views/entityExplorer/entity-detail.scss +++ b/src/assets/css/components/views/entityExplorer/entity-detail.scss @@ -1,4 +1,8 @@ .entity-detail.cn-home { + .panel-chart { + width: 100%; + } + flex-direction: column; .entity-detail__header { @@ -45,9 +49,6 @@ .chart-header { border: none; } - .chart-drawing { - width: 530px; - } } } } diff --git a/src/components/advancedSearch/TagMode.vue b/src/components/advancedSearch/TagMode.vue index 5942c4b2..c7024c0e 100644 --- a/src/components/advancedSearch/TagMode.vue +++ b/src/components/advancedSearch/TagMode.vue @@ -391,7 +391,6 @@ export default { deep: true, handler (n) { if (!_.isEmpty(n)) { - console.info(n) this.metaList = n } } diff --git a/src/components/advancedSearch/TextMode.vue b/src/components/advancedSearch/TextMode.vue index d6e02824..5a0c4c1f 100644 --- a/src/components/advancedSearch/TextMode.vue +++ b/src/components/advancedSearch/TextMode.vue @@ -73,11 +73,9 @@ export default { const errorList = parser.validateStr(str) if (_.isEmpty(errorList)) { const metaList = parser.parseStr(str) - console.info(metaList) this.$emit('changeMode', 'tag', metaList) } else { this.$emit('changeMode', 'tag', { metaList: [], str: '' }) - console.info(errorList) } } else { this.$emit('changeMode', 'tag', { str: '', metaList: [] }) diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue index 9004fe3e..9bd9566a 100644 --- a/src/views/charts/Chart.vue +++ b/src/views/charts/Chart.vue @@ -149,6 +149,7 @@ :time-filter="timeFilter" :query-params="queryParams" :entity="entity" + :need-timeout="needTimeout" > @@ -400,7 +402,8 @@ export default { table: Object, timeFilter: Object, orderPieTable: String, - tabHandleClickType: String + tabHandleClickType: String, + needTimeout: Boolean }, computed: { isNoData () { @@ -437,13 +440,13 @@ export default { this.$emit('showLoading', show) }, getAlarmInfo (url, extraParams, isRefresh, timeFilter) { - this.$emit('getChartData', url, extraParams, isRefresh, timeFilter) + this.$emit('getChartData', url, extraParams, timeFilter, isRefresh) }, getChartData (url, extraParams) { this.$emit('getChartData', url, extraParams) }, getDetectionData (url, extraParams, isRefresh, timeFilter) { - this.$emit('getChartData', url, extraParams, isRefresh, timeFilter) + this.$emit('getChartData', url, extraParams, timeFilter, isRefresh) }, initEchartsWithTable () { this.$refs['chart' + this.chartInfo.id] && diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index ddfd2a4a..37d89ee1 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -38,6 +38,7 @@ :table="table" :is-fullscreen="isFullscreen" :order-pie-table="orderPieTable" + :need-timeout="needTimeout" :time-filter="timeFilter" @getChartData="getChartData" @showLoading="showLoading" @@ -102,7 +103,8 @@ export default { timeFilter: Object, // 时间范围 isFullscreen: Boolean, panelLock: Boolean, - entity: Object + entity: Object, + needTimeout: Boolean }, data () { return { @@ -170,7 +172,7 @@ export default { this.getChartData() }, /* 参数 extraParams 额外请求参数 */ - getChartData (url, extraParams = {}, chartTimeFilter, num) { + getChartData (url, extraParams = {}, chartTimeFilter, isRefresh) { this.loading = true try { if (chartTimeFilter) { @@ -267,7 +269,13 @@ export default { this.errorInfo = response.msg || response.message || 'Unknown' } }).finally(() => { - this.loading = false + if (this.needTimeout) { + setTimeout(() => { + this.loading = false + }, 3000) + } else { + this.loading = false + } }) } else if (this.isGroup || this.isTabs) { this.$refs.chart && this.$refs.chart.$refs.chart && this.$refs.chart.$refs.chart.reload() diff --git a/src/views/charts/PanelChartList.vue b/src/views/charts/PanelChartList.vue index 245431d6..a5b7dac1 100644 --- a/src/views/charts/PanelChartList.vue +++ b/src/views/charts/PanelChartList.vue @@ -1,5 +1,5 @@ diff --git a/src/views/charts/charts/ChartRelationShip.vue b/src/views/charts/charts/ChartRelationShip.vue index 10c951cd..2500ea0c 100644 --- a/src/views/charts/charts/ChartRelationShip.vue +++ b/src/views/charts/charts/ChartRelationShip.vue @@ -114,7 +114,7 @@