From 9733e3b67cd1abe6e7ce298cc048fabd86c0f24e Mon Sep 17 00:00:00 2001 From: zhaowei <zhaowei> Date: 星期三, 25 六月 2025 10:01:09 +0800 Subject: [PATCH] 1、报警分析页面饼图种类过多时饼图颜色出现白色与背景色一致导致无法区分 2、综合效率分析页面计算OEE功能新增loading提示 3、统计分析和统计图表页面新增图表数据加载提示以及优化图表展示增加分辨率适应及代码 --- src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainBottom.vue | 49 +++++++++++++++++++++++++++++-------------------- 1 files changed, 29 insertions(+), 20 deletions(-) diff --git a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainBottom.vue b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainBottom.vue index 308ce66..fa67d6c 100644 --- a/src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainBottom.vue +++ b/src/views/dnc/base/modules/DeviceStructure/DeviceStructureMainBottom.vue @@ -1,30 +1,31 @@ <template> - <a-tabs style="height: 100%" v-model="activeTabKey" @change="handleTabChange"> - <a-tab-pane :key="1" tab="璁惧灞炴��" v-if="currentTreeNodeInfo.equipmentId"> - <DeviceInfo :currentLevelDetails="currentTreeNodeInfo.entity" :size="containerSize"/> - </a-tab-pane> - - <template v-else> - <a-tab-pane :key="1" tab="鏂囨。灞炴��"> - <DocumentInfo :currentLevelDetails="currentDocumentInfo" :size="containerSize"/> + <div style="height: 100%"> + <a-tabs style="height: 100%" v-model="activeTabKey" @change="handleTabChange"> + <a-tab-pane :key="1" tab="璁惧灞炴��" v-if="currentTreeNodeInfo.type===2&&!currentDocumentInfo.docId"> + <DeviceInfo :currentLevelDetails="currentTreeNodeInfo.entity" :size="containerSize"/> </a-tab-pane> - <a-tab-pane :key="2" tab="棰勮"> - <FilePreview ref="filePreviewRef" :currentDocumentInfo="currentDocumentInfo"/> - </a-tab-pane> + <template v-if="currentDocumentInfo.docId"> + <a-tab-pane :key="1" tab="鏂囨。灞炴��"> + <DocumentInfo :currentLevelDetails="currentDocumentInfo" :size="containerSize"/> + </a-tab-pane> - <a-tab-pane :key="3" tab="鏂囨。鐗堟湰"> - <DocumentVersionTableList ref="documentVersionTableRef" :currentDocumentInfo="currentDocumentInfo" - @handleTableContextMenuOpen="handleTableContextMenuOpen" - @releaseFilePreviewApi="releaseFilePreviewApi" - :size="containerSize"/> - </a-tab-pane> - </template> + <a-tab-pane :key="2" tab="棰勮"> + <FilePreview ref="filePreviewRef" :currentDocumentInfo="currentDocumentInfo"/> + </a-tab-pane> + + <a-tab-pane :key="3" tab="鏂囨。鐗堟湰"> + <DocumentVersionTableList ref="documentVersionTableRef" :currentDocumentInfo="currentDocumentInfo" + @handleTableContextMenuOpen="handleTableContextMenuOpen" + @releaseFilePreviewApi="releaseFilePreviewApi" + :size="containerSize"/> + </a-tab-pane> + </template> + </a-tabs> <TableContextMenu :tableRowInfo="currentRightClickedTableRowInfo" ref="tableContextMenuRef"/> - </a-tabs> + </div> </template> - <script> import DeviceInfo from './Device/DeviceInfo' import DocumentInfo from '../../../common/DocumentInfo' @@ -55,6 +56,14 @@ hasLoadedDataTabKeyArray: [] } }, + watch: { + currentTreeNodeInfo: { + handler(value) { + this.currentDocumentInfo = {} + }, + immediate: true + } + }, created() { this.$bus.$on('sendCurrentClickedDocumentInfo', this.receiveCurrentDocumentInfo) this.$bus.$on('reloadMainBottomTableData', this.reloadMainBottomTableData) -- Gitblit v1.9.3