From 31bcf72d31420b35652504ec44da218a6d7aa0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=BD=A6=E6=B3=BD?= <liuyanze@syxysoft.com>
Date: Fri, 2 Dec 2022 13:36:24 +0800
Subject: [PATCH] =?UTF-8?q?UI=E7=95=8C=E9=9D=A2=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             | 17 ++++++++------
 jero-web/src/common/lang/zh-cn.js             |  9 +++++---
 .../components/globalAdvancedQuery/index.vue  |  6 +++--
 .../src/components/tools/HeaderNotice.vue     |  2 ++
 jero-web/src/components/tools/UserMenu.vue    |  2 ++
 .../components/evaluationResultsList.vue      |  6 +++--
 .../components/problemKnowledgeBaseList.vue   |  4 ++--
 .../problemKnowledgeBaseListView.vue          |  2 +-
 .../components/modules/defaultTemplate.vue    |  8 +++----
 .../components/TermInformation.vue            | 12 +++++++++-
 .../components/initiatingProcess.vue          |  2 +-
 .../library/docDetail/index.vue               | 10 ++++++++-
 .../splitting/modules/SplitAddForm.vue        |  6 ++++-
 .../splitting/modules/SplitDetail.vue         |  4 ++--
 .../components/documentDataComparison.vue     |  6 ++---
 .../components/DocumentLibrary.vue            |  2 +-
 .../searchCenter/components/whole.vue         | 12 +++++++---
 .../components/engineeringConfirmation.vue    |  2 +-
 .../ParameterItemCollectionList.vue           | 22 ++++++++++++-------
 .../components/settingList.vue                | 14 ++++++------
 .../components/TaskPlanList.vue               |  4 ++--
 .../projectStatusBoard/index.vue              |  6 ++---
 .../components/batchProcessing.vue            |  2 +-
 23 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 2049d8217..b6507fcd6 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -99,6 +99,7 @@ module.exports = {
   RoleCode: 'Role Code',
   createTime: 'Creation Time',
   userName: 'User Name',
+  userManual:'User Manual',
   selectOneRule: 'Please select a role!',
   setAttribute: 'Please set the url.list2 attribute!',
   setDelAttribute: 'Please set the url.delete2 attribute!',
@@ -426,6 +427,7 @@ module.exports = {
   MessageType: 'Message Type',
   NotificationTime: 'Notification Time',
   MessageNotification: 'Message Notification',
+  MessageCenter:'Message Center',
   SeeMore: 'See More',
   OperationSuccessful: 'Operation Successful',
   Intheexport: 'In The Export...',
@@ -609,7 +611,7 @@ module.exports = {
   Deliverables: 'Deliverables',
   personLiable: 'Assignee',
   PrehomoConfirmation: 'Pre-Homo Confirmation',
-  verificationAndConformityconfirmation: 'Validation Compliance Check',
+  verificationAndConformityconfirmation: 'Validation Compliance Check ',
   StandardImplementationDate: 'New Type Execution Date',
   regulatoryEngineer: 'Regulation Engineer',
   certifiedEngineer: 'Homo Engineer',
@@ -720,11 +722,11 @@ module.exports = {
   time: 'Time',
   uploadMaximumATime: 'Upload a Maximum of 20 Images at a time',
 
-  confirmationOfRegulationsList: 'Regulation List Confirmation',
-  regulatoryTaskConfirmation: 'Regulation Task Confirmation',
-  certificationStart: 'Homo Completion',
-  preHomoCompletion: 'Pre-Homo Confirmation',
-  certificationEnd: 'Homo KO',
+  confirmationOfRegulationsList: 'Regulation List Confirmation ',
+  regulatoryTaskConfirmation: 'Regulation Task Confirmation ',
+  certificationStart: 'Homo Completion ',
+  preHomoCompletion: 'Pre-Homo Confirmation ',
+  certificationEnd: 'Homo KO ',
   directoryName: 'Catalogue Name',
   batch: 'Batch',
   uploadTime: 'Upload Time',
@@ -880,7 +882,7 @@ module.exports = {
   number: 'No.',
   Deadline: 'Deadline',
   toBeConfirmed: 'To Confirm',
-  designComplianceReview: 'Design Compliance Confirmation',
+  designComplianceReview: 'Design Compliance Confirmation ',
   preHomeConfirmation: 'Pre-Homo Confirmation',
   verificationComplianceReview: 'Validation Compliance Confirmation',
   Deployment: 'Deploy',
@@ -1170,6 +1172,7 @@ module.exports = {
   RemarkInfo: 'Remarks Info',
   initiateDocumentComparison: 'Initiate Document Comparison',
   comparativeComments: 'Comparative Comments',
+  Comparisonofarticles:'Comparison Of Articles',
   viewTheComparisonResults: 'View Results',
   addFullTextComment: 'Full Text Comment',
   turnOffAutomaticMatching: 'Turn Off Auto Match',
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index af3986456..d835378b0 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -101,6 +101,7 @@ module.exports = {
   RoleCode: '角色编码',
   createTime: '创建时间',
   userName: '用户名称',
+  userManual:'用户手册',
   selectOneRule: '请选择一个角色！',
   setAttribute: '请设置url.list2属性!',
   setDelAttribute: '请设置url.delete2 属性!',
@@ -431,6 +432,7 @@ module.exports = {
   MessageType: '消息类型',
   NotificationTime: '通知时间',
   MessageNotification: '消息通知',
+  MessageCenter:'消息中心',
   SeeMore: '查看更多',
   OperationSuccessful: '操作成功',
   Intheexport: '导出中...',
@@ -1001,9 +1003,9 @@ module.exports = {
   taskConfirmationResponsiblePerson: '责任人任务确认',
   or: '或',
   warningTime: '预警时间',
-  RegulationMonthlyManagement: '法规月报管理',
-  RegulationMonthlyFill: '法规月报填写',
-  RegulationMonthlyName: '法规月报名称',
+  RegulationMonthlyManagement: '月报管理',
+  RegulationMonthlyFill: '月报填写',
+  RegulationMonthlyName: '月报名称',
   monthlyLanguage: '月报语种',
   releaseStatus: '发布状态',
   uploadedBy: '上传人',
@@ -1175,6 +1177,7 @@ module.exports = {
   RemarkInfo: '备注信息',
   initiateDocumentComparison: '发起文档对比',
   comparativeComments: '对比评论',
+  Comparisonofarticles:'条款对比评论',
   viewTheComparisonResults: '查看对比结果',
   addFullTextComment: '添加全文评论',
   turnOffAutomaticMatching: '关闭自动匹配',
diff --git a/jero-web/src/components/globalAdvancedQuery/index.vue b/jero-web/src/components/globalAdvancedQuery/index.vue
index 3bce861ad..ed1fba712 100644
--- a/jero-web/src/components/globalAdvancedQuery/index.vue
+++ b/jero-web/src/components/globalAdvancedQuery/index.vue
@@ -12,7 +12,8 @@
         </template>
         <a-button-group>
           <a-button type="primary" @click="handleOpen" style="margin-right: 8px;height: 38px">
-            <a-icon type="appstore" theme="twoTone" spin/>
+<!--            <a-icon type="appstore" theme="twoTone" spin/>-->
+            <a-icon type="filter" theme="filled"/>
             <span>{{$t('advancedQuery')}}</span>
           </a-button>
           <a-button style="margin-right: 8px;height: 38px" v-if="izMobile" type="primary" icon="delete" @click="handleReset"/>
@@ -21,7 +22,7 @@
       <a-button v-else style="margin-right: 8px;height: 38px" type="primary" icon="filter" @click="handleOpen">{{$t('advancedQuery')}}</a-button>
     </slot>
   <j-modal
-    :title="$t('advancedQuery')+$t('constructor')"
+    :title="$t('advancedQuery')"
     :width="1000"
     :maskClosable="false"
     :visible="visible"
@@ -687,6 +688,7 @@
         height: 80px;
         line-height: 80px;
         margin-bottom: 0;
+        margin-top: 10px;
       }
 
       /deep/ img {
diff --git a/jero-web/src/components/tools/HeaderNotice.vue b/jero-web/src/components/tools/HeaderNotice.vue
index 52298ebb1..835c6d99a 100644
--- a/jero-web/src/components/tools/HeaderNotice.vue
+++ b/jero-web/src/components/tools/HeaderNotice.vue
@@ -31,9 +31,11 @@
       </a-spin>
     </template>
     <span @click="fetchNotice" class="header-notice">
+      <a-tooltip placement="bottomRight" :title="$t('MessageCenter')">
       <a-badge :count="msgTotal">
         <a-icon style="font-size: 16px; padding: 4px" type="bell"/>
       </a-badge>
+      </a-tooltip>
     </span>
     <dynamic-notice ref="showDynamNotice" :path="openPath" :formData="formData"/>
   </a-popover>
diff --git a/jero-web/src/components/tools/UserMenu.vue b/jero-web/src/components/tools/UserMenu.vue
index 65ed8a73a..63059fb63 100644
--- a/jero-web/src/components/tools/UserMenu.vue
+++ b/jero-web/src/components/tools/UserMenu.vue
@@ -33,7 +33,9 @@
     <!--    </span>-->
     <div class="action" @click="Jumpflybook">
       <span  class="header-notice">
+         <a-tooltip placement="bottomRight" :title="$t('userManual')">
           <a-icon style="font-size: 16px; padding: 4px; color: #000000A6" type="question-circle"/>
+           </a-tooltip>
       </span>
     </div>
     <header-notice class="action"/>
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 85e38ad5a..095f0e8c0 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -57,12 +57,14 @@
             <span class="text">{{$t('filingExternalOpinions')}}:</span>
             <div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
                  v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
-              <a-icon type="cloud-upload"/>
+              <a-button type="primary"style="margin-right: 8px;height: 32px">
               {{$t('clickUpload')}}
+              </a-button>
             </div>
             <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
-              <a-icon type="eye"/>
+              <a-button type="primary"style="margin-right: 8px;height: 32px">
               {{$t('viewFile')}}
+              </a-button>
             </div>
           </div>
         </div>
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index 9c4249f90..1c1d57c65 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -111,7 +111,7 @@
             <div class="content-box-button-right">
               <div class="content-box-button-text" @click="forwardClick(item)">
                 <a-icon type="logout"/>
-                {{$t('forward')}}
+                {{$t('share')}}
               </div>
               <div class="content-box-button-text">
                 <a-icon type="eye"/>
@@ -174,7 +174,7 @@
     <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
     <classificationMaintenanceModel @classificationMaintenanceModelForm="classificationMaintenanceModelForm"
                                     ref="classificationMaintenanceModelRef"/>
-    <SelectedBy ref="SelectedByRef" :title="$t('forward')" @SelectedByForm="SelectedByForm"></SelectedBy>
+    <SelectedBy ref="SelectedByRef" :title="$t('share')" @SelectedByForm="SelectedByForm"></SelectedBy>
   </div>
 </template>
 
diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
index 4fd6b4a18..8db575b4d 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseListView.vue
@@ -55,7 +55,7 @@
         <div class="content-box-button-right">
           <div class="content-box-button-text" @click="forwardClick(queryForm)">
             <a-icon type="logout"/>
-            {{$t('forward')}}
+            {{$t('share')}}
           </div>
           <div class="content-box-button-text">
             <a-icon type="eye"/>
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
index e9fb33a95..3baa708c8 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/modules/defaultTemplate.vue
@@ -48,7 +48,7 @@
             <span class="title-text-text"
                   :title="$t('technicalField')">{{$t('technicalField')}}</span>
           </div>
-          <a-form-model-item class="itemModel" prop="technologyTerritory">
+          <a-form-model-item class="itemModel" prop="technologyTerritory" style="height: 40px">
             <a-tree-select
               tree-node-filter-prop="title"
               v-model="formInline.technologyTerritory"
@@ -101,7 +101,7 @@
                 <span class="title-text-text"
                       :title="$t('scopeOfApplication')">{{$t('scopeOfApplication')}}</span>
           </div>
-          <a-form-model-item class="itemModel-multi itemModel-multi-one">
+          <a-form-model-item class="itemModel-multi itemModel-multi-one" style="border: none">
             <j-multi-select-tag class="box-input" v-model="formInline.applyScope"
                                 :placeholder="$t('PleaseSelect')+$t('scopeOfApplication')"
                                 :type="'checkbox'"
@@ -118,7 +118,7 @@
               <span class="title-text-text"
                     :title="$t('status')">{{$t('status')}}</span>
           </div>
-          <a-form-model-item class="itemModel-multi itemModel-multi-one">
+          <a-form-model-item class="itemModel-multi itemModel-multi-one" style="border: none">
             <j-dict-select-tag class="box-input" v-model="formInline.state"
                                 :disabled="disabled"
                                 :placeholder="$t('PleaseSelect')+$t('status')"
@@ -135,7 +135,7 @@
               <span class="title-text-text"
                     :title="$t('usage')">{{$t('usage')}}</span>
           </div>
-          <a-form-model-item class="itemModel-multi itemModel-multi-one">
+          <a-form-model-item class="itemModel-multi itemModel-multi-one" style="border: none">
             <j-dict-select-tag class="box-input" v-model="formInline.useMethod"
                                 :placeholder="$t('PleaseSelect')+$t('usage')"
                                 :type="'radio'"
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 36d49be72..ba8af1d8a 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -92,7 +92,7 @@
       :pagination="false"
       :loading="loading">
       <div slot="clauseContent" slot-scope="text,result">
-        <a-tooltip placement="topLeft">
+        <a-tooltip overlayClassName="tooltipColor" placement="topLeft" overlayStyle>
           <template slot="title">
             <span v-html="text"></span>
           </template>
@@ -322,6 +322,16 @@
   }
 </script>
 
+<style>
+  .tooltipColor .ant-tooltip-inner {
+    color: #333;
+    background-color: #fff !important;
+    }
+  .tooltipColor .ant-tooltip-arrow::before {
+    background-color: #fff !important;
+  }
+</style>
+
 <style scoped>
   .box-input {
     display: inline-block;
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index e355e226c..bf9609511 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -112,7 +112,7 @@
               <div class="box-title-text">
                 <div class="title-text">
                   <span class="title-text-text"
-                        :title="$t('uploadRelevantMaterials')">{{$t('uploadRelevantMaterials')}}</span>
+                        :title="$t('RelevantMaterials')">{{$t('RelevantMaterials')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="accessory_id">
                   <a-button type="primary" class="button-text"
diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue
index bfd52bea2..1cf22bedc 100644
--- a/jero-web/src/views/documentManage/library/docDetail/index.vue
+++ b/jero-web/src/views/documentManage/library/docDetail/index.vue
@@ -184,7 +184,7 @@
         :loading="loading"
       >
        <span slot="content" slot-scope="text,record">
-          <a-tooltip placement="topLeft">
+          <a-tooltip placement="topLeft" overlayClassName="tooltipColor">
         <template slot="title">
           <span v-html="text"></span>
         </template>
@@ -575,6 +575,14 @@
   .uploadFile .ant-upload {
     display: none !important;
   }
+
+  .tooltipColor .ant-tooltip-inner {
+    color: #333;
+    background-color: #fff !important;
+  }
+  .tooltipColor .ant-tooltip-arrow::before {
+    background-color: #fff;
+  }
 </style>
 <style lang="less" scoped>
   @import '~@assets/less/common.less';
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
index c51d31859..0acc148b5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitAddForm.vue
@@ -1280,8 +1280,12 @@
         justify-content: space-around;
 
         .title-flex {
+          width: 75px;
+          height: 35px;
+          text-align: center;
+          border-radius: 5px;
           border: 1px solid #d9d9d9;
-          padding: 10px 40px;
+          padding: 7px;
           cursor: pointer;
         }
 
diff --git a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
index 0ba7dd070..c8fe72fa5 100644
--- a/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
+++ b/jero-web/src/views/documentManage/splitting/modules/SplitDetail.vue
@@ -1193,7 +1193,7 @@ export default {
 
     .split-detail-left {
       /*height: 100%;*/
-      width: 300px;
+      width: 230px;
       float: left;
       padding-right: 20px;
       /*border-right: 1px solid #E6E7EC;*/
@@ -1222,7 +1222,7 @@ export default {
 
     .split-detail-right {
       padding-left: 20px;
-      width: calc(100% - 300px);
+      width: calc(100% - 230px);
       float: right;
       border-left: 1px solid #E6E7EC;
       /*flex: 1;*/
diff --git a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
index 309f061db..f0c09272b 100644
--- a/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
+++ b/jero-web/src/views/documentTools/documentComparison/components/documentDataComparison.vue
@@ -95,11 +95,11 @@
                           class="formAdd" :rules="rules"
                           ref="ruleForm">
               <div class="box-title-text-Remarks">
-                <div class="title-text-Remarks" :title="$t('comparativeComments')">
-                  <span>{{$t('comparativeComments')}}</span>
+                <div class="title-text-Remarks" :title="$t('Comparisonofarticles')" style="width: 84px">
+                  <span>{{$t('Comparisonofarticles')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="comment">
-                  <a-textarea :placeholder="$t('pleaseEnter')+$t('comparativeComments')"
+                  <a-textarea :placeholder="$t('pleaseEnter')+$t('Comparisonofarticles')"
                               v-model="formInline.comment"
                               :rows="3"/>
                 </a-form-model-item>
diff --git a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
index 586d54b97..9f2c56347 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue
@@ -116,7 +116,7 @@
             </span>
             <span slot="file_name" slot-scope="text,record">
               <a style="color:#21c9cc" @click="fileNameClick(record)">
-                  {{record.file_name && record.file_name.length > 0 ? $t('viewFile') : '--'}}
+                  {{record.file_name && record.file_name.length > 0 ? $t('view') : '--'}}
               </a>
             </span>
             <!-- 字符串超长截取省略号显示-->
diff --git a/jero-web/src/views/documentTools/searchCenter/components/whole.vue b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
index 0b2597018..b896339b6 100644
--- a/jero-web/src/views/documentTools/searchCenter/components/whole.vue
+++ b/jero-web/src/views/documentTools/searchCenter/components/whole.vue
@@ -16,18 +16,24 @@
                   <span v-html="item.module_type"></span>
                 </template>
                 <span class="text-header-text" style="cursor: pointer" v-html="item.module_type"></span>
-                <template slot="title">
+              </a-tooltip>
+              <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
+              <template slot="title">
                   <span v-html="item.serial_number"></span>
                 </template>
                 <span style="cursor: pointer"
                       class="text-header-text"
                       v-if="item.serial_number && item.module_type_flag == 'WDK'"
                       v-html="item.serial_number"></span>
-                <template slot="title">
+              </a-tooltip>
+              <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
+              <template slot="title">
                   <span v-html="item.title"></span>
                 </template>
                 <span class="text-header-text" v-if="item.title" style="cursor: pointer" v-html="item.title"></span>
-                <template slot="title">
+              </a-tooltip>
+              <a-tooltip placement="topLeft" overlayClassName="tooltip-index" :mouseEnterDelay="0.5">
+              <template slot="title">
                   <span v-html="item.file_name"></span>
                 </template>
                 <span class="text-header-text" v-if="item.file_name && item.module_type_flag == 'WDK'" style="cursor: pointer"
diff --git a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
index 34ffd4e5d..d4f14b411 100644
--- a/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
+++ b/jero-web/src/views/processCenter/components/engineeringConfirmation.vue
@@ -910,7 +910,7 @@
 
   .button-text {
     height: 38px;
-    width: calc(100% - 100px);
+    width: 100%;
     line-height: 38px;
     background: #fff;
     border: 1px #00B3BE solid;
diff --git a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
index d63c0d71b..96c142804 100644
--- a/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
+++ b/jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
@@ -394,7 +394,7 @@
             </div>
           </div>
           <!--          认证工程师-提示-->
-          <div style='font-size: 16px;color: red;text-align: center' v-if='NoEngineer === 1'>
+          <div style='font-size: 18px;text-align: center' v-if='NoEngineer === 1'>
             {{ currentPersonRole =='homo'? $t('certifiedEngineer'): (currentPersonRole =='sdt'?
             $t('engineeringInterfacePerson'): $t('completedBy')) }}{{$t('Datastatusis')}}
             <!--            下发收集时-->
@@ -418,23 +418,29 @@
               '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
             </span>
             <!--            退回-->
-            <span v-else-if='jurisdiction === "homoTH"' class="text-wraning">
+            <span v-else-if='jurisdiction === "homoTH"' class="text-wraning" style='color: red'>
               {{$t('Submitted')}}
             </span>
             <span v-else-if='jurisdiction === "sdtTH"' class="text-wraning">
-              '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
+              <p style='display: inline; color: red'>'{{$t('handledInterface')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('Filledreturn')}}'</p>
             </span>
             <span v-else-if='jurisdiction === "dreTH"' class="text-wraning">
-              '{{$t('completed')}}'{{$t('or')}}'{{$t('ReturnedEngineer')}}'
+              <p style='display: inline; color: red'>'{{$t('completed')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('ReturnedEngineer')}}'</p>
             </span>
             <!--            强制撤回-->
-            <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning">
-              '{{$t('handledInterface')}}'{{$t('or')}}'{{$t('Filledreturn')}}'
+            <span v-else-if='jurisdiction === "homoQZTH"' class="text-wraning" >
+              <p style='display: inline; color: red'>'{{$t('handledInterface')}}'</p>
+              {{$t('or')}}
+              <p style='display: inline; color: red'>'{{$t('Filledreturn')}}'</p>
             </span>
-            <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning">
+            <span v-else-if='jurisdiction === "sdtQZTH"' class="text-wraning" style='color: red'>
               {{$t('completed')}}
             </span>
-            <span v-else-if='jurisdiction === "dreQZTH"' class="text-wraning">
+            <span v-else-if='jurisdiction === "dreQZTH"' class="text-wraning" style='color: red'>
               {{$t('Submitted')}}
             </span>
             {{$t('timeoperation')}}
diff --git a/jero-web/src/views/projectManagement/components/settingList.vue b/jero-web/src/views/projectManagement/components/settingList.vue
index a16be93a9..27189de6d 100644
--- a/jero-web/src/views/projectManagement/components/settingList.vue
+++ b/jero-web/src/views/projectManagement/components/settingList.vue
@@ -19,7 +19,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="listConfirmation">
               <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('confirmationOfRegulationsList')"
+                             :placeholder="$t('PleaseSelect')+$t('confirmationOfRegulationsList')+$t('time')"
                              @change="dateChange({db_field_name:'listConfirmation'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -38,7 +38,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="legalTaskConfirmation">
               <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('regulatoryTaskConfirmation')"
+                             :placeholder="$t('PleaseSelect')+$t('regulatoryTaskConfirmation')+$t('time')"
                              @change="dateChange({db_field_name:'legalTaskConfirmation'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -57,7 +57,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="designDeadline">
               <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('confirmationOfDesignConformity')"
+                             :placeholder="$t('PleaseSelect')+$t('confirmationOfDesignConformity')+$t('time')"
                              @change="dateChange({db_field_name:'designDeadline'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -76,7 +76,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="prehomoDeadline">
               <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('preHomoCompletion')"
+                             :placeholder="$t('PleaseSelect')+$t('preHomoCompletion')+$t('time')"
                              @change="dateChange({db_field_name:'prehomoDeadline'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -96,7 +96,7 @@
             <a-form-model-item class="itemModel" prop="attestationStartTime">
               <a-date-picker class="box-input"
                              :disabledDate='this.disabledRegistrationStartDate'
-                             :placeholder="$t('PleaseSelect')+$t('certificationStart')"
+                             :placeholder="$t('PleaseSelect')+$t('certificationStart')+$t('time')"
                              @change="dateChange({db_field_name:'attestationStartTime'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -116,7 +116,7 @@
             <a-form-model-item class="itemModel" prop="attestationEndTime">
               <a-date-picker class="box-input"
                              :disabledDate='this.disabledRegistrationEndDate'
-                             :placeholder="$t('PleaseSelect')+$t('certificationEnd')"
+                             :placeholder="$t('PleaseSelect')+$t('certificationEnd')+$t('time')"
                              @change="dateChange({db_field_name:'attestationEndTime'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -135,7 +135,7 @@
             </div>
             <a-form-model-item class="itemModel" prop="verifyDeadline">
               <a-date-picker class="box-input"
-                             :placeholder="$t('PleaseSelect')+$t('verificationAndConformityconfirmation')"
+                             :placeholder="$t('PleaseSelect')+$t('verificationAndConformityconfirmation')+$t('time')"
                              @change="dateChange({db_field_name:'verifyDeadline'})"
                              format="YYYY-MM-DD"
                              :getCalendarContainer="(trigger) => trigger.parentNode"
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
index ea6f263f7..10820b718 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/components/TaskPlanList.vue
@@ -20,9 +20,9 @@
              @panelChange="panelChange"
              @change="hodeChange"
            >
-             <div slot="renderExtraFooter" style="width: 100%;display: block">
+             <div slot="renderExtraFooter" style="margin-left:230px;width: 100%;display: block">
                <div style="text-align: right;width: 100%">
-                   <a @click="okChange">{{$t('determine')}}</a>
+                   <a-button  type="primary" @click="okChange">{{$t('determine')}}</a-button>
                </div>
              </div>
            </a-range-picker>
diff --git a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
index 0492867a4..625856bdd 100644
--- a/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
+++ b/jero-web/src/views/projectManagement/projectStatusBoard/index.vue
@@ -46,9 +46,9 @@
              @panelChange="panelChange"
              @change="hodeChange"
            >
-             <div slot="renderExtraFooter" style="width: 100%;display: block">
-               <div style="text-align: right;width: 100%">
-                   <a @click="okChange">{{$t('determine')}}</a>
+             <div slot="renderExtraFooter" style="margin-left:230px;width: 100%;display: block">
+               <div style="text-align: right;width: 100%;">
+                   <a-button type="primary" @click="okChange">{{$t('determine')}}</a-button>
                </div>
              </div>
            </a-range-picker>
diff --git a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
index ec5e2708f..3e2904c65 100644
--- a/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
+++ b/jero-web/src/views/toDoCenter/taskConfirmation/components/batchProcessing.vue
@@ -25,7 +25,7 @@
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text"></span>
+                <span class="title-text-text" :title="$t('feedbackResults')">{{$t('feedbackResults')}}</span>
               </div>
               <a-form-model-item class="itemModel" prop="flag">
                 <a-radio-group style="margin-top: 2px" @change="flagChange" class="box-input" v-model="formInline.flag">