1205

ruoyi-system/src/main/java/com/ruoyi/system/controller/GradTableController.java

@@ -23,9 +23,9 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * A类证书Controller
- * 
+ *
  * @author ruoyi
- * @date 2022-11-28
+ * @date 2022-12-05
  */
 @RestController
 @RequestMapping("/system/grad")
@@ -96,7 +96,7 @@ public class GradTableController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:grad:remove')")
     @Log(title = "A类证书", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{ids}")
+    @DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Integer[] ids)
     {
         return toAjax(gradTableService.deleteGradTableByIds(ids));

ruoyi-system/src/main/java/com/ruoyi/system/domain/GradTable.java

@@ -9,14 +9,18 @@ import com.ruoyi.common.core.domain.BaseEntity;
 
 /**
  * A类证书对象 grad_table
- * 
+ *
  * @author ruoyi
- * @date 2022-11-28
+ * @date 2022-12-05
  */
 public class GradTable extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
+    /** 证书类型 */
+    @Excel(name = "证书类型")
+    private Integer certType;
+
     /** 姓名 */
     @Excel(name = "姓名")
     private String uesrName;
@@ -50,15 +54,9 @@ public class GradTable extends BaseEntity
     @Excel(name = "等级")
     private String level;
 
-    /** 培训起始时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "培训起始时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date startDate;
-
-    /** 培训截止时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "培训截止时间", width = 30, dateFormat = "yyyy-MM-dd")
-    private Date endDate;
+    /** 培训时间段 */
+    @Excel(name = "培训时间段")
+    private String trainPeriod;
 
     /** 照片 */
     @Excel(name = "照片")
@@ -78,174 +76,160 @@ public class GradTable extends BaseEntity
     /** 自增id */
     private Integer id;
 
-    /** 证书类型 */
-    @Excel(name = "证书类型")
-    private Integer certType;
+    public void setCertType(Integer certType)
+    {
+        this.certType = certType;
+    }
 
-    public void setUesrName(String uesrName) 
+    public Integer getCertType()
+    {
+        return certType;
+    }
+    public void setUesrName(String uesrName)
     {
         this.uesrName = uesrName;
     }
 
-    public String getUesrName() 
+    public String getUesrName()
     {
         return uesrName;
     }
-    public void setUserId(String userId) 
+    public void setUserId(String userId)
     {
         this.userId = userId;
     }
 
-    public String getUserId() 
+    public String getUserId()
     {
         return userId;
     }
-    public void setCertId(String certId) 
+    public void setCertId(String certId)
     {
         this.certId = certId;
     }
 
-    public String getCertId() 
+    public String getCertId()
     {
         return certId;
     }
-    public void setIssueDate(Date issueDate) 
+    public void setIssueDate(Date issueDate)
     {
         this.issueDate = issueDate;
     }
 
-    public Date getIssueDate() 
+    public Date getIssueDate()
     {
         return issueDate;
     }
-    public void setCertName(String certName) 
+    public void setCertName(String certName)
     {
         this.certName = certName;
     }
 
-    public String getCertName() 
+    public String getCertName()
     {
         return certName;
     }
-    public void setCourseName(String courseName) 
+    public void setCourseName(String courseName)
     {
         this.courseName = courseName;
     }
 
-    public String getCourseName() 
+    public String getCourseName()
     {
         return courseName;
     }
-    public void setCourseHours(String courseHours) 
+    public void setCourseHours(String courseHours)
     {
         this.courseHours = courseHours;
     }
 
-    public String getCourseHours() 
+    public String getCourseHours()
     {
         return courseHours;
     }
-    public void setLevel(String level) 
+    public void setLevel(String level)
     {
         this.level = level;
     }
 
-    public String getLevel() 
+    public String getLevel()
     {
         return level;
     }
-    public void setStartDate(Date startDate) 
-    {
-        this.startDate = startDate;
-    }
-
-    public Date getStartDate() 
-    {
-        return startDate;
-    }
-    public void setEndDate(Date endDate) 
+    public void setTrainPeriod(String trainPeriod)
     {
-        this.endDate = endDate;
+        this.trainPeriod = trainPeriod;
     }
 
-    public Date getEndDate() 
+    public String getTrainPeriod()
     {
-        return endDate;
+        return trainPeriod;
     }
-    public void setPicture(String picture) 
+    public void setPicture(String picture)
     {
         this.picture = picture;
     }
 
-    public String getPicture() 
+    public String getPicture()
     {
         return picture;
     }
-    public void setUserPhone(String userPhone) 
+    public void setUserPhone(String userPhone)
     {
         this.userPhone = userPhone;
     }
 
-    public String getUserPhone() 
+    public String getUserPhone()
     {
         return userPhone;
     }
-    public void setUserEmail(String userEmail) 
+    public void setUserEmail(String userEmail)
     {
         this.userEmail = userEmail;
     }
 
-    public String getUserEmail() 
+    public String getUserEmail()
     {
         return userEmail;
     }
-    public void setUpdateDate(Date updateDate) 
+    public void setUpdateDate(Date updateDate)
     {
         this.updateDate = updateDate;
     }
 
-    public Date getUpdateDate() 
+    public Date getUpdateDate()
     {
         return updateDate;
     }
-    public void setId(Integer id) 
+    public void setId(Integer id)
     {
         this.id = id;
     }
 
-    public Integer getId() 
+    public Integer getId()
     {
         return id;
     }
-    public void setCertType(Integer certType) 
-    {
-        this.certType = certType;
-    }
-
-    public Integer getCertType() 
-    {
-        return certType;
-    }
 
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("uesrName", getUesrName())
-            .append("userId", getUserId())
-            .append("certId", getCertId())
-            .append("issueDate", getIssueDate())
-            .append("certName", getCertName())
-            .append("courseName", getCourseName())
-            .append("courseHours", getCourseHours())
-            .append("level", getLevel())
-            .append("startDate", getStartDate())
-            .append("endDate", getEndDate())
-            .append("picture", getPicture())
-            .append("userPhone", getUserPhone())
-            .append("userEmail", getUserEmail())
-            .append("updateDate", getUpdateDate())
-            .append("id", getId())
-            .append("certType", getCertType())
-            .toString();
+                .append("certType", getCertType())
+                .append("uesrName", getUesrName())
+                .append("userId", getUserId())
+                .append("certId", getCertId())
+                .append("issueDate", getIssueDate())
+                .append("certName", getCertName())
+                .append("courseName", getCourseName())
+                .append("courseHours", getCourseHours())
+                .append("level", getLevel())
+                .append("trainPeriod", getTrainPeriod())
+                .append("picture", getPicture())
+                .append("userPhone", getUserPhone())
+                .append("userEmail", getUserEmail())
+                .append("updateDate", getUpdateDate())
+                .append("id", getId())
+                .toString();
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/mapper/GradTableMapper.java

@@ -5,15 +5,15 @@ import com.ruoyi.system.domain.GradTable;
 
 /**
  * A类证书Mapper接口
- * 
+ *
  * @author ruoyi
- * @date 2022-11-28
+ * @date 2022-12-05
  */
-public interface GradTableMapper 
+public interface GradTableMapper
 {
     /**
      * 查询A类证书
-     * 
+     *
      * @param id A类证书主键
      * @return A类证书
      */
@@ -21,7 +21,7 @@ public interface GradTableMapper
 
     /**
      * 查询A类证书列表
-     * 
+     *
      * @param gradTable A类证书
      * @return A类证书集合
      */
@@ -29,7 +29,7 @@ public interface GradTableMapper
 
     /**
      * 新增A类证书
-     * 
+     *
      * @param gradTable A类证书
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface GradTableMapper
 
     /**
      * 修改A类证书
-     * 
+     *
      * @param gradTable A类证书
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface GradTableMapper
 
     /**
      * 删除A类证书
-     * 
+     *
      * @param id A类证书主键
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface GradTableMapper
 
     /**
      * 批量删除A类证书
-     * 
+     *
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/IGradTableService.java

@@ -5,15 +5,15 @@ import com.ruoyi.system.domain.GradTable;
 
 /**
  * A类证书Service接口
- * 
+ *
  * @author ruoyi
- * @date 2022-11-28
+ * @date 2022-12-05
  */
-public interface IGradTableService 
+public interface IGradTableService
 {
     /**
      * 查询A类证书
-     * 
+     *
      * @param id A类证书主键
      * @return A类证书
      */
@@ -21,7 +21,7 @@ public interface IGradTableService
 
     /**
      * 查询A类证书列表
-     * 
+     *
      * @param gradTable A类证书
      * @return A类证书集合
      */
@@ -29,7 +29,7 @@ public interface IGradTableService
 
     /**
      * 新增A类证书
-     * 
+     *
      * @param gradTable A类证书
      * @return 结果
      */
@@ -37,7 +37,7 @@ public interface IGradTableService
 
     /**
      * 修改A类证书
-     * 
+     *
      * @param gradTable A类证书
      * @return 结果
      */
@@ -45,7 +45,7 @@ public interface IGradTableService
 
     /**
      * 批量删除A类证书
-     * 
+     *
      * @param ids 需要删除的A类证书主键集合
      * @return 结果
      */
@@ -53,7 +53,7 @@ public interface IGradTableService
 
     /**
      * 删除A类证书信息
-     * 
+     *
      * @param id A类证书主键
      * @return 结果
      */

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GradTableServiceImpl.java

@@ -9,19 +9,19 @@ import com.ruoyi.system.service.IGradTableService;
 
 /**
  * A类证书Service业务层处理
- * 
+ *
  * @author ruoyi
- * @date 2022-11-28
+ * @date 2022-12-05
  */
 @Service
-public class GradTableServiceImpl implements IGradTableService 
+public class GradTableServiceImpl implements IGradTableService
 {
     @Autowired
     private GradTableMapper gradTableMapper;
 
     /**
      * 查询A类证书
-     * 
+     *
      * @param id A类证书主键
      * @return A类证书
      */
@@ -33,7 +33,7 @@ public class GradTableServiceImpl implements IGradTableService
 
     /**
      * 查询A类证书列表
-     * 
+     *
      * @param gradTable A类证书
      * @return A类证书
      */
@@ -45,7 +45,7 @@ public class GradTableServiceImpl implements IGradTableService
 
     /**
      * 新增A类证书
-     * 
+     *
      * @param gradTable A类证书
      * @return 结果
      */
@@ -57,7 +57,7 @@ public class GradTableServiceImpl implements IGradTableService
 
     /**
      * 修改A类证书
-     * 
+     *
      * @param gradTable A类证书
      * @return 结果
      */
@@ -69,7 +69,7 @@ public class GradTableServiceImpl implements IGradTableService
 
     /**
      * 批量删除A类证书
-     * 
+     *
      * @param ids 需要删除的A类证书主键
      * @return 结果
      */
@@ -81,7 +81,7 @@ public class GradTableServiceImpl implements IGradTableService
 
     /**
      * 删除A类证书信息
-     * 
+     *
      * @param id A类证书主键
      * @return 结果
      */

ruoyi-system/src/main/resources/mapper/system/GradTableMapper.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.system.mapper.GradTableMapper">
-    
+
     <resultMap type="GradTable" id="GradTableResult">
+        <result property="certType"    column="cert_type"    />
         <result property="uesrName"    column="uesr_name"    />
         <result property="userId"    column="user_id"    />
         <result property="certId"    column="cert_id"    />
@@ -13,23 +14,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseName"    column="course_name"    />
         <result property="courseHours"    column="course_hours"    />
         <result property="level"    column="level"    />
-        <result property="startDate"    column="start_date"    />
-        <result property="endDate"    column="end_date"    />
+        <result property="trainPeriod"    column="train_period"    />
         <result property="picture"    column="picture"    />
         <result property="userPhone"    column="user_phone"    />
         <result property="userEmail"    column="user_email"    />
         <result property="updateDate"    column="update_date"    />
         <result property="id"    column="id"    />
-        <result property="certType"    column="cert_type"    />
     </resultMap>
 
     <sql id="selectGradTableVo">
-        select uesr_name, user_id, cert_id, issue_date, cert_name, course_name, course_hours, level, start_date, end_date, picture, user_phone, user_email, update_date, id, cert_type from grad_table
+        select cert_type, uesr_name, user_id, cert_id, issue_date, cert_name, course_name, course_hours, level, train_period, picture, user_phone, user_email, update_date, id from grad_table
     </sql>
 
     <select id="selectGradTableList" parameterType="GradTable" resultMap="GradTableResult">
         <include refid="selectGradTableVo"/>
-        <where>  
+        <where>
+            <if test="certType != null "> and cert_type = #{certType}</if>
             <if test="uesrName != null  and uesrName != ''"> and uesr_name like concat('%', #{uesrName}, '%')</if>
             <if test="userId != null  and userId != ''"> and user_id = #{userId}</if>
             <if test="certId != null  and certId != ''"> and cert_id = #{certId}</if>
@@ -37,18 +37,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseName != null  and courseName != ''"> and course_name like concat('%', #{courseName}, '%')</if>
             <if test="userPhone != null  and userPhone != ''"> and user_phone = #{userPhone}</if>
             <if test="userEmail != null  and userEmail != ''"> and user_email = #{userEmail}</if>
-            <if test="certType != null "> and cert_type = #{certType}</if>
         </where>
     </select>
-    
+
     <select id="selectGradTableById" parameterType="Integer" resultMap="GradTableResult">
         <include refid="selectGradTableVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertGradTable" parameterType="GradTable" useGeneratedKeys="true" keyProperty="id">
         insert into grad_table
         <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="certType != null">cert_type,</if>
             <if test="uesrName != null">uesr_name,</if>
             <if test="userId != null">user_id,</if>
             <if test="certId != null">cert_id,</if>
@@ -57,15 +57,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseName != null">course_name,</if>
             <if test="courseHours != null">course_hours,</if>
             <if test="level != null">level,</if>
-            <if test="startDate != null">start_date,</if>
-            <if test="endDate != null">end_date,</if>
+            <if test="trainPeriod != null">train_period,</if>
             <if test="picture != null">picture,</if>
             <if test="userPhone != null">user_phone,</if>
             <if test="userEmail != null">user_email,</if>
             <if test="updateDate != null">update_date,</if>
-            <if test="certType != null">cert_type,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="certType != null">#{certType},</if>
             <if test="uesrName != null">#{uesrName},</if>
             <if test="userId != null">#{userId},</if>
             <if test="certId != null">#{certId},</if>
@@ -74,19 +73,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseName != null">#{courseName},</if>
             <if test="courseHours != null">#{courseHours},</if>
             <if test="level != null">#{level},</if>
-            <if test="startDate != null">#{startDate},</if>
-            <if test="endDate != null">#{endDate},</if>
+            <if test="trainPeriod != null">#{trainPeriod},</if>
             <if test="picture != null">#{picture},</if>
             <if test="userPhone != null">#{userPhone},</if>
             <if test="userEmail != null">#{userEmail},</if>
             <if test="updateDate != null">#{updateDate},</if>
-            <if test="certType != null">#{certType},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateGradTable" parameterType="GradTable">
         update grad_table
         <trim prefix="SET" suffixOverrides=",">
+            <if test="certType != null">cert_type = #{certType},</if>
             <if test="uesrName != null">uesr_name = #{uesrName},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="certId != null">cert_id = #{certId},</if>
@@ -95,13 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseName != null">course_name = #{courseName},</if>
             <if test="courseHours != null">course_hours = #{courseHours},</if>
             <if test="level != null">level = #{level},</if>
-            <if test="startDate != null">start_date = #{startDate},</if>
-            <if test="endDate != null">end_date = #{endDate},</if>
+            <if test="trainPeriod != null">train_period = #{trainPeriod},</if>
             <if test="picture != null">picture = #{picture},</if>
             <if test="userPhone != null">user_phone = #{userPhone},</if>
             <if test="userEmail != null">user_email = #{userEmail},</if>
             <if test="updateDate != null">update_date = #{updateDate},</if>
-            <if test="certType != null">cert_type = #{certType},</if>
         </trim>
         where id = #{id}
     </update>
@@ -111,7 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </delete>
 
     <delete id="deleteGradTableByIds" parameterType="String">
-        delete from grad_table where id in 
+        delete from grad_table where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>

ruoyi-ui/src/api/cert.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function getCert(data) {
+    return request({
+      url: '/system/grad/list',
+      method: 'post',
+      data: data
+    })
+}

ruoyi-ui/src/views/cert/grad/index.vue

@@ -69,10 +69,11 @@
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button style="margin-left:20px" icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb18">
+
+    <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -120,42 +121,33 @@
 
     <el-table v-loading="loading" :data="gradList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="证书类型" align="center" prop="certType" width="120">
+      <el-table-column label="证书类型" align="center" prop="certType">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.cert_a_type" :value="scope.row.certType"/>
         </template>
       </el-table-column>
-      <el-table-column label="姓名" align="center" prop="uesrName" width="120"/>
-      <el-table-column label="身份证" align="center" prop="userId" width="200"/>
-      <el-table-column label="证书编号" align="center" prop="certId" width="200"/>
+      <el-table-column label="姓名" align="center" prop="uesrName" />
+      <el-table-column label="身份证" align="center" prop="userId" />
+      <el-table-column label="证书编号" align="center" prop="certId" />
       <el-table-column label="发证时间" align="center" prop="issueDate" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.issueDate, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="培训名称" align="center" prop="certName" width="200"/>
-      <el-table-column label="课程名称" align="center" prop="courseName" width="200"/>
-      <el-table-column label="学时数" align="center" prop="courseHours" width="100"/>
-      <el-table-column label="等级" align="center" prop="level" width="100"/>
-      <el-table-column label="培训起始时间" align="center" prop="startDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.startDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="培训截止时间" align="center" prop="endDate" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endDate, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+      <el-table-column label="培训名称" align="center" prop="certName" />
+      <el-table-column label="课程名称" align="center" prop="courseName" />
+      <el-table-column label="学时数" align="center" prop="courseHours" />
+      <el-table-column label="等级" align="center" prop="level" />
+      <el-table-column label="培训时间段" align="center" prop="trainPeriod" />
       <el-table-column label="照片" align="center" prop="picture" width="100">
         <template slot-scope="scope">
           <image-preview :src="scope.row.picture" :width="50" :height="50"/>
         </template>
       </el-table-column>
-      <el-table-column label="手机号码" align="center" prop="userPhone" width="120"/>
-      <el-table-column label="邮箱" align="center" prop="userEmail" width="200"/>
-      <!-- <el-table-column label="自增id" align="center" prop="id" /> -->
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120">
+      <el-table-column label="手机号码" align="center" prop="userPhone" />
+      <el-table-column label="邮箱" align="center" prop="userEmail" />
+      <el-table-column label="自增id" align="center" prop="id" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -184,10 +176,10 @@
     />
 
     <!-- 添加或修改A类证书对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="证书类型" prop="certType">
-          <el-select v-model="form.certType" placeholder="请选择证书类型" style="width:100%">
+          <el-select v-model="form.certType" placeholder="请选择证书类型">
             <el-option
               v-for="dict in dict.type.cert_a_type"
               :key="dict.value"
@@ -210,7 +202,7 @@
             v-model="form.issueDate"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="请选择发证时间" style="width:100%">
+            placeholder="请选择发证时间">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="培训名称" prop="certName">
@@ -225,24 +217,11 @@
         <el-form-item label="等级" prop="level">
           <el-input v-model="form.level" placeholder="请输入等级" />
         </el-form-item>
-        <el-form-item label="培训起始时间" prop="startDate"  >
-          <el-date-picker clearable
-            v-model="form.startDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择培训起始时间" style="width:100%" >
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="培训截止时间" prop="endDate">
-          <el-date-picker clearable
-            v-model="form.endDate"
-            type="date"
-            value-format="yyyy-MM-dd"
-            placeholder="请选择培训截止时间" style="width:100%">
-          </el-date-picker>
+        <el-form-item label="培训时间段" prop="trainPeriod">
+          <el-input v-model="form.trainPeriod" type="textarea" placeholder="请输入内容" />
         </el-form-item>
         <el-form-item label="照片">
-          <image-upload v-model="form.picture" />
+          <image-upload v-model="form.picture"/>
         </el-form-item>
         <el-form-item label="手机号码" prop="userPhone">
           <el-input v-model="form.userPhone" placeholder="请输入手机号码" />
@@ -250,15 +229,14 @@
         <el-form-item label="邮箱" prop="userEmail">
           <el-input v-model="form.userEmail" placeholder="请输入邮箱" />
         </el-form-item>
-        <!-- <el-form-item label="导入系统的时间戳" prop="updateDate">
+        <el-form-item label="导入系统的时间戳" prop="updateDate">
           <el-date-picker clearable
             v-model="form.updateDate"
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="请选择导入系统的时间戳">
           </el-date-picker>
-        </el-form-item> -->
-        
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -298,6 +276,7 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 10,
+        certType: null,
         uesrName: null,
         userId: null,
         certId: null,
@@ -305,7 +284,6 @@ export default {
         courseName: null,
         userPhone: null,
         userEmail: null,
-        certType: null
       },
       // 表单参数
       form: {},
@@ -335,6 +313,7 @@ export default {
     // 表单重置
     reset() {
       this.form = {
+        certType: null,
         uesrName: null,
         userId: null,
         certId: null,
@@ -343,14 +322,12 @@ export default {
         courseName: null,
         courseHours: null,
         level: null,
-        startDate: null,
-        endDate: null,
+        trainPeriod: null,
         picture: null,
         userPhone: null,
         userEmail: null,
         updateDate: null,
-        id: null,
-        certType: null
+        id: null
       };
       this.resetForm("form");
     },
@@ -425,8 +402,3 @@ export default {
   }
 };
 </script>
-<style lang="scss" scoped>
-.mb18{
-  margin-bottom: 18px;
-}
-</style>

ruoyi-ui/src/views/certInquire/member/index.vue

@@ -36,6 +36,7 @@
   
 <script>
 import { getCodeImg } from "@/api/login";
+import { getCert } from "@/api/cert"
 export default {
   data() {
     return {