Commit 0a89c884 authored by 耿迪迪's avatar 耿迪迪

培训及考试人脸验证 gengdidi

parent 131f7091
...@@ -74,13 +74,13 @@ spring: ...@@ -74,13 +74,13 @@ spring:
# redis 配置 # redis 配置
redis: redis:
# 地址 # 地址
host: 127.0.0.1 host: 36.148.23.59
# 端口,默认为6379 # 端口,默认为6379
port: 6379 port: 6379
# 数据库索引 # 数据库索引
database: 0 database: 0
# 密码 # 密码
password: password: 1qaz2wsx3edc
# 连接超时时间 # 连接超时时间
timeout: 10s timeout: 10s
lettuce: lettuce:
...@@ -106,7 +106,7 @@ zehong: ...@@ -106,7 +106,7 @@ zehong:
# 实例演示开关 # 实例演示开关
demoEnabled: true demoEnabled: true
# 文件路径 示例( Windows配置D:/zehong/uploadPath,Linux配置 /home/zehong/uploadPath) # 文件路径 示例( Windows配置D:/zehong/uploadPath,Linux配置 /home/zehong/uploadPath)
profile: /home/zehong/uploadPath profile: E:/zehong/uploadPath
# 获取ip地址开关 # 获取ip地址开关
addressEnabled: false addressEnabled: false
# 验证码类型 math 数组计算 char 字符验证 # 验证码类型 math 数组计算 char 字符验证
......
...@@ -100,6 +100,9 @@ public class TTrainCourse extends BaseEntity ...@@ -100,6 +100,9 @@ public class TTrainCourse extends BaseEntity
/**判断题分数*/ /**判断题分数*/
private Integer judgmentScore; private Integer judgmentScore;
/** 是否人脸认证:1是 2否 */
private String isVeriftyFace;
public static long getSerialVersionUID() { public static long getSerialVersionUID() {
return serialVersionUID; return serialVersionUID;
} }
...@@ -297,6 +300,14 @@ public class TTrainCourse extends BaseEntity ...@@ -297,6 +300,14 @@ public class TTrainCourse extends BaseEntity
return testPersons; return testPersons;
} }
public String getIsVeriftyFace() {
return isVeriftyFace;
}
public void setIsVerfityFace(String isVeriftyFace) {
this.isVeriftyFace = isVeriftyFace;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
......
...@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -28,6 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="multipleChoiceScore" column="multiple_choice_score" /> <result property="multipleChoiceScore" column="multiple_choice_score" />
<result property="singleChoiceScore" column="single_choice_score" /> <result property="singleChoiceScore" column="single_choice_score" />
<result property="judgmentScore" column="judgment_score" /> <result property="judgmentScore" column="judgment_score" />
<result property="isVeriftyFace" column="is_verifty_face" />
</resultMap> </resultMap>
<resultMap id="StatisticsTrainCourseResult" type="StatisticsTrainCourse"> <resultMap id="StatisticsTrainCourseResult" type="StatisticsTrainCourse">
...@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -42,7 +43,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectTTrainCourseVo"> <sql id="selectTTrainCourseVo">
select multiple_choice_score,single_choice_score,judgment_score,course_id, course_name, course_type, course_conent, status,personnel_type, release_time, enclosure, video, qualified_num, topic_num, create_time, create_user, is_del, data_kind, test_start_time, test_end_time, test_persons,duration from t_train_course select multiple_choice_score,single_choice_score,judgment_score,course_id, course_name, course_type, course_conent, status,personnel_type, release_time, enclosure, video, qualified_num, topic_num, create_time, create_user, is_del, data_kind, test_start_time, test_end_time, test_persons,duration,is_verifty_face from t_train_course
</sql> </sql>
<select id="selectTTrainCourseList" parameterType="TTrainCourse" resultMap="TTrainCourseResult"> <select id="selectTTrainCourseList" parameterType="TTrainCourse" resultMap="TTrainCourseResult">
...@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -65,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="testStartTime != null "> and test_start_time = #{testStartTime}</if> <if test="testStartTime != null "> and test_start_time = #{testStartTime}</if>
<if test="testEndTime != null "> and test_end_time = #{testEndTime}</if> <if test="testEndTime != null "> and test_end_time = #{testEndTime}</if>
<if test="testPersons != null and testPersons != ''"> and test_persons = #{testPersons}</if> <if test="testPersons != null and testPersons != ''"> and test_persons = #{testPersons}</if>
<if test="isVeriftyFace != null and isVeriftyFace != ''"> and is_verifty_face = #{isVeriftyFace}</if>
</where> </where>
</select> </select>
...@@ -97,7 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -97,7 +99,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="multipleChoiceScore != null">multiple_choice_score,</if> <if test="multipleChoiceScore != null">multiple_choice_score,</if>
<if test="singleChoiceScore != null">single_choice_score,</if> <if test="singleChoiceScore != null">single_choice_score,</if>
<if test="judgmentScore != null">judgment_score,</if> <if test="judgmentScore != null">judgment_score,</if>
</trim> <if test="isVeriftyFace != null">is_verifty_face,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=","> <trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="courseName != null">#{courseName},</if> <if test="courseName != null">#{courseName},</if>
<if test="courseType != null">#{courseType},</if> <if test="courseType != null">#{courseType},</if>
...@@ -120,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -120,7 +123,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="multipleChoiceScore != null">#{multipleChoiceScore},</if> <if test="multipleChoiceScore != null">#{multipleChoiceScore},</if>
<if test="singleChoiceScore != null">#{singleChoiceScore},</if> <if test="singleChoiceScore != null">#{singleChoiceScore},</if>
<if test="judgmentScore != null">#{judgmentScore},</if> <if test="judgmentScore != null">#{judgmentScore},</if>
</trim> <if test="isVeriftyFace != null">#{isVeriftyFace},</if>
</trim>
</insert> </insert>
<update id="updateTTrainCourse" parameterType="TTrainCourse"> <update id="updateTTrainCourse" parameterType="TTrainCourse">
...@@ -147,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -147,6 +151,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="multipleChoiceScore != null">multiple_choice_score = #{multipleChoiceScore},</if> <if test="multipleChoiceScore != null">multiple_choice_score = #{multipleChoiceScore},</if>
<if test="singleChoiceScore != null">single_choice_score = #{singleChoiceScore},</if> <if test="singleChoiceScore != null">single_choice_score = #{singleChoiceScore},</if>
<if test="judgmentScore != null">judgment_score = #{judgmentScore},</if> <if test="judgmentScore != null">judgment_score = #{judgmentScore},</if>
<if test="isVeriftyFace != null">is_verifty_face = #{isVeriftyFace},</if>
</trim> </trim>
where course_id = #{courseId} where course_id = #{courseId}
</update> </update>
......
...@@ -93,6 +93,10 @@ ...@@ -93,6 +93,10 @@
:disabled="checkLock" :disabled="checkLock"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否人脸认证" prop="isVeriftyFace" style="margin-left: 50px">
<el-radio v-model="form.isVeriftyFace" label="1"></el-radio>
<el-radio v-model="form.isVeriftyFace" label="2"></el-radio>
</el-form-item>
</div> </div>
<!-- </div> --> <!-- </div> -->
<el-form-item label="课程内容" prop="courseConent"> <el-form-item label="课程内容" prop="courseConent">
...@@ -166,6 +170,7 @@ export default { ...@@ -166,6 +170,7 @@ export default {
courseConent: "", courseConent: "",
video: "", video: "",
enclosure: "", enclosure: "",
isVeriftyFace: "2"
}, },
fileType: ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf"], fileType: ["doc", "docx", "xls", "xlsx", "ppt", "txt", "pdf"],
fileListVideo: [], fileListVideo: [],
...@@ -234,6 +239,7 @@ export default { ...@@ -234,6 +239,7 @@ export default {
duration, duration,
testStartTime, testStartTime,
testEndTime, testEndTime,
isVeriftyFace,
} = data; } = data;
this.form = { this.form = {
courseName, courseName,
...@@ -244,6 +250,7 @@ export default { ...@@ -244,6 +250,7 @@ export default {
duration, duration,
testStartTime, testStartTime,
testEndTime, testEndTime,
isVeriftyFace,
}; };
console.log('video',video) console.log('video',video)
this.fileListVideo = video? [ this.fileListVideo = video? [
......
...@@ -44,6 +44,10 @@ ...@@ -44,6 +44,10 @@
:disabled="checkLock" :disabled="checkLock"
/> />
</el-form-item> </el-form-item>
<el-form-item label="是否人脸认证" prop="isVeriftyFace" style="margin-left: 50px">
<el-radio v-model="form.isVeriftyFace" label="1"></el-radio>
<el-radio v-model="form.isVeriftyFace" label="2"></el-radio>
</el-form-item>
</div> </div>
<el-form-item label="选择人员" prop="testPersons"> <el-form-item label="选择人员" prop="testPersons">
<ChangePapel <ChangePapel
...@@ -93,6 +97,7 @@ export default { ...@@ -93,6 +97,7 @@ export default {
testStartTime: "", testStartTime: "",
testEndTime: "", testEndTime: "",
testPersons: "", testPersons: "",
isVeriftyFace: "2"
}, },
jsonSelectNameList: null, jsonSelectNameList: null,
// '[{"peoPleId":880,"peoPleName":"孙卓亚"},{"peoPleId":871,"peoPleName":"张玉宾"}]', // '[{"peoPleId":880,"peoPleName":"孙卓亚"},{"peoPleId":871,"peoPleName":"张玉宾"}]',
...@@ -146,12 +151,13 @@ export default { ...@@ -146,12 +151,13 @@ export default {
getLessonById(this.courseId).then((res) => { getLessonById(this.courseId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
const data = res.data; const data = res.data;
const { courseName, testStartTime, testEndTime, testPersons } = data; const { courseName, testStartTime, testEndTime, testPersons, isVeriftyFace } = data;
this.form = { this.form = {
courseName, courseName,
testStartTime, testStartTime,
testEndTime, testEndTime,
testPersons, testPersons,
isVeriftyFace,
}; };
this.jsonSelectNameList = testPersons; this.jsonSelectNameList = testPersons;
this.$refs.changePaple.changeNameList(this.jsonSelectNameList); this.$refs.changePaple.changeNameList(this.jsonSelectNameList);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment