From aeb4d26b6c546f4abfcf31c636b70f40f2e49788 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 05 七月 2025 17:26:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/openRateFractionAnalysis.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/openRateFractionAnalysis.vue b/src/views/mdc/base/openRateFractionAnalysis.vue
index fc741c6..bcc1a31 100644
--- a/src/views/mdc/base/openRateFractionAnalysis.vue
+++ b/src/views/mdc/base/openRateFractionAnalysis.vue
@@ -2,18 +2,18 @@
<div style="width: 100%; height: 100%;">
<a-card :bordered="false">
<a-row type="flex" :gutter="16">
- <a-col :md="4">
+ <a-col :md="5">
<a-tabs :activeKey="activeKey" @change="tabChange">
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
- <base-tree @getCurrSelected="changeSelectionNode"></base-tree>
+ <base-tree @getCurrSelected="changeSelectionNode" :filterAbnormalDeviceKey="'1'"></base-tree>
</a-tab-pane>
<a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">,
<depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
- <a-col :md="20">
- <open-rate-fraction-analysis-main ref="EfficiencyList" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></open-rate-fraction-analysis-main>
+ <a-col :md="19">
+ <open-rate-fraction-analysis-main ref="openRateFractionAnalysisMain" :nodePeople='selectPeople' :nodeTree = 'selectEquement' :Type="slectTypeTree"></open-rate-fraction-analysis-main>
</a-col>
</a-row>
</a-card>
@@ -66,7 +66,11 @@
if (res.success) {
this.isDepartType = res.result[0].value
} else {
- this.$message.warn(res.message)
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
}
}).finally(() =>{
})
--
Gitblit v1.9.3