From 7369fd5866a78cde7ecbb4721d9decdfa181fd39 Mon Sep 17 00:00:00 2001
From: 孔祥富 <kongxf@daryun.com>
Date: 星期四, 11 三月 2021 15:34:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/dashboard/ctUser.vue |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/views/dashboard/ctUser.vue b/src/views/dashboard/ctUser.vue
index fbb3716..087bb5d 100644
--- a/src/views/dashboard/ctUser.vue
+++ b/src/views/dashboard/ctUser.vue
@@ -23,12 +23,14 @@
         :data="list"
         row-key="prop1"
         stripe
+        border
+        :cell-style="{padding:'7px 0','text-align':'center'}"
         :header-cell-style="{'height':'5.3vh','background-color':'#e6e6e6'}"
         style="width: 100%;"
       >
         <el-table-column show-overflow-tooltip type="selection" :reserve-selection="false" width="100" />
         <el-table-column show-overflow-tooltip prop="empNumb" label="员工编号" width="100" />
-        <el-table-column show-overflow-tooltip prop="deptName" label="护卫点" width="100" />
+        <el-table-column show-overflow-tooltip prop="allDeptName" label="护卫点" width="100" />
         <el-table-column show-overflow-tooltip prop="jobName" label="岗位" width="100" />
         <el-table-column show-overflow-tooltip prop="empName" label="姓名" width="100" />
         <el-table-column show-overflow-tooltip prop="certificateNumb" label="身份证号码" width="100" />

--
Gitblit v1.8.0