From 2e80903f72d58a86cd13c2a24a8d3132d015073e Mon Sep 17 00:00:00 2001
From: GuLiMmo <2820890765@qq.com>
Date: Tue, 23 Jan 2024 14:00:41 +0800
Subject: [PATCH] 更新

---
 src/views/evaluate/components/secondRoundResult.vue |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/views/evaluate/components/secondRoundResult.vue b/src/views/evaluate/components/secondRoundResult.vue
index 04d216f..63a1b66 100644
--- a/src/views/evaluate/components/secondRoundResult.vue
+++ b/src/views/evaluate/components/secondRoundResult.vue
@@ -11,17 +11,17 @@
                 <div class="tool">操作</div>
             </li>
             <li class="type-item" v-for="(item, index) in data" :key="index">
-                <div class="title">{{ item.category.categoryName }}</div>
+                <div class="title">{{ item.category?.categoryName || '' }}</div>
                 <el-tooltip effect="dark" placement="top">
                     <template #content>
-                        <p style="max-width: 500px;">{{ item.category.standard }}</p>
+                        <p style="max-width: 500px;">{{ item.category?.standard || '' }}</p>
                     </template>
                     <div class="introduction">
-                        {{ item.category.standard }}
+                        {{ item.category?.standard || '' }}
                     </div>
                 </el-tooltip>
 
-                <div class="number">{{ item.category.peopleNum }}人</div>
+                <div class="number">{{ item.category?.peopleNum || 0 }}人</div>
                 <div class="tool">
                     <el-button type="primary" text icon="el-icon-view" @click="view(item)">查看最终结果</el-button>
                 </div>
@@ -125,24 +125,24 @@
                 column: [
                     {
                         label: '姓名',
-                        prop: 'userName',
+                        prop: 'user_name',
                         type: 'input'
                     },
                     {
                         label: '部门',
-                        prop: 'postName',
+                        prop: 'post_name',
                         type: 'input'
                     },
                     {
                         label: '职位',
-                        prop: 'deptName',
+                        prop: 'dept_name',
                         type: 'input'
                     },
-                    // {
-                    //     label: '票数',
-                    //     prop: 'voteNum',
-                    //     type: 'input'
-                    // }
+                    {
+                        label: '票数',
+                        prop: 'voteNum',
+                        type: 'input'
+                    }
                 ]
             },
             dialogParams: {

--
Gitblit v1.9.3