From b9b725dd6c2bfc7f3a02264ccd7fd7062e3f3443 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Fri, 21 Oct 2022 19:36:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E9=97=AE=E7=AD=94=E6=8E=92?=
 =?UTF-8?q?=E8=A1=8C=E6=A6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ellipsis.scss     |  6 +++++-
 src/views/portal/article/Detail.vue | 10 +++++-----
 src/views/portal/article/Index.vue  | 10 +++++-----
 src/views/portal/qa/Answer.vue      | 26 ++++++++++++++++++++------
 src/views/portal/qa/Index.vue       | 27 +++++++++++++++++++++------
 5 files changed, 56 insertions(+), 23 deletions(-)

diff --git a/src/assets/styles/ellipsis.scss b/src/assets/styles/ellipsis.scss
index d1543f8a..439d4717 100644
--- a/src/assets/styles/ellipsis.scss
+++ b/src/assets/styles/ellipsis.scss
@@ -5,7 +5,11 @@
   display: block;
   word-break:break-all;
 }
-
+.orinfo-text{
+  font-size: 13px;
+  color: #666666;
+  font-weight: 400;
+}
 .previewStyle{
   color: #337ab7;
   cursor: pointer;
diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue
index aac64e00..43193a71 100644
--- a/src/views/portal/article/Detail.vue
+++ b/src/views/portal/article/Detail.vue
@@ -60,19 +60,19 @@
                 <ul class="ranking-data">
                     <li v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
                       <router-link  :to="'article/detail?id=' + item.id">
-                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:25px">
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
                           <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                         </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:25px">
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
                             <img :src="`${webBaseUrl}/images/list02.png`" alt="">
                         </span>
-                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:25px">
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
                             <img :src="`${webBaseUrl}/images/list03.png`" alt="">
                         </span>
-                        <span class="portal-right-text" v-if="index==3" style="margin-right:25px">
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
                              <img :src="`${webBaseUrl}/images/list04.png`" alt="">
                         </span>
-                         <span class="portal-right-text" v-if="index==4" style="margin-right:25px">
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
                              <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                         </span>
                         <span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">({{ item.orinfo }})</span>  </span>
diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue
index c44898a6..4b88266b 100644
--- a/src/views/portal/article/Index.vue
+++ b/src/views/portal/article/Index.vue
@@ -80,19 +80,19 @@
                  <ul class="ranking-data">
                       <li  v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
                         <!-- <router-link  :to="'article/detail?id=' + item.id"> -->
-                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:25px">
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
                           <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
                         </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:25px">
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
                             <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
                         </span>
-                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:25px">
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
                             <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
                         </span>
-                        <span class="portal-right-text" v-if="index==3" style="margin-right:25px">
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
                              <img :src="`${webBaseUrl}/images/list04.png`" alt="">
                         </span>
-                         <span class="portal-right-text" v-if="index==4" style="margin-right:25px">
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
                              <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                         </span>
                         <span class="portal-title-desc">{{ item.sysCreateUname }}<span class="orinfo-text">({{ item.orinfo }})</span>   </span>
diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue
index 804c70d8..81856002 100644
--- a/src/views/portal/qa/Answer.vue
+++ b/src/views/portal/qa/Answer.vue
@@ -238,22 +238,22 @@
                         <p class="ranking-title">贡献榜</p>
                         <ul class="ranking-data">
                           <li v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
-                            <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:94px">
+                            <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
                               <img :src="`${webBaseUrl}/images/list-01.png`" alt="">
                             </span>
-                            <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:94px">
+                            <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
                                 <img :src="`${webBaseUrl}/images/list02.png`" alt="">
                             </span>
-                            <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:94px">
+                            <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
                                 <img :src="`${webBaseUrl}/images/list03.png`" alt="">
                             </span>
-                            <span class="portal-right-text" v-if="index==3" style="margin-right:94px">
+                            <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
                                 <img :src="`${webBaseUrl}/images/list04.png`" alt="">
                             </span>
-                            <span class="portal-right-text" v-if="index==4" style="margin-right:94px">
+                            <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
                                 <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                             </span>
-                            <span class="portal-title-desc">{{ item.sysCreateUname }}</span>
+                            <span class="portal-title-desc">{{ item.sysCreateUname }} <span class="orinfo-text">({{ item.orinfo }})</span> </span>
                           </li>
                         </ul>
                   </div>
@@ -315,6 +315,7 @@ export default {
   },
   data() {
     return {
+      ankIds:[],
       resonimg:{},
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       noData: true,
@@ -416,6 +417,19 @@ export default {
       apiQa.queryList(5).then(res => {
         if (res.status == 200) {
           this.ankingList = res.result;
+           let ids = [];
+          this.ankingList.forEach(item =>{
+            ids.push(item.sysCreateAid);
+          })
+           apiUser.getByIds(ids).then(res=>{
+              res.result.forEach(item=>{
+                this.ankIds.push(item.orgInfo);
+               this.ankingList.forEach((value, index) => {
+                   value['orinfo'] = this.ankIds[index];
+                     })
+              })
+              // console.log(this.ankingList);
+             })
         }
       });
     },
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue
index a37130b4..8f048380 100644
--- a/src/views/portal/qa/Index.vue
+++ b/src/views/portal/qa/Index.vue
@@ -84,22 +84,22 @@
                         <p class="ranking-title">贡献榜</p>
                         <ul class="ranking-data">
                           <li  v-for="(item, index) in ankingList" :key="index" style="margin-top:30px;line-height: 22px;cursor: pointer;">
-                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:94px">
+                        <span class="portal-right-text orange-one" v-if="index==0" style="margin-right:20px">
                           <img :src="`${webBaseUrl}/images/listblue01.png`" alt="">
                         </span>
-                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:94px">
+                        <span class="portal-right-text orange-tow" v-if="index==1" style="margin-right:20px">
                             <img :src="`${webBaseUrl}/images/listblue02.png`" alt="">
                         </span>
-                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:94px">
+                        <span class="portal-right-text orange-three" v-if="index==2" style="margin-right:20px">
                             <img :src="`${webBaseUrl}/images/listblue03.png`" alt="">
                         </span>
-                        <span class="portal-right-text" v-if="index==3" style="margin-right:94px">
+                        <span class="portal-right-text" v-if="index==3" style="margin-right:20px">
                              <img :src="`${webBaseUrl}/images/list04.png`" alt="">
                         </span>
-                         <span class="portal-right-text" v-if="index==4" style="margin-right:94px">
+                         <span class="portal-right-text" v-if="index==4" style="margin-right:20px">
                              <img :src="`${webBaseUrl}/images/list05.png`" alt="">
                         </span>
-                        <span class="portal-title-desc">{{ item.sysCreateUname }}</span>
+                        <span class="portal-title-desc">{{ item.sysCreateUname }}<span class="orinfo-text">({{ item.orinfo }})</span> </span>
                         </li>
                         </ul>
                     </div>
@@ -164,6 +164,7 @@ export default {
   // },
   data() {
     return {
+      ankIds:[],
       resonimg:{},
       fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
       loading: false,
@@ -421,6 +422,20 @@ export default {
       apiQa.queryList(5).then(res => {
         if (res.status == 200) {
           this.ankingList = res.result;
+           this.ankingList = res.result;
+          let ids = [];
+          this.ankingList.forEach(item =>{
+            ids.push(item.sysCreateAid);
+          })
+           apiUser.getByIds(ids).then(res=>{
+              res.result.forEach(item=>{
+                this.ankIds.push(item.orgInfo);
+               this.ankingList.forEach((value, index) => {
+                   value['orinfo'] = this.ankIds[index];
+                     })
+              })
+              // console.log(this.ankingList);
+             })
         }
       });
     }