diff --git a/jero-web/src/components/ImportFileOnlyList/index.vue b/jero-web/src/components/ImportFileOnlyList/index.vue index 7caf6dabd..a0e0b4709 100644 --- a/jero-web/src/components/ImportFileOnlyList/index.vue +++ b/jero-web/src/components/ImportFileOnlyList/index.vue @@ -54,6 +54,10 @@ export default { type: String, default: '' }, + paramsManifestId: { + type: String, + default: '' + }, projectLibraryId: { type: String, default: '' @@ -76,6 +80,8 @@ export default { return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '¶msTemplateId=' + this.paramsTemplateId } else if (this.projectLibraryId) { return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '&projectLibraryId=' + this.projectLibraryId + } else if (this.paramsManifestId) { + return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut + '¶msManifestId=' + this.paramsManifestId } return window._CONFIG['domianURL'] + '/' + this.url.importZipUrl + '?cut=' + this.cut } diff --git a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue index 13c144e6e..89a4db7c1 100644 --- a/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue +++ b/jero-web/src/views/projectManagement/components/ParameterCollectionEchart.vue @@ -5,7 +5,7 @@ - + {{ d.label }} diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 1fb2a099e..5d05a0cb0 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -210,6 +210,16 @@ {{$t('sendBack')}} + +
+ +
+ +
+ + {{$t('export')}} +
@@ -453,6 +463,7 @@ import AdjustareaSofrespon from '@/components/AdjustareaSofrespon/index' import ReferenceParameter from '@/components/ReferenceParameter/index' import AssignedBy from '@/components/AssignedBy/index' + import ImportFileOnlyList from '@/components/ImportFileOnlyList/index' import axios from 'axios' import { ACCESS_TOKEN } from '@/store/mutation-types' import Vue from 'vue' @@ -465,6 +476,7 @@ ParameterLibraryAdd, AssignedBy, AdjustareaSofrespon, + ImportFileOnlyList, TaskCutOffTime, ReferenceParameter, SynchronousSubmissionLibrary, @@ -603,6 +615,7 @@ getLoginUserType: 'params/collectManifest/getLoginUserType', // 获取当前登陆人 getquerySdtList: 'params/collectManifest/querySdtList', // 获取工程接口人的列表 updateSdt: 'params/collectManifest/updateSdt', // 提交工程接口人 + importZipUrl: 'params/collectManifest/importDre', // 导入 deleteBatch: 'params/collectManifest/deleteBatch' }, loading: false, @@ -619,6 +632,7 @@ rowId: '', version: 0, confirmLoading: false, + importsVisible: false, itemId: '', selectedRowKeysValue: [], // table列表所选得数据 token: Vue.ls.get(ACCESS_TOKEN), @@ -873,6 +887,39 @@ this.textLoading = false }) }, + //填写人导出 + handleExportDre(){ + console.log(this.selectedRowKeys) + this.$message.success(this.$t('Intheexport')) + let long = localStorage.getItem('language') + this.cut = '' + if (long && long === 'zh-cn') { + this.cut = 'cn' + } else if (long && long === 'en-us') { + this.cut = 'en' + } + let query = { + paramsManifestId: this.paramsManifest.id, + cut: this.cut, + ids: this.selectedRowKeys.join(','), + exportName:this.$route.query.projectName + '(' + this.$route.query.title + ')' + } + getAction('/params/collectManifest/exportDre', query).then((res) => { + if (res && !res.success) { + this.$message.error(res.message) + } + this.textLoading = false + }) + }, + getList(){ + this.$refs.CollectionTabel.getTableList(this.queryParamQuery) + }, + iVisible(val,num) { + this.importsVisible = val + if (num == 1){ + eventBUs.$emit('searchGetData') + } + }, // 高级搜索 handleSuperQuery(params, matchType) { let sqp = {}