From 780a572e11edb67ed228a6e97392c8bbbf376c77 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 27 Jun 2022 15:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../virtualList/components/virtualListDetails.vue |  4 ++--
 .../projectManagement/ProjectDetails/index.vue    | 15 +++++++++++----
 .../components/listOfRegulations.vue              | 12 ++++++------
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index b0ddce21f..59c687e9b 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -84,7 +84,7 @@
               </a-row>
             </a-form>
           </div>
-          <div class="table-operator">
+          <div class="table-operator" style="margin-bottom: 16px">
             <!--            导入-->
             <!--            <div class="operator-text"-->
             <!--                 style="float: left;font-size: 16px;font-weight: 400;color: #040B29;">-->
@@ -143,7 +143,7 @@
               class="ant-table tableList"
               :loading="loading"
               :pagination="false"
-              :scroll="{x: '100%',y:'calc(100vh - 200px)'}"
+              :scroll="{x: '100%',y:'calc(100vh - 170px)'}"
               rowKey="id"
               :data-source="dataSource"
               :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index 3b845cad6..3cbb6655b 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -2,9 +2,10 @@
   <div class="doc-detail">
     <div class="Virtual-detail-header" style="position: fixed;top: 0">
       <div class="Virtual-detail-title">
-        <!--          <span style="line-height: 74px;display: inline-block;float: left">-->
-        <!--            <a-icon type="left-circle" theme="filled" style="margin-right: 6px;font-size: 30px;color: #21c9cc;"/>-->
-        <!--          </span>-->
+                  <span style="line-height: 74px;display: inline-block;float: left">
+                    <a-icon @click="backClick" type="left-circle" theme="filled"
+                            style="margin-right: 8px;font-size: 30px;color: #21c9cc;"/>
+                  </span>
         <span>
              {{this.title}}
         </span>
@@ -100,7 +101,7 @@
     },
     data() {
       return {
-        title: this.$t('projectDetails'),
+        title: '',
         isDisplayNum: '',
         textTitle: '',
         isTrue: true,
@@ -116,6 +117,7 @@
     },
     created() {
       document.title = this.$t('projectDetails') + '-' + this.$route.query.projectName
+      this.title = this.$route.query.projectName + '-' + this.$route.query.targetMarket_dictText
     },
     mounted() {
       this.getTaskId()
@@ -261,6 +263,11 @@
             text[i].classList.add('Virtual-detail-left-text-color')
           }
         }
+      },
+      backClick() {
+        this.$router.push({
+          path: '/projectLibrary'
+        })
       }
     }
   }
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index ff6a3e1ca..8b772aa67 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -1,8 +1,8 @@
 <template>
   <a-card :bordered="false">
-    <div class="header-text">
-      {{ $t('DocumentStandard') }}
-    </div>
+<!--    <div class="header-text">-->
+<!--      {{ $t('DocumentStandard') }}-->
+<!--    </div>-->
     <div class="table-page-search-wrapper">
       <a-form layout="inline" @keyup.enter.native="searchQuery">
         <a-row :gutter="24">
@@ -47,7 +47,7 @@
       </a-form>
     </div>
     <div class="table-operator" style="overflow:hidden;">
-      <div style="float: left;margin-bottom: 10px;margin-left: 20px" v-if="isDisplay">
+      <div style="float: left;margin-bottom: 0px;margin-left: 20px" v-if="isDisplay">
         <div class="operator-text" @click="initiateListConfirmationcClick('清单')">
           <a-icon type="solution"/>
           {{ $t('initiateListConfirmation') }}
@@ -124,7 +124,7 @@
           {{ $t('roleSwitching') }}
         </div>
       </div>
-      <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 19px">
+      <div v-if="!isDisplay" style="float: right;margin-top: 1px;margin-bottom: 0px">
         <div class="operator-text" @click="submitClick(0)" v-if="isRoleSwitching">
           <a-icon type="check-circle"/>
           {{ $t('submit') }}
@@ -151,7 +151,7 @@
         class="tableList"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 420px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 360px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"