Merge remote-tracking branch 'origin/master'

jiangping

2025-04-14 417b355cf5b25c0dced403abb99aa152d219e9db

 admin/src/views/business/deviceEvent.vue

@@ -1,47 +1,54 @@
<template>
  <TableLayout :permissions="['business:deviceevent:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="姓名/手机号" prop="keyWords">
        <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="组织" prop="companyName">
        <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <!-- <el-form-item label="人员类型" prop="personType">
    <div ref="QueryFormRef" slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="姓名/手机号" prop="keyWords">
          <el-input v-model="searchForm.keyWords" placeholder="请输入姓名/手机号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <el-form-item label="组织" prop="companyName">
          <el-input v-model="searchForm.companyName" placeholder="请输入组织名称" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <!-- <el-form-item label="人员类型" prop="personType">
        <el-select v-model="searchForm.personType" placeholder="请选择">
          <el-option label="外来访客" value="1"></el-option>
          <el-option label="内部人员" value="2"></el-option>
        </el-select>
      </el-form-item> -->
      <el-form-item label="人员类型" prop="queryUserType">
        <el-select v-model="searchForm.queryUserType" placeholder="请选择">
          <el-option label="访客" value="0"></el-option>
          <el-option label="相关方组织" value="1"></el-option>
          <el-option label="内部员工" value="2"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="事件类型" prop="eventType">
        <el-select v-model="searchForm.eventType" placeholder="请选择">
          <el-option label="人脸认证失败" value="197163"></el-option>
          <el-option label="人脸认证通过" value="196893"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="起止时间" prop="eventType">
        <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
          value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
        </el-date-picker>
      </el-form-item>
      <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
        <el-radio-button label="0">当天</el-radio-button>
        <el-radio-button label="1">近7天</el-radio-button>
        <el-radio-button label="2">近30天</el-radio-button>
      </el-radio-group>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button @click="reset">重置</el-button>
      </section>
    </el-form>
        <el-form-item label="人员类型" prop="queryUserType">
          <el-select v-model="searchForm.queryUserType" placeholder="请选择">
            <el-option label="访客" value="0"></el-option>
            <el-option label="相关方组织" value="1"></el-option>
            <el-option label="内部员工" value="2"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="事件类型" prop="eventType">
          <el-select v-model="searchForm.eventType" placeholder="请选择">
            <el-option label="人脸认证失败" value="197163"></el-option>
            <el-option label="人脸认证通过" value="196893"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="起止时间" prop="eventType">
          <!-- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
            value-format="yyyy-MM-dd HH:mm:ss" range-separator="至" start-placeholder="开始时间" end-placeholder="结束时间">
          </el-date-picker> -->
          <el-date-picker type="datetime" v-model="searchForm.startTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择开始时间" @change="changeRadio" />
          <el-date-picker type="datetime" v-model="searchForm.endTime" value-format="yyyy-MM-dd HH:mm:ss"
            placeholder="请选择结束时间" @change="changeRadio" />
        </el-form-item>
        <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
          <el-radio-button label="0">当天</el-radio-button>
          <el-radio-button label="1">近7天</el-radio-button>
          <el-radio-button label="2">近30天</el-radio-button>
        </el-radio-group>
        <section>
          <el-button type="primary" @click="search">搜索</el-button>
          <el-button @click="reset">重置</el-button>
        </section>
      </el-form>
    </div>

    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
@@ -49,7 +56,7 @@
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">导出</el-button></li>
-->
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <!-- <el-table-column prop="userType" label="人员类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.personType == 0">劳务访客</span>
@@ -58,9 +65,9 @@
                        <span v-if="row.personType == null">外来访客</span>
                    </template>
</el-table-column> -->
        <el-table-column prop="personName" label="姓名" min-width="100px"></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="100px"></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 }">
@@ -69,11 +76,12 @@
            <span v-else>访客</span>
          </template>
        </el-table-column>
        <el-table-column prop="happenTime" label="事件时间" min-width="100px"></el-table-column>
        <el-table-column prop="happenTime" label="事件时间" min-width="140px"></el-table-column>
        <el-table-column prop="devName" label="门禁名称" min-width="100px"></el-table-column>
        <el-table-column prop="srcName" 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>
@@ -86,9 +94,6 @@
            </el-image>
          </template>
        </el-table-column>



      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
@@ -129,20 +134,29 @@
    })
    this.changeRadio('0')
  },
  mounted() {
    this.$nextTick(() => {
      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
    })
  },
  methods: {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      } else {
        this.searchForm.radio = ''
      }
      if (this.searchForm.startTime && this.searchForm.endTime && new Date(this.searchForm.startTime).getTime() > new Date(this.searchForm.endTime).getTime()) {
        this.$message.error('开始时间不能大于结束时间')
        this.searchForm.startTime = ''
        return
      }
      this.search()
    },
@@ -154,7 +168,15 @@
    },
    reset() {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.searchForm = {
        keyWords: '',
        companyName: '',
        personType: '',
        eventType: '',
        startTime: '',
        endTime: '',
        radio: 0
      }
      this.searchForm.radio = ''
      // this.changeRadio('0')
      this.search()