From 7e63cb8a4a424e6117f628093c9c403f837bafcf Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Fri, 4 Nov 2022 17:17:56 +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

---
 .../problemKnowledgeBaseRelease.vue           | 19 ++++++++++++++++---
 .../dashboard/components/documentDynamics.vue |  2 +-
 .../components/monthlyReportRegulations.vue   |  2 +-
 .../src/views/dashboard/components/myList.vue |  2 +-
 .../src/views/dashboard/components/myNews.vue |  2 +-
 .../components/ProjectDetails.vue             |  2 +-
 6 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
index edf3c31da..b65366ba9 100644
--- a/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
+++ b/jero-web/src/views/businessSupport/problemKnowledgeBase/components/problemKnowledgeBaseRelease.vue
@@ -65,12 +65,15 @@
                   <div class="text-content">
                     {{item.contentOne}}
                   </div>
-                  <div class="text-text-right-text-Two">
+                  <div class="text-text-right-text-The">
                     {{item.showPermissions_dicText}}
                   </div>
-                  <div class="text-text-right-text-One">
+                  <div class="text-text-right-text-Two">
                     {{item.releaseStatus == 'Draft'?$t('draft'):$t('HaveReleased')}}
                   </div>
+                  <div class="text-text-right-text-One">
+                    {{item.createBy}}
+                  </div>
                   <div class="text-text-right-text">
                     <a style="margin-right: 10px" @click="edit(item)"
                        v-if="userInfoQuery.username == item.createBy || administrators">{{$t('edit')}}</a>
@@ -325,7 +328,7 @@
 
   .text-text-right {
     padding: 19px 19px;
-    width: calc(100% - 420px);
+    width: calc(100% - 540px);
     box-sizing: border-box;
     /*margin-left: 38px;*/
   }
@@ -340,6 +343,16 @@
     transform: translate-Y(-50%);
   }
 
+  .text-text-right-text-The {
+    width: 120px;
+    height: 100%;
+    text-align: center;
+    position: absolute;
+    right: 420px;
+    top: 50%;
+    transform: translate-Y(-50%);
+  }
+
   .text-text-right-text-One {
     width: 120px;
     height: 100%;
diff --git a/jero-web/src/views/dashboard/components/documentDynamics.vue b/jero-web/src/views/dashboard/components/documentDynamics.vue
index c55e2b116..85a3d9073 100644
--- a/jero-web/src/views/dashboard/components/documentDynamics.vue
+++ b/jero-web/src/views/dashboard/components/documentDynamics.vue
@@ -21,7 +21,7 @@
     <div v-else style="height: 200px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
index 7955c1749..a6caefcff 100644
--- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
@@ -17,7 +17,7 @@
     <div v-else style="height: 300px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/dashboard/components/myList.vue b/jero-web/src/views/dashboard/components/myList.vue
index b3e9180d5..6e92d7091 100644
--- a/jero-web/src/views/dashboard/components/myList.vue
+++ b/jero-web/src/views/dashboard/components/myList.vue
@@ -30,7 +30,7 @@
     <div v-else style="height: 300px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/dashboard/components/myNews.vue b/jero-web/src/views/dashboard/components/myNews.vue
index 3d693062a..fe22a2d10 100644
--- a/jero-web/src/views/dashboard/components/myNews.vue
+++ b/jero-web/src/views/dashboard/components/myNews.vue
@@ -26,7 +26,7 @@
     <div v-else style="height: 300px;position: relative">
       <JNoData/>
     </div>
-    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
+    <JLoading style="z-index: 999" :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
diff --git a/jero-web/src/views/projectManagement/components/ProjectDetails.vue b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
index f4e32f59c..1a5bf7a42 100644
--- a/jero-web/src/views/projectManagement/components/ProjectDetails.vue
+++ b/jero-web/src/views/projectManagement/components/ProjectDetails.vue
@@ -308,7 +308,7 @@
 
     .text-field-content {
       width: 100%;
-      margin-bottom: 8px;
+      margin-bottom: 34px;
 
       .text-field-left {
         width: 124px;