From bfde61a3c0ab487176ca6fb0ebed6d790859cb1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Wed, 25 Oct 2023 15:45:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + .../components/AdjustareaSofrespon/index.vue | 453 ++++++++++-------- .../ParameterItemCollectionList.vue | 122 ++--- 4 files changed, 318 insertions(+), 259 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 8d8457aa1..f7b84ed7c 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -2029,4 +2029,5 @@ module.exports = { high:'High', centre:'Centre', low:'Low', + interfacePerson:'Interface person', } \ No newline at end of file diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index afea290de..c7d04575e 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -3985,4 +3985,5 @@ module.exports = { high:'高', centre:'中', low:'低', + interfacePerson:'接口人', } \ No newline at end of file diff --git a/jero-web/src/components/AdjustareaSofrespon/index.vue b/jero-web/src/components/AdjustareaSofrespon/index.vue index 4d39fee45..c8a207b83 100644 --- a/jero-web/src/components/AdjustareaSofrespon/index.vue +++ b/jero-web/src/components/AdjustareaSofrespon/index.vue @@ -14,11 +14,29 @@ + + + + + + {{ item.userName}} + + + + + - - - - + + + + - - - + + + @@ -66,235 +84,260 @@ \ No newline at end of file diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 8f22803d6..93fe58c0d 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -234,7 +234,7 @@
- {{$t('Adjustareasofresponsibility')}} + {{$t('BatchSetting')}}
@@ -272,17 +272,20 @@ {{$t('dataExport')}}
-
+
{{$t('Derivedlist')}}
-
+
{{$t('referenceparameter')}}
-
+
{{$t('tempSave')}}
@@ -359,12 +362,14 @@
-
+
{{$t('dataExport')}}
-
+
{{$t('Derivedlist')}}
@@ -455,7 +460,7 @@ @areaVisibleTaskCutOffTimeAll='areaVisibleTaskCutOffTimeAll'/> - + @@ -631,27 +636,27 @@ @ok="exportok" @cancel="exportvisiblecancel" > - - + + {{$t('download')}} {{$t('delete')}} - - - - - - + + + + + +
- + import TableCollection from '@/components/tableCollection/index' import parameterColumn from '../dialog/parametercolumn' - import { getAction, postAction, downloadFile ,deleteAction } from '../../../api/manage' + import { getAction, postAction, downloadFile, deleteAction } from '../../../api/manage' import eventBUs from '../../../common/event' import customizeList from './customizeList' import ParameterLibraryAdd from '@/components/ParameterLibraryAdd/index' @@ -774,7 +779,7 @@ globalAdvancedQuery, batchUpdateDeadline }, - mixins:[ResizeHeader, ResizeColumnProvide], + mixins: [ResizeHeader, ResizeColumnProvide], data() { this.statusList = [ { @@ -894,7 +899,7 @@ title: this.$t('status'), align: 'left', dataIndex: 'stateText', - width: 120, + width: 120 }, { title: this.$t('Exporttime'), @@ -1162,9 +1167,9 @@ } if (this.$route.query.statusFlag == '1') { this.formInline.state = '1' - } else if(this.$route.query.statusFlag == '2'){ + } else if (this.$route.query.statusFlag == '2') { this.formInline.state = '2' - }else if(this.$route.query.statusFlag == '4'){ + } else if (this.$route.query.statusFlag == '4') { this.formInline.state = '4' } // clearTimeout(this.timeBatch) @@ -1272,20 +1277,29 @@ this.visibleRoleSwitching = false }, bringInTheProjectInterfaceClick() { - let query = { - paramsManifestId: this.paramsManifest.id, - projectId: this.$route.query.projectId - } - this.textLoading = true - getAction('/params/collectManifest/bringSdtInto', query).then((res) => { - if (res.success) { - this.$message.success(this.$t('OperationSuccessful')) - this.$refs.CollectionTabel.getTableList(this.queryParamQuery) - } else { - this.$message.warning(this.$t('operationFailed')) + if (this.selectedRowKeysValue && this.selectedRowKeysValue.length > 0) { + let ids = [] + this.selectedRowKeysValue.forEach(res => { + ids.push(res.id) + }) + let query = { + paramsManifestId: this.paramsManifest.id, + ids: ids.join(','), + projectId: this.$route.query.projectId } - this.textLoading = false - }) + this.textLoading = true + getAction('/params/collectManifest/bringSdtInto', query).then((res) => { + if (res.success) { + this.$message.success(this.$t('OperationSuccessful')) + this.$refs.CollectionTabel.getTableList(this.queryParamQuery) + } else { + this.$message.warning(this.$t('operationFailed')) + } + this.textLoading = false + }) + } else { + this.$message.warning(this.$t('selectLeastOne')) + } }, handleOkRoleSwitching() { if (this.$route.query.type == '1') { @@ -1574,7 +1588,7 @@ // downloadFile('/params/collectManifest/exportAll', name, query, this.selectClear) }, // 导出列表 - Derivedlist(){ + Derivedlist() { this.exportvisible = true this.expoteList() }, @@ -1587,22 +1601,22 @@ this.pageSizehistory = pageSize this.expoteList() }, - exportok(){ + exportok() { this.exportvisible = false }, - exportvisiblecancel(){ + exportvisiblecancel() { this.exportvisible = false }, - exportsubmit(){ + exportsubmit() { this.ExportFailed = false }, - exportcancel(){ + exportcancel() { this.ExportFailed = false }, - exportdata(item){ + exportdata(item) { downloadFile('/sys/common/downLoadFile', item.fileName, { id: item.fileId }) }, - exportdelete(item){ + exportdelete(item) { this.$confirm({ title: this.$t('confirmDeletion'), content: '', @@ -1661,8 +1675,8 @@ paramsTemplatePublishVersion: 1, cut: this.cut, userTypes: this.currentPersonRole, - exportName: this.$route.query.projectName.slice(0,-3)+ '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')'+'-' + this.$route.query.version, - isHistory:this.isHistroy + exportName: this.$route.query.projectName.slice(0, -3) + '-' + this.$route.query.projectVersion + '(' + this.$route.query.title + ')' + '-' + this.$route.query.version, + isHistory: this.isHistroy } let name = this.$route.query.projectName + '(' + this.$route.query.title + ')' + '.zip' getAction('/params/collectManifest/exportAll', query).then((res) => { @@ -2325,7 +2339,7 @@ let selectedRowKeysValue = [] data.forEach(res => { if (res.state == 'To be filled' || res.state == '待填写' || res.state == '认证工程师退回' || - res.state == 'Rejected by homo engineer' ||res.state == 'Modify' || res.state == '变更') { + res.state == 'Rejected by homo engineer' || res.state == 'Modify' || res.state == '变更') { selectedRowKeysValue.push(res) } }) @@ -2509,7 +2523,7 @@ if (keyNameOne[l].type == 'pull_more') { keyNameOne[l].dataValue = keyNameOne[l].dataValue.join(',') } - if ((keyNameOne[l].dataValue== undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { + if ((keyNameOne[l].dataValue == undefined || keyNameOne[l].dataValue == null) && keyNameOne[l].isMust == '1' && keyNameOne[l].isLock == '0') { this.$message.warning(selectedRowKeysValue[i].nioNumber + ',' + this.$t('requiredParametersEmpty')) return }