Merge remote-tracking branch 'origin/master'

nidapeng

2024-03-28 e8158d16a13c2ea1f2d8566578137db4394ab610

 admin/src/views/business/carEvent.vue

@@ -8,7 +8,7 @@
            <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-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">
@@ -51,7 +51,8 @@
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
                <li><el-button type="primary" v-permissions="['business:carevent:exportExcel']">导出</el-button></li>
              <li><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></li>
            </ul>
            <el-table
                v-loading="isWorking.search"
@@ -59,16 +60,6 @@
                stripe
            >
                <el-table-column prop="plateNos" label="车牌号" min-width="100px"></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 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>
@@ -78,13 +69,36 @@
                        <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">
                <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>
                  </div>
                </template>
              </el-table-column>
                <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>
                      </div>
                    </template>
                </el-table-column>
                <el-table-column prop="happenTime" label="事件时间" min-width="100px"></el-table-column>
@@ -95,6 +109,8 @@
                :pagination="tableData.pagination"
            >
            </pagination>

          <OperaCarEventHkWindow ref="OperaCarEventHkWindow" @success="search()" />
        </template>
    </TableLayout>
</template>
@@ -103,11 +119,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCarEventHkWindow from '@/components/business/OperaCarEventHkWindow'
import { timeForMat } from '@/utils/util'
export default {
  name: 'CarEvent',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  components: { TableLayout, Pagination ,OperaCarEventHkWindow},
  data () {
    return {
      // 搜索
@@ -119,7 +136,7 @@
        companyName: '',
        startTime: '',
        endTime: '',
        radio: null
        radio: '0'
      },
      time: []
    }
@@ -131,30 +148,30 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    this.changeRadio('0')
    this.search()
  },
  methods: {
    reset () {
      this.$refs.searchForm.resetFields()
      this.searchForm.startTime = ''
      this.searchForm.endTime = ''
      this.searchForm.radio = '0'
      this.changeRadio('0')
      this.time = []
      this.searchForm.radio = null
      this.search()
    },
    changeRadio (e) {
      if (e === '0') {
        this.searchForm.startTime = timeForMat(1)[0]
        this.searchForm.endTime = timeForMat(1)[1]
        this.time = timeForMat(1)
        this.searchForm.startTime = timeForMat(0)[0]
        this.searchForm.endTime = timeForMat(0)[1]
        this.time = timeForMat(0)
      } else if (e === '1') {
        this.searchForm.startTime = timeForMat(7)[0]
        this.searchForm.endTime = timeForMat(7)[1]
        this.time = timeForMat(7)
        this.searchForm.startTime = timeForMat(6)[0]
        this.searchForm.endTime = timeForMat(6)[1]
        this.time = timeForMat(6)
      } else if (e === '2') {
        this.searchForm.startTime = timeForMat(30)[0]
        this.searchForm.endTime = timeForMat(30)[1]
        this.time = timeForMat(30)
        this.searchForm.startTime = timeForMat(29)[0]
        this.searchForm.endTime = timeForMat(29)[1]
        this.time = timeForMat(29)
      }
      this.search()
    },