diff --git a/jero-web/src/components/tableCollection/index.vue b/jero-web/src/components/tableCollection/index.vue index 46fde66e8..b7e1dc86a 100644 --- a/jero-web/src/components/tableCollection/index.vue +++ b/jero-web/src/components/tableCollection/index.vue @@ -362,11 +362,22 @@ export default { }) }, getData() { + let paramsManifestid + let url + if(this.$route.query.it === undefined) { + // 页面跳转 + paramsManifestid = this.paramsManifest.id + url = this.url.tableHeader + } else { + // 历史版本 + paramsManifestid = this.$route.query.it + url = 'params/collectManifestHistory/getHeader' + } let params = { - paramsManifestId: this.paramsManifest.id, + paramsManifestId: paramsManifestid, flag: '7' } - getAction(this.url.tableHeader, params).then((res) => { + getAction(url, params).then((res) => { if (res.success) { var jsonHead = res.result this.columns = [] @@ -408,6 +419,7 @@ export default { console.log(pagination,filters,sorter,'iiiiiiiiiiiiiiiii') }, getTableListReset() { + console.log('清空') let params = { paramsManifestId: this.paramsManifest.id, } @@ -423,13 +435,25 @@ export default { }) }, getTableList() { + let paramsManifestid + let url + if(this.$route.query.it === undefined) { + // 页面跳转 + paramsManifestid = this.paramsManifest.id + url = this.url.tableList + } else { + console.log('历史版本呢') + // 历史版本 + paramsManifestid = this.$route.query.it + url = 'params/collectManifestHistory/list' + } let params = { userTypes: this.LoginUserType, - paramsManifestId: this.paramsManifest.id, + paramsManifestId: paramsManifestid, ...this.formInline } this.loading = true - getAction(this.url.tableList, params).then((res) => { + getAction(url, params).then((res) => { if (res.success) { this.dataSource = res.result this.total = res.result.total diff --git a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue index 16540da31..bfe0e35f1 100644 --- a/jero-web/src/views/projectManagement/dialog/historicalVersion.vue +++ b/jero-web/src/views/projectManagement/dialog/historicalVersion.vue @@ -101,21 +101,12 @@ export default { }, // 查看 editArea(val) { - console.log('查看') + let newUrl = this.$router.resolve({ + path: '/ParameterItemCollection', + query: {it: val} + }) + window.open(newUrl.href, '_blank') } - // this.title = this.$t('edit') - // this.newVisible = true - // let params = { - // id: val - // } - // getAction(`tag/onlCgformArea/queryById`, params).then((res) => { - // if (res.success) { - // this.form = { ...res.result } - // // this.$emit('updateOk',res.result) - // - // } - // }) - // } }, }