Merge remote-tracking branch 'origin/master'

jiangping

2025-02-26 4e2e52b766d87fc528d02bdebc1757c3dda8c596

 admin/src/views/business/trainTime.vue

@@ -9,15 +9,8 @@
                <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 @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">
@@ -32,11 +25,7 @@
        </el-form>
        <!-- 表格和分页 -->
        <template v-slot:table-wrap>
            <el-table
                v-loading="isWorking.search"
                :data="tableData.list"
                stripe
            >
      <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>
@@ -45,10 +34,7 @@
                <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"
            <el-image v-if="row.faceImg" style="width: 80px; height: 80px" :src="row.faceImg"
                      :preview-src-list="[row.faceImg]">
                  </el-image>
                </template>
@@ -56,11 +42,7 @@
                <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 @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
            </pagination>
        </template>
    </TableLayout>
@@ -155,9 +137,9 @@
      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()
    }
  }