From 745996c2265fe2b3eb325dce725f89ae18dc8373 Mon Sep 17 00:00:00 2001
From: zhoulingpo <zhoulingpo>
Date: Tue, 9 May 2023 17:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E6=94=B9=E3=80=91=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E5=91=8A=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/icon/svg/pointe_fill.svg      |  2 +-
 src/views/Report/ReportDetail.vue | 25 ++++++++++++++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/src/icon/svg/pointe_fill.svg b/src/icon/svg/pointe_fill.svg
index 5c82f5e..b79ae5b 100644
--- a/src/icon/svg/pointe_fill.svg
+++ b/src/icon/svg/pointe_fill.svg
@@ -1 +1 @@
-<svg t="1683517728690" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2927" width="200" height="200"><path d="M64 483.04V872c0 37.216 30.144 67.36 67.36 67.36H192V416.32l-60.64-0.64A67.36 67.36 0 0 0 64 483.04zM857.28 344.992l-267.808 1.696c12.576-44.256 18.944-83.584 18.944-118.208 0-78.56-68.832-155.488-137.568-145.504-60.608 8.8-67.264 61.184-67.264 126.816v59.264c0 76.064-63.84 140.864-137.856 148L256 416.96v522.4h527.552a102.72 102.72 0 0 0 100.928-83.584l73.728-388.96a102.72 102.72 0 0 0-100.928-121.824z" p-id="2928" fill="#13227a"></path></svg>
+<svg t="1683623452238" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3732" width="200" height="200"><path d="M64 483.04V872c0 37.216 30.144 67.36 67.36 67.36H192V416.32l-60.64-0.64A67.36 67.36 0 0 0 64 483.04zM857.28 344.992l-267.808 1.696c12.576-44.256 18.944-83.584 18.944-118.208 0-78.56-68.832-155.488-137.568-145.504-60.608 8.8-67.264 61.184-67.264 126.816v59.264c0 76.064-63.84 140.864-137.856 148L256 416.96v522.4h527.552a102.72 102.72 0 0 0 100.928-83.584l73.728-388.96a102.72 102.72 0 0 0-100.928-121.824z" p-id="3733" fill="#d81e06"></path></svg>
diff --git a/src/views/Report/ReportDetail.vue b/src/views/Report/ReportDetail.vue
index 092b979..db5a47b 100644
--- a/src/views/Report/ReportDetail.vue
+++ b/src/views/Report/ReportDetail.vue
@@ -46,9 +46,9 @@
           报告满意度:<el-rate allow-half :max="5" v-model="userRating" @click.native="saveScore"></el-rate>
         </div>
         <div class="pointclick">
-          <svg-icon v-if="!isShow"   icon-class="pointe" @click="pointZan('y')"  class-name="icon" ></svg-icon>
-          <svg-icon v-else  icon-class="pointe_fill" @click="pointZan('n')"  class-name="icon" ></svg-icon>
-
+          <svg-icon v-if="!isShow"   icon-class="pointe" @click="pointZan('y')" style="font-size: 25px"   class-name="icon" ></svg-icon>
+          <svg-icon v-else  icon-class="pointe_fill" @click="pointZan('n')" style="font-size: 25px"  class-name="icon" ></svg-icon>
+          {{pointNum}}
         </div>
       </div>
       <div class="juggle_box showLimit">
@@ -69,7 +69,7 @@
               {{item.userName.slice(0,1)}}
             </div>
             <div class="name">
-              {{item.orgName+"【"+item.userName+"】"}}
+              {{(item.orgName ||'' ) +"【"+item.userName+"】"}}
             </div>
           </div>
           <div class="juggle_right">
@@ -80,9 +80,8 @@
                          @click="delJugg(item.id)">删除</el-button>
             </div>
           </div>
-
         </div>
-        <el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
+        <el-pagination v-if="commonList.length>0" @size-change="handleSizeChange" @current-change="handleCurrentChange" :current-page="q.pageNo"
                        :page-sizes="[5, 10, 20]" :page-size="q.pageSize" layout="total, sizes, prev, pager, next, jumper"
                        :total="total" />
       </div>
@@ -130,17 +129,21 @@ export default {
     // 获取点赞数量及其状态
     getGood(){
       this.$api.report.getGood({reportId:this.reportId}).then(res=>{
-
+            if(res.data.logId){
+              this.isShow=true
+            }else{
+              this.isShow=false
+            }
+            this.pointNum=res.data.thumbUpCount
       })
     },
     //点赞
     pointZan(type){
 
-        this.$api.report.goodLuck(this.reportId).then(res=>{
-          this.isShow=!this.isShow
+        this.$api.report.goodLuck({reportId:this.reportId}).then(res=>{
           this.$message.success("操作成功")
+          this.getGood()
         }).catch(()=>{
-          this.$message.warning("操作失败")
         })
     },
     //评分
@@ -381,7 +384,7 @@ export default {
         .juggle_right{
           position: relative;
           width: 85%;
-          padding: 20px;
+          padding: 10px 10px 40px;
           .content{
             width: 100%;
           }