合并分支 'fix_bug_first_stage' 到 'master'

Fix bug first stage

查看合并请求 laws-nio/laws-weilai!91

jero-boot/db/蔚来标准sql/first_bug_fix_record.sql

@@ -49,3 +49,7 @@ VALUES
 -- 消息表添加发起人字段   已同步正式环境
 ALTER TABLE `sys_announcement`
 ADD COLUMN `initiator` varchar(255) NULL COMMENT '发起人' AFTER `document_id`;
+
+-- 2022-07-05 修改字段类型  生产环境已同步
+ALTER TABLE `project_laws_inventory_log`
+MODIFY COLUMN `log_content` text CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT 'log内容' AFTER `project_library_id`;

jero-web/src/common/lang/en-us.js

@@ -142,7 +142,7 @@ module.exports = {
   fax: 'Fax',
   enterOrganizationType: 'Please enter organization type',
   sureDeleteSelected: 'Are you sure you want to delete the selected',
-  pieceData: 'piece of data and child node data?',
+  pieceData: 'Piece of data and child node data?',
   selectSuperiorDepartmentFirst: 'Please click to select the superior Department first',
   deleteDepartmentData: 'Are you sure you want to delete this Department and child node data?',
   DeleteSucceeded: 'Delete Succeeded',
@@ -160,11 +160,11 @@ module.exports = {
   DictionaryConfiguration: 'Dictionary Configuration',
   dataDictionaryPage: 'This is the data dictionary page',
   describe: 'Description',
-  DescriptionRefreshCache: 'Description refresh cache complete!',
+  DescriptionRefreshCache: 'Description Refresh Cache Complete!',
-  FailedRefreshCache: 'Failed to refresh cache!',
+  FailedRefreshCache: 'Failed To Refresh Cache!',
   refreshFailed: 'Refresh Failed',
   ClassificationDictionary: 'Classification Dictionary',
-  ClassifManagementPage: 'Classification dictionary management page',
+  ClassifManagementPage: 'Classification Dictionary Management Page',
   ClassificationName: 'Classification Name',
   ClassificationCode: 'Classification Code',
   AddSubcategory: 'Add Subcategory',
@@ -208,7 +208,7 @@ module.exports = {
   DataID: 'Data ID',
   enterID: 'Please Enter ID',
   DataComparison: 'Data Comparison',
-  DataLogManagementPage: 'Data log management page',
+  DataLogManagementPage: 'Data Log Management Page',
   VersionNumber: 'Version',
   DataContent: 'Data Content',
   creator: 'Creator',
@@ -350,7 +350,7 @@ module.exports = {
   ModificationContent: 'Modification Content',
   personnel: 'Personnel',
   dataExport: 'Data Export',
-  exportWithFile: 'Export with file',
+  exportWithFile: 'Export With File',
   Push: 'Push',
   templateDownload: 'Template Download',
   textInformation: 'Document Files',
@@ -368,12 +368,12 @@ module.exports = {
   clickUpload: 'Click To Upload',
   viewUploadedFiles: 'View Uploaded Files',
   standardSelection: 'Standard Selection',
-  Collection: 'Add to Collection',
+  Collection: 'Add To Collection',
   CancelCollection: 'Cancel From Collection',
   deleteLib: 'Delete',
   subscribe: 'Subscribe',
   CancelSubscribe: 'Unsubscribe',
-  ConfirmCollection: 'Confirm collection ?',
+  ConfirmCollection: 'Confirm Collection ?',
   cancelConfirmCollection: 'Are you sure you want to cancel the collection',
   ConfirmSubscribe: 'Confirm Subscribe ?',
   cancelConfirmSubscribe: 'Are you sure you want to cancel the subscribe',
@@ -390,9 +390,9 @@ module.exports = {
   DocumentLibrary: 'Document Library',
   GeneralExportInformation:'General export information',
   CustomizeExportInformation:'Customize export information',
-  DocumentComparisonLibrary: 'Document comparison Library',
+  DocumentComparisonLibrary: 'Document Comparison Library',
   weekly: 'Weekly',
-  SyncLibrary: 'Sync to doc. library',
+  SyncLibrary: 'Sync To doc. Library',
   check: 'Proofread',
   enName: 'English Name',
   selectLeastOne: 'Please select at least one piece of data',
@@ -419,7 +419,7 @@ module.exports = {
   MessageType: 'Message Type',
   NotificationTime: 'Notification Time',
   MessageNotification: 'Message Notification',
-  SeeMore: 'See more',
+  SeeMore: 'See More',
   OperationSuccessful: 'Operation Successful',
   OperationFailed: 'Operation Failed',
   PersonnelSelection: 'Personnel Selection',
@@ -449,13 +449,13 @@ module.exports = {
   DisplayOrder: 'Display Order',
   PleaseEnterDisplayOrder: 'Please enter the display order',
   Required: 'Required',
-  DocumentLibraryModuleDisplay: 'Document library module display',
+  DocumentLibraryModuleDisplay: 'Document Library Module Display',
-  DocumentLibraryListDisplay: 'Document library list display',
+  DocumentLibraryListDisplay: 'Document Library List Display',
   SelectWhetherDisplayList: 'Please select whether to display the document library list',
   SelectDisplayArea: 'Please select a display area',
   Search: 'Search',
   SelectWhetherToSearch: 'Please select whether to search',
-  DisplayOtherModules: 'Display of other modules',
+  DisplayOtherModules: 'Display Of Other Modules',
   RegulationsListDisplay: 'Regulations List Display',
   selectDisplayListRegulations: 'Please select whether to display the list of regulations',
   SearchCenterDisplay: 'Search Center Display',
@@ -476,7 +476,7 @@ module.exports = {
   processDone: 'Completed',
   sentProcess: 'Initiated Process',
   monitoringProcess: 'Monitor',
-  ConfirmDeployment: 'Confirm deployment?',
+  ConfirmDeployment: 'Confirm Deployment?',
   terminationProcess: 'Termination Process',
   issue: 'Issue',
   projectInformation: 'Project Information',
@@ -543,7 +543,7 @@ module.exports = {
   theRelease: 'The release date should Not exceed the standard implementation date',
   zoneOfApplication: 'Area',
   releaseDate: 'Release Date',
-  standardImplementationTime: 'Standard implementation time',
+  standardImplementationTime: 'Standard Implementation Time',
   onlyPicture: 'Only Upload Pictures!',
   fileUploadFailed: 'File Upload Failed',
   deletedSuccessfully: 'Deleted Successfully',
@@ -573,16 +573,16 @@ module.exports = {
   OnlyWordItem: 'Only the GSO file type can split PDF files. Please re select the file',
   OnlyWord: 'Only word files can be imported',
   labelAreaDeleted: 'If it is deleted, All label items under the display area will be deleted',
-  searchInResults: 'Search in results',
+  searchInResults: 'Search In Results',
   searchContent: 'Search Content',
   viewFile: 'View File',
   fileFormatIncorrect: 'The file format is incorrect',
   pleaseUploadFile: 'Please upload the file',
-  documentSplitList: 'Document split list display',
+  documentSplitList: 'Document Split List Display',
   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: 'Virtual list Name',
+  VirtualListName: 'Virtual List Name',
   listStatus: 'List Status',
   creater: 'Creater',
   withdraw: 'Withdraw',
@@ -600,7 +600,7 @@ module.exports = {
   personLiable: 'Assignee',
   PrehomoConfirmation: 'Pre-Homo Confirmation',
   verificationAndConformityconfirmation: 'Validation Compliance Check',
-  StandardImplementationDate: 'Standard implementation date',
+  StandardImplementationDate: 'Standard Implementation Date',
   regulatoryEngineer: 'Regulation Engineer',
   certifiedEngineer: 'Homologation Engineer',
   regulatoryEngineerOrcertifiedEngineer: 'Regulation Engineer Or Homologation Engineer',
@@ -615,8 +615,8 @@ module.exports = {
   NTplatform: 'NT Platform',
   NPplatform: 'NP Platform',
   IPDInformation: 'IPD Information',
-  certificationProgramInformation: 'Certification program Information',
+  certificationProgramInformation: 'Certification Program Information',
-  taskReleaseStatus: 'Task release status',
+  taskReleaseStatus: 'Task Release Status',
   task: 'Task',
   TaskCutOffTime: 'Due Date',
   Transfer: 'Transfer',
@@ -628,7 +628,7 @@ module.exports = {
   ParameterName: 'Parameter Name',
   ParameterDescription: 'Parameter Description',
   Version: 'Version',
-  certificationProgramTime: 'Certification program time',
+  certificationProgramTime: 'Certification Program Time',
   ArchitecturePlatform: 'Architecture Platform',
   ModelPlatform: 'Model Platform',
   ListOfRelevantPersonnel: 'Personal List',
@@ -668,15 +668,15 @@ module.exports = {
   certificationProgram: 'Homologation Plan',
   DocumentStandard: 'Document Standard',
   standardName: 'Standard Name',
-  initiateListConfirmation: 'Initiate list confirmation',
+  initiateListConfirmation: 'Initiate List Confirmation',
-  initiateTaskConfirmation: 'Initiate task confirmation',
+  initiateTaskConfirmation: 'Initiate Task Confirmation',
   alteration: 'Change',
   fixedPlate: 'Baseline',
   taskAffirmStatus: 'Task Confirmation Status',
   taskAffirm: 'Task Confirmation',
   listConfirmationStatus: 'List Confirmation Status',
   listConfirmation: 'List Confirmation',
-  ListConfirmationDeadline: 'List confirmation deadline',
+  ListConfirmationDeadline: 'List Confirmation Deadline',
   dataConfirmation: 'Please select the data whose list confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
   pleaseSelectPersonFirst: 'Please select a person first',
   onlyOnePersonCanBeSelected: 'Only one person can be selected',
@@ -687,7 +687,7 @@ module.exports = {
   submitted: 'Data has been submitted and cannot be submitted again',
   basicInformationOfParameters: 'Project Basic Information',
   regulatoryCertificationTaskPlan: 'Regulation/Homologation Task Plan',
-  bringInRelevantPersonnel: 'Bring in relevant personnel',
+  bringInRelevantPersonnel: 'Bring In Relevant Personnel',
   confirmBringInRelevantPersonnel: 'Confirm Bring in relevant personnel',
   problemType: 'Issue Type',
   projectDetails: 'Project Details',
@@ -695,13 +695,13 @@ module.exports = {
   taskList: 'Task List',
   TaskParameterCollection: 'Task Parameter Collection',
   nonConformance: 'Non Conformance',
-  deadlineForConfirmationOfDesignCompliance: 'Deadline for confirmation of design compliance',
+  deadlineForConfirmationOfDesignCompliance: 'Deadline For Confirmation Of Design Compliance',
-  prehomoConfirmationDeadline: 'Pre-Homo confirmation deadline',
+  prehomoConfirmationDeadline: 'Pre-Homo Confirmation Deadline',
-  verificationComplianceConfirmationDeadline: 'Verification compliance confirmation deadline',
+  verificationComplianceConfirmationDeadline: 'Verification Compliance Confirmation Deadline',
   pleaseEnterTheCorrectWebAddress: 'Please enter the correct web address',
   updateTime: 'Update Time',
   comment: 'Comment',
-  historicalVersion: 'Historical version',
+  historicalVersion: 'Historical Version',
   versionName: 'Version Name',
   finalizationTime: 'Finalization Time',
   setting: 'Setting',
@@ -731,9 +731,9 @@ module.exports = {
   a: '+',
   positiveInteger: 'Positive Integer',
   // 参数收集开始
-  MaintainConfigureInfo: 'Maintain configuration Information',
+  MaintainConfigureInfo: 'Maintain Configuration Information',
   ParameteItemCollectionList: 'Parameter item collection list',
-  ParameterViewPage:'Parameter View page',
+  ParameterViewPage:'Parameter View Page',
   Areyousureparameteritems: 'Are you sure to submit the selected parameter items?',
   Theselectedconfiguration: 'The configuration can only be added when the parameter items in the parameter list are to be collected or changed',
   NoConfigurationNotStart: 'No configuration added, unable to start collection, please check',
@@ -742,15 +742,15 @@ module.exports = {
   Frozenstatus: 'Frozen status, can only be viewed',
   chinese: 'Chinese',
   integerOrDecimal: 'Integer Or Decimal',
-  OneDecimalPlace: 'One Decimal Place',
+  OneDecimalPlace: 'One Decimal Places',
   TwoDecimalplaces: 'Two Decimal places',
-  Threedecimalplaces: 'Threedecimalplaces',
+  Threedecimalplaces: 'Three decimal places',
-  FourDecimalplaces: 'FourDecimalplaces',
+  FourDecimalplaces: 'Four Decimal places',
   Positivefloatingpointnumber: 'Positive floating point number',
   oneconfigurationInformation: 'Contains at least one configuration Information',
   Correspondingstandarddeleted: 'Correspondingstandarddeleted',
   changeTheTitle: 'Title already exists, please change the title',
-  resetPassword: 'reset Password',
+  resetPassword: 'Reset Password',
   DepartmentAllocation: 'Department Allocation',
   ListTitle: 'List Title',
   CopyProjectCollectionparameters: 'Copy Project Collection parameters',
@@ -800,8 +800,8 @@ module.exports = {
   parameterTemplate: 'Parameter Template',
   contentDescription: 'Content Description',
   WhetherMergeParameters:'Whether to merge parameters',
-  merge:'merge',
+  merge:'Merge',
-  nonjoinder:'nonjoinder',
+  nonjoinder:'Nonjoinder',
   MergeSeparator:'Merge separator',
   parameterTemplateExportName: 'Parameter List',
   parameterDataExport: 'Parameter Export Data',
@@ -890,7 +890,7 @@ module.exports = {
   notLaunch: 'Not Start',
   refuse: 'Reject',
   taskTermination: 'Task Termination',
-  projectStatusAndProgress: 'Project status and progress',
+  projectStatusAndProgress: 'Project Status And Progress',
   listConfirmationProgress: 'List Confirmation Progress',
   taskConfirmationProgress: 'Task Confirmation Progress',
   designComplianceConfirmationProgress: 'Design Compliance Confirmation Progress',
@@ -904,14 +904,14 @@ module.exports = {
   startMonth: 'Start Month',
   endMonth: 'End Month',
   Importing: 'Importing...',
-  projectDeliveryDescription: 'Project delivery description',
+  projectDeliveryDescription: 'Project Delivery Description',
   cancelConfirm: 'Cancel Confirm',
   currentInformation: 'Current Information',
   deliveryHistory: 'Delivery History',
   projectDeliveryRequirements: 'Project delivery requirements',
   personLiableConfirm: 'PersonLiable Confirm',
-  complianceResults: 'Compliance results',
+  complianceResults: 'Compliance Results',
-  noData: 'No data',
+  noData: 'No Data',
   confirmOperation: 'Confirm Operation',
   sponsorReview: 'Sponsor Review',
   fillInProjectDelivery: 'Fill in project delivery',
@@ -922,7 +922,7 @@ module.exports = {
   pleaseWillBeReturned: 'Please reconfirm the project confirmation results and the review results of the responsible person. If they meet the requirements, they will be submitted, otherwise they will be returned',
   pleaseSubmitStatus: 'Please submit the data confirmed by the project in the confirmation status',
   modelName: 'Model Name',
-  modelYear: 'Model year',
+  modelYear: 'Model Year',
   NoteConfirmTheChange: 'Note: after the change, the list will be in the status of not being reviewed, which will start from the internal review, and the historical data will be discarded Confirm the change',
   onlyDataChanged: 'Only data whose task confirmation status is accepted can be changed',
   inquiry: 'Inquiry',
@@ -937,7 +937,7 @@ module.exports = {
   dataCannotEmpty: 'Data Cannot Empty',
   documentDynamics: 'Document Update',
   theNumberAgain: 'The number already exists and cannot be added again',
-  myList: 'My to-do list',
+  myList: 'My to-do List',
   myNews: 'My Message',
   monthlyReportRegulations: 'Regulation Monthly Report',
   Pending: 'Pending',
@@ -951,7 +951,7 @@ module.exports = {
   systemPrompt: 'System Prompt',
   loginExpired: 'Login Expired',
   reportNotUploaded: 'Report not uploaded',
-  position: 'position',
+  position: 'Position',
 //  认证权限状态
   CollectionInitiated: 'Wait Collect',
   handledInterface: 'Wait Sdt',
@@ -963,12 +963,12 @@ module.exports = {
   SynchronizedLibrary: 'Sync Report',
   Statusis: 'Statusis',
   toHavePermission: 'To Have Permission',
-  and: 'and',
+  and: 'And',
   judge: 'Judge',
   pleaseWaitWhileRunning: 'Please wait while running',
   roleSwitching: 'Role Switching',
   setCreator: 'Set Creator',
-  documentLibraryDetails: 'Document library details',
+  documentLibraryDetails: 'Document Library Details',
   question: 'Question',
   ConfirmQuestion: 'Confirm Question',
   disableInput: 'Disable Input',
@@ -1009,7 +1009,7 @@ module.exports = {
   workProgressEn: 'NIO Work Progress (En)',
   initiatingProcess: 'Initiating Process',
   collectResults: 'Collect Results',
-  dateOfInitiation: 'Date of initiation',
+  dateOfInitiation: 'Date Of Initiation',
   closingDate: 'Closing Date',
   viewProcess: 'View Process',
   evaluationResults: 'Evaluation Results',