diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 3e9d42218..15b53388d 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -454,6 +454,23 @@ this.loading = true getAction(url, params).then((res) => { if (res.success) { + // todo + // console.log(res.result,'res.result') + // let tt = [] + // this.dataSource = [] + // // 需要转化数据类型 + // tt = res.result + // tt.forEach((Obj) => { + // Object.keys(Obj).forEach((item) => { + // if(Obj[item] instanceof Object && Obj[item].controlType !== undefined){ + // Obj[item].list.forEach((itemLi) => { + // if(itemLi.type === 'pull_more'){ + // itemLi.dataValue = itemLi.dataValue === null ? [] : itemLi.dataValue.splice(',') + // } + // }) + // } + // }) + // }) this.dataSource = res.result this.total = res.result.total this.selectedRowKeys = [] @@ -464,8 +481,6 @@ }) }, onChange(page, pageSize) { - // this.pageNo = page - // this.getTableList() }, onSelectChange(value, rowValue) { this.selectedRowKeys = value diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 665391e07..541e152cc 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -823,7 +823,7 @@ export default { if (res.data.success) { this.FreezeList = res.data.result }else{ - _this.$message.warning(res.data.result) + _this.$message.warning(res.data.message) } }) .catch( (error) =>{