Merge remote-tracking branch 'origin/dev_third_stage' into dev_third_stage

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

@@ -193,8 +193,13 @@ module.exports = {
   OperationLog: 'Operation Log',
   SearchLog: 'Search Log',
   enterSearchKeyword: 'Please enter a search keyword',
+  enterSearchContent:'Please enter Search Content',
+  enterStandard:'Please enter Number',
+  entertitle:'Please enter Title',
   OperationType: 'Operation Type',
   selectOperationType: 'Please select Operation type',
+  selectProblemClassification:'Please select Classification',
+  selectMarket:'Please select Market',
   RequestMethod: 'Request Method',
   RequestParameters: 'Request Parameters',
   logManagementPage: 'This is the log management page',
@@ -386,7 +391,7 @@ module.exports = {
   DocumentComparison: 'Doc Comparison',
   KnowledgeDatabase: 'Q&A Knowledge',
   StandardDetails: 'Standard Details',
-  whole: 'Whole',
+  whole: 'All',
   DocumentLibrary: 'Document Library',
   GeneralExportInformation: 'General export information',
   CustomizeExportInformation: 'Customize export information',
@@ -500,7 +505,7 @@ module.exports = {
   ProcessName: 'Process Name',
   ProcessType: 'Process Type',
   AddProcess: 'Add Process',
-  RelatedItems: 'Relevant Project',
+  RelatedItems: 'Project',
   Sponsor: 'Creator',
   CurrentProcessor: 'Current Processor',
   LastProcessor: 'Last Processor',
@@ -721,7 +726,7 @@ module.exports = {
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
-  enclosure: 'Enclosure',
+  enclosure: 'Attachments',
   // 认证
   // 认证状态
   timeOperation: 'You have permission to operate this button.',
@@ -916,7 +921,7 @@ module.exports = {
   deliveryHistory: 'Delivery History',
   projectDeliveryRequirements: 'Project delivery requirements',
   personLiableConfirm: 'PersonLiable Confirm',
-  complianceResults: 'Compliance Results',
+  complianceResults: 'Feedback',
   noData: 'No Data',
   confirmOperation: 'Confirm Operation',
   sponsorReview: 'Sponsor Review',
@@ -983,25 +988,25 @@ module.exports = {
   taskConfirmationResponsiblePerson: 'Task confirmation of responsible person',
   or: 'or',
   warningTime: 'Warning Time',
-  RegulationMonthlyManagement: 'Regulation Monthly Management',
+  RegulationMonthlyManagement: 'Manage Monthly Report',
-  RegulationMonthlyFill: 'Regulation Monthly Fill',
+  RegulationMonthlyFill: 'Fill in Monthly Report',
-  RegulationMonthlyName: 'Regulation monthly name',
+  RegulationMonthlyName: 'Report Name',
-  monthlyLanguage: 'Monthly Language',
+  monthlyLanguage: 'Language',
   releaseStatus: 'Release Status',
   uploadedBy: 'Uploaded By',
-  uploadMonthly: 'Upload Monthly',
+  uploadMonthly: 'Upload Report',
-  chapterContents: 'Chapter Contents',
+  chapterContents: 'Chapter',
   chineseTitle: 'Chinese Title',
   englishTitle: 'English Title',
-  regulatoryContact: 'Regulatory Contact',
+  regulatoryContact: 'Reg. Contact',
   exportStatus: 'Export Status',
-  monthlyTitleTemplate: 'Monthly Title Template',
+  monthlyTitleTemplate: 'Title Template',
-  monthlyIntegrationAndExport: 'Monthly integration and export',
+  monthlyIntegrationAndExport: 'Export Report',
   addContent: 'Add Content',
   editContent: 'Edit Content',
   viewContent: 'View Content',
-  fillInTheMonth: 'Fill in the month',
+  fillInTheMonth: 'Filled in (Month)',
-  monthSelection: 'Month Selection',
+  monthSelection: 'Select Month',
   bringInStandardInformation: 'Bring in standard Information',
   contentTemplate: 'Content Template',
   moveUp: 'Move Up',
@@ -1009,32 +1014,32 @@ module.exports = {
   vehicleType: 'Vehicle Type',
   usage: 'Usage',
   implementationModel: 'Implementation Model',
-  primaryCoverageCn: 'Primary Coverage (Cn)',
+  primaryCoverageCn: 'Description (Cn)',
-  primaryCoverageEn: 'Primary Coverage (En)',
+  primaryCoverageEn: 'Description (En)',
   workProgressCn: 'NIO Work Progress (Cn)',
   workProgressEn: 'NIO Work Progress (En)',
-  initiatingProcess: 'Initiating Process',
+  initiatingProcess: 'Initiate Process',
   collectResults: 'Collect Results',
   dateOfInitiation: 'Date Of Initiation',
-  closingDate: 'Closing Date',
+  closingDate: 'Due Date',
   viewProcess: 'View Process',
   evaluationResults: 'Evaluation Results',
   Assessor: 'Assessor',
   collectionOfRegulatoryOpinions: 'Collection Of Regulatory Opinions',
   collectionOfRegulatoryOpinionsProcess: 'Collection Of Regulatory Opinions Process',
-  feedbackInformation: 'Feedback Information',
+  feedbackInformation: 'Feedback',
-  relevantSections: 'Relevant Sections',
+  relevantSections: 'Chapter',
-  questionsSuggestions: 'Questions Or Suggestions',
+  questionsSuggestions: 'Questions/Suggestions',
   reason: 'Reason',
   proposedTime: 'Proposed Time',
   feedbackPoint: 'Feedback Point',
   link: 'Link',
   planNoChinese: 'Plan No.',
-  standardNameCn: 'Standard Name Cn',
+  standardNameCn: 'Standard Title Cn',
-  standardNameEn: 'Standard Name En',
+  standardNameEn: 'Standard Title En',
-  deadlineForComments: 'Deadline for comments',
+  deadlineForComments: 'Deadline for Comments',
   standardNo: 'Standard No',
-  implemenDate: 'Implementation Date',
+  implemenDate: 'Effective Date',
 //  上报库
   Enable: 'Enable',
   Latestupdatetime: 'Latest Update Time',
@@ -1115,7 +1120,7 @@ module.exports = {
   PreHomoNotification: 'Pre-Homo Notification',
   ValidationComplianceNotification: 'Validation Compliance Notification',
   RegulationTaskConfirmationNotification: 'Regulation Task Confirmation Notification',
-  evaluationMethod: 'Evaluation method',
+  evaluationMethod: 'Check Method',
   uploadRelevantMaterials: 'Upload relevant materials',
   processBackground: 'Process Background',
   selectedStandard: 'Selected Standard',
@@ -1123,13 +1128,13 @@ module.exports = {
   pleaseSelectStandardFirst: 'Please select a standard first',
   RelevantMaterials: 'RelevantMaterials',
   evaluatorFeedback: 'Evaluator Feedback',
-  nameTechnicalDocument: 'Name of technical document',
+  nameTechnicalDocument: 'Technical Document',
   chapter: 'Chapter',
   problemDescription: 'Problem Description',
   filingExternalOpinions: 'Filing of external opinions',
   regulatoryTechnicalEvaluationResults: 'Regulatory technical evaluation results',
   initiateProcessForCurrentStandard: 'Initiate process for current standard',
-  engineerFeedbackResults: 'Engineer feedback results',
+  engineerFeedbackResults: 'Engineer Feedback',
   fileExport: 'File Export',
   feedbackTime: 'Feedback Time',
   regulatoryTechnologyAssessmentProcess: 'Regulatory technology assessment process',
@@ -1147,29 +1152,30 @@ module.exports = {
   releaseSituation: 'Release situation',
   comparisonResults: 'Comparison results',
   Published: 'Published',
-  initiateComparison: 'Initiate comparison',
+  initiateComparison: 'Initiate Comparison',
   translationLanguage: 'Translation language',
   translationResults: 'Translation results',
   conversionTime: 'Conversion time',
   category: 'Category',
   RegulatoryProcessEvaluationResults: 'Regulatory Process Evaluation Results',
   ViewConformanceResults: 'View Conformance Results',
-  CommentsCollectionResultsForReference: 'Comments Collection Results For',
+  CommentsCollectionResultsForReference: 'Opinion Collection Results',
-  TechnicalEvaluationResultsForReference: 'Technical Evaluation Results For',
+  TechnicalEvaluationResultsForReference: 'Technical Assessment Results',
   ComplianceConfirmationRecord: 'Compliance Confirmation Record',
   complianceConfirmation: 'Compliance Confirmation',
   noComparisonDocumentSelected: 'No comparison document selected',
   RemarkInfo: 'Remarks Info',
   initiateDocumentComparison: 'Initiate Document Comparison',
   comparativeComments: 'Comparative Comments',
-  viewTheComparisonResults: 'View The Comparison Results',
+  viewTheComparisonResults: 'View Results',
-  addFullTextComment: 'Add Full Text Comment',
+  addFullTextComment: 'Full Text Comment',
-  turnOffAutomaticMatching: 'Turn Off Automatic Matching',
+  turnOffAutomaticMatching: 'Turn Off Auto Match',
-  Deriveconformanceresults: 'Derive Conformance Results',
+  Deriveconformanceresults: 'Export Results',
   Regulatorycompliancekanban: 'Regulatory Compliance Kanban',
   exportComparisonReport: 'Export Comparison Report',
   comparisonDifferenceComment: 'Comparison Difference Comment',
-  fullTextComments: 'Full text comments',
+  fullTextComments: 'Full Text Comment',
+  pleaseEnterfullTextComments:'Please enter Full Text Comment',
   fileDeclaration: 'File Declaration',
   FileForDetails: 'File For Details',
   Converting: 'Converting',
@@ -1177,7 +1183,7 @@ module.exports = {
   convertFailed: 'Convert Failed',
   standardData: 'Standard Data',
   Theorganization: 'The Organization',
-  Addingfolder: 'Adding a folder',
+  Addingfolder: 'Create New Folder',
   Addingsubfolders: 'Adding Subfolders',
   Editfolder: 'Edit Folder',
   Deletefolders: 'Delete Folders',
@@ -1188,8 +1194,8 @@ module.exports = {
   Openpersonnel: 'Open Personnel',
   originalText: 'Original Text',
   translatedText: 'Translated Text',
-  Administrativeprivileges: 'Administrativ Pprivileges',
+  Administrativeprivileges: 'Administrative Permissions',
-  Checkthepermissions: 'Check The Permissions',
+  Checkthepermissions: 'Read Permissions',
   onlyFilesUploaded: 'Only.Docx,.Doc files can be uploaded',
   selectDirectorylocation: 'Please select the directory location to add the folder',
   Fileuploaded: 'File uploaded, please wait',
@@ -1199,10 +1205,10 @@ module.exports = {
   Parametercollection: 'Parameter Collection',
   Collectlist: 'Colle Ctlist',
   Statisticalmodels: 'Statisti Calmodels',
-  Inthecollection: 'In the collection',
+  Inthecollection: 'During collection',
-  Notatthe: 'Not at the',
+  Notatthe: 'Not started',
   Thepercentage: 'The Percentage',
-  problemKnowledgeBase: 'Problem Knowledge Base',
+  problemKnowledgeBase: 'Q&A Knowledge',
   recentHotSpots: 'Recent Hot Spots',
   disseminationMaterials: 'Dissemination Materials',
   informationSafety: 'Information Safety',
@@ -1211,10 +1217,10 @@ module.exports = {
   productHighlights: 'Product Highlights',
   financialReimbursement: 'Financial Reimbursement',
   classificationMaintenance: 'Classification Maintenance',
-  managePublishing: 'Manage Publishing',
+  managePublishing: 'Release Management',
-  displayPermission: 'Display permission',
+  displayPermission: 'Display Permission',
   authorizedUser: 'Authorized user',
-  problemClassification: 'Problem classification',
+  problemClassification: 'Problem Classification',
   market: 'Market',
   documentNumber: 'Document Number',
   documentTitle: 'Document Title',
@@ -1225,23 +1231,23 @@ module.exports = {
   dre: 'Dre',
   applicableInstructionsMarketList: 'Applicable instructions of market list',
   pleaseSelectTheDataCompared: 'Please select the data to be compared',
-  problemLabel: 'Problem label',
+  problemLabel: 'Topic Tag',
   personCharge: 'Person in charge',
-  addLabel: 'Add Label',
+  addLabel: 'Add Tag',
   editLabel: 'Edit Label',
-  applicableMarket: 'Applicable market',
+  applicableMarket: 'Applicable Market',
-  templateMaintenance: 'Template maintenance',
+  templateMaintenance: 'Template Maintenance',
   associatedWebsite: 'Associated website',
   dropDownOptions: 'Drop down options',
   dropDownOptionMaintenance: 'Drop down option maintenance',
-  displayInformation: 'Display information',
+  displayInformation: 'Display Information',
-  addComparison: 'Add comparison',
+  addComparison: 'Add Comparison',
   showOrNot: 'Show or not',
   comparisonMarket: 'Comparison Market',
   share: 'Share',
   simplifiedChinese:'Simplified Chinese',
   uploadOnly:'Upload only',
-  turnOnAutoMatch:'Turn on auto match',
+  turnOnAutoMatch:'Turn On Auto Match',
   Adjustareasofresponsibility:'Adjust areas of responsibility',
   regulatoryTechnicalAssessment:'Regulatory Technical Assessment',
   punctuationmark:'You can only enter English punctuation marks except the # sign and commas',
@@ -1267,8 +1273,8 @@ module.exports = {
   onlyTheDataWhoseStatusNotInitiatedAcceptedChanged:'Only the data whose list confirmation status is accepted and the task list status is not initiated or the task list status is accepted can be changed',
   thereTitleWhichCannotBeDeleted:'There are new contents under this title, which cannot be deleted',
   industryInformationDynamicTemplate:'Industry information dynamic template',
-  relatedFields:'Related fields',
+  relatedFields:'Relaevant Area',
-  relatedFieldsEn:'Related fields (English)',
+  relatedFieldsEn:'Relaevant Area (English)',
   source:'Source',
   sourceEn:'Source (English)',
   onlyone:'Only one merge delimiter can be entered',
@@ -1308,9 +1314,9 @@ module.exports = {
   inRecentYear2:'In recent 2 year',
   selectAll:'Select All',
   importLocalDisassemblyOrder:'Import local disassembly order',
-  notExport:'Not export',
+  notExport:'Not exported',
-  hasBeenExport:'Has been export',
+  hasBeenExport:'Exported',
-  firstLevelDirectory:'First level directory',
+  firstLevelDirectory:'Primary Directory',
   deselectAll:'Deselect All',
   classification:'Classification',
   consistentAssessment:'Consistent',
@@ -1319,6 +1325,6 @@ module.exports = {
   viewAll:'View All',
   endProcess:'End Process',
   thereForTheCurrentlySelectedData:'There is no standard breakdown for the currently selected data',
-  secondaryDirectory:'Secondary directory',
+  secondaryDirectory:'Secondary Directory',
   OnlyPersonsCanBeSelected:'The maximum upper limit is exceeded; Only 100 persons can be selected',
 }

jero-web/src/common/lang/zh-cn.js

@@ -195,8 +195,13 @@ module.exports = {
   OperationLog: '操作日志',
   SearchLog: '搜索日志',
   enterSearchKeyword: '请输入搜索关键词',
+  enterSearchContent:'请输入搜索内容',
+  enterStandard:'请输入编号',
+  enterTitle:'请输入标题',
   OperationType: '操作类型',
   selectOperationType: '请选择操作类型',
+  selectProblemClassification:'请选择问题分类',
+  selectMarket:'请选择市场',
   RequestMethod: '请求方法',
   RequestParameters: '请求参数',
   logManagementPage: '这是日志管理页面',
@@ -1173,6 +1178,7 @@ module.exports = {
   exportComparisonReport: '导出对比报告',
   comparisonDifferenceComment: '对比差异评论',
   fullTextComments: '全文评论',
+  pleaseEnterfullTextComments:'请输入全文评论',
   fileDeclaration: '文件说明',
   FileForDetails: '文件详情',
   Converting: '转换中',

jero-web/src/views/documentTools/documentComparison/components/comparisonResults.vue

@@ -60,7 +60,7 @@
                 <span style="cursor: pointer"
                       @click="fileClick(resultData.fileNameRight,resultData.fileIdRight)">{{resultData.fileNameRight}}</span>
               </div>
-              <div class="detail-content-header-content-rightOne">
+              <div class="detail-content-header-content-rightOne" :title="$t('comparisonDifferenceComment')">
                 {{$t('comparisonDifferenceComment')}}
               </div>
               <div class="detail-content-header-content-right" v-if="!isDisplay">
@@ -162,7 +162,7 @@
             <span>{{$t('fullTextComments')}}</span>
           </div>
           <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
+            <a-textarea :placeholder="$t('pleaseEnterfullTextComments')"
                         v-model.trim="formInlineText.comment"
                         :rows="4"/>
           </a-form-model-item>
@@ -494,6 +494,7 @@
       .operator-text-text {
         cursor: pointer;
         margin-right: 53px;
+        max-width: 138px;
         font-size: 14px;
         font-weight: 400;
         color: #040B29;

jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue

@@ -137,7 +137,7 @@
             <span>{{$t('fullTextComments')}}</span>
           </div>
           <a-form-model-item class="itemModel" style="width: calc(100% - 113px)" prop="comment">
-            <a-textarea :placeholder="$t('pleaseEnter')+$t('fullTextComments')"
+            <a-textarea :placeholder="$t('PleaseEnter')+' '+$t('fullTextComments')"
                         v-model.trim="formInlineText.comment"
                         :rows="4"/>
           </a-form-model-item>

jero-web/src/views/documentTools/documentComparison/index.vue

@@ -8,7 +8,7 @@
               <div class="title-text" :title="$t('standard')">
                 <span>{{$t('standard')}}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('standard')"
+              <a-input class="box-input" :placeholder="$t('enterStandard')"
                        v-model="queryParam.serialNumber"></a-input>
             </div>
           </a-col>
@@ -17,7 +17,7 @@
               <div class="title-text" :title="$t('title')">
                 <span>{{$t('title')}}</span>
               </div>
-              <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('title')"
+              <a-input class="box-input" :placeholder="$t('entertitle')"
                        v-model="queryParam.title"></a-input>
             </div>
           </a-col>
@@ -42,11 +42,11 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="initiatingProcessClick" class="operator-text">
+      <div @click="initiatingProcessClick" v-has="'documentComparison:Initiate'" class="operator-text">
         <a-icon type="apartment"/>
         {{$t('initiateComparison')}}
       </div>
-      <div @click="BatchDelete" class="operator-text">
+      <div @click="BatchDelete" v-has="'documentComparison:batchDelete'" class="operator-text">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -67,15 +67,15 @@
         <span slot="operation" slot-scope="text,record">
            <a class="text-operation" @click="comparisonResultsClick(record)">{{$t('comparisonResults')}}</a>
            <a class="text-operation"
-              v-if="record.createBy == userInfoQuery.username"
+              v-if="record.createBy == userInfoQuery.username || administrators"
               @click="subscribe(record)">
             {{!record.releaseState || record.releaseState == 'draft' ? $t('release') :$t('withdraw')}}
            </a>
           <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
              @click="edit(record)">{{$t('edit')}}</a>
           <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseState == 'draft'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseState == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
         <span slot="serialNumberRight" :title="text" slot-scope="text,record">
@@ -132,10 +132,11 @@
         pageNo: 1,
         queryParam: {},
         userInfoQuery: {},
+        administrators:false,
         selectedRowKeysRecord: [],
         columns: [
           {
-            title: this.$t('standard') + 1,
+            title: this.$t('standard') + ' 1',
             align: 'center',
             dataIndex: 'serialNumberLeft',
             width: 170,
@@ -143,7 +144,7 @@
             scopedSlots: { customRender: 'serialNumberLeft' }
           },
           {
-            title: this.$t('title') + 1,
+            title: this.$t('title') + ' 1',
             align: 'center',
             dataIndex: 'titleLeft',
             width: 170,
@@ -151,7 +152,7 @@
             scopedSlots: { customRender: 'serialNumberLeft' }
           },
           {
-            title: this.$t('TextStatus') + 1,
+            title: this.$t('TextStatus') + ' 1',
             align: 'center',
             width: 200,
             ellipsis: true,
@@ -166,7 +167,7 @@
           //   scopedSlots: { customRender: 'fileNameLeft' }
           // },
           {
-            title: this.$t('standard') + 2,
+            title: this.$t('standard') + ' 2',
             align: 'center',
             dataIndex: 'serialNumberRight',
             ellipsis: true,
@@ -174,7 +175,7 @@
             width: 170
           },
           {
-            title: this.$t('title') + 2,
+            title: this.$t('title') + ' 2',
             align: 'center',
             dataIndex: 'titleRight',
             scopedSlots: { customRender: 'serialNumberRight' },
@@ -182,7 +183,7 @@
             width: 170
           },
           {
-            title: this.$t('TextStatus') + 2,
+            title: this.$t('TextStatus') + ' 2',
             align: 'center',
             width: 200,
             ellipsis: true,
@@ -233,6 +234,14 @@
         this.queryParam = { ...this.queryParam }
       }
       this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
       this.getList()
     },
     methods: {

jero-web/src/views/documentTools/documentTranslation/index.vue

@@ -59,15 +59,15 @@
       </a-form>
     </div>
     <div class="table-operator">
-      <div @click="uploadClick" class="operator-text">
+      <div @click="uploadClick" v-has="'documentTranslation:upload'" class="operator-text">
         <a-icon type="cloud-upload"/>
         {{$t('upload1')}}
       </div>
-      <div @click="RetrieveFilesClick" class="operator-text">
+      <div @click="RetrieveFilesClick" v-has="'documentTranslation:retrieval'" class="operator-text">
         <a-icon type="database"/>
         {{$t('RetrieveFiles')}}
       </div>
-      <div @click="BatchDelete" class="operator-text">
+      <div @click="BatchDelete" v-has="'documentTranslation:batchDeletion'" class="operator-text">
         <a-icon type="delete"/>
         {{$t('BatchDelete')}}
       </div>
@@ -86,18 +86,22 @@
       >
         <!--         -->
         <span slot="operation" slot-scope="text,record">
-          <a class="text-operation" @click="viewClick(record)">{{$t('view')}}</a>
+          <a class="text-operation"
+             v-has="'documentTranslation:view'"
+             @click="viewClick(record)">{{$t('view')}}</a>
           <!--          <a class="text-operation" @click="checkClick(record)">{{$t('check')}}</a>-->
            <a class="text-operation"
-              v-if="record.createBy == userInfoQuery.username"
+              v-if="record.createBy == userInfoQuery.username || administrators"
               @click="subscribe(record)">
             {{!record.releaseCondition || record.releaseCondition == 'draft' ? $t('release') :$t('withdraw')}}
            </a>
           <a class="text-operation"
+             v-has="'documentTranslation:download'"
              v-if="record.translationResult == 'Translation done'"
              @click="downloadData(record)">{{$t('download')}}</a>
           <a class="text-operation"
-             v-if="record.createBy == userInfoQuery.username && record.releaseCondition == 'draft'"
+             v-has="'documentTranslation:delete'"
+             v-if="(record.createBy == userInfoQuery.username || administrators) && record.releaseCondition == 'draft'"
              @click="deleteData(record)">{{$t('delete')}}</a>
         </span>
         <span slot="standardTitle" slot-scope="text,record" :title="text">
@@ -158,6 +162,7 @@
         queryParam: {},
         userInfoQuery: {},
         selectedRowKeysRecord: [],
+        administrators:false,
         columns: [
           {
             title: this.$t('standard'),
@@ -233,6 +238,14 @@
       }
       this.getList()
       this.userInfoQuery = this.userInfo()
+      this.administrators = false
+      if (this.userInfo().userRoleList && this.userInfo().userRoleList.length > 0) {
+        this.userInfo().userRoleList.forEach(res => {
+          if (res.roleCode == 'admin') {
+            this.administrators = true
+          }
+        })
+      }
     },
     methods: {
       ...mapGetters(['userInfo']),

jero-web/src/views/documentTools/searchCenter/components/problemKnowledgeBase.vue

@@ -5,7 +5,7 @@
         <div class="text-left-wrap">
           <div class="text-left-select">
             <span class="text-sel" :title="$t('problemClassification')">{{$t('problemClassification')}}</span>
-            <a-select :placeholder="$t('PleaseSelect')+$t('problemClassification')"
+            <a-select :placeholder="$t('selectProblemClassification')"
                       class="text-select"
                       mode="multiple"
                       :getPopupContainer="triggerNode=> triggerNode.parentNode"
@@ -23,7 +23,7 @@
           <div class="text-left-select">
             <span class="text-sel" :title="$t('market')">{{$t('market')}}</span>
             <j-multi-select-tag class="text-select" v-model="queryParamOne.target_market"
-                                :placeholder="$t('PleaseSelect')+$t('market')"
+                                :placeholder="$t('selectMarket')"
                                 :type="'select'"
                                 :triggerChange="false" :dictCode="'region'"/>
           </div>

jero-web/src/views/documentTools/searchCenter/index.vue

@@ -26,7 +26,7 @@
               v-else-if="active === $t('whole') || active === $t('problemKnowledgeBase')
               || active === $t('monthlyReportRegulations')"
               class="inputSearch"
-              :placeholder="$t('pleaseEnter')+$t('searchContent')"
+              :placeholder="$t('enterSearchContent')"
             ></a-input>
             <a-button class="textSearch"
                       v-if="active === $t('DocumentLibrary')"

jero-web/src/views/externalReports/components/addModel.vue

@@ -18,7 +18,7 @@
                     <div class="title-text">
                       <span class="Required">*</span>
                       <span class="title-text-text"
-                            :title="$t('file')">{{$t('file')}}</span>
+                            :title="$t('fileName')">{{$t('fileName')}}</span>
                     </div>
                     <a-form-model-item class="itemModel" prop="fileKey">
                       <a-button type="primary" class="button-text"

jero-web/src/views/externalReports/index.vue

@@ -61,10 +61,10 @@
                   <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                       <div class="box-title-text">
-                        <div class="title-text" :title="$t('file')">
+                        <div class="title-text" :title="$t('fileName')">
-                          <span>{{ $t('file') }}</span>
+                          <span>{{ $t('fileName') }}</span>
                         </div>
-                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('file')"
+                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('fileName')"
                                  v-model="queryParams.fileName"></a-input>
                       </div>
                     </a-col>
@@ -359,7 +359,7 @@ export default {
       ],
       columns: [
         {
-          title: this.$t('file'),
+          title: this.$t('fileName'),
           align: 'center',
           dataIndex: 'fileName',
           scopedSlots: { customRender: 'fileName' },

jero-web/src/views/regulatoryEarlyWarning/index.vue

@@ -8,11 +8,14 @@
               :url="url"/>
     </div>
     <div class="table-operator">
-      <div @click="handleCompare" class="operator-text">
+      <div @click="handleCompare" v-has="'regulatoryEarlyWarning:push'"
+           class="operator-text">
         <a-icon type="rocket" :rotate="45"/>
         {{$t('Push')}}
       </div>
-      <div @click="handleExport" class="operator-text">
+      <div @click="handleExport"
+           v-has="'regulatoryEarlyWarning:export'"
+           class="operator-text">
         <a-icon type="export" :rotate="-90"/>
         {{$t('export')}}
       </div>