Merge branch 'dev_20240122_MEETING' into 'master'

Dev 20240122 m EE ting

See merge request laws-nio/laws-weilai!369

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<ParamsReportEO, IPa
 			 }else{
 				 version = row.getProjectVersion();
 			 }
-			 row.setProjectNameAll(row.getProjectName() + "-" +row.getTargetMarket()+"-"+version);
+			 row.setProjectNameAll(row.getProjectName() + "-" +row.getTargetMarket());
+//			 row.setProjectNameAll(row.getProjectName() + "-" +row.getTargetMarket()+"-"+version);
 
 			 // 项目名称-国家-清单名称
 			 row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());

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