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/dnc/base/NcDeviceCharactersList.vue | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/src/views/dnc/base/NcDeviceCharactersList.vue b/src/views/dnc/base/NcDeviceCharactersList.vue
index 94a3dc2..f21099e 100644
--- a/src/views/dnc/base/NcDeviceCharactersList.vue
+++ b/src/views/dnc/base/NcDeviceCharactersList.vue
@@ -20,9 +20,11 @@
</a-form-item>
</a-col>
<template v-if="toggleSearchStatus">
- <a-col :xl="6" :lg="7" :md="8" :sm="24">
- <a-form-item label="閮ㄩ棬鍒嗙粍">
- <j-dict-select-tag v-model="queryParam.departId" placeholder="璇烽�夋嫨閮ㄩ棬鍒嗙粍" dictCode="sys_department,depart_name,depart_id"/>
+ <a-col :md="4" :sm="4">
+ <a-form-item label="杞﹂棿鍚嶇О">
+ <!--<a-input placeholder="璇疯緭鍏ヨ溅闂村悕绉�" v-model="queryParam.productionName"></a-input>-->
+ <a-tree-select v-model="queryParam.departId" :treeData="workshopTreeData" placeholder="璇烽�夋嫨杞﹂棿"
+ :treeDefaultExpandedKeys="treeDefaultExpandedKeys"></a-tree-select>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -129,6 +131,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
import NcDeviceCharactersModal from './modules/NcDeviceCharacters/NcDeviceCharactersModal__Style#Drawer.vue'
+import { queryProductionTreeList } from '@api/api'
export default {
name: 'NcDeviceCharactersList',
@@ -159,7 +162,7 @@
width: 200,
},
{
- title: '鎵�灞為儴闂�',
+ title: '鎵�灞炶溅闂�',
align: "center",
dataIndex: 'departId_dictText',
width: 220,
@@ -199,9 +202,12 @@
importExcelUrl: "mdc/mdcDriveTypeParamConfig/importExcel",
},
dictOptions:{},
+ workshopTreeData: [],
+ treeDefaultExpandedKeys: []
}
},
created() {
+ this.getWorkshopListByApi()
},
computed: {
importExcelUrl: function(){
@@ -210,7 +216,18 @@
},
methods: {
initDictConfig(){
- }
+ },
+ /**
+ * 璋冪敤鎺ュ彛鑾峰彇鏌ヨ鍖哄煙杞﹂棿鏍戝垪琛�
+ */
+ getWorkshopListByApi() {
+ queryProductionTreeList().then(res => {
+ if (res.success) {
+ this.workshopTreeData = res.result
+ this.treeDefaultExpandedKeys = [...res.result].map(item => item.key)
+ }
+ })
+ },
}
}
</script>
--
Gitblit v1.9.3