修改禅道已知bug

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

@@ -15,7 +15,7 @@ module.exports = {
   frozen: 'frozen',
   reset: 'reset',
   putAway: 'Put away',
-  open: 'open',
+  open: 'More',
   addUser: 'add user',
   userInformation: 'user information',
   export: 'export',
@@ -134,7 +134,7 @@ module.exports = {
   enterMobileNumber: 'Please enter your mobile phone number',
   enterAddress: 'Please enter the address',
   address: 'address',
-  remarks: 'remarks',
+  remarks: 'Comments',
   enterComments: 'Please enter comments',
   selectDepartmentFirst: 'Please select a department first!',
   OrganizationCode: 'Organization code',
@@ -463,7 +463,7 @@ module.exports = {
   charactersLength1to300: '1 - 300 characters in length',
   OnlyOneSelected: 'Only one piece of data can be selected',
   OnlyPDF: 'Only PDF files can be imported',
-  open: 'open',
+  open: 'More',
   away: 'away',
   toDoProcess: 'To Do List',
   processDone: 'Process done',
@@ -493,7 +493,7 @@ module.exports = {
   ProcessType: 'Process type',
   AddProcess: 'Add process',
   RelatedItems: 'Related items',
-  Sponsor: 'Sponsor',
+  Sponsor: 'Initiator',
   CurrentProcessor: 'Current processor',
   LastProcessor: 'Last processor',
   ProcessingTime: 'Processing time',
@@ -534,7 +534,7 @@ module.exports = {
   unsubscribeConfirm: 'unsubscribe confirm?',
   confirmCancelCollection: 'confirm to cancel collection?',
   theRelease: 'The release date should not exceed the standard implementation date',
-  zoneOfApplication: 'zone of application',
+  zoneOfApplication: 'Area',
   releaseDate: 'release Date',
   standardImplementationTime: 'Standard implementation time',
   onlyPicture: 'only upload pictures!',
@@ -582,20 +582,20 @@ module.exports = {
   instructionForUse: 'instruction for use',
   subtitle: 'Sub-Title',
   scopeOfApplication: 'Scope of application',
-  correspondingStandard: 'Corresponding standard',
+  correspondingStandard: 'Compare',
-  implementationCategory: 'Implementation category',
+  implementationCategory: 'Usage',
   certificationType: 'Certification Type',
   certificationLevel: 'Certification Level',
   areaOfResponsibility: 'Responsible Field',
-  confirmationOfDesignConformity: 'Design Compliance Check Deliverable',
+  confirmationOfDesignConformity: 'Design Compliance Check',
   Deliverables: 'Deliverables',
-  personLiable: 'person liable',
+  personLiable: 'Assignee',
-  PrehomoConfirmation: 'Prehomo confirmation',
+  PrehomoConfirmation: 'Pre-homo Check',
-  verificationAndConformityconfirmation: 'Verification and conformity confirmation',
+  verificationAndConformityconfirmation: 'Validation Compliance Check',
   StandardImplementationDate: 'Standard implementation date',
-  regulatoryEngineer: 'Regulatory Engineer',
+  regulatoryEngineer: 'Regulation Engineer',
-  certifiedEngineer: 'Certified Engineer',
+  certifiedEngineer: 'Homologation Engineer',
-  engineeringInterfacePerson: 'Engineering interface person',
+  engineeringInterfacePerson: 'Engineering Interface',
   typeOfDeliverables: 'Type of deliverables',
   deliverableTemplate: 'Deliverable template',
   entryName: 'entry name',
@@ -609,7 +609,7 @@ module.exports = {
   certificationProgramInformation: 'Certification program information',
   taskReleaseStatus: 'Task release status',
   task: 'task',
-  TaskCutOffTime: 'Task cut-off time',
+  TaskCutOffTime: 'Due Date',
   Transfer: 'Transfer',
   CertificationDirectory: 'Certification directory',
   TaskRequirements: 'Task requirements',
@@ -660,8 +660,8 @@ module.exports = {
   initiateTaskConfirmation: 'Initiate task confirmation',
   alteration: 'alteration',
   fixedPlate: 'Fixed plate',
-  taskAffirmStatus: 'task Affirm Status',
+  taskAffirmStatus: 'Task Confirmation Status',
-  listConfirmationStatus: 'List confirmation status',
+  listConfirmationStatus: 'List Confirmation Status',
   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',
@@ -741,50 +741,50 @@ module.exports = {
   opinion: 'opinion',
   operationNode: 'operation node',
   taskDataConfirmation: 'Please select the data whose list confirmation status is accepted and task confirmation status is not initiated or rejected, and the regulatory engineer and certification engineer are not empty',
-  selectIssuer:'Select issuer',
+  selectIssuer: 'Select issuer',
-  sendBack:'send back',
+  sendBack: 'send back',
-  taskConfirmationProcess:'Task confirmation process',
+  taskConfirmationProcess: 'Task confirmation process',
-  notFinished:'not finished',
+  notFinished: 'not finished',
-  Finished:'Finished',
+  Finished: 'Finished',
-  theRequirementst:'The engineering interface person confirms the compliance requirements',
+  theRequirementst: 'The engineering interface person confirms the compliance requirements',
-  dataLoading:'Data loading...',
+  dataLoading: 'Data loading...',
-  Submitting:'Submitting',
+  Submitting: 'Submitting',
-  Returning:'Returning',
+  Returning: 'Returning',
-  terminationProcessing:'Termination process',
+  terminationProcessing: 'Termination process',
-  publishComment:'publish comment',
+  publishComment: 'publish comment',
-  record:'record',
+  record: 'record',
-  replyToComments:'Reply to comments',
+  replyToComments: 'Reply to comments',
-  noComment:'No comment',
+  noComment: 'No comment',
-  theReceived:'The final version can be made only when the list confirmation status and task confirmation status of all data are received',
+  theReceived: 'The final version can be made only when the list confirmation status and task confirmation status of all data are received',
-  notEvaluated:'Not evaluated',
+  notEvaluated: 'Not evaluated',
-  cannotExceed:'cannot exceed',
+  cannotExceed: 'cannot exceed',
-  Characters:'Characters',
+  Characters: 'Characters',
-  standardInformation:'standardInformation',
+  standardInformation: 'standardInformation',
-  VirtualList:'VirtualList',
+  VirtualList: 'VirtualList',
-  importTemplate:'import template',
+  importTemplate: 'import template',
-  verificationConfirmationDeadline:'Verification compliance confirmation deadline',
+  verificationConfirmationDeadline: 'Verification compliance confirmation deadline',
-  technicalEvaluationResults:'technical evaluation results',
+  technicalEvaluationResults: 'technical evaluation results',
-  engineeringConfirmation:'engineeringConfirmation',
+  engineeringConfirmation: 'engineeringConfirmation',
-  feedbackFromTheEngineer:'Feedback from the Engineer',
+  feedbackFromTheEngineer: 'Feedback from the Engineer',
-  completedBy:'Completed by',
+  completedBy: 'Completed by',
-  completedTime:'Completed time',
+  completedTime: 'Completed time',
-  replyFromProjectContactPerson:'Reply from project contact person',
+  replyFromProjectContactPerson: 'Reply from project contact person',
-  answer:'answer',
+  answer: 'answer',
-  distributionEngineer:'Distribution Engineer',
+  distributionEngineer: 'Distribution Engineer',
-  reminderHandling:'Reminder handling',
+  reminderHandling: 'Reminder handling',
-  addFeedback:'Add feedback',
+  addFeedback: 'Add feedback',
-  engineer:'engineer',
+  engineer: 'engineer',
-  engineeringConfirmationDetails:'Engineering confirmation details',
+  engineeringConfirmationDetails: 'Engineering confirmation details',
-  reminder:'reminder',
+  reminder: 'reminder',
-  adopt:'adopt',
+  adopt: 'adopt',
-  reviewedByThePersonInCharge:'Reviewed by the person in charge',
+  reviewedByThePersonInCharge: 'Reviewed by the person in charge',
-  onlyDeleted:'Only data whose list confirmation status is not initiated or rejected can be deleted',
+  onlyDeleted: 'Only data whose list confirmation status is not initiated or rejected can be deleted',
-  experimentPassed:'Experiment passed',
+  experimentPassed: 'Experiment passed',
-  experimentFailed:'Experiment failed',
+  experimentFailed: 'Experiment failed',
-  toBeStarted:'To be started',
+  toBeStarted: 'To be started',
-  inProgress:'In Progress',
+  inProgress: 'In Progress',
-  green:'green',
+  green: 'green',
-  red:'red',
+  red: 'red',
-  blue:'blue',
+  blue: 'blue',
-  yellow:'yellow',
+  yellow: 'yellow'
 }

jero-web/src/components/PersonnelSelection/index.vue

@@ -30,6 +30,7 @@
           style="margin-bottom: 60px;height: 600px"
           v-if="treeVisible"
           checkable
+          checkStrictly
           :loading="loading"
           :tree-data="gData"
           @check="onCheck"

jero-web/src/permission.js

@@ -49,8 +49,9 @@ router.beforeEach((to, from, next) => {
                message: '系统提示',
                description: '请求用户信息失败，请重试！'
              })*/
+            // query: { redirect: to.fullPath }
             store.dispatch('Logout').then(() => {
-              next({ path: '/user/login', query: { redirect: to.fullPath } })
+              next({ path: '/user/login', })
             })
           })
       } else {
@@ -62,7 +63,8 @@ router.beforeEach((to, from, next) => {
       // 在免登录白名单，直接进入
       next()
     } else {
-      next({ path: '/user/login', query: { redirect: to.fullPath } })
+      //query: { redirect: to.fullPath }
+      next({ path: '/user/login', })
       NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
     }
   }