Merge remote-tracking branch 'origin/master'

jiangping

2025-05-12 07c39bebefd1244dfccd83de82895e6c1f896e01

 admin/src/views/business/deviceEvent.vue

@@ -56,7 +56,7 @@
                <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">导出</el-button></li>
-->
      </ul>
      <el-table :max-height="tableHeight" 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>
@@ -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 }">
@@ -93,9 +93,6 @@
            </el-image>
          </template>
        </el-table-column>



      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
@@ -170,7 +167,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()