Merge remote-tracking branch 'origin/master'

jiangping

2025-02-26 4e2e52b766d87fc528d02bdebc1757c3dda8c596

 admin/src/views/business/trainTime.vue

@@ -1,69 +1,51 @@
<template>
    <TableLayout :permissions="['business:deviceevent:query']">
        <!-- 搜索表单 -->
        <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
            <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="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>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
                <el-table-column prop="name" label="人员姓名" min-width="100px"></el-table-column>
                <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
              <el-table-column prop="idcardNo" label="证件号" min-width="150px"></el-table-column>
                <el-table-column prop="companyName" label="组织名称" min-width="150px"></el-table-column>
                <el-table-column prop="startTime" label="开始日期" min-width="150px"></el-table-column>
                <el-table-column prop="endTime" label="结束日期" min-width="150px"></el-table-column>
              <el-table-column label="人脸照片" min-width="80px">
                <template slot-scope="{row}">
                  <el-image
                      v-if="row.faceImg"
                      style="width: 80px; height: 80px"
                      :src="row.faceImg"
                      :preview-src-list="[row.faceImg]">
                  </el-image>
                </template>
              </el-table-column>
                <el-table-column prop="createName" label="操作人" min-width="100px"></el-table-column>
              <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
            </el-table>
            <pagination
                @size-change="handleSizeChange"
                @current-change="handlePageChange"
                :pagination="tableData.pagination"
            >
            </pagination>
        </template>
    </TableLayout>
  <TableLayout :permissions="['business:deviceevent:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <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="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>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
        <el-table-column prop="name" label="人员姓名" min-width="100px"></el-table-column>
        <el-table-column prop="phone" label="手机号" min-width="100px"></el-table-column>
        <el-table-column prop="idcardNo" label="证件号" min-width="150px"></el-table-column>
        <el-table-column prop="companyName" label="组织名称" min-width="150px"></el-table-column>
        <el-table-column prop="startTime" label="开始日期" min-width="150px"></el-table-column>
        <el-table-column prop="endTime" label="结束日期" min-width="150px"></el-table-column>
        <el-table-column label="人脸照片" min-width="80px">
          <template slot-scope="{row}">
            <el-image v-if="row.faceImg" style="width: 80px; height: 80px" :src="row.faceImg"
              :preview-src-list="[row.faceImg]">
            </el-image>
          </template>
        </el-table-column>
        <el-table-column prop="createName" label="操作人" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="150px"></el-table-column>
      </el-table>
      <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
      </pagination>
    </template>
  </TableLayout>
</template>

<script>
@@ -75,7 +57,7 @@
  name: 'DeviceEvent',
  extends: BaseTable,
  components: { TableLayout, Pagination },
  data () {
  data() {
    return {
      // 搜索
      searchForm: {
@@ -92,7 +74,7 @@
      time1: []
    }
  },
  created () {
  created() {
    this.config({
      module: '培训有效期列表',
      api: '/business/trainTime',
@@ -103,7 +85,7 @@
    this.search()
  },
  methods: {
    changeRadio (e) {
    changeRadio(e) {
      if (e === '0') {
        this.searchForm.startTimeStart = timeForMat(0)[0]
        this.searchForm.startTimeEnd = timeForMat(0)[1]
@@ -119,15 +101,15 @@
      }
      this.search()
    },
    seleTime (e) {
      if(e && e.length > 1) {
    seleTime(e) {
      if (e && e.length > 1) {
        this.searchForm.startTimeStart = e[0]
        this.searchForm.startTimeEnd = e[1]
        this.searchForm.radio = null
        this.search()
      }
    },
    changeRadio1 (e) {
    changeRadio1(e) {
      if (e === '0') {
        this.searchForm.endTimeStart = timeForMat(0)[0]
        this.searchForm.endTimeEnd = timeForMat(0)[1]
@@ -143,21 +125,21 @@
      }
      this.search()
    },
    seleTime1 (e) {
      if (e && e.length > 1 ) {
    seleTime1(e) {
      if (e && e.length > 1) {
        this.searchForm.endTimeStart = e[0]
        this.searchForm.endTimeEnd = e[1]
        this.searchForm.radio1 = null
        this.search()
      }
    },
    reset () {
    reset() {
      this.$refs.searchForm.resetFields()
      this.time = []
      this.time1 = []
      this.searchForm.radio = '0'
      this.searchForm.radio = ''
      this.searchForm.radio1 = '0'
      this.changeRadio('0')
      // this.changeRadio('0')
      this.search()
    }
  }