From 87ab49edd13a1cbb9e22bc6e2f36595ce4cf9f97 Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Tue, 27 Sep 2022 15:17:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluationResultsClause.vue    | 31 +++++--
 .../components/evaluationResultsWhole.vue     | 86 +++++++++++++++----
 2 files changed, 96 insertions(+), 21 deletions(-)

diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
index ad32144fd..900365c82 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsClause.vue
@@ -8,15 +8,21 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
+        <div class="doc-detail-right">
+          <div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
+            <a-icon type="profile" />
+            {{$t('initiateSupplementaryProcess')}}
+          </div>
+        </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content">
           <div class="content-box">
-            <div class="header-text">
-              <a-button class="box-button-top" type="primary" @click="CurrentStandard">
-                {{$t('initiateSupplementaryProcess')}}
-              </a-button>
-            </div>
+<!--            <div class="header-text">-->
+<!--              <a-button class="box-button-top" type="primary" @click="CurrentStandard">-->
+<!--                {{$t('initiateSupplementaryProcess')}}-->
+<!--              </a-button>-->
+<!--            </div>-->
             <div class="processBackground-text">
               <span style="font-size: 16px;font-weight: 400;color: #000F16;"> {{$t('processBackground')}}:</span>
               {{$route.query.processBackground}}
@@ -327,7 +333,7 @@
         }
 
         .doc-detail-right {
-          width: 800px;
+          /*width: 800px;*/
           line-height: 68px;
           display: flex;
 
@@ -353,6 +359,7 @@
       .processBackground-text {
         font-size: 16px;
         color: #000F16;
+        margin-top: 16px;
       }
     }
   }
@@ -432,6 +439,18 @@
   ::v-deep .ant-table-body {
     background: transparent !important;
   }
+  .operator-text-text {
+    cursor: pointer;
+    margin-right: 23px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-align: right;
+  }
 </style>
 <style>
   .box-clause .ant-card-body {
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
index 9596e0d7d..3756367b3 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/evaluationResultsWhole.vue
@@ -8,15 +8,21 @@
           <!--          </span>-->
           {{$route.query.serialNumber +' '+$t('regulatoryTechnicalEvaluationResults')}}
         </div>
+        <div class="doc-detail-right">
+          <div @click="CurrentStandard" class="operator-text-text" :title="$t('initiateSupplementaryProcess')">
+            <a-icon type="profile"/>
+            {{$t('initiateSupplementaryProcess')}}
+          </div>
+        </div>
       </div>
       <div style="padding-top: 68px;background: #fff">
         <div class="detail-content">
           <div class="content-box">
-            <div class="header-text">
-              <a-button class="box-button-top" type="primary" @click="CurrentStandard">
-                {{$t('initiateSupplementaryProcess')}}
-              </a-button>
-            </div>
+            <!--            <div class="header-text">-->
+            <!--              <a-button class="box-button-top" type="primary" @click="CurrentStandard">-->
+            <!--                {{$t('initiateSupplementaryProcess')}}-->
+            <!--              </a-button>-->
+            <!--            </div>-->
             <div class="processBackground-text">
               <span style="font-size: 16px;font-weight: 400;color: #000F16;"> {{$t('processBackground')}}:</span>
               {{$route.query.processBackground}}
@@ -24,18 +30,24 @@
             <!--            <div class="header-text">-->
             <!--              {{$t('engineerFeedbackResults')}}-->
             <!--            </div>-->
-            <a-card :bordered="false" class="box-clause" style="margin-top: 20px" v-for="(item,index) in dataSource">
-              <div class="table-operator" v-if="item.id">
-                <div class="operator-text" style="float: left;font-size: 16px">
+            <a-card :bordered="false" class="box-clause" style="margin-top: 20px"
+                    v-for="(item,index) in dataSource">
+              <div class="table-operator-admin">
+                <div class="operator-text" v-if="item.id" :class="{'operator-text-feed':index == 0 ? true:false}"
+                     style="font-size: 16px">
                   {{$t('engineer')+item.createBy+$t('feedbackResults')}}
                 </div>
-                <div @click="fileExportClick" v-if="index == 0" class="operator-text">
+                <div class="text-results" v-if="item.id">
+                  {{$t('complianceResults')}}：{{item.complianceResultName}}
+                </div>
+              </div>
+              <div class="table-operator-admin-right">
+                <div @click="fileExportClick" v-if="index == 0" class="operator-text-index">
                   <a-icon type="export" :rotate="-90"/>
                   {{$t('fileExport')}}
                 </div>
-              </div>
-              <div>
                 <a-table
+                  style="margin-left: 18px"
                   ref="table"
                   size="middle"
                   :loading="loading"
@@ -52,9 +64,6 @@
                      </span>
                 </a-table>
               </div>
-              <div class="text-results">
-                {{$t('complianceResults')}}：{{item.complianceResultName}}
-              </div>
             </a-card>
           </div>
         </div>
@@ -91,6 +100,7 @@
             title: this.$t('relevantSections'),
             dataIndex: 'relatedSection',
             align: 'center',
+            width: 160,
             ellipsis: true
           },
           {
@@ -103,6 +113,7 @@
             title: this.$t('enclosure'),
             dataIndex: 'accessoryFile',
             align: 'center',
+            width: 160,
             ellipsis: true,
             scopedSlots: { customRender: 'accessoryFile' }
           }
@@ -197,7 +208,7 @@
         }
 
         .doc-detail-right {
-          width: 800px;
+          /*width: 800px;*/
           line-height: 68px;
           display: flex;
 
@@ -223,6 +234,7 @@
       .processBackground-text {
         font-size: 16px;
         color: #000F16;
+        margin-top: 16px;
       }
     }
   }
@@ -284,6 +296,50 @@
   .text-results {
     font-size: 14px;
     margin-top: 10px;
+    display: inline-block;
+  }
+
+  .operator-text-text {
+    cursor: pointer;
+    margin-right: 23px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-align: right;
+  }
+
+  .table-operator-admin {
+    width: 240px;
+    float: left;
+    padding: 0.1px;
+  }
+
+  .table-operator-admin-right {
+    float: left;
+    width: calc(100% - 240px);
+    text-align: right;
+    border-left: 1px solid #e8e8e8;
+  }
+
+  .operator-text-index {
+    cursor: pointer;
+    margin-right: 13px;
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    overflow: hidden;
+    text-align: right;
+  }
+
+  .operator-text-feed {
+    margin-top: 27px;
   }
 </style>
 <style>