Skip to content

T
tea-resources-web
Commit 970e7f3f authored by 高宇's avatar 高宇
Browse files
Options

Merge remote-tracking branch 'origin/1.0' into 1.0

parents a3108de8 0f5658f5
Hide whitespace changes
Inline Side-by-side
Showing with 112 additions and 82 deletions
src/views/contentManagement/developmentCourse/index.vue
View file @ 970e7f3f
...@@ -72,14 +72,14 @@ ...@@ -72,14 +72,14 @@
@click="handleAdd" @click="handleAdd"
>新增 >新增
</el-button> </el-button>
<el-button <!-- <el-button-->
:class="commonField.exportClass" <!-- :class="commonField.exportClass"-->
:type="commonField.typeSuccess" <!-- :type="commonField.typeSuccess"-->
:icon="commonField.exportIcon" <!-- :icon="commonField.exportIcon"-->
:size="commonField.smallSize" <!-- :size="commonField.smallSize"-->
@click="handleExport" <!-- @click="handleExport"-->
>导出 <!-- >导出-->
</el-button> <!-- </el-button>-->
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -107,13 +107,13 @@ ...@@ -107,13 +107,13 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标题" prop="title" width="440px" > <el-table-column label="标题" prop="title" width="440px">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.title || '-' }} {{ scope.row.title || '-' }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="正文" prop="text" :show-overflow-tooltip="true" > <el-table-column label="正文" prop="text" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.text || '-' }} {{ scope.row.text || '-' }}
</template> </template>
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,7 @@
<!-- <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>--> <!-- <span>{{ scope.row.createDate | transformDateByFormat('YYYY-MM-DD HH:mm') }}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column label="操作" class-name="small-padding fixed-width" width="110px" > <el-table-column label="操作" class-name="small-padding fixed-width" width="110px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
:class="commonField.updateClass" :class="commonField.updateClass"
......
src/views/contentManagement/newsInformation/index.vue
View file @ 970e7f3f
...@@ -330,7 +330,9 @@ export default { ...@@ -330,7 +330,9 @@ export default {
page: 1, page: 1,
rows: 10, rows: 10,
flag: '' flag: ''
} }
this.dateRange = []
this.loadData() this.loadData()
}, },
handleChangeTime() { handleChangeTime() {
......
src/views/contentManagement/newsInformation/info/index.vue
View file @ 970e7f3f
...@@ -169,9 +169,7 @@ ...@@ -169,9 +169,7 @@
prop="details" prop="details"
:rules="{ required: !(controls.isOperation === '3'), message: '请填写新闻内容', trigger: 'blur' }" :rules="{ required: !(controls.isOperation === '3'), message: '请填写新闻内容', trigger: 'blur' }"
> >
<!-- <div class="ql-editor">-->
<vue-editor id="editorsay" v-model="form.details" :editor-toolbar="customToolbar" :disabled="secondFromDisabled" @image-added="handleImageAdded" /> <vue-editor id="editorsay" v-model="form.details" :editor-toolbar="customToolbar" :disabled="secondFromDisabled" @image-added="handleImageAdded" />
<!-- </div>-->
</el-form-item> </el-form-item>
</el-col> </el-col>
......
src/views/courseInformation/courseManagement/courseCatalogues.vue
View file @ 970e7f3f
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
<span>暂无内容</span> <span>暂无内容</span>
</div> </div>
<div class="cur-content-detail"> <div class="cur-content-detail">
<div style="text-align: center">{{ lessonName }}</div> <div style="text-align: center">{{ lessonName }}<el-button type="primary" style="margin-left: 10px" size="mini" @click="goBack">返回</el-button> </div>
<dl v-for="(item,index) in chapterList"> <dl v-for="(item,index) in chapterList">
<dt class="chapter"> <dt class="chapter">
<span>第{{ index+1 }}章</span> <span>第{{ index+1 }}章</span>
...@@ -234,9 +234,9 @@ ...@@ -234,9 +234,9 @@
</div> </div>
<div class="cur-line" /> <div class="cur-line" />
<!--------------------------- 附加功能区 --------------------------------> <!--------------------------- 附加功能区 -------------------------------->
<div class="cur-footer"> <!-- <div class="cur-footer">-->
<span class="cur-btn goBack" style="background-color: #50bfff;" @click="goBack">返 回</span> <!-- <span class="cur-btn goBack" style="background-color: #50bfff;" @click="goBack">返 回</span>-->
</div> <!-- </div>-->
</div> </div>
</template> </template>
...@@ -565,7 +565,7 @@ export default { ...@@ -565,7 +565,7 @@ export default {
loading.close() loading.close()
// 给目录赋值 // 给目录赋值
if (_this.lessonId === '') { _this.lessonId = lessonId } if (_this.lessonId === '') { _this.lessonId = lessonId }
if (_this.classHours === '') { _this.classHours = classHours == '' ? 0 : classHours } if (_this.classHours === '') { _this.classHours = classHours === '' ? 0 : classHours }
if (_this.lessonName === '') { _this.lessonName = lessonName } if (_this.lessonName === '') { _this.lessonName = lessonName }
if (_this.code === '') { _this.code = code } if (_this.code === '') { _this.code = code }
if (_this.directionId === '') { _this.directionId = dirId } if (_this.directionId === '') { _this.directionId = dirId }
...@@ -919,7 +919,7 @@ export default { ...@@ -919,7 +919,7 @@ export default {
console.log(err) console.log(err)
}) })
}).catch(() => { }).catch(() => {
if (secHour == 1) { if (secHour === 1) {
this.chapterList[index].childList[indexChild].classHour = '0' this.chapterList[index].childList[indexChild].classHour = '0'
this.updateCancel = true this.updateCancel = true
} }
...@@ -1573,7 +1573,7 @@ export default { ...@@ -1573,7 +1573,7 @@ export default {
position:absolute; position:absolute;
top:50%; top:50%;
left:50%; left:50%;
margin-top:-50px; margin-top:50px;
margin-left:-50px; margin-left:-50px;
box-sizing:border-box; box-sizing:border-box;
} }
......
src/views/courseInformation/courseManagement/index.vue
View file @ 970e7f3f
...@@ -5,11 +5,11 @@ ...@@ -5,11 +5,11 @@
<div class="search" style="border-bottom: 14px solid #f4f4f4"> <div class="search" style="border-bottom: 14px solid #f4f4f4">
<el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true"> <el-form ref="queryForm" style="padding: 0 0 0 10px" :model="queryParams" :inline="true">
<el-form-item label="课程名称" prop="lessonName"> <el-form-item label="课程名称" prop="lessonName">
<el-input v-model="queryParams.lessonName" placeholder="课程名称" :maxlength="15" style="width: 200px" /> <el-input v-model="queryParams.lessonName" placeholder="课程名称" :maxlength="15" style="width: 210px" />
</el-form-item> </el-form-item>
<!-- 课程方案--> <!-- 课程方案-->
<el-form-item label="课程方案" prop="classPlan"> <el-form-item label="课程方案" prop="classPlan">
<el-select v-model="queryParams.classPlan" placeholder="课程方案" clearable> <el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="课程方案" clearable>
<el-option <el-option
v-for="item in coursePlanOptions" v-for="item in coursePlanOptions"
:key="item.dictValue" :key="item.dictValue"
...@@ -128,24 +128,8 @@ ...@@ -128,24 +128,8 @@
:icon="commonField.addIcon" :icon="commonField.addIcon"
:size="commonField.smallSize" :size="commonField.smallSize"
@click="handleAdd" @click="handleAdd"
>{{ commonField.addName }}</el-button> >{{ commonField.addName }}
<!-- //下载模板按钮--> </el-button>
<!-- <el-button-->
<!-- :class="commonField.importClass"-->
<!-- :type="commonField.typeWarning"-->
<!-- :icon="commonField.importIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="exportmould"-->
<!-- >下载模板</el-button>-->
<!-- &lt;!&ndash; //导入按钮&ndash;&gt;-->
<!-- <el-button-->
<!-- :class="commonField.importClass"-->
<!-- :type="commonField.typeWarning"-->
<!-- :icon="commonField.importIcon"-->
<!-- :size="commonField.smallSize"-->
<!-- @click="importmould"-->
<!-- >{{ commonField.importName }}</el-button>-->
<!-- <input id="btn_file" type="file" style="display:none" @change="fileupload">-->
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
...@@ -589,13 +573,13 @@ export default { ...@@ -589,13 +573,13 @@ export default {
}, },
// 是否首页显示list // 是否首页显示list
homeDisplayList: [ homeDisplayList: [
{ value: '0', label: '显示' }, { value: '1', label: '显示' },
{ value: '1', label: '未显示' } { value: '0', label: '未显示' }
], ],
// 是否企业精品课list // 是否企业精品课list
entQualityLessonList: [ entQualityLessonList: [
{ value: '0', label: '是' }, { value: '1', label: '是' },
{ value: '1', label: '否' } { value: '0', label: '否' }
], ],
// 上传提交 // 上传提交
uploadList: { uploadList: {
...@@ -621,7 +605,8 @@ export default { ...@@ -621,7 +605,8 @@ export default {
homeDisplay: '', homeDisplay: '',
flag: '', flag: '',
schoolQualityLesson: '', schoolQualityLesson: '',
entQualityLesson: '' entQualityLesson: '',
lessonTeaName: ''
}, },
coursePlanOptions: [], coursePlanOptions: [],
// pagination // pagination
...@@ -729,8 +714,19 @@ export default { ...@@ -729,8 +714,19 @@ export default {
this.queryParams = { this.queryParams = {
page: 1, page: 1,
rows: 10, rows: 10,
coursekey: '', lessonDescription: '',
searchByDirection: '' lessonName: '',
classHour: '',
classPlan: '',
jobClassify: '',
tecClassify: '',
difficultyClassify: '',
lessonBrief: '',
teacherName: '',
lessonPrice: '',
homeDisplay: '',
flag: '',
lessonTeaName: ''
} }
this.loadData() this.loadData()
}, },
...@@ -801,7 +797,7 @@ export default { ...@@ -801,7 +797,7 @@ export default {
}) })
}, },
// 修改是否院校精品课 // 修改是否院校精品课
handleSchoolQualityChange(row){ handleSchoolQualityChange(row) {
const text = row.schoolQualityLesson === '1' ? '显示' : '不显示' const text = row.schoolQualityLesson === '1' ? '显示' : '不显示'
const params = { const params = {
businessId: row.businessId, businessId: row.businessId,
...@@ -853,10 +849,10 @@ export default { ...@@ -853,10 +849,10 @@ export default {
var pages = res.rows// 查询过来的每页数据 var pages = res.rows// 查询过来的每页数据
_this.total = res.total// 总记录数 _this.total = res.total// 总记录数
_this.bussid = [] _this.bussid = []
console.log('查询过来的每页数据', pages)
for (let i = 0; i < pages.length; i++) { for (let i = 0; i < pages.length; i++) {
var obj = {} var obj = {}
obj.id = i + 1 obj.id = i + 1
obj.tcode = pages[i].code
obj.tlessonName = pages[i].lessonName obj.tlessonName = pages[i].lessonName
obj.bussinessId = pages[i].businessId obj.bussinessId = pages[i].businessId
obj.tname = pages[i].name obj.tname = pages[i].name
...@@ -873,8 +869,9 @@ export default { ...@@ -873,8 +869,9 @@ export default {
obj.credit = pages[i].credits obj.credit = pages[i].credits
obj.totalStuHours = pages[i].classHour obj.totalStuHours = pages[i].classHour
_this.bussid.push(pages[i].businessId) _this.bussid.push(pages[i].businessId)
obj.imageSrc = 'http://imgsrc.baidu.com/image/c0%3Dshijue1%2C0%2C0%2C294%2C40/sign=60aeee5da74bd11310c0bf7132c6ce7a/72f082025aafa40fe3c0c4f3a164034f78f0199d.jpg' // obj.imageSrc = 'http://imgsrc.baidu.com/image/c0%3Dshijue1%2C0%2C0%2C294%2C40/sign=60aeee5da74bd11310c0bf7132c6ce7a/72f082025aafa40fe3c0c4f3a164034f78f0199d.jpg'
data[i] = obj data[i] = obj
console.log('data', data)
} }
_this.tableData = pages _this.tableData = pages
console.log('tableData', _this.tableData) console.log('tableData', _this.tableData)
...@@ -983,9 +980,9 @@ export default { ...@@ -983,9 +980,9 @@ export default {
blessonAdd(params).then(res => { blessonAdd(params).then(res => {
let type = res.code let type = res.code
const message = res.message const message = res.message
type = (type == 200) ? 'success' : 'warning' type = (type === 200) ? 'success' : 'warning'
that.$notify({ that.$notify({
title: type == 'success' ? '成功' : '提示', title: type === 'success' ? '成功' : '提示',
message: message, message: message,
type: type type: type
}) })
...@@ -1323,15 +1320,15 @@ export default { ...@@ -1323,15 +1320,15 @@ export default {
}, },
//* ************目录*************// //* ************目录*************//
loadCurCat(index) { loadCurCat(index) {
console.log('什么玩意', this.bussid[index])
this.showSwitch.courseContent = false this.showSwitch.courseContent = false
this.showSwitch.curCat = true this.showSwitch.curCat = true
this.curCatForm.id = this.bussid[index] this.curCatForm.id = this.bussid[index]
this.curCatForm.totalStuHours = this.tableData[index].totalStuHours this.curCatForm.totalStuHours = this.tableData[index].totalStuHours
this.curCatForm.tlessonName = this.tableData[index].tlessonName this.curCatForm.tlessonName = this.tableData[index].lessonName
this.curCatForm.tcode = this.tableData[index].tcode this.curCatForm.tcode = this.tableData[index].tcode
this.curCatForm.directionId = this.tableData[index].directionId this.curCatForm.directionId = this.tableData[index].directionId
this.curCatForm.directionCode = this.tableData[index].directionCode this.curCatForm.directionCode = this.tableData[index].directionCode
console.log('this.curCatForm', this.curCatForm)
// 加载课程目录 // 加载课程目录
this.$refs.curcat.loadCatalog(this.curCatForm.id, this.curCatForm.totalStuHours, this.curCatForm.tlessonName, this.curCatForm.tcode, this.curCatForm.directionId, this.curCatForm.directionCode) this.$refs.curcat.loadCatalog(this.curCatForm.id, this.curCatForm.totalStuHours, this.curCatForm.tlessonName, this.curCatForm.tcode, this.curCatForm.directionId, this.curCatForm.directionCode)
}, },
...@@ -1370,7 +1367,7 @@ export default { ...@@ -1370,7 +1367,7 @@ export default {
} }
} }
#courseManage .el-select{ #courseManage .el-select{
width: 100%; width: 203px;
} }
.courseContent{ .courseContent{
/*padding-left: 15px;*/ /*padding-left: 15px;*/
......
src/views/courseInformation/courseManagement/info/index.vue
View file @ 970e7f3f
...@@ -85,9 +85,9 @@ ...@@ -85,9 +85,9 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row :gutter="100"> <el-row :gutter="100">
<!-- :rules="[{ required: status !== '3', message: '请输入课程讲师', trigger: 'blur' }]"--> <!-- "-->
<el-col :span="12"> <el-col :span="12">
<el-form-item label="课程讲师:" prop="teacherName"> <el-form-item label="课程讲师:" prop="teacherName" :rules="[{ required: status !== '3', message: '请输入课程讲师', trigger: 'blur' }]">
<el-select <el-select
v-model="form.teacherName" v-model="form.teacherName"
filterable filterable
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
<el-option <el-option
v-for="(items,index) in lecturerList" v-for="(items,index) in lecturerList"
:key="index" :key="index"
:label="items.dictLabel" :label="items.name"
:value="items.dictValue" :value="items.bussinessId"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
...@@ -127,8 +127,9 @@ ...@@ -127,8 +127,9 @@
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="首页显示:" prop="homeDisplay"> <el-form-item label="首页显示:" prop="homeDisplay">
<el-radio-group v-for="(item,index) in enterpriseCourseList" :key="index" v-model="form.homeDisplay"> <el-radio-group v-model="form.homeDisplay">
<el-radio :label="item.dictValue">{{ item.dictLabel }}</el-radio> <el-radio label="1">显示</el-radio>
<el-radio label="0">不显示</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -136,15 +137,17 @@ ...@@ -136,15 +137,17 @@
<el-row :gutter="100"> <el-row :gutter="100">
<el-col :span="12"> <el-col :span="12">
<el-form-item label="企业精品课:" prop="entQualityLesson"> <el-form-item label="企业精品课:" prop="entQualityLesson">
<el-radio-group v-for="(item,index) in enterpriseCourseList" :key="index" v-model="form.entQualityLesson"> <el-radio-group v-model="form.entQualityLesson">
<el-radio :label="item.dictValue">{{ item.dictLabel }}</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12"> <el-col :span="12">
<el-form-item label="院校精品课" prop="schoolQualityLesson"> <el-form-item label="院校精品课" prop="schoolQualityLesson">
<el-radio-group v-for="(item,index) in enterpriseCourseList" :key="index" v-model="form.schoolQualityLesson"> <el-radio-group v-model="form.schoolQualityLesson">
<el-radio :label="item.dictValue">{{ item.dictLabel }}</el-radio> <el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
...@@ -165,6 +168,14 @@ ...@@ -165,6 +168,14 @@
</el-upload> </el-upload>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="12">
<el-form-item label="课程状态" prop="schoolQualityLesson">
<el-radio-group v-model="form.flag">
<el-radio label="1">已发布</el-radio>
<el-radio label="0">未发布</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row> </el-row>
<el-row :gutter="20"> <el-row :gutter="20">
...@@ -197,6 +208,7 @@ ...@@ -197,6 +208,7 @@
import { uploadPublic } from '@/api/contentManagement/sysContest' import { uploadPublic } from '@/api/contentManagement/sysContest'
import { blessonAdd, queryTeaLessonJobs, queryTeaLessonTecs } from '@/api/courseManagement/indexApi' import { blessonAdd, queryTeaLessonJobs, queryTeaLessonTecs } from '@/api/courseManagement/indexApi'
import { getDict } from '@/api/system/dict/data' import { getDict } from '@/api/system/dict/data'
import { listCmsLecturer } from '@/api/courseManagement/cmsLecturer'
export default { export default {
name: 'Index', name: 'Index',
...@@ -226,7 +238,16 @@ export default { ...@@ -226,7 +238,16 @@ export default {
} }
], ],
// 企业精品课 // 企业精品课
enterpriseCourseList: [], enterpriseCourseList: [
{
dictLabel: '是',
dictValue: '1'
},
{
dictLabel: '否',
dictValue: '0'
}
],
// 难道集合 // 难道集合
difficultyList: [], difficultyList: [],
imageUrl: null, imageUrl: null,
...@@ -241,34 +262,34 @@ export default { ...@@ -241,34 +262,34 @@ export default {
// 课程名称 // 课程名称
lessonName: '', lessonName: '',
// 一句话介绍 // 一句话介绍
value2: '', lessonBrief: '',
// 课时数 // 课时数
classHour: '', classHour: '',
// 课程方案 // 课程方案
value4: '', classPlan: '',
// 岗位分类 // 岗位分类
value5: '', jobClassify: '',
// 技术分类 // 技术分类
value6: '', tecClassify: '',
// 课程讲师 // 课程讲师
value7: '', teacherName: '',
// 价格 // 价格
lessonPrice: '', lessonPrice: '',
// 难度
difficultyClassify: '',
// 首页显示 // 首页显示
value9: '', homeDisplay: '0',
// 课程状态
value10: '0',
// 企业精品课 // 企业精品课
value11: '', entQualityLesson: '0',
// 院校精品课 // 院校精品课
value12: '', schoolQualityLesson: '0',
// 课程封面 // 课程封面
value13: '', pictureId: '',
// 难度 // 课程介绍
value14: '', lessonDescription: '',
// 课程介绍: flag: '1'
value15: ''
}, },
teacherOptions: [],
rules: { rules: {
} }
} }
...@@ -285,6 +306,7 @@ export default { ...@@ -285,6 +306,7 @@ export default {
this.getCoursePlan() this.getCoursePlan()
this.getJobClassification() this.getJobClassification()
this.getCourseDirection() this.getCourseDirection()
this.getTeacher()
}, },
getDifficultyLevlList() { getDifficultyLevlList() {
getDict('difficulty_grade').then(res => { getDict('difficulty_grade').then(res => {
...@@ -346,6 +368,17 @@ export default { ...@@ -346,6 +368,17 @@ export default {
path: '/courseInformation/courseManagement/index' path: '/courseInformation/courseManagement/index'
}) })
}, },
// 查询讲师
getTeacher() {
const params = {
page: -1,
rows: -1
}
listCmsLecturer(params).then(res => {
this.lecturerList = res.rows
console.log('讲师', this.teacherOptions)
})
},
getTeaLessonJobs() { getTeaLessonJobs() {
queryTeaLessonJobs().then(res => { queryTeaLessonJobs().then(res => {
console.log('岗位信息', res) console.log('岗位信息', res)
......
src/views/courseInformation/examinationManagement/examinationPaper.vue
View file @ 970e7f3f
...@@ -682,7 +682,7 @@ export default { ...@@ -682,7 +682,7 @@ export default {
// this.form.optionB = optionB // this.form.optionB = optionB
// this.form.optionC = optionC // this.form.optionC = optionC
// this.form.optionD = optionD // this.form.optionD = optionD
this.title = '修改试题' this.title = '编辑试题'
this.dialogFormVisible = true this.dialogFormVisible = true
}) })
}, },
......
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