From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/views/mdc/base/ComparativeAnalysis.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/src/views/mdc/base/ComparativeAnalysis.vue b/src/views/mdc/base/ComparativeAnalysis.vue
index b3ead03..669c233 100644
--- a/src/views/mdc/base/ComparativeAnalysis.vue
+++ b/src/views/mdc/base/ComparativeAnalysis.vue
@@ -2,23 +2,17 @@
<a-card :bordered="false">
<div style="width: 100%; height: 100%;overflow: hidden">
<a-row type="flex" :gutter="16">
- <!--<a-col :md="5" :sm="24">-->
- <!--<base-tree @getCurrSelected="changeSelectionNode"></base-tree>-->
- <!--</a-col>-->
<a-col :md="5">
<a-tabs :activeKey="activeKey" @change="tabChange">
<a-tab-pane key="1" tab="杞﹂棿灞傜骇" force-render>
<base-tree @getCurrSelected="changeSelectionNode"></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>
<a-col :md="24-5" :sm="24">
- <!--<statistical-analysis-main :equip="selectEquementnode"></statistical-analysis-main>-->
- <!--<device-repair-list ref="DeviceRepairList" :nodeTree='selectEquement' :nodePeople='selectPeople' :Type="slectTypeTree" />-->
<comparative-analysismain ref="comparativeAnalysismain" :nodeTree='selectEquement' :nodePeople='selectPeople' :Type="slectTypeTree"></comparative-analysismain>
</a-col>
</a-row>
@@ -29,11 +23,14 @@
<script>
import BaseTree from '../common/BaseTree'
import comparativeAnalysismain from './modules/comparativeAnalysis/comparativeAnalysismain'
+ import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'ComparativeAnalysis',
components:{
BaseTree,
- comparativeAnalysismain
+ comparativeAnalysismain,
+ DepartTree
},
data() {
return {
@@ -45,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