From 03689dcaef95895782e5d060f35d82ca60e52fe8 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Tue, 9 Aug 2022 17:22:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=97=AE=E9=A2=98=E7=9F=A5?=
 =?UTF-8?q?=E8=AF=86=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/problemKnowledgeBaseList.vue            |  2 +-
 .../components/TermInformation.vue                     |  2 +-
 .../components/initiatingProcess.vue                   | 10 +++++-----
 .../businessSupport/technologyAssessment/index.vue     |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
index d7a0ab0e4..a50d4e6f7 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseList.vue
@@ -36,7 +36,7 @@
         </div>
       </div>
     </div>
-    <div v-if="conList.length > 0" style="margin-top: 58px;height: calc(100vh - 260px);overflow:auto;">
+    <div v-if="conList.length > 0" style="margin-top: 16px;height: calc(100vh - 260px);overflow:auto;">
       <li v-for="(item,index) in conList" :key="item.id">
         <div style="margin-bottom: 10px;position: relative">
           <!--          <a-checkbox :value="item.id" class="checkbox-left"></a-checkbox>-->
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
index 98f2bc425..9e8fec8bc 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/TermInformation.vue
@@ -104,7 +104,7 @@
           {
             title: this.$t('operation'),
             align: 'center',
-            width: 100,
+            width: 120,
             scopedSlots: { customRender: 'operation' }
           }
         ],
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
index 3fe7b62f4..8cdb5103a 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/components/initiatingProcess.vue
@@ -45,7 +45,7 @@
                 </div>
                 <div class="title-text-content"
                      :class="{'title-text-content-one':!isTrue}">
-                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber :''}}
+                  {{selectedRowKeysRecord[0] ? selectedRowKeysRecord[0].serialNumber+' - '+selectedRowKeysRecord[0].title:''}}
                 </div>
                 <div class="title-text-right" v-if="isTrue">
                   <span :title="$t('standardDecompositionDocument')" @click="standardDecompositionDocumentClick">
@@ -124,7 +124,7 @@
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
-<!--                  <span class="Required">*</span>-->
+                  <!--                  <span class="Required">*</span>-->
                   <span class="title-text-text" :title="$t('evaluationMethod')">{{$t('evaluationMethod')}}</span>
                 </div>
                 <a-form-model-item class="itemModel" prop="gatherResult">
@@ -240,20 +240,20 @@
               trigger: 'change'
             }
           ],
-          processBackground:[
+          processBackground: [
             {
               max: 300,
               message: this.$t('processBackground') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
           ],
-          remark:[
+          remark: [
             {
               max: 300,
               message: this.$t('remarks') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
               trigger: 'blur'
             }
-          ],
+          ]
         },
         searchParmes: {},
         selectedRowKeysRecord: [],
diff --git a/jero-web/src/views/businessSupport/technologyAssessment/index.vue b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
index 407c7e451..56d9722e5 100644
--- a/jero-web/src/views/businessSupport/technologyAssessment/index.vue
+++ b/jero-web/src/views/businessSupport/technologyAssessment/index.vue
@@ -86,7 +86,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
+        :scroll="{x: '100%',y:'calc(100vh)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"