From 2aa654798aa5fb76e76e07b771cbe1fc1afdeb2b Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 22 Jan 2024 14:41:59 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85-=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=9B=9E=E6=98=BE=EF=BC=88=E7=89=88=E6=9C=AC=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/projectInformation.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue index d7920faa6..379fbc735 100644 --- a/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue +++ b/jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue @@ -106,11 +106,12 @@ RelatedItemsClick(item) { if(this.platform == 'YES'){ + //+'-'+item.projectVersion let newUrl = this.$router.resolve({ path: '/platformItemLibraryDetails', query: { id: item.id, - projectName: item.projectName+'-'+item.projectVersion, + projectName: item.projectName, projectNameId: item.projectName, targetMarket: item.targetMarket, studioEngineer: item.studioEngineer @@ -118,11 +119,12 @@ }) window.open(newUrl.href, '_blank') }else{ + //+'-'+item.projectVersion let newUrl = this.$router.resolve({ path: '/ProjectDetails', query: { id: item.projectLibraryId, - projectName: item.projectName+'-'+item.projectVersion, + projectName: item.projectName, projectNameId: item.projectNameId, targetMarket: item.targetMarket, studioEngineer: item.studioEngineer From a7bdf8eee2acb434023e663b6d34788be4fb6ff5 Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Mon, 22 Jan 2024 14:56:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-=E5=8E=BB=E6=8E=89=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cert/report/controller/ParamsReportEOController.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java index c0679c874..5d10baa69 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java @@ -232,7 +232,8 @@ public class ParamsReportEOController extends JeroController