Skip to content

K
kaoshi-java
Commit b1cbc3fc authored by 刘帅's avatar 刘帅
Browse files
Options

1.【专业介绍】等6个富文本输入信息移动至【职业信息列表】

parent d0f5ee3f
Show whitespace changes
Inline Side-by-side
Showing with 178 additions and 39 deletions
ruoyi-admin/src/main/java/com/ruoyi/hezhi/controller/TbCourseController.java
View file @ b1cbc3fc
......@@ -114,6 +114,22 @@ public class TbCourseController extends BaseController
return AjaxResult.success();
}
/**
* 新增课程
*/
@PreAuthorize("@ss.hasPermi('hezhi:course:add')")
@Log(title = "课程-专业介绍", businessType = BusinessType.INSERT)
@PostMapping("/addCourseMajor")
public AjaxResult addCourseMajor(@RequestBody TbCourse tbCourse)
{
TbCourse course = tbCourseService.selectTbCourseByCourseId(tbCourse.getCourseId());
if (null == course) {
return AjaxResult.error("课程不存在，请检查后重试");
}
tbCourseService.updateTbCourseById(tbCourse);
return AjaxResult.success();
}
/**
* 修改课程
*/
......
ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbCourse.java
View file @ b1cbc3fc
......@@ -174,4 +174,22 @@ public class TbCourse extends BaseEntity
@Excel(name = "参考资料")
private String courseInformation;
/** 专业介绍 */
private String majorDetails;
/** 研究方向 */
private String majorOverview;
/** 实践环节 */
private String majorSyllabus;
/** 就业方向 */
private String majorKnowledge;
/** 政策支持 */
private String majorCertificate;
/** 证书样本 */
private String majorInformation;
}
ruoyi-system/src/main/java/com/ruoyi/hezhi/domain/TbMajorClass.java
View file @ b1cbc3fc
......@@ -83,24 +83,6 @@ public class TbMajorClass extends TreeEntity
/** 删除标记（0-正常，1-删除） */
private Integer delFlag;
/** 专业详情 */
private String majorDetails;
/** 专业概述 */
private String majorOverview;
/** 专业大纲 */
private String majorSyllabus;
/** 预备知识 */
private String majorKnowledge;
/** 证书要求 */
private String majorCertificate;
/** 参考资料 */
private String majorInformation;
private List<TbMajorClass> childrenList;
}
ruoyi-system/src/main/java/com/ruoyi/hezhi/service/ITbCourseService.java
View file @ b1cbc3fc
......@@ -56,6 +56,14 @@ public interface ITbCourseService
*/
public int updateTbCourse(TbCourse tbCourse);
/**
* 修改课程
*
* @param tbCourse 课程
* @return 结果
*/
public int updateTbCourseById(TbCourse tbCourse);
/**
* 批量删除课程
*
......
ruoyi-system/src/main/java/com/ruoyi/hezhi/service/impl/TbCourseServiceImpl.java
View file @ b1cbc3fc
......@@ -133,6 +133,20 @@ public class TbCourseServiceImpl implements ITbCourseService
return tbCourseMapper.updateTbCourse(tbCourse);
}
/**
* 修改课程
*
* @param tbCourse 课程
* @return 结果
*/
@Override
public int updateTbCourseById(TbCourse tbCourse)
{
tbCourse.setUpdateTime(DateUtils.getNowDate());
return tbCourseMapper.updateTbCourse(tbCourse);
}
/**
* 批量删除课程
*
......
ruoyi-system/src/main/resources/mapper/hezhi/TbCourseMapper.xml
View file @ b1cbc3fc
......@@ -45,6 +45,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="isRecommend" column="is_recommend" />
<result property="courseCertificate" column="course_certificate" />
<result property="courseInformation" column="course_information" />
<result property="majorDetails" column="major_details" />
<result property="majorOverview" column="major_overview" />
<result property="majorSyllabus" column="major_syllabus" />
<result property="majorKnowledge" column="major_knowledge" />
<result property="majorCertificate" column="major_certificate" />
<result property="majorInformation" column="major_information" />
</resultMap>
<sql id="selectTbCourseVo">
......@@ -56,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tc.course_arrange, tc.participate_num, tc.course_details, tc.course_overview, tc.course_syllabus, tc.course_knowledge, tc.course_team, tc.tag_name,
tc.teacher_ids, tc.remarks, tc.sort, tc.status,
tc.publication_time, tc.publisher, tc.create_time, tc.create_by, tc.update_time, tc.update_by, tc.delete_time, tc.delete_by, tc.del_flag,
tc.major_details, tc.major_overview, tc.major_syllabus, tc.major_knowledge, tc.major_certificate, tc.major_information,
(
select GROUP_CONCAT(tct.type_name SEPARATOR '、')
from tb_type_course ttc
......@@ -242,6 +249,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="isRecommend != null">is_recommend = #{isRecommend},</if>
<if test="courseCertificate != null">course_certificate = #{courseCertificate},</if>
<if test="courseInformation != null">course_information = #{courseInformation},</if>
<if test="majorDetails != null">major_details = #{majorDetails},</if>
<if test="majorOverview != null">major_overview = #{majorOverview},</if>
<if test="majorSyllabus != null">major_syllabus = #{majorSyllabus},</if>
<if test="majorKnowledge != null">major_knowledge = #{majorKnowledge},</if>
<if test="majorCertificate != null">major_certificate = #{majorCertificate},</if>
<if test="majorInformation != null">major_information = #{majorInformation},</if>
</trim>
where course_id = #{courseId}
</update>
......
ruoyi-system/src/main/resources/mapper/hezhi/TbMajorClassMapper.xml
View file @ b1cbc3fc
......@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap>
<sql id="selectTbMajorClassVo">
select major_id, pid, level, type, major_name, major_logo_one, major_logo_two, is_recommend, remarks, sort, status, publication_time, publisher, create_time, create_by, update_time, update_by, delete_time, delete_by, del_flag, major_details, major_overview, major_syllabus, major_knowledge, major_certificate, major_information from tb_major_class
select major_id, pid, level, type, major_name, major_logo_one, major_logo_two, is_recommend, remarks, sort, status, publication_time, publisher, create_time, create_by, update_time, update_by, delete_time, delete_by, del_flag from tb_major_class
</sql>
<select id="selectTbMajorClassList" parameterType="TbMajorClass" resultMap="TbMajorClassResult">
......
ruoyi-ui/src/api/hezhi/course.js
View file @ b1cbc3fc
......@@ -35,6 +35,15 @@ export function updateCourse(data) {
})
}
// 修改课程
export function addCourseMajor(data) {
return request({
url: '/hezhi/course/addCourseMajor',
method: 'post',
data: data
})
}
// 删除课程
export function delCourse(courseId) {
return request({
......
ruoyi-ui/src/views/hezhi/course/index.vue
View file @ b1cbc3fc
......@@ -160,6 +160,13 @@
</el-link>
</template>
</el-table-column>
<el-table-column align="center" prop="screenTeacher" width="80">
<template slot-scope="scope">
<el-link type="primary" @click="addProfession(scope.row)">
<span>专业介绍</span>
</el-link>
</template>
</el-table-column>
<el-table-column label="推荐" align="center" prop="isRecommend">
<template slot-scope="scope">
......@@ -263,6 +270,9 @@
<el-radio v-for="dict in dict.type.tb_is_recommend" :key="dict.value" :label="parseInt(dict.value)">{{dict.label }}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="参加人数" prop="participateNum">
<el-input-number v-model="form.participateNum" placeholder="请输入参加人数" />
</el-form-item>
<!-- <el-form-item label="标签" prop="tagName">-->
<!-- <div v-for="(item,index) in valueList" :key="index">-->
......@@ -296,11 +306,40 @@
<el-button @click="openScreenTeacherCancel">关 闭</el-button>
</div>
</el-dialog>
<!--专业介绍-->
<el-dialog title="专业介绍" :visible.sync="professionShow" @close="professionCancel" width="1000px"
append-to-body>
<el-form ref="professionForm" :model="professionForm" :rules="rules" label-width="80px">
<el-form-item label="专业介绍" prop="majorDetails">
<editor v-model="professionForm.majorDetails" :min-height="100"/>
</el-form-item>
<el-form-item label="研究方向" prop="majorOverview">
<editor v-model="professionForm.majorOverview" :min-height="100"/>
</el-form-item>
<el-form-item label="实践环节" prop="majorSyllabus">
<editor v-model="professionForm.majorSyllabus" :min-height="100"/>
</el-form-item>
<el-form-item label="就业方向" prop="majorKnowledge">
<editor v-model="professionForm.majorKnowledge" :min-height="100"/>
</el-form-item>
<el-form-item label="政策支持" prop="majorCertificate">
<editor v-model="professionForm.majorCertificate" :min-height="100"/>
</el-form-item>
<el-form-item label="证书样本" prop="majorInformation">
<editor v-model="professionForm.majorInformation" :min-height="100"/>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="professionSubmitForm">确 定</el-button>
<el-button @click="professionCancel">取 消</el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import { listCourse, getCourse, delCourse, addCourse, updateCourse } from "@/api/hezhi/course";
import {listCourse, getCourse, delCourse, addCourse, updateCourse, addCourseMajor} from "@/api/hezhi/course";
import { listCaseType } from "@/api/hezhi/caseType";
import CourseChapter from "@/views/hezhi/courseChapter";
import TeacherCourse from "@/views/hezhi/courseChapter/teacher";
......@@ -370,6 +409,7 @@ export default {
},
// 表单参数
form: {},
professionForm:{},
// 表单校验
rules: {
// classIds: [
......@@ -391,6 +431,7 @@ export default {
],
evaluateAgencyOptions: undefined,
majorClassList: undefined,
professionShow:false,
};
},
created() {
......@@ -413,11 +454,49 @@ export default {
// }
// this.valueList.push(value)
// },
addProfession(data){
this.professionForm = {
courseId: data.courseId,
majorDetails:data.majorDetails,
majorOverview:data.majorOverview,
majorSyllabus:data.majorSyllabus,
majorKnowledge:data.majorKnowledge,
majorCertificate:data.majorCertificate,
majorInformation:data.majorInformation,
};
this.professionShow = true;
console.log('111', this.professionForm);
},
openScreenTeacherCancel() {
this.screenCourseId = null;
this.openScreenTeacher = false;
},
professionCancel(){
this.professionShow = false;
this.professionReset()
},
professionReset(){
this.professionForm = {
courseId: null,
majorDetails:null,
majorOverview:null,
majorSyllabus:null,
majorKnowledge:null,
majorCertificate:null,
majorInformation:null,
};
},
professionSubmitForm(){
this.$refs["professionForm"].validate(valid => {
if (valid) {
addCourseMajor(this.professionForm).then(response => {
this.$modal.msgSuccess("操作成功");
this.professionShow = false;
this.getList();
});
}
});
},
/** 列表弹窗 */
getScreenTeacherList(row) {
this.screenCourseId = row.courseId;
......
ruoyi-ui/src/views/hezhi/majorClass/index.vue
View file @ b1cbc3fc
......@@ -179,24 +179,24 @@
<!-- <el-form-item label="备注" prop="remarks">-->
<!-- <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />-->
<!-- </el-form-item>-->
<el-form-item label="专业介绍" prop="majorDetails">
<editor v-model="form.majorDetails" :min-height="100"/>
</el-form-item>
<el-form-item label="研究方向" prop="majorOverview">
<editor v-model="form.majorOverview" :min-height="100"/>
</el-form-item>
<el-form-item label="实践环节" prop="majorSyllabus">
<editor v-model="form.majorSyllabus" :min-height="100"/>
</el-form-item>
<el-form-item label="就业方向" prop="majorKnowledge">
<editor v-model="form.majorKnowledge" :min-height="100"/>
</el-form-item>
<el-form-item label="政策支持" prop="majorCertificate">
<editor v-model="form.majorCertificate" :min-height="100"/>
</el-form-item>
<el-form-item label="证书样本" prop="majorInformation">
<editor v-model="form.majorInformation" :min-height="100"/>
</el-form-item>
<!-- <el-form-item label="专业介绍" prop="majorDetails">-->
<!-- <editor v-model="form.majorDetails" :min-height="100"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="研究方向" prop="majorOverview">-->
<!-- <editor v-model="form.majorOverview" :min-height="100"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="实践环节" prop="majorSyllabus">-->
<!-- <editor v-model="form.majorSyllabus" :min-height="100"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="就业方向" prop="majorKnowledge">-->
<!-- <editor v-model="form.majorKnowledge" :min-height="100"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="政策支持" prop="majorCertificate">-->
<!-- <editor v-model="form.majorCertificate" :min-height="100"/>-->
<!-- </el-form-item>-->
<!-- <el-form-item label="证书样本" prop="majorInformation">-->
<!-- <editor v-model="form.majorInformation" :min-height="100"/>-->
<!-- </el-form-item>-->
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
......
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