WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20240122_MEETING' into 'master'

Browse Source 
Dev 20240122 m EE ting

See merge request laws-nio/laws-weilai!369
This commit is contained in:
高嵩
2024-01-22 06:57:03 +00:00
parent 9000e85200 a7bdf8eee2
commit 6d20160c3b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/report/controller/ParamsReportEOController.java
+2 -1
View File
@@ -232,7 +232,8 @@ public class ParamsReportEOController extends JeroController<ParamsReportEO, IPa
}else{ }else{
version = row.getProjectVersion(); 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()); row.setPageName(row.getProjectName() + "-" + row.getTargetMarket() + "-" + row.getTitle());
jero-web/src/views/toDoCenter/projectRegulationTasks/components/projectInformation.vue
+4 -2
View File
@@ -106,11 +106,12 @@
RelatedItemsClick(item) { RelatedItemsClick(item) {
if(this.platform == 'YES'){ if(this.platform == 'YES'){
//+'-'+item.projectVersion
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/platformItemLibraryDetails', path: '/platformItemLibraryDetails',
query: { query: {
id: item.id, id: item.id,
projectName: item.projectName+'-'+item.projectVersion, projectName: item.projectName,
projectNameId: item.projectName, projectNameId: item.projectName,
targetMarket: item.targetMarket, targetMarket: item.targetMarket,
studioEngineer: item.studioEngineer studioEngineer: item.studioEngineer
@@ -118,11 +119,12 @@
}) })
window.open(newUrl.href, '_blank') window.open(newUrl.href, '_blank')
}else{ }else{
//+'-'+item.projectVersion
let newUrl = this.$router.resolve({ let newUrl = this.$router.resolve({
path: '/ProjectDetails', path: '/ProjectDetails',
query: { query: {
id: item.projectLibraryId, id: item.projectLibraryId,
projectName: item.projectName+'-'+item.projectVersion, projectName: item.projectName,
projectNameId: item.projectNameId, projectNameId: item.projectNameId,
targetMarket: item.targetMarket, targetMarket: item.targetMarket,
studioEngineer: item.studioEngineer studioEngineer: item.studioEngineer