From d3e6c1b93d6fabc9ee8110d6ad9128ff05921203 Mon Sep 17 00:00:00 2001
From: xuhuajiao <13476289682@163.com>
Date: Sat, 1 Jul 2023 15:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E7=A6=81=E8=AF=B4=E6=98=8E=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/SecurityDoor.vue        | 6 +++---
 src/views/system/logManage/doorLog/index.vue | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/components/SecurityDoor.vue b/src/views/components/SecurityDoor.vue
index d524037..65afd2d 100644
--- a/src/views/components/SecurityDoor.vue
+++ b/src/views/components/SecurityDoor.vue
@@ -13,15 +13,15 @@
           <div>{{ scope.row.hisTime | parseTime }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="位置" align="center" width="160">
+      <el-table-column label="位置" align="center" width="120">
         <template slot-scope="scope">
           <div>{{ scope.row.doorName }}</div>
         </template>
       </el-table-column>
       <el-table-column prop="inOrOut" label="说明" align="center">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.inOrOut===0">进门</el-tag>
-          <el-tag v-if="scope.row.inOrOut===1" type="warning">出门</el-tag>
+          <el-tag v-if="scope.row.inOrOut===0">{{ scope.row.userName }}_进门_{{ scope.row.action }}</el-tag>
+          <el-tag v-if="scope.row.inOrOut===1" type="warning">{{ scope.row.userName }}_出门_{{ scope.row.action }}</el-tag>
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/system/logManage/doorLog/index.vue b/src/views/system/logManage/doorLog/index.vue
index ce65c47..02a98ba 100644
--- a/src/views/system/logManage/doorLog/index.vue
+++ b/src/views/system/logManage/doorLog/index.vue
@@ -36,6 +36,7 @@
       @selection-change="selectionChangeHandler"
     >
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column prop="lsh" label="流水号" min-width="100" align="center" />
       <el-table-column prop="userName" label="姓名" min-width="100" align="center" />
       <el-table-column prop="employeeId" label="工号" min-width="140" align="center" />
       <el-table-column prop="cardNo" label="卡编号" min-width="140" align="center" />