From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期一, 18 三月 2024 16:08:49 +0800 Subject: [PATCH] 1、mdc菜单下除特殊要求外,页面表格最少条数由10条调整为30条,每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮,实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题 --- src/views/system/modules/SelectDeviceModal.vue | 22 ---------------------- 1 files changed, 0 insertions(+), 22 deletions(-) diff --git a/src/views/system/modules/SelectDeviceModal.vue b/src/views/system/modules/SelectDeviceModal.vue index 4b28bc2..599de84 100644 --- a/src/views/system/modules/SelectDeviceModal.vue +++ b/src/views/system/modules/SelectDeviceModal.vue @@ -103,36 +103,16 @@ this.autoExpandParent = false }, queryTreeData(value) { - // this.loading = true - // this.cardLoading = true - // this.QueryProduction().then(res => { - // if (res.success) { - // this.dataList = [] - // this.allTreeKeys = [] - // this.getTreeDataSouce(res.result) - // this.treeDataSource = res.result - // this.generateList(this.treeDataSource) - // console.log('treeDataSource', this.treeDataSource) - // this.expandedKeys = this.allTreeKeys - // } else { - // this.$message.warn(res.message) - // } - // }).finally(() => { - // this.loading = false - // this.cardLoading = false - // }) this.loading = true this.selectedWorkshopIds = value getAction(this.url.getDeviceTree, { ids: value }) .then(res => { - console.log('res===============', res) if (res.success) { this.dataList = [] this.allTreeKeys = [] this.getTreeDataSouce(res.result) this.treeDataSource = res.result this.generateList(this.treeDataSource) - console.log('treeDataSource', this.treeDataSource) this.expandedKeys = this.allTreeKeys } else { this.$notification.warning({ @@ -188,9 +168,7 @@ }, onCheck(value, obj) { this.checkedKeys = value - console.log('obj,', obj) this.deviceNodes = obj.checkedNodes.filter(item => item.data.props.equipmentId).map(item => item.data.props.equipmentId) - console.log(this.deviceNodes) }, handleCancel() { this.visible = false -- Gitblit v1.9.3