From 3e7447dab16df6d5073679c79f30ffe77d9ca89d Mon Sep 17 00:00:00 2001
From: ablikim_m <2812437343@qq.com>
Date: Fri, 6 Aug 2021 15:21:03 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E9=80=89=E5=90=A6?=
 =?UTF-8?q?=E7=9A=84=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/Content/Achievements.vue | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/views/Content/Achievements.vue b/src/views/Content/Achievements.vue
index 3ee5573..8c011e9 100644
--- a/src/views/Content/Achievements.vue
+++ b/src/views/Content/Achievements.vue
@@ -29,14 +29,14 @@
       </el-form-item>
     </el-form>
     <!--列表-->
-    <el-table size="small" :data="res.listData" highlight-current-row v-loading="loading" border
+    <el-table size="small" :data="listData" highlight-current-row v-loading="loading" border
               element-loading-text="拼命加载中" style="width: 100%;">
       <el-table-column align="center" type="index" width="60"/>
       <el-table-column sortable prop="title" label="成果名称" width="150" show-overflow-tooltip/>
-      <el-table-column sortable prop="is_have_brief" label="是否有成果简介" align="center" width="60" :formatter="achievementMapping" show-overflow-tooltip/>
+      <el-table-column sortable prop="is_have_brief" label="是否有成果简介" align="center" width="60" :formatter="briefMapping" show-overflow-tooltip/>
       <el-table-column sortable prop="brief_title" label="成果简介标题" width="180" show-overflow-tooltip/>
       <el-table-column sortable prop="brief_content" label="成果简介内容" width="180" show-overflow-tooltip/>
-      <el-table-column sortable prop="is_honored " label="是否获奖" align="center" width="60" :formatter="achievementMapping" show-overflow-tooltip/>
+      <el-table-column sortable prop="is_honored" label="是否获奖" align="center" width="60" :formatter="honoredMapping" show-overflow-tooltip/>
       <el-table-column sortable prop="honor" label="所获奖励" width="180" show-overflow-tooltip/>
       <el-table-column sortable prop="honored_date" label="成果获奖日期" width="110" align="center" show-overflow-tooltip/>
       <el-table-column sortable prop="pub_time" label="成果发表日期" width="110" align="center" show-overflow-tooltip/>
@@ -168,7 +168,6 @@ export default {
         ],
         token: localStorage.getItem('logintoken'),
       },
-      res:{
         listData: [
           {
             title: '',
@@ -181,8 +180,6 @@ export default {
             honored_date: '',
           },
         ],
-      },
-
       // 分页参数
       pageparm: {
         currentPage: 1,
@@ -211,11 +208,16 @@ export default {
    */
   methods: {
     // 获取公司列表
-    achievementMapping(row){
-      if(row.is_have_brief){
+    briefMapping(row){
+      if(row.is_have_brief === true){
         return "是";
       }
-      else if(row.is_honored){
+      else {
+        return "否";
+      }
+    },
+    honoredMapping(row){
+      if(row.is_honored === true ){
         return "是";
       }
       else {
@@ -242,8 +244,8 @@ export default {
         }
       }
       get(`/achievement/`, params).then(value => {
-        // this.listData = value.results;
-        this.$set(this.res,"listData",value.results);
+        this.listData = value.results;
+        // this.$set(this.res,"listData",value.results);
         that.pageparm.currentPage = that.formInline.page;
         that.pageparm.pageSize = that.formInline.pageSize;
         that.pageparm.total = value.count;
-- 
Gitee