Merge remote-tracking branch 'origin/master'

jiangping

2025-02-26 4e2e52b766d87fc528d02bdebc1757c3dda8c596

 admin/src/views/business/deviceEvent.vue

@@ -14,7 +14,7 @@
          <el-option label="内部人员" value="2"></el-option>
        </el-select>
      </el-form-item> -->
      <el-form-item label="人员类型" prop="memberType">
      <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>
@@ -58,6 +58,10 @@
                        <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="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 label="人员类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.companyType == 0">相关方组织</span>
@@ -77,16 +81,13 @@
        </el-table-column>
        <el-table-column label="抓拍照片" min-width="100px">
          <template slot-scope="{row}">
            <el-image style="width: 80px; height: 80px" :src="row.extEventPictureURL"
            <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL"
              :preview-src-list="[row.extEventPictureURL]">
            </el-image>
          </template>
        </el-table-column>

        <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>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
@@ -154,8 +155,8 @@
    reset() {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.searchForm.radio = '0'
      this.changeRadio('0')
      this.searchForm.radio = ''
      // this.changeRadio('0')
      this.search()
    }
  }