From 32d0e0581ebfcba3603e0bbee24a0bbd8d1117d2 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 16:09:56 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=83=A8=E5=88=86=E7=9A=84=E7=BC=96=E5=8F=B7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E8=BF=9B=E8=A1=8C=E4=BF=AE=E6=94=B9?= 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 + .../src/views/parameter/parameterlist/components/addModel.vue | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 864996229..31adbbc6f 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1028,6 +1028,7 @@ module.exports = { FNumber: 'Number', NNNiONumber: 'Number', NNiONumber: 'NIO Number', + ParameterNo: 'Number', NRequired: 'Is Must', NParameterName: 'Params Name', NtechnicalField: 'Technical Field', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index be54f48e2..16d90e5b3 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1033,6 +1033,7 @@ module.exports = { FNumber: '账号', NNNiONumber: 'NIO编号', NNiONumber: 'NIO编号', + ParameterNo: '编号', NRequired: '是否必填', NParameterName: '参数名称', NtechnicalField: '技术领域', diff --git a/jero-web/src/views/parameter/parameterlist/components/addModel.vue b/jero-web/src/views/parameter/parameterlist/components/addModel.vue index 594a1bc86..10107d1b3 100644 --- a/jero-web/src/views/parameter/parameterlist/components/addModel.vue +++ b/jero-web/src/views/parameter/parameterlist/components/addModel.vue @@ -236,13 +236,13 @@
* {{$t('NNNiONumber')}} + :title="$t('ParameterNo')">{{$t('ParameterNo')}}
+ :placeholder="$t('PleaseEnter')+$t('ParameterNo')"/> From ace469130f1276eb58d530e88e2e38160ada3f7b Mon Sep 17 00:00:00 2001 From: liyawei Date: Thu, 30 Jun 2022 17:04:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-bug55184?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../collect/service/impl/ParamsManifestEOServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java index 02261b799..c24cab3ee 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsManifestEOServiceImpl.java @@ -304,8 +304,6 @@ public class ParamsManifestEOServiceImpl extends ServiceImpl Date: Thu, 30 Jun 2022 17:13:40 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=AE=A4=E8=AF=81-=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B8=85=E5=8D=95-bug55182?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ParamsTemplateEOController.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java index 198f7b38b..f98d03861 100644 --- a/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java +++ b/jero-boot/jero-boot-module-certification/src/main/java/com/jero/modules/cert/template/controller/ParamsTemplateEOController.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.AutoLog; +import com.jero.common.constant.enums.CutEnum; import com.jero.common.system.base.controller.JeroController; import com.jero.modules.cert.template.entity.ParamsTemplateEO; import com.jero.modules.cert.template.service.IParamsTemplateEOService; @@ -188,9 +189,14 @@ public class ParamsTemplateEOController extends JeroController copyById(@RequestParam(name="id") String id, - @RequestParam(name="paramsTemplateName") String paramsTemplateName) { + @RequestParam(name="paramsTemplateName") String paramsTemplateName, + @RequestParam(name="cut") String cut) { ParamsTemplateEO paramsTemplateEO = paramsTemplateEOService.copyById(id, paramsTemplateName); - return Result.OK("复制成功", paramsTemplateEO); + if (CutEnum.EN.getValue().equals(cut)) { + return Result.OK("Copy successful", paramsTemplateEO); + } else { + return Result.OK("复制成功", paramsTemplateEO); + } } From 312c47fc9038c7445766836db4cc2d4847922fa4 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Thu, 30 Jun 2022 17:30:59 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93?= =?UTF-8?q?=E5=B7=B2=E7=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/TaskParameterCollection.vue | 57 +-- .../dialog/ParameterTemplateAdd.vue | 420 +++++++++--------- 2 files changed, 248 insertions(+), 229 deletions(-) diff --git a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue index 571641062..e6476fe42 100644 --- a/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue +++ b/jero-web/src/views/projectManagement/components/TaskParameterCollection.vue @@ -1,7 +1,7 @@ @@ -139,7 +144,8 @@ { title: this.$t('collectionCompletionTime'), align: 'center', - dataIndex: 'finishTime' + dataIndex: 'finishTime', + scopedSlots: { customRender: 'collectionCompletionTime' } }, { title: this.$t('Version'), @@ -177,7 +183,7 @@ deleteAll: 'params/manifest/deleteBatch', conAdd: 'params/config/addBatch', conList: 'params/config/list', - changeExtension:'params/manifest/changeExtension', + changeExtension: 'params/manifest/changeExtension', verifyConfig: 'params/manifest/verifyConfig' }, loading: false, @@ -199,7 +205,7 @@ drawerVisible: false, drawerVisibleitem: false, titleTag: '', - selectedRowKeysvalArray: [], + selectedRowKeysvalArray: [] } }, mounted() { @@ -214,7 +220,7 @@ localStorage.setItem('paramsManifest', JSON.stringify(item)) let newUrl = _this.$router.resolve({ path: '/ParameterItemCollection', - query: item, + query: item }) window.open(newUrl.href, '_blank') } else { @@ -223,7 +229,7 @@ }) }, deleteLib(val) { - if(val.state === '已完成' || val.state === 'Finished' ) { + if (val.state === '已完成' || val.state === 'Finished') { let _this = this this.$confirm({ content: _this.$t('ConfirmDelete'), @@ -252,9 +258,9 @@ }, // 配置 configure(item) { - this.itemId = item.id - this.itemRow = item - this.$refs.configureRef.addModel(item.id) + this.itemId = item.id + this.itemRow = item + this.$refs.configureRef.addModel(item.id) }, handleCancel(val) { this.areaVisible = val @@ -277,7 +283,7 @@ this.pageNo = 1 this.getlist() }, - onSelectChange(val,valArray) { + onSelectChange(val, valArray) { this.selectedRowKeys = val this.selectedRowKeysArray = val.join(',') this.selectedRowKeysvalArray = valArray @@ -286,7 +292,7 @@ this.areaVisible = true setTimeout(() => { this.$refs.templateRef.editData(edit) - },50) + }, 50) }, handleAdd() { this.areaVisible = true @@ -294,11 +300,11 @@ // 变更扩展 handleModule() { let _this = this - if(this.selectedRowKeys.length == 0){ + if (this.selectedRowKeys.length == 0) { this.$message.warning(_this.$t('pleaseSelectData')) - }else if(this.selectedRowKeys.length > 1){ + } else if (this.selectedRowKeys.length > 1) { this.$message.warning(_this.$t('OnlyOneSelected')) - } else if(this.selectedRowKeysvalArray[0].state === '已完成'|| this.selectedRowKeysvalArray[0].state ==='Finished'){ + } else if (this.selectedRowKeysvalArray[0].state === '已完成' || this.selectedRowKeysvalArray[0].state === 'Finished') { getAction(_this.url.changeExtension, { id: this.selectedRowKeys[0] }).then((res) => { if (res.success) { _this.$message.success(_this.$t('OperationSuccessful')) @@ -316,11 +322,11 @@ // 默认为0 可全部删除 let flag = 1 this.selectedRowKeysvalArray.forEach((item) => { - if(item.state !== '已完成' && val.state !== 'Finished' ){ - flag = 0 + if (item.state !== '已完成' && val.state !== 'Finished') { + flag = 0 } }) - if(flag) { + if (flag) { let param = { ids: this.selectedRowKeysArray } @@ -501,8 +507,9 @@ cursor: pointer; border-radius: 4px; } - /deep/.add-padding{ - margin-left: -89px!important; + + /deep/ .add-padding { + margin-left: -89px !important; } + \ No newline at end of file From 2d32bcfb3c4c4f774ecaff75eb3d52c522344735 Mon Sep 17 00:00:00 2001 From: lixuetao Date: Thu, 30 Jun 2022 17:36:59 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=A4=8D=E5=88=B6?= =?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 --- .../projectManagement/dialog/ProjectCollectionParameters.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue index 8b4388419..3abd7c09a 100644 --- a/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue +++ b/jero-web/src/views/projectManagement/dialog/ProjectCollectionParameters.vue @@ -174,7 +174,7 @@ export default { methods: { // 清单列表传出数据 listVisibleRow(val) { - this.selectedRowKeys = [] + // this.selectedRowKeys = [] let newAreaTable=JSON.parse(JSON.stringify(this.areaTable)) newAreaTable.forEach((item, index) => { if( item.id == this.listVisibleRowDate.id ) {