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

doum

11 小时以前 cb6aca0642ac8dd5de877ade168066d85acb589c

 admin/src/views/business/carEvent.vue

@@ -1,154 +1,89 @@
<template>
  <TableLayout :permissions="['business:carevent:query']">
    <!-- 搜索表单 -->
    <el-form
      ref="searchForm"
      slot="search-form"
      :model="searchForm"
      label-width="100px"
      inline
    >
      <el-form-item label="车牌号" prop="plateNos">
        <el-input
          v-model="searchForm.plateNos"
          placeholder="请输入车牌号"
          @keypress.enter.native="search"
        ></el-input>
      </el-form-item>
      <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="memberType">
        <el-select v-model="searchForm.memberType" 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="771760130"></el-option>
          <el-option label="在园放行事件" value="771760131"></el-option>
          <el-option label="离园压线事件" value="771760133"></el-option>
          <el-option label="离园放行事件" value="771760134"></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>
    <div ref="QueryFormRef" slot="search-form">
      <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
        <el-form-item label="车牌号" prop="plateNos">
          <el-input v-model="searchForm.plateNos" placeholder="请输入车牌号" @keypress.enter.native="search"></el-input>
        </el-form-item>
        <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="queryUserType">
          <el-select v-model="searchForm.queryUserType" clearable 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="771760130"></el-option>
            <el-option label="入场放行事件" value="771760131"></el-option>
            <el-option label="出场压线事件" value="771760133"></el-option>
            <el-option label="出场放行事件" value="771760134"></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:carevent:exportExcel']">
        <li>
          <el-button
            type="primary"
            v-permissions="['business:carevent:sync']"
            @click="$refs.OperaCarEventHkWindow.open('同步过车记录')"
            >同步</el-button
          >
          <el-button type="primary" v-permissions="['business:carevent:sync']"
            @click="$refs.OperaCarEventHkWindow.open('同步过车记录')">同步</el-button>
        </li>
        <li>
          <el-button
            type="primary"
            :loading="isWorking.export"
            v-permissions="['business:carevent:exportExcel']"
            @click="exportExcel"
            >导出</el-button
          >
          <el-button type="primary" :loading="isWorking.export" v-permissions="['business:carevent:exportExcel']"
            @click="exportExcel">导出</el-button>
        </li>
      </ul>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column
          prop="plateNos"
          label="车牌号"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="parkName"
          label="停车库名称"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="gateName"
          label="出入口名称"
          min-width="100px"
        ></el-table-column>
        <el-table-column
          prop="eventTypeName"
          label="事件类型"
          min-width="100px"
        ></el-table-column>
      <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe>
        <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="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>
            <span v-else-if="row.companyType == 1">内部员工</span>
            <span v-else>访客</span>
          </template>
        </el-table-column>
        <el-table-column prop="plateNos" label="车牌号" min-width="100px"></el-table-column>
        <el-table-column prop="parkName" label="停车库名称" min-width="100px"></el-table-column>
        <el-table-column prop="gateName" label="出入口名称" min-width="100px"></el-table-column>
        <el-table-column prop="eventTypeName" label="事件类型" min-width="100px"></el-table-column>
        <el-table-column label="出入类型" min-width="100px">
          <template slot-scope="{ row }">
            <span v-if="row.inoutType === 0">进场</span>
            <span v-if="row.inoutType === 1">离园</span>
          </template>
        </el-table-column>
        <el-table-column 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>
          </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="personCompanyName"
          label="组织"
          min-width="100px"
        ></el-table-column>
        <el-table-column label="车牌抓拍图" min-width="100px">
        <!--        <el-table-column label="车牌抓拍图" min-width="100px">
          <template slot-scope="{ row }">
            <div v-if="row.platePicUrl != null">
              <el-image
                style="width: 80px; height: 80px"
                :src="row.platePicUrl"
                :preview-src-list="[row.platePicUrl]"
              >
              <el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
              </el-image>
            </div>
          </template>
@@ -156,26 +91,15 @@
        <el-table-column label="抓拍图片" min-width="100px">
          <template slot-scope="{ row }">
            <div v-if="row.vehiclePicUrl != null">
              <el-image
                style="width: 80px; height: 80px"
                :src="row.vehiclePicUrl"
                :preview-src-list="[row.vehiclePicUrl]"
              >
              <el-image style="width: 80px; height: 80px" :src="row.vehiclePicUrl"
                :preview-src-list="[row.vehiclePicUrl]">
              </el-image>
            </div>
          </template>
        </el-table-column>
        <el-table-column
          prop="happenTime"
          label="事件时间"
          min-width="100px"
        ></el-table-column>
        </el-table-column>-->
        <el-table-column prop="happenTime" label="事件时间" min-width="140px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
        @current-change="handlePageChange"
        :pagination="tableData.pagination"
      >
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>

      <OperaCarEventHkWindow ref="OperaCarEventHkWindow" @success="search()" />
@@ -204,7 +128,7 @@
        companyName: '',
        startTime: '',
        endTime: '',
        radio: '0'
        radio: ''
      },
      time: []
    }
@@ -219,11 +143,24 @@
    this.changeRadio('0')
    this.search()
  },
  mounted() {
    this.$nextTick(() => {
      this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
    })
  },
  methods: {
    reset() {
      this.$refs.searchForm.resetFields()
      this.searchForm.radio = '0'
      this.changeRadio('0')
      this.searchForm = {
        eventType: '',
        keyWords: '',
        plateNos: '',
        memberType: '',
        companyName: '',
        startTime: '',
        endTime: '',
        radio: ''
      }
      this.time = []
      this.search()
    },
@@ -231,15 +168,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()
    },