From b7ad54294da15dccc59f7b6c879af3e000024d9d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 19 六月 2025 17:51:30 +0800
Subject: [PATCH] 1、全局树组件多选设备抽屉组件增加点击树节点名称也可以选中当前节点 2、设备监控页面布局图查看设备详情时首次进入清空上一次设备信息（由于数据为定时刷新不能每次获取数据均清空） 3、设备类型管理页面调整设备类型图片尺寸以解决表格错行问题 4、设备管理页面添加或编辑设备弹窗选择设备时增加点击行即可选中
---
src/views/system/modules/SelectDeviceModal.vue | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 deletions(-)
diff --git a/src/views/system/modules/SelectDeviceModal.vue b/src/views/system/modules/SelectDeviceModal.vue
index 599de84..e3f8b69 100644
--- a/src/views/system/modules/SelectDeviceModal.vue
+++ b/src/views/system/modules/SelectDeviceModal.vue
@@ -58,6 +58,7 @@
} from '@/api/manage'
import BaseTree from '@/views/mdc/common/BaseTree'
import DepartTree from '@/views/mdc/base/modules/DepartList/DepartListTree/DepartTree'
+ import { getSystemConfigValue } from '@api/api'
export default {
name: 'SelectDeviceModal',
@@ -85,16 +86,20 @@
expandedKeys: [],
checkedKeys: [],
url: {
- getDeviceTree: '/mdc/mdcEquipment/loadTreeListByProductionIds'
+ getDeviceTree: '/mdc/mdcEquipment/loadTreeListByProductionIds',
+ getEquipmentTree: '/eam/equipment/loadTreeListByProductionIds',
},
selectedWorkshopIds: '',
dataList: [],
allTreeKeys: [],
visible: false,
- dataSource: []
+ dataSource: [],
+ //绯荤粺鏄惁瀹炴柦璁惧绠＄悊妯″潡
+ eamModuleFlag: true,
}
},
created() {
+ this.loadEamSystemConfigValue();
this.closeAll()
},
methods: {
@@ -105,7 +110,15 @@
queryTreeData(value) {
this.loading = true
this.selectedWorkshopIds = value
- getAction(this.url.getDeviceTree, { ids: value })
+ let url = '';
+ if(this.eamModuleFlag) {
+ //鍔犺浇璁惧绠＄悊鐨勬爲缁撴瀯
+ url = this.url.getEquipmentTree
+ }else {
+ //鍔犺浇MDC鐨勬爲缁撴瀯
+ url = this.url.getDeviceTree
+ }
+ getAction(url, { ids: value })
.then(res => {
if (res.success) {
this.dataList = []
@@ -176,7 +189,15 @@
handleOk() {
this.$emit('selectFinished', this.deviceNodes)
this.visible = false
- }
+ },
+ loadEamSystemConfigValue() {
+ let params = {settingKey: 'has_eam_module'};
+ getSystemConfigValue(params).then(res => {
+ if (res.success) {
+ this.eamModuleFlag = res.result.settingValue === '1'
+ }
+ })
+ },
}
}
--
Gitblit v1.9.3