diff --git a/src/assets/css/components/views/charts/panel.scss b/src/assets/css/components/views/charts/panel.scss index e33fc351..3b2e7c20 100644 --- a/src/assets/css/components/views/charts/panel.scss +++ b/src/assets/css/components/views/charts/panel.scss @@ -103,6 +103,9 @@ justify-content: space-between; align-items: center; + .panel__time { + top: 7px; + } .header__operation-btn { margin-left: 12px; cursor: pointer; diff --git a/src/views/charts/Chart.vue b/src/views/charts/Chart.vue index 9e85538e..d1b35c69 100644 --- a/src/views/charts/Chart.vue +++ b/src/views/charts/Chart.vue @@ -396,7 +396,7 @@ export default { isError: Boolean, table: Object, timeFilter: Object, - orderPieTable: Object, + orderPieTable: String, tabHandleClickType: String }, computed: { diff --git a/src/views/charts/ChartHeader.vue b/src/views/charts/ChartHeader.vue index e8700a27..fc676aa3 100644 --- a/src/views/charts/ChartHeader.vue +++ b/src/views/charts/ChartHeader.vue @@ -264,7 +264,7 @@ export default { default: false }, table: Object, - orderPieTable: Object + orderPieTable: String }, components: { ChartError diff --git a/src/views/charts/PanelChart.vue b/src/views/charts/PanelChart.vue index 9b0ad94e..ad0005f6 100644 --- a/src/views/charts/PanelChart.vue +++ b/src/views/charts/PanelChart.vue @@ -266,12 +266,14 @@ export default { this.loading = false }) } else if (this.isGroup || this.isTabs) { - this.$refs.chart.$refs.chart.reload() + this.$refs.chart && this.$refs.chart.$refs.chart && this.$refs.chart.$refs.chart.reload() } else if (this.isBlock) { if (!this.chartInfo.firstShow) { this.chartInfo.firstShow = true } else { - this.$refs.chart.$refs.chart.reload() + if (this.$refs.chart && this.$refs.chart.$refs.chart) { + this.$refs.chart.$refs.chart.reload() + } } } } catch (e) { @@ -400,7 +402,7 @@ export default { const dateRangeValue = 60 const { startTime, endTime } = getNowTime(dateRangeValue) const chartTimeFilter = ref({ startTime, endTime, dateRangeValue }) - const table = ref('') + const table = ref({}) if (isBasicTable(props.chartInfo.type)) { table.value = { pageSize: chartTableDefaultPageSize, diff --git a/src/views/charts/charts/ChartBlock.vue b/src/views/charts/charts/ChartBlock.vue index 27afd319..280d93bc 100644 --- a/src/views/charts/charts/ChartBlock.vue +++ b/src/views/charts/charts/ChartBlock.vue @@ -11,22 +11,18 @@