Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

15 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/deviceEvent.vue

@@ -28,10 +28,17 @@
            <el-option label="人脸认证通过" value="196893"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="门禁点" prop="srcName">
          <el-input v-model="searchForm.srcName" placeholder="请输入门禁点" @keypress.enter.native="search"></el-input>
        </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"
          <!-- <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> -->
          <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>
@@ -48,11 +55,9 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
        <!--
                <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>
@@ -63,7 +68,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 }">
@@ -84,14 +89,9 @@
        </el-table-column>
        <el-table-column label="抓拍照片" min-width="100px">
          <template slot-scope="{row}">
            <el-image v-if="row.extEventPictureURL" style="width: 80px; height: 80px" :src="row.extEventPictureURL"
              :preview-src-list="[row.extEventPictureURL]">
            </el-image>
            <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>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
@@ -118,7 +118,8 @@
        eventType: '',
        startTime: '',
        endTime: '',
        radio: 0
        radio: 0,
        srcName: ''
      },
      time: []
    }
@@ -142,15 +143,19 @@
      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()
    },
@@ -162,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()