Merge remote-tracking branch 'origin/master'

jiangping

2025-04-14 417b355cf5b25c0dced403abb99aa152d219e9db

 admin/src/views/business/deviceEvent.vue

@@ -67,7 +67,7 @@
</el-table-column> -->
        <el-table-column prop="personName" label="姓名" min-width="80px"></el-table-column>
        <el-table-column prop="personPhone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="personIdcardDecode" label="证件号" min-width="140px"></el-table-column>
        <el-table-column prop="personIdcardDecode" label="身份证号" min-width="140px"></el-table-column>
        <el-table-column prop="personCompanyName" label="组织" min-width="100px"></el-table-column>
        <el-table-column label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
@@ -80,7 +80,8 @@
        <el-table-column prop="devName" label="门禁名称" min-width="100px"></el-table-column>
        <el-table-column prop="srcName" label="门禁点" min-width="110px"></el-table-column>
        <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
        <el-table-column label="出入类型" min-width="100px">
        <el-table-column label="出入类型" min-width="100px">WMS作业已完成

          <template slot-scope="{row}">
            <span v-if="row.extEventInOut === 1">进</span>
            <span v-if="row.extEventInOut != 1">出</span>
@@ -93,9 +94,6 @@
            </el-image>
          </template>
        </el-table-column>



      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>