From 623c691a3cbf09fc0fe68bfa50d9354d12a3da77 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 17 十一月 2023 14:34:51 +0800
Subject: [PATCH] 1、车间看板页面修改设备详情弹窗触发条件由悬浮改为单击 2、大屏车间管理页面增加有关设备编号字体颜色各项功能，由用户自行设置
---
src/views/mdc/base/DeviceRepair.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/DeviceRepair.vue b/src/views/mdc/base/DeviceRepair.vue
index 41f4a78..adc416c 100644
--- a/src/views/mdc/base/DeviceRepair.vue
+++ b/src/views/mdc/base/DeviceRepair.vue
@@ -2,17 +2,13 @@
<div style="width: 100%; height: 100%;">
<a-card :bordered="false">
<a-row type="flex" :gutter="16">
- <!--<a-col :md="5">
- <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>
@@ -36,6 +32,7 @@
import JSuperQuery from '@/components/jeecg/JSuperQuery'
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
import DepartTree from './modules/DepartList/DepartListTree/DepartTree'
+ import {mapActions} from 'vuex'
export default {
name: 'DeviceRepair',
@@ -57,12 +54,30 @@
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