From b253d5c794093e7872c41025812aed21fe1fb7ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Tue, 30 May 2023 19:05:28 +0800 Subject: [PATCH 01/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?= =?UTF-8?q?=E9=A2=84=E8=AD=A6=E9=BB=98=E8=AE=A4=E6=97=B6=E9=97=B4=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=89=E5=B9=B4=E5=86=85?= =?UTF-8?q?=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BussDocumentLibraryEOServiceImpl.java | 38 +++++++++---------- .../modules/warn/service/LawsWarnService.java | 4 +- jero-web/src/common/lang/en-us.js | 1 + jero-web/src/common/lang/zh-cn.js | 1 + jero-web/src/components/search/index.vue | 5 ++- .../views/regulatoryEarlyWarning/index.vue | 8 +++- 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java index a01f25fa6..0cc56ba53 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/document/service/impl/BussDocumentLibraryEOServiceImpl.java @@ -4373,25 +4373,25 @@ public class BussDocumentLibraryEOServiceImpl extends ServiceImpl= '" + warnTime.split(",")[0] + "'" - + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); - } - }else{ - //日期(区分单日期还时间范围) - if (warnTime.contains(",")) { - conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" - + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); - } else { - conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); - } - } - } +// if(StringUtils.isNotBlank(warnTime)){ +// if("0".equals(flag)){ +// //日期(区分单日期还时间范围) +// if (warnTime.contains(",")) { +// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" +// + " and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); +// } else { +// conditionSb.append(" and " + "date_format(" + "xin1_che1_xing2_shi2_shi1_ri4_qi1" + ",'%Y-%m-%d') = '" + warnTime + "'"); +// } +// }else{ +// //日期(区分单日期还时间范围) +// if (warnTime.contains(",")) { +// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') >= '" + warnTime.split(",")[0] + "'" +// + " and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') <= '" + warnTime.split(",")[1] + "'"); +// } else { +// conditionSb.append(" and " + "date_format(" + "implement_time" + ",'%Y-%m-%d') = '" + warnTime + "'"); +// } +// } +// } //高级搜索 queryConditionVOList List if(ObjectUtils.isNotEmpty(parameter.get("queryConditionVOList"))){ diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java index 1fd7b4b88..1887f6bb7 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/warn/service/LawsWarnService.java @@ -102,7 +102,7 @@ public class LawsWarnService { } else if(StringUtils.equals(flag,"1")){ parameter.put("implement_time",parameter.get("WarnTime")); } - parameter.remove("WarnTime"); +// parameter.remove("WarnTime"); String cut = (String) parameter.get("cut");//中英文切换标识 List onlCgformFieldList = onlCgformFieldService.getFieldList(ModuleEnum.DOCUMENT_LIBRARY.getValue()); @@ -122,6 +122,8 @@ public class LawsWarnService { fieldListNew.add(fieldTemp); } } + + //封装查询条件 String condition = bussDocumentLibraryEOService.getConditionStr(parameter); int pageNo = Integer.parseInt(parameter.get("pageNo").toString()); diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 28d744d1e..e65385334 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -1333,6 +1333,7 @@ module.exports = { inRecentMonths6:'In recent 6 months', inRecentYear1:'In recent 1 year', inRecentYear2:'In recent 2 year', + inRecentYear3:'In recent 3 year', selectAll:'Select All', importLocalDisassemblyOrder:'Import local disassembly order', notExport:'Not exported', diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js index f92664c4a..f4d27845b 100644 --- a/jero-web/src/common/lang/zh-cn.js +++ b/jero-web/src/common/lang/zh-cn.js @@ -1435,6 +1435,7 @@ module.exports = { inRecentMonths6: '近6个月内', inRecentYear1: '近1年内', inRecentYear2: '近2年内', + inRecentYear3: '近3年内', selectAll: '全选', importLocalDisassemblyOrder: '导入本地拆解单', notExport: '未导出', diff --git a/jero-web/src/components/search/index.vue b/jero-web/src/components/search/index.vue index af43a52be..465f35037 100644 --- a/jero-web/src/components/search/index.vue +++ b/jero-web/src/components/search/index.vue @@ -245,7 +245,7 @@ if (this.isDefault) { let startTime = moment(new Date()).format('YYYY-MM-DD') // this.queryParam['WarnTimeText'] = '2' - let endTime = this.getNowdate() + let endTime = '2099-01-01' this.queryParam['WarnTime'] = [startTime, endTime] this.queryParam = { ...this.queryParam } } @@ -295,6 +295,9 @@ }else if (this.queryParam['WarnTimeText'] == '5') { monthData = 7 yearData = -1 + }else if (this.queryParam['WarnTimeText'] == '6') { + monthData = 37 + yearData = 3 } if(this.queryParam['WarnTimeText'] == '5'){ var time = new Date(); diff --git a/jero-web/src/views/regulatoryEarlyWarning/index.vue b/jero-web/src/views/regulatoryEarlyWarning/index.vue index e1d2d7b2b..6554970ac 100644 --- a/jero-web/src/views/regulatoryEarlyWarning/index.vue +++ b/jero-web/src/views/regulatoryEarlyWarning/index.vue @@ -155,7 +155,10 @@ value: '4', name: this.$t('inRecentYear2') }, - + { + value: '6', + name: this.$t('inRecentYear3') + }, ] } ], @@ -338,6 +341,9 @@ } else if (this.searchParmes['WarnTimeText'] == '4') { monthData = 25 yearData = 2 + }else if (this.queryParam['WarnTimeText'] == '6') { + monthData = 37 + yearData = 3 } var date_now = new Date()//获取当前时间 var year = date_now.getFullYear()//获取当前时间的年份 From 1274cd60dcf2d4cc5c05d97324d5a7aac6bdbfa0 Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Wed, 31 May 2023 11:05:22 +0800 Subject: [PATCH 02/65] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=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 | 118 +++++++++++++++--------------- 1 file changed, 59 insertions(+), 59 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 28d744d1e..086821aa1 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -66,11 +66,11 @@ module.exports = { withStart: 'Start with', withEnd: 'End with', in: 'In', - notEqual: 'Not Equal To', - granter: 'Greater Than', - greaterOrEqual: 'Greater Than Or Equal To', - less: 'Less Than', - lessOrEqual: 'Less Than Or Equal To', + notEqual: 'Not equal to', + granter: 'Greater than', + greaterOrEqual: 'Greater than or equal to', + less: 'Less than', + lessOrEqual: 'Less than or equal to', user: 'User', numericalValue: 'Value', not: 'No', @@ -85,7 +85,7 @@ module.exports = { name: 'Name', AlreadyExists: 'Already exists, overwrite?', SavedSuccessfully: 'Saved', - DeleteQuery: 'Delete current Search?', + DeleteQuery: 'Delete current search?', VersionNotSupported: 'Version Not Supported', SaveQueryCriteria: 'Save Search Conditions', roleName: 'Role Name', @@ -114,7 +114,7 @@ module.exports = { DeleteMultiplePiecesData: 'Delete Multiple Items', CurrentSelection: 'Current Selection', Deselect: 'Deselect', - enterDepartmentName: 'Please enter Department name', + enterDepartmentName: 'Please enter department name', addTo: 'Add', cancel: 'Cancel', checkAll: 'Check All', @@ -200,7 +200,7 @@ module.exports = { enterSearchKeyword: 'Please enter a search keyword', enterSearchContent:'Please enter Search Content', enterStandard:'Please enter No.', - entertitle:'Please enter Title', + entertitle:'Please enter title', OperationType: 'Operation Type', selectOperationType: 'Please select Operation type', selectProblemClassification:'Please select Problem Classification', @@ -314,7 +314,7 @@ module.exports = { selectUserRole: 'Please select user role', DepartmentAllocation: 'Department Allocation', ClickSelectDepartment: 'Click to select a Department', - choice: 'Choice', + choice: 'Select', identity: 'Identity', OrdinaryUsers: 'Ordinary Users', superior: 'Superior', @@ -501,8 +501,8 @@ module.exports = { feedback: 'Feedback', approvalHistory: 'Approval History', cannotExceed500characters: 'Cannot Exceed 500 characters', - accord: 'Compliance', - nonConformity: 'Non-Compliant', + accord: 'Compliant', + nonConformity: 'Non-compliant', Tracked: 'To Be Tracked', notInvolved: 'NA', Operator: 'Operator', @@ -531,7 +531,7 @@ module.exports = { list: 'List', paragraph: 'Paragraph', enterNumber: 'Please enter No.', - enterTitle: 'Please enter Title', + enterTitle: 'Please enter title', backDocument: 'Back To Document Library', fileName: 'File Name', splitTime: 'Split Time', @@ -601,7 +601,7 @@ module.exports = { selectSplitListDisplay: 'Please select whether to split the document list for display', selectDisplayList: 'Please select whether to display in list', documentSplitDisplay: 'Document splitting module display', - VirtualListName: 'Market List', + VirtualListName: 'Market Regulation List', CertificationListName:'Homologation List', listStatus: 'List Status', creater: 'Created by', @@ -615,11 +615,11 @@ module.exports = { certificationType: 'Homo Type', certificationLevel: 'Homo Level', areaOfResponsibility: 'Responsible Field', - confirmationOfDesignConformity: 'Design Compliance Check ', + confirmationOfDesignConformity: 'Design Compliance Confirmation', Deliverables: 'Deliverables', personLiable: 'Owner', PrehomoConfirmation: 'Pre-Homo Check', - verificationAndConformityconfirmation: 'Validation Compliance Check', + verificationAndConformityconfirmation: 'Validation Compliance Confirmation', StandardImplementationDate: 'Standard Effective Date', regulatoryEngineer: 'Regulation Engineer', certifiedEngineer: 'Homo Engineer', @@ -671,7 +671,7 @@ module.exports = { GSO: 'GSO', onlyOnefileUploaded: 'Only One File can be uploaded', typeCannotUploaded: 'This Type of File Cannot be Uploaded', - confirmWithdraw: 'Confirm Withdraw ?', + confirmWithdraw: 'Confirm to Withdraw ?', OperationDetails: 'Operation Details', OperationTime: 'Operation Time', oneTableAdded: 'Only one table can be added', @@ -692,7 +692,7 @@ module.exports = { initiateListConfirmation: 'Initiate List Confirmation', initiateTaskConfirmation: 'Initiate Task Confirmation', alteration: 'Change', - fixedPlate: 'Final Version', + fixedPlate: 'Finalization', taskAffirmStatus: 'Task Confirmation Status', taskAffirm: 'Task Confirmation', listConfirmationStatus: 'List Confirmation Status', @@ -735,7 +735,7 @@ module.exports = { regulatoryTaskConfirmation: 'Regulation Task Confirmed ', certificationStart: 'Homo Completed ', preHomoCompletion: 'Pre-Homo Completed ', - certificationEnd: 'Homo KO', + certificationEnd: 'Homo Approved', directoryName: 'Catalogue Name', batch: 'Batch', uploadTime: 'Upload Time', @@ -859,7 +859,7 @@ module.exports = { cannotExceed: 'Cannot Exceed', Characters: 'Characters', standardInformation: 'Standard Information', - VirtualList: 'MarketList', + VirtualList: 'Market List', importTemplate: 'Import Template', verificationConfirmationDeadline: 'Validation Compliance Confirmation Deadline', technicalEvaluationResults: 'Technical Evaluation Result', @@ -894,7 +894,7 @@ module.exports = { toBeConfirmed: 'To Be Confirmed', designComplianceReview: 'Design Compliance Check', preHomeConfirmation: 'Pre-Homo Check', - verificationComplianceReview: 'Validation Compliance Check', + verificationComplianceReview: 'Validation Compliance Confirmation', verificationComplianceExamine:'Validation Compliance Review', Deployment: 'Deploy', pleaseDesignConformityConfirmation: 'Please complete the data of design compliance confirmation', @@ -905,14 +905,14 @@ module.exports = { VirtualAuthenticationList: 'Virtual Homo List', maintainVirtualList: 'Maintain Market List', certificationListMaintenance: 'Homo List Maintenance', - reasonsForRejection: 'Reasons For Rejection', - inconformity: 'Non-Compliant', + reasonsForRejection: 'Reason for Rejection', + inconformity: 'Non-compliant', toTrack: 'To Be Tracked', Launch: 'Initiate', maintainProgress: 'Maintain Schedule', - redSchedule: 'Red: unqualified without available solutions or timeline. ', - yellowSchedule: 'Yellow: unqualified and with available solutions and timeline. ', - greenRequirements: 'Green: qualified and confirmed.', + redSchedule: 'Red: non-compliant, without acceptable solutions or timeline ', + yellowSchedule: 'Yellow: non-compliant/to be tracked, with acceptable solutions and timeline ', + greenRequirements: 'Green: compliant or meeting the requirements', blueUndeterminedState: 'Blue: pending', authenticationMessage: 'Homo Parameter Task', taskRegulationComplianceTask: 'Regulation Compliance Task', @@ -990,7 +990,7 @@ module.exports = { Filledreturn: 'Rejected by the applicant', Submitted: 'Submitted', ReturnedEngineer: 'Rejected by homo engineer', - SynchronizedLibrary: 'Synced to library', + SynchronizedLibrary: 'Synced to Library', Statusis: 'Statusis', toHavePermission: 'To Have Permission', and: 'And', @@ -1000,7 +1000,7 @@ module.exports = { setCreator: 'Set Creator', documentLibraryDetails: 'Document Library Details', question: 'Reminder', - ConfirmQuestion: 'Confirm Question', + ConfirmQuestion: 'Confirm to remind?', disableInput: 'Disable Input', taskConfirmationDeadline: 'Task Confirmation Deadline', OnlyOrTaskconfirmationOut: 'Only when the list confirmation status or task confirmation status is to be confirmed can the reminder be carried out', @@ -1058,7 +1058,7 @@ module.exports = { standardNameEn: 'Standard Title En', deadlineForComments: 'Deadline for Comments', standardNo: 'Standard No.', - implemenDate: 'Effective Date', + implemenDate: 'Implementation Date', // 上报库 Enable: 'Enable', Latestupdatetime: 'Latest Update Time', @@ -1351,14 +1351,14 @@ module.exports = { projectVersion:'Project Version', softwareVersion:'Homo Software Version', versionStatistics:'Version statistics', - addSubproject:'Add Subitem', + addSubproject:'Add Subproject', Topping:'Top', cancelTopping:'Cancel Topping', relatedProjectVersion:'Related Project Version', taskType:'Task Type', taskStatus:'Task Status', taskConfirmationHandling:'Task confirmation handling', - relatedVersion:'Related version', + relatedVersion:'Related Version', filledBy:'Filled by', parameterToBeInitiated:'Parameter to be initiated', listTaskConfirmation:'List task confirmation', @@ -1373,7 +1373,7 @@ module.exports = { projectVersion:'Project Version', softwareVersion:'Homo Software Version', versionStatistics:'Version statistics', - addSubproject:'Add Subitem', + addSubproject:'Add Subproject', Topping:'Top', cancelTopping:'Cancel Topping', relatedProjectVersion:'Related Project Version', @@ -1383,12 +1383,12 @@ module.exports = { allsubitemsitem:'Delete all subitems under this item?', contactTheFounder:'Contact author', certificationCategoryNumber: 'certification Category Number', - historicalrecord:'Historical Record', + historicalrecord:'Revision History', Referenceparametercolumn:'Reference Parameter Column', Updateparametercolumn:'Update The Parameter Column', columnfirst:'Reference the parameter column first', columnforced:'Confirm a forced retraction?', - customize:'List setting', + customize:'List Setting', customColumn:'Custom column', afterdate:'In... After the date', afterdatein:'In... After date (inclusive)', @@ -1404,10 +1404,10 @@ module.exports = { DeliverablesResult:'Delivery Result', reportNo:'Report No.', productModel:'Product Model', - nameOfManufacturer:'Name Of Manufacturer', + nameOfManufacturer:'Manufacturer Name', regulationNo:'Regulation No.', itemInformation:'Item Information', - modifyHistory:'Historical Record', + modifyHistory:'Revision History', returnToStudio:'Return to Studio', Approved:'Approved', returnedForApproval:'Returned', @@ -1415,10 +1415,10 @@ module.exports = { referenceDeliverables:'Reference Deliverable', missionAccepted:'Task Accepted', missionRejection:'Task Rejected', - turnToDo:'Turn To', - initiateTask:'Initiate a Task', - compliancereport:'Generate compliance report', - todocenter:'To-do center', + turnToDo:'Forward', + initiateTask:'Initiate Task', + compliancereport:'Generate Compliance report', + todocenter:'To-Do Center', areYouReturnToStudio:'Confirm to return to studio?', confirmLaunchTask:'Confirm to initiate a task ?', conditionsNotMet:'Conditions not met', @@ -1426,13 +1426,13 @@ module.exports = { onlyProcessReturned:'Only data with a process status of list to be verified and rejected by the responsible person can be initiated, and the delivery type, engineering interface person, responsible person, and deadline cannot be empty', confirmToAcceptTheTask:'Confirm to accept the task?', confirmRejectTask:'Confirm to reject the task ?', - onlyDataStatusConfirmedSelected:'Only data with process status of task to be confirmed can be selected', - onlyDataStatusSubmittedCanBeSelected:'Only data with process status of result to be submitted can be selected', + onlyDataStatusConfirmedSelected:'Only data with process status of Task to Be Confirmed can be selected', + onlyDataStatusSubmittedCanBeSelected:'Only data with process status of Result to Be Submitted can be selected', operationWithoutPermission:'No access', data:"'s data", - confirmApproval:'Confirm pass review?', - confirmReturnForApproval:'Confirm Return for review ?', - onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of result to be reviewed can be selected', + confirmApproval:'Confirm to approve?', + confirmReturnForApproval:'Confirm to reject?', + onlyDataStatusResultReviewedCanBeSelected:'Only data with process status of Result to Be Reviewed can be selected', confirmResetProcess:'Confirm to reset the process?', confirmUrging:'Confirm to remind?', confirmWithdrawal:'Confirm to withdraw?', @@ -1443,16 +1443,16 @@ module.exports = { youCannotStatusListToBeReleasedAndApproved:'Data with process status of List to Be Released and Approved cannot be selected', batchmodify:'Modify in batch?', onlyDataListReleasedAndCertificationReturnCanSelected:'Only data with process status of List to Be Released and Returned in Homo can be selected and the deadline cannot be empty', - type:'type', + type:'Type', select:'select', - onlyDataWithProcessStatusDeleted:'Only data with process status of list to be released and approved can be deleted', + onlyDataWithProcessStatusDeleted:'Only data with process status of List to Be Released and Approved can be deleted', complianceCertificationProgram:'Compliance & Homologation Program', - listPublishing:'List Publishing', - responsibilityConfirmation:'Responsibility Confirmation', - designVerification:'Design Verification', - getStarted:'Get Started', - certificationStartOne:'Certification Start', - verificationAndVerification:'Verification And Verification', + listPublishing:'List Release', + responsibilityConfirmation:'Responsibility Confirm', + designVerification:'Design Check', + getStarted:'Pre-Homo Starts', + certificationStartOne:'Homo Starts', + verificationAndVerification:'Validation Check', projectInterfacePersonRegulationEngineerSetting:'Project Interface Person - Regulation Engineer Setting', projectInterfacePersonCertificationEngineerSetting:'Project Interface Person - Certification Engineer Setting', registrationnumber:'Product registration number', @@ -1670,8 +1670,8 @@ module.exports = { Taskconfirmationresult:'Task confirmation result', Compliancetaskhandling:'Compliance task handling', theDataYouSelectedContainsSkip:'The data selected contains empty deliverable; please confirm whether to skip', - designComplianceProcessFor:'Design compliance process for', - validationComplianceProcessFor:'Validation compliance process for', + designComplianceProcessFor:'Design Compliance Process for', + validationComplianceProcessFor:'Validation Compliance Process for', thePersonResponsibleForVerifyingEmpty:'The owner for validation compliance process cannot be empty', theDeadlineComplianceProcessCannotEmpty:'The deadline for validation compliance process cannot be empty', theDeadlineForTheDesignCannotBeEmpty:'The deadline for design compliance process cannot be empty', @@ -1696,7 +1696,7 @@ module.exports = { taskNodeMismatch:'Task Node Mismatch', ifNot:'If not, fill in "none" or "not involved"', designComplianceProcess:'Design Compliance Process', - validationComplianceProcess:'Verify Compliance Process', + validationComplianceProcess:'Validation Compliance Process', onlyDataInTheReminderProcessBanBeProcessed:'Only data in the reminder process can be processed', expeditionProcess:'Reminder Process', addfunction:'Add function', @@ -1705,7 +1705,7 @@ module.exports = { softwareversion:'Software version', returntofill:'Return to fill', thereAreCurrentlyNoRegulationsToHandle:'No regulations to be processed now', - certificationSubmission:'Certification Submission', + certificationSubmission:'Application Submitted', upgradecompletion:'Upgrade completion', implementedupgrade:'Whether the implemented upgrade is consistent with the record', numberofvehicles:'Number of vehicles that have completed upgrades', @@ -1714,7 +1714,7 @@ module.exports = { implementationrecords:'Fault handling measures and emergency response implementation records', onlyDataWithListStatusDraftCanBeDeleted:'Only data with a list status of Draft can be deleted', implementationDateTwo:'Implementation Date', - reasonForReturn:'Reason For Return', + reasonForReturn:'Reason for Reject', pleaseFillInTheInformationTaskProcess:'Please fill in the information of the Eng. Interface and the owner before initiating the task process', complianceReporting:'Compliance Reporting', youCanOnlySelectStatusClearSubmit:'You can only select data with a process status of Clear to Submit', @@ -1737,7 +1737,7 @@ module.exports = { dykzq:'Corresponding controller', releaseRegulatoryList:'Regulation List Release', preHomoFlow:'Pre-Homo Process', - verifyConformanceConfirmation:'Validation Compliance Check', + verifyConformanceConfirmation:'Validation Compliance Confirmation', designConformanceVerification:'Design Compliance Check', nomorethan:'No more than 10', marketCertificationList:'Market Certification List', @@ -1753,7 +1753,7 @@ module.exports = { resultsToBeSubmitted:'Results to be submitted', resultsToBeReviewed:'Results to be reviewed', compliance:'Compliant', - nonCompliance:'Non-Compliant', + nonCompliance:'Non-compliant', toBeTracked:'To Be Tracked', NA:'NA', electroniccontrollerparameter:'Electronic controller parameter', From 3a8e61e5338d98a69a71801af0cf7254bd8eff9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 31 May 2023 11:57:34 +0800 Subject: [PATCH 03/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/service/impl/ProjectLawsInventoryEOServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java index 781436b00..91797c52f 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLawsInventoryEOServiceImpl.java @@ -6846,7 +6846,7 @@ public class ProjectLawsInventoryEOServiceImpl extends ServiceImpl Date: Wed, 31 May 2023 14:04:27 +0800 Subject: [PATCH 04/65] =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E7=BF=BB?= =?UTF-8?q?=E8=AF=91=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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js index 086821aa1..547a8153a 100644 --- a/jero-web/src/common/lang/en-us.js +++ b/jero-web/src/common/lang/en-us.js @@ -800,7 +800,7 @@ module.exports = { Battery: 'Battery', Model: 'Model', configurationName: 'Configuration Name', - historicalVersion: 'Historical Version', + historicalVersion: 'History Version', configure: 'Configuration', parameter: 'Parameter', changeExtension: 'Extension', @@ -953,7 +953,7 @@ module.exports = { pleaseSubmitStatus: 'Please change the status of engineering data to Confirmed before submission', modelName: 'Model Name', modelYear: 'Model Year', - NoteConfirmTheChange: 'Note: After resetting, the selected item data will change to a list pending release status, and the historical data will disappear. Please confirm whether to perform a process reset', + NoteConfirmTheChange: 'Note: After resetting, the status of the selected items will be changed to To Be Released and the historical data will disappear. Please confirm whether to reset', onlyDataChanged: 'Only data with task confirmation status of Accepted can be changed', inquiry: 'Inquiry', ConfirmationDeadline: 'Confirm Deadline', From e37b4d5dd266954001dfb82bb1d358e336462034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 31 May 2023 14:57:53 +0800 Subject: [PATCH 05/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=91=98=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/ParameterItemCollectionList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue index 1d03677eb..e0210dca8 100644 --- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue +++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue @@ -247,7 +247,7 @@ {{$t('Assignedby')}} -
+
{{$t('dataExport')}}
From 211e7d34abec523ce8e60980e7dc5f02c176ff4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 31 May 2023 15:07:32 +0800 Subject: [PATCH 06/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ota/service/impl/OtaBaSjSjmbclServiceImpl.java | 6 +++--- .../otamanagement/upgradeactivity/components/gnxtwh.vue | 8 ++++---- .../components/upgradehavechanged.vue | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java index 22cdf4d23..e583dc9c3 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaBaSjSjmbclServiceImpl.java @@ -213,8 +213,8 @@ public class OtaBaSjSjmbclServiceImpl extends ServiceImpl 10){ - this.$message.warning(this.$t('nomorethan')) - return - } + // if(this.formInline.dataList.length + 1 > 10){ + // this.$message.warning(this.$t('nomorethan')) + // return + // } this.formInline.dataList.splice(index + 1, 0, {}) this.formInline = { ...this.formInline } }, diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8583fb4b0..397cbf543 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -60,8 +60,8 @@ - {{ $t('yes') }} - {{ $t('not') }} + {{ $t('yes') }} + {{ $t('not') }} From b56b30a9391e028721205b15da0c6fa58a3b3063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= Date: Wed, 31 May 2023 15:33:35 +0800 Subject: [PATCH 07/65] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectLibraryBaseServiceImpl.java | 5 +++-- .../service/impl/ProjectStatusBoardServiceImpl.java | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java index 9373a6125..f75e0937c 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java @@ -3010,8 +3010,9 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl certificationProgressMap = this.projectCertificationInventoryEOService.groupByCertificationProgress(pciEos); From 4d38e870a25909d4db74fef1b84fe05833dfa68c Mon Sep 17 00:00:00 2001 From: "zyx.net" Date: Thu, 1 Jun 2023 16:00:29 +0800 Subject: [PATCH 08/65] =?UTF-8?q?ota-=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/otamanagement/upgradeactivity/index.vue | 12 ++++++------ .../components/auxiliaryupgradehavechanged.vue | 4 ++-- .../components/thetargetvehicleofthisupgrade.vue | 4 ++-- .../components/upgradehavechanged.vue | 4 ++-- .../components/upgradeimpactassessment.vue | 4 ++-- .../components/upgradetargetmodel.vue | 4 ++-- .../components/usernotification.vue | 4 ++-- .../components/basicInformation.vue | 4 ++-- .../components/beupgradedonline.vue | 4 ++-- .../components/recordparameters.vue | 4 ++-- .../components/safetyPrecautions.vue | 4 ++-- .../components/upgradeRequirements.vue | 4 ++-- .../vehicleinformation/components/upgradedonline.vue | 4 ++-- .../otamanagement/vehicleregistration/index.vue | 10 +++++----- 14 files changed, 35 insertions(+), 35 deletions(-) diff --git a/jero-web/src/views/otamanagement/upgradeactivity/index.vue b/jero-web/src/views/otamanagement/upgradeactivity/index.vue index 48692641d..63af28480 100644 --- a/jero-web/src/views/otamanagement/upgradeactivity/index.vue +++ b/jero-web/src/views/otamanagement/upgradeactivity/index.vue @@ -91,36 +91,36 @@
{{$t('createanupgradeactivityrecord')}}
{{$t('citeforrecord')}}
{{$t('datamaintenance')}}
-
{{$t('templateDownload')}}
{{$t('gnxtwh')}} diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue index 09c93952f..e76dd38c4 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/auxiliaryupgradehavechanged.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue index 4ed59496c..1a5f21f17 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/thetargetvehicleofthisupgrade.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue index 8583fb4b0..15807bc81 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradehavechanged.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue index 1bd0f1aab..ca866e881 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradeimpactassessment.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue index c2a5a9896..b9f9b4c49 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/upgradetargetmodel.vue @@ -2,11 +2,11 @@
-
+
-
+
{{ $t('templateDownload') }}
diff --git a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue index 6bbe680d2..93a6ea5bd 100644 --- a/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue +++ b/jero-web/src/views/otamanagement/upgradeactivityrecord/components/usernotification.vue @@ -2,10 +2,10 @@
-
+
-
+
{{$t('templateDownload')}}
diff --git a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue index 905b33b69..4fcb6718c 100644 --- a/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue +++ b/jero-web/src/views/otamanagement/vehicleinformation/components/basicInformation.vue @@ -1,10 +1,10 @@