From 31d62d0ac0bf6fdcb200ffeaa7b4e15aaf2d4946 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 七月 2025 16:40:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/mdc/base/equipmentDayAvail.vue | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/views/mdc/base/equipmentDayAvail.vue b/src/views/mdc/base/equipmentDayAvail.vue
index 7b67954..51280ad 100644
--- a/src/views/mdc/base/equipmentDayAvail.vue
+++ b/src/views/mdc/base/equipmentDayAvail.vue
@@ -5,11 +5,10 @@
<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 key="2" tab="閮ㄩ棬灞傜骇">
- <depart-tree @getCurrSelectedDD="changeSelectionNodedd"
- ></depart-tree>
+ <a-tab-pane v-if="isDepartType == 0" key="2" tab="閮ㄩ棬灞傜骇">
+ <depart-tree @getCurrSelectedDD="changeSelectionNodedd"></depart-tree>
</a-tab-pane>
</a-tabs>
</a-col>
@@ -25,6 +24,7 @@
import BaseTree from '../common/BaseTree'
import equipmentDayAvailMain from './modules/equipmentDayAvail/equipmentDayAvailMain'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'equipmentDayAvail',
components:{
@@ -42,10 +42,29 @@
slectTypeTree: '',
url: {
equipmentStatistics: '/mdc/equipment/equipmentStatistics'
- }
+ },
+ isDepartType:'',
}
},
+ created() {
+ this.queryTreeData()
+ },
methods: {
+ ...mapActions(['QueryDepartTree']),
+ queryTreeData() {
+ this.QueryDepartTree().then(res => {
+ if (res.success) {
+ this.isDepartType = res.result[0].value
+ } else {
+ // this.$message.warn(res.message)
+ this.$notification.warning({
+ message:'娑堟伅',
+ description:res.message
+ });
+ }
+ }).finally(() =>{
+ })
+ },
tabChange(val) {
// console.log(val)
this.activeKey = val
--
Gitblit v1.9.3