Merge remote-tracking branch 'origin/master'

k94314517

2024-10-12 51e18e190dafdec70dc1f4a3a9ecd76fb2116726

 admin/src/views/business/deviceEvent.vue

@@ -5,8 +5,8 @@
            <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 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="请选择">
@@ -20,7 +20,7 @@
                    <el-option label="人脸认证通过" value="196893"></el-option>
                </el-select>
            </el-form-item>
            <el-form-item label="起始时间" prop="eventType">
            <el-form-item label="起止时间" prop="eventType">
                <el-date-picker
                    @change="seleTime"
                    v-model="time"
@@ -28,8 +28,8 @@
                    format="yyyy-MM-dd HH:mm:ss"
                    value-format="yyyy-MM-dd HH:mm:ss"
                    range-separator="至"
                    start-placeholder="开始日期"
                    end-placeholder="结束日期">
                    start-placeholder="开始时间"
                    end-placeholder="结束时间">
                </el-date-picker>
            </el-form-item>
            <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
@@ -56,9 +56,9 @@
            >
                <el-table-column prop="userType" label="人员类型" min-width="100px">
                    <template slot-scope="{row}">
                        <span v-if="row.personType === 0">劳务访客</span>
                        <span v-if="row.personType === 1">普通访客</span>
                        <span v-if="row.personType === 2">内部人员</span>
                        <span v-if="row.personType == 0">劳务访客</span>
                        <span v-if="row.personType == 1">普通访客</span>
                        <span v-if="row.personType == 2">内部人员</span>
                        <span v-if="row.personType == null">外来访客</span>
                    </template>
                </el-table-column>
@@ -85,7 +85,7 @@
              <el-table-column prop="personName" label="姓名" min-width="100px"></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="personCompanyName" label="公司/组织" min-width="100px"></el-table-column>
              <el-table-column prop="personCompanyName" label="组织" min-width="100px"></el-table-column>

            </el-table>
            <pagination
@@ -130,7 +130,6 @@
      'field.main': 'id'
    })
    this.changeRadio('0')
    this.search()
  },
  methods: {
    changeRadio (e) {