CN-268 feat: panel重构--tabs(部分)
This commit is contained in:
@@ -19,6 +19,8 @@ import timezone from 'dayjs/plugin/timezone'
|
|||||||
import advancedFormat from 'dayjs/plugin/advancedFormat'
|
import advancedFormat from 'dayjs/plugin/advancedFormat'
|
||||||
import weekday from 'dayjs/plugin/weekday'
|
import weekday from 'dayjs/plugin/weekday'
|
||||||
|
|
||||||
|
import PanelChartList from '@/views/charts/PanelChartList'
|
||||||
|
|
||||||
const _ = require('lodash') // lodash工具
|
const _ = require('lodash') // lodash工具
|
||||||
|
|
||||||
dayjs.extend(utc)
|
dayjs.extend(utc)
|
||||||
@@ -45,5 +47,7 @@ app.config.globalProperties.$_ = _
|
|||||||
|
|
||||||
app.mixin(commonMixin)
|
app.mixin(commonMixin)
|
||||||
|
|
||||||
|
app.component('panel-chart-list', PanelChartList)
|
||||||
|
|
||||||
app.mount('#app')
|
app.mount('#app')
|
||||||
export default app
|
export default app
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
@showLoading="showLoading"
|
@showLoading="showLoading"
|
||||||
></chart-map>
|
></chart-map>
|
||||||
|
|
||||||
|
<div v-else style="height: 100%; width: 100%; background-color: lightcyan;"></div>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -62,7 +62,6 @@ import { ref } from 'vue'
|
|||||||
import { panelTypeAndRouteMapping } from '@/utils/constants'
|
import { panelTypeAndRouteMapping } from '@/utils/constants'
|
||||||
import { api, getPanelList, getChartList } from '@/utils/api'
|
import { api, getPanelList, getChartList } from '@/utils/api'
|
||||||
import { getNowTime } from '@/utils/date-util'
|
import { getNowTime } from '@/utils/date-util'
|
||||||
import PanelChartList from './PanelChartList'
|
|
||||||
import DateTimeRange from '@/components/common/TimeRange/DateTimeRange'
|
import DateTimeRange from '@/components/common/TimeRange/DateTimeRange'
|
||||||
import TimeRefresh from '@/components/common/TimeRange/TimeRefresh'
|
import TimeRefresh from '@/components/common/TimeRange/TimeRefresh'
|
||||||
|
|
||||||
@@ -75,8 +74,7 @@ export default {
|
|||||||
},
|
},
|
||||||
components: {
|
components: {
|
||||||
DateTimeRange,
|
DateTimeRange,
|
||||||
TimeRefresh,
|
TimeRefresh
|
||||||
PanelChartList
|
|
||||||
},
|
},
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<div :class="{'panel-chart--fullscreen': isFullscreen, 'panel-chart--title-chart': isTitle}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)">
|
<div :class="{'panel-chart--fullscreen': isFullscreen, 'panel-chart--title-chart': isTitle}" class="panel-chart" :id="isFullscreen ? ('chart-screen-' + chartInfo.id ) : ('chart-local-' + chartInfo.id)">
|
||||||
<!-- title和工具栏,支持浮动 -->
|
<!-- title和工具栏,支持浮动 -->
|
||||||
<chart-header
|
<chart-header
|
||||||
v-if="!isFullscreen && showHeader && !isSingleValue"
|
v-if="!isFullscreen && showHeader && !isSingleValue && !isTabs"
|
||||||
:is-error="isError"
|
:is-error="isError"
|
||||||
:error-info="errorInfo"
|
:error-info="errorInfo"
|
||||||
:chart-data="chartData"
|
:chart-data="chartData"
|
||||||
|
|||||||
@@ -11,22 +11,19 @@
|
|||||||
:key="tab.id"
|
:key="tab.id"
|
||||||
:ref="`chart-${chartInfo.id}`"
|
:ref="`chart-${chartInfo.id}`"
|
||||||
>
|
>
|
||||||
<template v-for="chart in tab.children" :key="chart.id">
|
<panel-chart-list
|
||||||
<panel-chart
|
|
||||||
:ref="'chart' + chart.id"
|
|
||||||
:chart-info="chart"
|
|
||||||
:show-header="true"
|
|
||||||
:time-filter="timeFilter"
|
:time-filter="timeFilter"
|
||||||
@showFullscreen="showFullscreen"
|
:data-list="tab.children"
|
||||||
></panel-chart>
|
:panel-lock="true"
|
||||||
</template>
|
>
|
||||||
|
</panel-chart-list>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import _ from 'lodash'
|
import _ from 'lodash'
|
||||||
import PanelChart from '@/views/charts/PanelChart'
|
|
||||||
export default {
|
export default {
|
||||||
name: 'ChartTabs',
|
name: 'ChartTabs',
|
||||||
props: {
|
props: {
|
||||||
@@ -34,9 +31,6 @@ export default {
|
|||||||
chartData: [Object, Array, String], // 数据在父组件查询后传入,本组件内不查询,只根据接传递的数据来渲染
|
chartData: [Object, Array, String], // 数据在父组件查询后传入,本组件内不查询,只根据接传递的数据来渲染
|
||||||
queryParams: Object // 接口请求参数
|
queryParams: Object // 接口请求参数
|
||||||
},
|
},
|
||||||
components: {
|
|
||||||
PanelChart
|
|
||||||
},
|
|
||||||
computed: {
|
computed: {
|
||||||
timeFilter () {
|
timeFilter () {
|
||||||
return {
|
return {
|
||||||
|
|||||||
Reference in New Issue
Block a user