From 75271baf2b4dba13087674f020afbc7b08a83482 Mon Sep 17 00:00:00 2001
From: zhouwx <1175765986@qq.com>
Date: 星期三, 31 七月 2024 16:26:20 +0800
Subject: [PATCH] 修改

---
 src/views/onlineEducation/classBatch/index.vue |   82 +++++++++++++++++++++++++++++++++++++++-
 1 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/src/views/onlineEducation/classBatch/index.vue b/src/views/onlineEducation/classBatch/index.vue
index 3408c89..d9dbf8b 100644
--- a/src/views/onlineEducation/classBatch/index.vue
+++ b/src/views/onlineEducation/classBatch/index.vue
@@ -9,6 +9,33 @@
           :value="item.id">
         </el-option>
       </el-select>
+      <el-date-picker
+        v-model="time"
+        size="small"
+        type="daterange"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        value-format="yyyy-MM-DD"
+        style="margin-left: 40px;"
+      >
+      </el-date-picker>
+      <el-select v-model="queryParams.qualificationType"  size="small" style="margin-left: 40px;" clearable placeholder="请选择资格类型">
+        <el-option
+          v-for="item in qualificationList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+        </el-option>
+      </el-select>
+      <el-select v-model="queryParams.trainOrgId"  size="small" style="margin-left: 40px;" clearable filterable placeholder="请选择所属机构">
+        <el-option
+          v-for="item in trainOrgList"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id">
+        </el-option>
+      </el-select>
       <el-button
         size="small"
         type="primary"
@@ -27,6 +54,9 @@
       <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="批次名称" align="center" prop="batchName" />
       <el-table-column label="推送平台" align="center" prop="institutionName" />
+      <el-table-column label="开始时间" align="center" prop="startTime" />
+      <el-table-column label="计划结束时间" align="center" prop="endTime" />
+      <el-table-column label="类别" align="center" prop="category" />
       <el-table-column label="上报时间" align="center" prop="createTime" />
       <el-table-column label="所属培训机构" align="center" prop="trainOrgName" />
       <el-table-column label="课程" align="center" >
@@ -88,12 +118,14 @@
 import classHour from '@/views/onlineEducation/classBatch/components/classHour.vue'
 import { listBatch, listQuestion } from '@/api/onlineEducation/student'
 import { listPlatSelect } from '@/api/onlineEducation/plat'
+import moment from 'moment/moment'
 export default {
   name: "nPeopleManage",
   dicts: [],
   components: { courseDialog,studentList,classHour},
   data() {
     return {
+      time: [],
       loading: false,
       single: true,
       multiple: true,
@@ -105,20 +137,59 @@
       queryParams: {
         pageNum: 1,
         pageSize: 10,
-        institutionId: ''
+        institutionId: '',
+        startTime: '',
+        endTime: '',
+        qualificationType: null,
+        trainOrgId: null
       },
+      qualificationList: [
+        {
+          id: 1,
+          name: '主要负责人'
+        },
+        {
+          id: 2,
+          name: '安全生产管理人员'
+        },
+        {
+          id: 3,
+          name: '特种作业人员'
+        }
+
+      ],
+      trainOrgList: []
     };
   },
   created() {
+    this.setDate();
     this.getList();
     this.getPlat();
   },
   methods: {
+    setDate(){
+      const end = new Date();
+      const start = new Date();
+      start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+      const s = moment(start).format('YYYY-MM-DD')
+      const e = moment(end).format('YYYY-MM-DD')
+      this.time = [s,e]
+    },
     getList(){
+      // this.queryParams.startTime = moment(this.time[0]).format('YYYY-MM-DD')
+      // this.queryParams.endTime = moment(this.time[1]).format('YYYY-MM-DD')
       this.loading = true;
       listBatch( this.queryParams).then((res) => {
         if (res.code == 200) {
-          this.expertList = res.rows
+          this.expertList = res.rows.map(item => {
+            return {
+              ...item,
+              trainOrgName: item.trainOrgName ? item.trainOrgName : '--',
+              startTime: item.startTime ? item.startTime : '--',
+              endTime: item.endTime ? item.endTime : '--',
+              category: item.category ? item.category : '--'
+            }
+          })
           this.total = res.total
           this.loading = false;
         }
@@ -142,8 +213,13 @@
       this.queryParams = {
         pageNum: 1,
         pageSize: 10,
-        platform: ''
+        institutionId: '',
+        startTime: '',
+        endTime: '',
+        qualificationType: null,
+        trainOrgId: null
       }
+      this.time = [];
       this.getList();
     },
     handleViewCourse(data){

--
Gitblit v1.9.2