diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 19d15e003..83f6a46f0 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -797,9 +797,11 @@ this.columns = [] let num = 0 this.content = [] + let checkedList = [] jsonHead.forEach((res, index) => { // console.log(res) // 配置列 + checkedList.push(res.dataIndex) if (res.type) { // console.log('配置') this.columns.push({ @@ -875,10 +877,6 @@ this.colIndexs.forEach((item)=>{ this.minWidthColumns.push([this.columns[item],500]) }) - let checkedList = [] - this.columns.forEach((item) => { - checkedList.push(item.field) - }) this.$emit('getcustomizeList',checkedList) this.$forceUpdate() } diff --git a/jero-web/src/components/tableCollection/index1.vue b/jero-web/src/components/tableCollection/index1.vue index 3b8372c14..1314dbd20 100644 --- a/jero-web/src/components/tableCollection/index1.vue +++ b/jero-web/src/components/tableCollection/index1.vue @@ -588,7 +588,9 @@ this.columns = [] let num = 0 this.content = [] + let checkedList = [] jsonHead.forEach((res, index) => { + checkedList.push(res.dataIndex) // 配置列 if (res.type) { this.columns.push({ @@ -662,10 +664,6 @@ this.columns = [...this.columns] this.colIndexs.forEach((item)=>{ this.minWidthColumns.push([this.columns[item],500]) - let checkedList = [] - this.columns.forEach((item) => { - checkedList.push(item.field) - }) this.$emit('getcustomizeList',checkedList) }) },300) diff --git a/jero-web/src/views/parameter/managementdetails/index.vue b/jero-web/src/views/parameter/managementdetails/index.vue index 95b2a4d09..51cfa32a9 100644 --- a/jero-web/src/views/parameter/managementdetails/index.vue +++ b/jero-web/src/views/parameter/managementdetails/index.vue @@ -264,6 +264,7 @@ NotSelectedRowKeysValue: [], NoEngineer: 1, // 下发收集的权限,0为没有接口人 1为由接口人 默认有 NotSelectedNoEngineerValue: [], + statuList:[], paramsManifest: {}, customizevisible: false, indeterminate: false, @@ -394,6 +395,7 @@ getAction('params/collectManifest/getHeader', params).then((res) => { if (res.success) { let List = [] + let sList = [] res.result.forEach((item,index) => { if(!item.isLock){ if(item.headFieldCn == '操作'){ @@ -404,8 +406,12 @@ } List.push(item) } + if(item.isLock) { + sList.push(item) + } }) this.customizeList = List + this.statuList = sList } }) if(item){ @@ -432,12 +438,13 @@ if (item == val.field) { // val.sort = index + 1 val.dbFieldName = val.db_field_name + val.dbFieldTxt = val.db_field_txt list.push(val) } }) }) this.confirmLoading = true - let headCustomEOList = JSON.parse(JSON.stringify(list)) + let headCustomEOList = JSON.parse(JSON.stringify(list)).concat(this.statuList) let query = { headCustomEOList: headCustomEOList }