Skip to content

T
tea-resources-web
Commit c6ddb05b authored by liwei's avatar liwei
Browse files
Options

修改了bug

parent a0b79006
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 505 additions and 479 deletions
src/views/courseInformation/classManagement/index.vue
View file @ c6ddb05b
......@@ -1566,7 +1566,8 @@ export default {
lessonType: [],
intelligentClassroom: '',
jobClassify: '',
courseDimensions: ''
courseDimensions: '',
tecClassifySchool: ''
},
defaultProps: {
children: 'children',
......@@ -1641,24 +1642,24 @@ export default {
this.form.tecClassifySchool = '' // 技术分类
this.form.jobClassify = '' // 岗位分类
this.form.difficultyClassify = '' // 难度等级
this.form.courseType = '' // 前沿讲堂
// this.form.courseType = '' // 前沿讲堂
this.form.intelligentClassroom = '' // 智联课堂
}
// if (values[0] === '1' && values[1] === undefined) {
// // 没有选技术端
// this.form.classPlan = [] // 技术端课程方案
// this.form.courseDimensions = '' // 课程维度
// this.form.jobClassify = '' // 岗位分类
// this.form.difficultyClassify = '' // 难度等级
// this.form.courseType = '' // 前沿讲堂
// this.form.intelligentClassroom = '' // 智联课堂
// }
// if (values[0] === '0' && values[1] === undefined) {
// // 没有选技能端
// this.form.classPlanSchool = [] // 技能端课程方案
// this.form.tecClassifySchool = '' // 技术分类
// this.form.courseType = '' // 前沿讲堂
// }
if (values[0] === '1' && values[1] === undefined) {
// 没有选技术端
this.form.classPlan = [] // 技术端课程方案
this.form.courseDimensions = '' // 课程维度
this.form.jobClassify = '' // 岗位分类
this.form.difficultyClassify = '' // 难度等级
// this.form.courseType = '' // 前沿讲堂
this.form.intelligentClassroom = '' // 智联课堂
}
if (values[0] === '0' && values[1] === undefined) {
// 没有选技能端
this.form.classPlanSchool = [] // 技能端课程方案
this.form.tecClassifySchool = '' // 技术分类
// this.form.courseType = '' // 前沿讲堂
}
},
/** 获取结束时间的范围限制*/
getEndPickerOptions(row) {
......@@ -1682,13 +1683,12 @@ export default {
this.multipleSelection.splice(index, 1)
this.selectedLessonCount = this.multipleSelection.length
console.log('id')
// this.lessonList.forEach(item => {
// if (item.businessId === id) {
// console.log('lessonList', item)
// this.$refs.multipleTable.toggleRowSelection(item, false)
this.$refs.multipleTable.toggleRowSelection(this.multipleSelection[index], false)
// }
// })
this.lessonList.forEach(item => {
if (item.businessId === id) {
console.log('lessonList', item)
this.$refs.multipleTable.toggleRowSelection(item, false)
}
})
},
// 显示选中的列表
showSelectedLesson() {
......@@ -2134,27 +2134,18 @@ export default {
// this.jobClassification = []
// this.technicalClassification = []
// this.form.lessonName = ''
this.form = {
page: 1,
rows: 10,
lessonDescription: '',
lessonName: '',
classHour: '',
classPlan: '',
classPlanSchool: '',
tecClassifySchool: '',
jobClassify: '',
tecClassify: '',
difficultyClassify: '',
lessonBrief: '',
lessonTeaName: '',
lessonPrice: '',
homeDisplay: '',
flag: '',
qualityLesson: '',
lessonType: [],
chronologicalOrdering: 1
}
console.log('this.form1111:', this.form)
this.form.classPlan = ''
this.form.classPlanSchool = ''
this.form.lessonType = []
this.form.difficultyClassify = ''
this.form.tecClassifySchool = ''
this.form.jobClassify = ''
this.form.lessonName = ''
this.form.courseType = ''
this.form.courseDimensions = ''
this.form.intelligentClassroom = ''
console.log('this.form222:', this.form)
// }
this.getLessonQueryPage()
},
......
src/views/courseInformation/courseManagement/courseCatalogues.vue
View file @ c6ddb05b
......@@ -1429,20 +1429,30 @@ export default {
}
},
addSubsegmentBefore(item) {
console.log('addSubsegmentBefore', item)
this.subsegmentForm = {
stuHourRadio: '', // 学时单选按钮
text: '新增子节',
chapterId: item.chapterId,
chapterName: '',
stuMeans: [],
stuMeansValue: '',
stuMeansFile: '',
classHours: 1,
stuMeansOpt: false,
sectionId: item.businessId
if (item.isOnTrial === '0' && item.videoUrl === null) {
// 当前小节如果没有关联视频并且没有勾选试用 才可以添加小节
console.log('addSubsegmentBefore111', item)
this.subsegmentForm = {
stuHourRadio: '', // 学时单选按钮
text: '新增子节',
chapterId: item.chapterId,
chapterName: '',
stuMeans: [],
stuMeansValue: '',
stuMeansFile: '',
classHours: 1,
stuMeansOpt: false,
sectionId: item.businessId
}
this.addSubsegmentNo('subsegmentForm')
} else {
// 弹出一个提示信息 在页面上方 并且在页面上方的中间
this.$notify({
title: '提示',
message: '当前小节有视频或已勾选试用，请先删除视频并取消试用，再添加小节!',
type: 'warning'
})
}
this.addSubsegmentNo('subsegmentForm')
},
// 添加子节
addSubsegmentNo(formName) {
......
src/views/courseInformation/courseManagement/index.vue
View file @ c6ddb05b
......@@ -68,8 +68,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="技术端课程方案:" prop="classPlan" v-if="queryParams.lessonType.includes('0')">
<el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="技术端课程方案" multiple clearable>
<el-form-item label="技术端课程方案:" prop="classPlan" v-if="queryParams.lessonType.includes('0')" >
<el-select v-model="queryParams.classPlan" class="selectWidth" placeholder="技术端课程方案" multiple clearable @change="onCourseTypeChange">
<el-option
v-for="item in coursePlanOptions"
:key="item.dictValue"
......@@ -79,7 +79,7 @@
</el-select>
</el-form-item>
<el-form-item label="技能端课程方案:" prop="classPlanSchool" v-if="queryParams.lessonType.includes('1')">
<el-select v-model="queryParams.classPlanSchool" class="selectWidth" placeholder="院校课程方案" multiple clearable>
<el-select v-model="queryParams.classPlanSchool" class="selectWidth" placeholder="院校课程方案" multiple clearable @change="onCourseTypeChange">
<el-option
v-for="item in coursePlanOptionsC"
:key="item.dictValue"
......@@ -1064,6 +1064,7 @@ export default {
console.log('values[1]:', values[1])
// 在这里添加你的逻辑
if (values[0] === undefined && values[1] === undefined) {
console.log('1111')
// 两个都没选
this.queryParams.lessonType = [] // 课程类型
this.queryParams.classPlan = [] // 技术端课程方案
......@@ -1076,19 +1077,32 @@ export default {
this.queryParams.intelligentClassroom = '' // 智联课堂
}
if (values[0] === '1' && values[1] === undefined) {
console.log('2222')
// 没有选技术端
this.queryParams.classPlan = [] // 技术端课程方案
this.queryParams.courseDimensions = '' // 课程维度
this.queryParams.jobClassify = '' // 岗位分类
this.queryParams.difficultyClassify = '' // 难度等级
this.queryParams.courseType = '' // 前沿讲堂
// this.queryParams.courseType = '' // 前沿讲堂
this.queryParams.tecClassifySchool = '' // 技术分类
this.queryParams.intelligentClassroom = '' // 智联课堂
}
if (values[0] === '0' && values[1] === undefined) {
// 没有选技能端
console.log('3333')
this.queryParams.classPlanSchool = [] // 技能端课程方案
this.queryParams.tecClassifySchool = '' // 技术分类
this.queryParams.courseType = '' // 前沿讲堂
// this.queryParams.courseType = '' // 前沿讲堂
}
},
onCourseTypeChange(values) {
console.log('Selected values:', values)
console.log('values[0]:', values[0])
console.log('values[1]:', values[1])
console.log('values[2]:', values[2])
// 当values没有值为0的时候，就让this.queryParams.courseType = ''
if (values[0] !== '0' && values[1] !== '0' && values[2] !== '0') {
this.queryParams.courseType = ''
}
},
getUploadType() {
......@@ -1195,7 +1209,8 @@ export default {
flag: '',
qualityLesson: '',
lessonType: [],
chronologicalOrdering: 1
chronologicalOrdering: 1,
courseDimensions: ''
}
this.loadData()
},
......
src/views/courseInformation/courseManagement/info/index.vue
View file @ c6ddb05b
......@@ -390,7 +390,7 @@ export default {
coursePlanOptions: [],
coursePlanOptionsC: [],
form: {
intelligentClassroom: [],
intelligentClassroom: '',
// 课程维度
enterpriseCourseDimensions: '',
// 课程名称
......@@ -587,53 +587,53 @@ export default {
// console.log('form.path:', this.form.path)
// console.log('精品课', this.form.qualityLesson)
// console.log('课程类型', this.form.lessonType)
if (praseStrEmpty(this.form.classPlan) === '') {
if (praseStrEmpty(this.form.classPlan) === '') { // 技术端课程方案
// 把字符串转换成数组
this.form.classPlan = []
} else {
this.form.classPlan = this.form.classPlan.split(',')
}
if (praseStrEmpty(this.form.jobClassify) === '') {
this.form.jobClassify = []
} else {
this.form.jobClassify = this.form.jobClassify.split(',')
}
if (praseStrEmpty(this.form.tecClassify) === '') {
this.form.tecClassify = []
} else {
this.form.tecClassify = this.form.tecClassify.split(',')
}
if (praseStrEmpty(this.form.courseTypeC) === '') {
this.form.courseTypeC = []
} else {
this.form.courseTypeC = this.form.courseTypeC.split(',')
}
if (praseStrEmpty(this.form.courseType) === '') {
this.form.courseType = []
} else {
this.form.courseType = this.form.courseType.split(',')
}
if (praseStrEmpty(this.form.enterpriseCourseDimensions) === '') {
this.form.enterpriseCourseDimensions = []
} else {
this.form.enterpriseCourseDimensions = this.form.enterpriseCourseDimensions.split(',')
}
if (praseStrEmpty(this.form.classPlanSchool) === '') {
if (praseStrEmpty(this.form.classPlanSchool) === '') { // 企业端课程方案
// 把字符串转换成数组
this.form.classPlanSchool = []
} else {
this.form.classPlanSchool = this.form.classPlanSchool.split(',')
}
if (praseStrEmpty(this.form.tecClassifySchool) === '') {
this.form.tecClassifySchool = []
} else {
this.form.tecClassifySchool = this.form.tecClassifySchool.split(',')
}
if (praseStrEmpty(this.form.intelligentClassroom) === '') {
this.form.intelligentClassroom = []
} else {
this.form.intelligentClassroom = this.form.intelligentClassroom.split(',')
}
// if (praseStrEmpty(this.form.jobClassify) === '') { // 岗位分类
// this.form.jobClassify = []
// } else {
// this.form.jobClassify = this.form.jobClassify.split(',')
// }
// if (praseStrEmpty(this.form.tecClassify) === '') { // 技术分类
// this.form.tecClassify = []
// } else {
// this.form.tecClassify = this.form.tecClassify.split(',')
// }
// if (praseStrEmpty(this.form.courseTypeC) === '') { // 前沿讲堂分类
// this.form.courseTypeC = []
// } else {
// this.form.courseTypeC = this.form.courseTypeC.split(',')
// }
// if (praseStrEmpty(this.form.courseType) === '') { // 前沿讲堂分类
// this.form.courseType = []
// } else {
// this.form.courseType = this.form.courseType.split(',')
// }
// if (praseStrEmpty(this.form.enterpriseCourseDimensions) === '') { // 课程维度
// this.form.enterpriseCourseDimensions = []
// } else {
// this.form.enterpriseCourseDimensions = this.form.enterpriseCourseDimensions.split(',')
// }
// if (praseStrEmpty(this.form.tecClassifySchool) === '') { // 技能端技术分类
// this.form.tecClassifySchool = []
// } else {
// this.form.tecClassifySchool = this.form.tecClassifySchool.split(',')
// }
// if (praseStrEmpty(this.form.intelligentClassroom) === '') { // 智联课堂
// this.form.intelligentClassroom = []
// } else {
// this.form.intelligentClassroom = this.form.intelligentClassroom.split(',')
// }
this.imageUrl = response.data.path
console.log('this.form', this.form.classPlan)
})
......
src/views/courseInformation/unitManagement/index.vue
View file @ c6ddb05b
......@@ -171,7 +171,7 @@
<el-form-item label="单位名称:" prop="unitName">
<el-input v-model.trim="form.unitName" :maxlength="30" placeholder="请输入单位名称" />
</el-form-item>
<el-form-item label="单位管理员:" prop="unitNumber">
<el-form-item label="单位管理员:" prop="userId">
<el-select v-model="form.userId" filterable style="width: 100%" clearable placeholder="请选择管理员账号">
<el-option
v-for="(item,index) in userList"
......@@ -386,6 +386,8 @@ export default {
// 取消按钮
cancel() {
this.open = false
// 去除this.userList最后一个对象
this.userList.pop()
this.reset()
},
// 表单重置
......@@ -443,6 +445,13 @@ export default {
const id = row.businessId
getSysUnit(id).then(response => {
this.form = response.data
// // 将查询出的response.data临时添加到this.userList中
// this.addForm = {
// businessId: response.data.userId,
// username: response.data.username
// }
// this.userList.push(this.addForm)
// console.log('this.userList', this.userList)
if (response.data.lessonType === '1' && response.data.lessonTypeSchool === '1') {
this.form.lessonType = ['0', '1']
}
......
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