fix:解决冲突
This commit is contained in:
@@ -155,6 +155,8 @@
|
||||
<transition name="right-box">
|
||||
<chart-temp-box v-if="rightBox.chartTemp.show" :from="from" :obj="chart" :panel-data="panelData" :show-panel="showPanel" @close="closeRightBox" @on-create-success="createSuccess"></chart-temp-box>
|
||||
</transition>
|
||||
<!-- 快照进度 -->
|
||||
<snapshotProgress v-if="snapshotVisible" :showPanel="showPanel" :searchTime="searchTime" :snapshotVisible.sync="snapshotVisible"></snapshotProgress>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -175,6 +177,8 @@ import { randomcolor } from '@/components/common/js/radomcolor/randomcolor'
|
||||
import htmlToPdfMixin from '@/components/common/mixin/htmlToPdfMixin'
|
||||
import exportHtmlMixin from '@/components/common/mixin/exportHtml'
|
||||
import panelVariables from '@/components/common/panel/panelVariables'
|
||||
import snapshotProgress from '@/components/common/snapshotProgress/snapshotProgress.vue'
|
||||
|
||||
export default {
|
||||
name: 'panelTabNew',
|
||||
mixins: [subDataListMixin, detailViewRightMixin, htmlToPdfMixin, exportHtmlMixin],
|
||||
@@ -311,7 +315,8 @@ export default {
|
||||
nowTimeType: {},
|
||||
chartDetailInfo: {},
|
||||
variables: [],
|
||||
variablesInit: false
|
||||
variablesInit: false,
|
||||
snapshotVisible: false
|
||||
}
|
||||
},
|
||||
components: {
|
||||
@@ -320,7 +325,8 @@ export default {
|
||||
nzBottomDataList,
|
||||
topToolMoreOptions,
|
||||
chartTempBox,
|
||||
panelVariables // 处理panel变量的组件
|
||||
panelVariables, // 处理panel变量的组件
|
||||
snapshotProgress // 快照进度
|
||||
},
|
||||
methods: {
|
||||
// 刷新
|
||||
@@ -844,7 +850,7 @@ export default {
|
||||
if (type === 'PDF') {
|
||||
this.htmlToPdf()
|
||||
} else {
|
||||
this.exportToHtml(this.obj.name)
|
||||
this.snapshotVisible = true
|
||||
}
|
||||
},
|
||||
getPanelData () {
|
||||
|
||||
Reference in New Issue
Block a user