diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index b9b3e8584..79a382ccb 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -705,6 +705,12 @@ module.exports = { uploadTime: 'Upload time', enclosure: 'enclosure', // 认证 + deleteConfiguration: 'delete Configuration', + addConfiguration: 'add Configuration', + electricMachinery: 'electricMachinery', + Battery: 'Battery', + Model: 'Model', + configurationName: 'configuration Name', historicalVersion: 'historical Version', configure: 'configure', parameter: 'parameter', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index 5256016b6..48ca70d70 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -712,6 +712,12 @@ module.exports = { uploadTime:'上传时间', enclosure:'附件', // 认证 + deleteConfiguration: '删除配置', + addConfiguration: '添加配置', + electricMachinery: '电机', + Battery: '电池', + Model: '车型', + configurationName: '配置名称', historicalVersion: '历史版本', configure: '配置', parameter: '参数', diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 9361d5352..fad469c5f 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -73,7 +73,7 @@ - + @@ -146,6 +146,8 @@ queryById: 'params/manifest/queryById', deleteBatch: 'params/manifest/delete', deleteAll: 'params/manifest/deleteBatch', + conAdd: 'params/config/addBatch', + conList: 'params/config/list', }, loading: false, dataSource: [], @@ -158,7 +160,8 @@ templatetitle: '', templatetitleId: '', rowId: '', - version: 0 + version: 0, + itemId: '' } }, mounted() { @@ -189,8 +192,9 @@ }, // 配置 - configure() { - this.$refs.configureRef.addModel() + configure(item) { + this.itemId = item.id + this.$refs.configureRef.addModel(item.id) }, handleCancel(val) { this.areaVisible = val @@ -227,9 +231,6 @@ } else { } }) - }, - handleExport(){ - }, handleAdd(){ this.areaVisible = true diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue index 09c10091f..1ee80f7d8 100644 --- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue +++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue @@ -1078,7 +1078,7 @@ let num = 2 // for (let i = 0; i < 3; i++) { // setTimeout(() => { - this.startProcessDesign(val, num) + this.startProcessDesign(val) // }, 500) // } }, diff --git a/jero-web/src/views/projectManagement/dialog/configure.vue b/jero-web/src/views/projectManagement/dialog/configure.vue index 3f79b2e9e..3f8fdbfac 100644 --- a/jero-web/src/views/projectManagement/dialog/configure.vue +++ b/jero-web/src/views/projectManagement/dialog/configure.vue @@ -11,172 +11,91 @@ style="height: 100%;overflow: auto;padding-bottom: 53px;"> - - - - + + + + + {{$t('NiONumber')}} + :title="$t('configurationName')">{{$t('configurationName')}} + + + + - - - - - - - - - - - - {{$t('Required')}} + + + + + {{$t('Version')}} + + + + - - - - - - - - - - - - - - - + + + + + + {{$t('ParameterName')}} + :title="$t('Model')">{{$t('Model')}} + + + + - - - - - - - - - - - - {{$t('technicalField')}} + + + + + {{$t('Battery')}} + + + + - - - - - - - - - - - - - - - - - - + + + + + + {{$t('parameterBatch')}} + :title="$t('electricMachinery')">{{$t('electricMachinery')}} + + + + - - - - - - - - - - - - - {{$t('areaOfResponsibility')}} + + + + + + + {{$t('addConfiguration')}} + {{$t('deleteConfiguration')}} - - - - - - - - - - - - - - - {{$t('ParameterDescription')}} - - - - - - - - - - - - - - - {{$t('certificationCategory')}} - - - - - - - - - - - - - - - - - - {{$t('controlType')}} - - - - - - - - - - - - - - - - {{$t('controlVerification')}} - - - - - - - - - - - - - + + + @@ -184,151 +103,64 @@ {{$t('submit')}} -