Skip to content

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

修改了课程标签相关的bug

parent 9da7ba44
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 113 deletions
src/api/sysUnit.js
View file @ dc8b7f35
......@@ -92,6 +92,13 @@ export function listCourseAll(query) {
})
}
// 7.查询所有的单位管理员信息
export function listUnitAdminAll(query) {
return request({
url: '/sysunit/queryAllUnitAdmins',
method: 'get',
params: query
})
}
src/views/courseInformation/classManagement/index.vue
View file @ dc8b7f35
......@@ -477,7 +477,7 @@
</el-table-column>
<el-table-column label="课程类型:" prop="lessonType" show-overflow-tooltip>
{{ form.lessonType === '0' ? '企业课程' : '院校课程' }}
{{ form.lessonType === '0' ? '技术端' : '技能端' }}
</el-table-column>
<el-table-column label="课程方案:" prop="classPlan" show-overflow-tooltip>
......@@ -1026,8 +1026,8 @@
<el-form-item label="课程名称:" prop="lessonName">
<el-input v-model="form.lessonName" placeholder="请输入课程名称"></el-input>
</el-form-item>
<el-form-item label="课程类型">
<el-select v-model="form.lessonType" placeholder="课程类型" multiple clearable>
<el-form-item label="课程类型" prop="lessonType">
<el-select v-model="form.lessonType" placeholder="课程类型" multiple clearable @change="onLessonTypeChange">
<el-option
v-for="item in lessonTypeOptions"
:key="item.dictValue"
......@@ -1047,7 +1047,7 @@
</el-select>
</el-form-item>
<el-form-item label="技能端课程方案:" prop="classPlanSchool" v-if="form.lessonType.includes('1')">
<el-select v-model="form.classPlanSchool" class="selectWidth" placeholder="院校课程方案" multiple clearable>
<el-select v-model="form.classPlanSchool" class="selectWidth" placeholder="技能端课程方案" multiple clearable>
<el-option
v-for="item in coursePlanOptionsC"
:key="item.dictValue"
......@@ -1056,7 +1056,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="前沿讲堂分类:" prop="courseType" v-if="form.classPlan.includes('0') || form.classPlanSchool.includes('0')">
<el-form-item label="前沿讲堂分类:" prop="courseType" v-if="(form.classPlan.includes('0') || form.classPlanSchool.includes('0')) && form.lessonType.length > 0">
<el-select v-model="form.courseType" placeholder="前沿讲堂分类" clearable>
<el-option
v-for="item in courseTypeOptions"
......@@ -1066,7 +1066,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="智联课堂分类:" prop="courseType" v-if="form.classPlan.includes('3')">
<el-form-item label="智联课堂分类:" prop="intelligentClassroom" v-if="form.classPlan.includes('3')">
<el-select v-model="form.intelligentClassroom" placeholder="智联课堂分类" clearable>
<el-option
v-for="item in intelligentClassroomOptions"
......@@ -1096,8 +1096,8 @@
/>
</el-select>
</el-form-item>
<el-form-item label="课程维度:" prop="enterpriseCourseDimensions" v-if="form.classPlan.includes('1')">
<el-select v-model="form.enterpriseCourseDimensions" placeholder="课程维度" clearable>
<el-form-item label="课程维度:" prop="courseDimensions" v-if="form.classPlan.includes('1')">
<el-select v-model="form.courseDimensions" placeholder="课程维度" clearable>
<el-option
v-for="item in courseDimensionsOptions"
:key="item.dictValue"
......@@ -1116,7 +1116,7 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="技术分类:" prop="tecClassifySchool" v-if="form.classPlanSchool.includes('1')">
<el-form-item label="技术分类:" prop="tecClassifySchool" v-if="form.classPlanSchool.includes('1') && form.lessonType.includes('1')">
<el-select v-model="form.tecClassifySchool" placeholder="技术分类" clearable>
<el-option
v-for="item in courseDirection"
......@@ -1555,15 +1555,18 @@ export default {
beginDate: '',
endDate: '',
remarks: '',
classPlan: '',
jobClassification: '',
technicalClassification: '',
lessonName: '',
classPlanSchool: '',
classPlan: [],
classPlanSchool: [],
technicalClassSchool: '',
difficultyClassify: '',
settingList: [],
lessonType: []
lessonType: [],
intelligentClassroom: '',
jobClassify: '',
courseDimensions: ''
},
defaultProps: {
children: 'children',
......@@ -1623,6 +1626,40 @@ export default {
this.getCoursePlanC()
},
methods: {
onLessonTypeChange(values) {
// 这个方法将在选择发生变化时被调用
console.log('Selected values:', values)
console.log('values[0]:', values[0])
console.log('values[1]:', values[1])
// 在这里添加你的逻辑
if (values[0] === undefined && values[1] === undefined) {
// 两个都没选
this.form.lessonType = [] // 课程类型
this.form.classPlan = [] // 技术端课程方案
this.form.classPlanSchool = [] // 技能端课程方案
this.form.courseDimensions = '' // 课程维度
this.form.tecClassifySchool = '' // 技术分类
this.form.jobClassify = '' // 岗位分类
this.form.difficultyClassify = '' // 难度等级
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 = '' // 前沿讲堂
// }
},
/** 获取结束时间的范围限制*/
getEndPickerOptions(row) {
return {
......@@ -1848,8 +1885,9 @@ export default {
},
// 获取技能端课程方案
getCoursePlanC() {
getDict('class_plan_C').then(res => {
getDict('class_plan_c').then(res => {
this.coursePlanOptionsC = res.data
console.log('技能端课程方案', this.coursePlanOptionsC)
this.sumcCursePlanOptions.push(...res.data)
})
},
......@@ -2022,7 +2060,7 @@ export default {
courseType: this.form.courseType,
intelligentClassroom: this.form.intelligentClassroom,
jobClassify: this.form.jobClassify,
enterpriseCourseDimensions: this.form.enterpriseCourseDimensions,
enterpriseCourseDimensions: this.form.courseDimensions,
tecClassifySchool: this.form.tecClassifySchool
}
queryBLessonWithTrial(query).then(res => {
......
src/views/courseInformation/courseManagement/index.vue
View file @ dc8b7f35
......@@ -59,7 +59,7 @@
</el-select>
</el-form-item>
<el-form-item label="课程类型:" prop="lessonType">
<el-select v-model="queryParams.lessonType" placeholder="课程类型" multiple clearable>
<el-select v-model="queryParams.lessonType" placeholder="课程类型" multiple clearable @change="onLessonTypeChange">
<el-option
v-for="item in lessonTypeOptions"
:key="item.dictValue"
......@@ -88,7 +88,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="前沿讲堂分类:" prop="courseType" v-if="queryParams.classPlan.includes('0') || queryParams.classPlanSchool.includes('0')">
<el-form-item label="前沿讲堂分类:" prop="courseType" v-if="(queryParams.classPlan.includes('0') || queryParams.classPlanSchool.includes('0')) && queryParams.lessonType.length > 0">
<el-select v-model="queryParams.courseType" placeholder="前沿讲堂分类" clearable>
<el-option
v-for="item in courseTypeOptions"
......@@ -98,7 +98,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="智联课堂分类:" prop="courseType" v-if="queryParams.classPlan.includes('3')">
<el-form-item label="智联课堂分类:" prop="intelligentClassroom" v-if="queryParams.classPlan.includes('3') && queryParams.lessonType.includes('0')">
<el-select v-model="queryParams.intelligentClassroom" placeholder="智联课堂分类" clearable>
<el-option
v-for="item in intelligentClassroomOptions"
......@@ -108,7 +108,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="难度等级:" prop="difficultyClassify" v-if="queryParams.classPlan.includes('1')">
<el-form-item label="难度等级:" prop="difficultyClassify" v-if="queryParams.classPlan.includes('1') && queryParams.lessonType.includes('0')">
<el-select v-model="queryParams.difficultyClassify" placeholder="难度等级" clearable>
<el-option
v-for="item in difficultyOptions"
......@@ -118,7 +118,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="岗位分类:" prop="jobClassify" v-if="queryParams.classPlan.includes('1')">
<el-form-item label="岗位分类:" prop="jobClassify" v-if="queryParams.classPlan.includes('1') && queryParams.lessonType.includes('0')">
<el-select v-model="queryParams.jobClassify" placeholder="岗位分类" clearable>
<el-option
v-for="item in valueOptions"
......@@ -128,7 +128,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="课程维度:" prop="courseDimensions" v-if="queryParams.classPlan.includes('1')">
<el-form-item label="课程维度:" prop="courseDimensions" v-if="queryParams.classPlan.includes('1') && queryParams.lessonType.includes('0')">
<el-select v-model="queryParams.courseDimensions" placeholder="课程维度" clearable>
<el-option
v-for="item in courseDimensionsOptions"
......@@ -148,7 +148,7 @@
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="技术分类:" prop="tecClassifySchool" v-if="queryParams.classPlanSchool.includes('1')">
<el-form-item label="技术分类:" prop="tecClassifySchool" v-if="queryParams.classPlanSchool.includes('1') && queryParams.lessonType.includes('1')">
<el-select v-model="queryParams.tecClassifySchool" placeholder="技术分类" clearable>
<el-option
v-for="item in courseDirection"
......@@ -948,8 +948,8 @@ export default {
lessonDescription: '',
lessonName: '',
classHour: '',
classPlan: '',
classPlanSchool: '',
classPlan: [],
classPlanSchool: [],
courseDimensions: '',
tecClassifySchool: '',
jobClassify: '',
......@@ -1057,6 +1057,40 @@ export default {
})
},
methods: {
onLessonTypeChange(values) {
// 这个方法将在选择发生变化时被调用
console.log('Selected values:', values)
console.log('values[0]:', values[0])
console.log('values[1]:', values[1])
// 在这里添加你的逻辑
if (values[0] === undefined && values[1] === undefined) {
// 两个都没选
this.queryParams.lessonType = [] // 课程类型
this.queryParams.classPlan = [] // 技术端课程方案
this.queryParams.classPlanSchool = [] // 技能端课程方案
this.queryParams.courseDimensions = '' // 课程维度
this.queryParams.tecClassifySchool = '' // 技术分类
this.queryParams.jobClassify = '' // 岗位分类
this.queryParams.difficultyClassify = '' // 难度等级
this.queryParams.courseType = '' // 前沿讲堂
this.queryParams.intelligentClassroom = '' // 智联课堂
}
if (values[0] === '1' && values[1] === undefined) {
// 没有选技术端
this.queryParams.classPlan = [] // 技术端课程方案
this.queryParams.courseDimensions = '' // 课程维度
this.queryParams.jobClassify = '' // 岗位分类
this.queryParams.difficultyClassify = '' // 难度等级
this.queryParams.courseType = '' // 前沿讲堂
this.queryParams.intelligentClassroom = '' // 智联课堂
}
if (values[0] === '0' && values[1] === undefined) {
// 没有选技能端
this.queryParams.classPlanSchool = [] // 技能端课程方案
this.queryParams.tecClassifySchool = '' // 技术分类
this.queryParams.courseType = '' // 前沿讲堂
}
},
getUploadType() {
const params = {
page: 1,
......@@ -1330,7 +1364,8 @@ export default {
chronologicalOrdering: _this.queryParams.chronologicalOrdering,
isAppraisal: _this.queryParams.isAppraisal,
courseType: _this.queryParams.courseType,
intelligentClassroom: _this.queryParams.intelligentClassroom
intelligentClassroom: _this.queryParams.intelligentClassroom,
enterpriseCourseDimensions: _this.queryParams.courseDimensions
}
queryBLessonsByPagination(params).then(response => {
if (this.$store.getters.type === '1') { // 开启
......
src/views/courseInformation/courseManagement/info/index.vue
View file @ dc8b7f35
......@@ -87,7 +87,6 @@
<el-select
v-model="form.courseType"
:disabled="form.lessonType === '0'"
multiple
class="normalSelct"
>
<el-option
......@@ -105,7 +104,6 @@
v-model="form.jobClassify"
:disabled="form.lessonType === '0'"
class="normalSelct"
multiple
>
<el-option
v-for="(items,index) in valueOptions"
......@@ -116,23 +114,6 @@
</el-select>
</el-form-item>
</el-col>
<!-- <el-col :span="12">-->
<!-- <el-form-item label="技术分类:" prop="tecClassify">-->
<!-- <el-select-->
<!-- v-model="form.tecClassify"-->
<!-- :disabled="form.lessonType === '0'"-->
<!-- multiple-->
<!-- class="normalSelct"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="(items,index) in courseDirection"-->
<!-- :key="index"-->
<!-- :label="items.dictLabel"-->
<!-- :value="items.dictValue"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<el-col span="12">
<el-form-item label="难度等级:" prop="difficultyClassify" :rules="[{ required: form.classPlan.includes('1'), message: '请选择难度等级', trigger: 'change' }]">
<el-select
......@@ -155,7 +136,6 @@
<el-select
v-model="form.enterpriseCourseDimensions"
:disabled="form.lessonType === '0'"
multiple
class="normalSelct"
>
<el-option
......@@ -172,7 +152,6 @@
<el-select
v-model="form.intelligentClassroom"
:disabled="form.lessonType === '0'"
multiple
class="normalSelct"
>
<el-option
......@@ -214,7 +193,6 @@
<el-select
v-model="form.courseTypeC"
:disabled="form.lessonTypeSchool === '0'"
multiple
class="normalSelct"
>
<el-option
......@@ -231,7 +209,6 @@
<el-select
v-model="form.tecClassifySchool"
:disabled="form.lessonTypeSchool === '0'"
multiple
class="normalSelct"
>
<el-option
......@@ -244,23 +221,6 @@
</el-form-item>
</el-col>
</el-row>
<!-- <el-row :gutter="100">-->
<!-- <el-col :span="12">-->
<!-- <el-form-item label="课时数:" prop="classHour" :rules="[{ required: status !== '3', message: '请输入课时数', trigger: 'change' }]">-->
<!-- <el-input-number-->
<!-- v-model.trim="form.classHour"-->
<!-- controls-position="right"-->
<!-- :step="1"-->
<!-- :step-strictly="true"-->
<!-- style="width: 100%"-->
<!-- auto-complete="off"-->
<!-- :min="0"-->
<!-- :max="9999"-->
<!-- placeholder="请输入课时数"-->
<!-- />-->
<!-- </el-form-item>-->
<!-- </el-col>-->
<!-- </el-row>-->
<el-row :gutter="100">
<!-- "-->
<el-col :span="12">
......@@ -687,30 +647,30 @@ export default {
if (form.classPlan.length > 0) {
form.classPlan = form.classPlan.join(',')
}
if (form.jobClassify.length > 0) {
form.jobClassify = form.jobClassify.join(',')
}
if (form.tecClassify.length > 0) {
form.tecClassify = form.tecClassify.join(',')
}
// if (form.jobClassify.length > 0) {
// form.jobClassify = form.jobClassify.join(',')
// }
// if (form.tecClassify.length > 0) {
// form.tecClassify = form.tecClassify.join(',')
// }
if (form.classPlanSchool.length > 0) {
form.classPlanSchool = form.classPlanSchool.join(',')
}
if (form.tecClassifySchool.length > 0) {
form.tecClassifySchool = form.tecClassifySchool.join(',')
}
if (form.courseType.length > 0) {
form.courseType = form.courseType.join(',')
}
if (form.enterpriseCourseDimensions.length > 0) {
form.enterpriseCourseDimensions = form.enterpriseCourseDimensions.join(',')
}
if (form.courseTypeC.length > 0) {
form.courseTypeC = form.courseTypeC.join(',')
}
if (form.intelligentClassroom.length > 0) {
form.intelligentClassroom = form.intelligentClassroom.join(',')
}
// if (form.tecClassifySchool.length > 0) {
// form.tecClassifySchool = form.tecClassifySchool.join(',')
// }
// if (form.courseType.length > 0) {
// form.courseType = form.courseType.join(',')
// }
// if (form.enterpriseCourseDimensions.length > 0) {
// form.enterpriseCourseDimensions = form.enterpriseCourseDimensions.join(',')
// }
// if (form.courseTypeC.length > 0) {
// form.courseTypeC = form.courseTypeC.join(',')
// }
// if (form.intelligentClassroom.length > 0) {
// form.intelligentClassroom = form.intelligentClassroom.join(',')
// }
form.lessonPrice = 0.1
blessonAdd(form).then(res => {
let type = res.code
......@@ -761,30 +721,30 @@ export default {
if (form.classPlan.length > 0) {
form.classPlan = form.classPlan.join(',')
}
if (form.jobClassify.length > 0) {
form.jobClassify = form.jobClassify.join(',')
}
if (form.tecClassify.length > 0) {
form.tecClassify = form.tecClassify.join(',')
}
// if (form.jobClassify.length > 0) {
// form.jobClassify = form.jobClassify.join(',')
// }
// if (form.tecClassify.length > 0) {
// form.tecClassify = form.tecClassify.join(',')
// }
if (form.classPlanSchool.length > 0) {
form.classPlanSchool = form.classPlanSchool.join(',')
}
if (form.tecClassifySchool.length > 0) {
form.tecClassifySchool = form.tecClassifySchool.join(',')
}
if (form.courseType.length > 0) {
form.courseType = form.courseType.join(',')
}
if (form.enterpriseCourseDimensions.length > 0) {
form.enterpriseCourseDimensions = form.enterpriseCourseDimensions.join(',')
}
if (form.courseTypeC.length > 0) {
form.courseTypeC = form.courseTypeC.join(',')
}
if (form.intelligentClassroom.length > 0) {
form.intelligentClassroom = form.intelligentClassroom.join(',')
}
// if (form.tecClassifySchool.length > 0) {
// form.tecClassifySchool = form.tecClassifySchool.join(',')
// }
// if (form.courseType.length > 0) {
// form.courseType = form.courseType.join(',')
// }
// if (form.enterpriseCourseDimensions.length > 0) {
// form.enterpriseCourseDimensions = form.enterpriseCourseDimensions.join(',')
// }
// if (form.courseTypeC.length > 0) {
// form.courseTypeC = form.courseTypeC.join(',')
// }
// if (form.intelligentClassroom.length > 0) {
// form.intelligentClassroom = form.intelligentClassroom.join(',')
// }
// 调用了编辑方法
blessonAdd(form).then(res => {
let type = res.code
......
src/views/courseInformation/firstLevelAudit/firstLevelAuditOperation.vue
View file @ dc8b7f35
......@@ -316,7 +316,7 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="适用对象:" prop="choseEnterprise">
<el-checkbox v-model="choseEnterprise" @change="handChangeChoseEnterprise">企业</el-checkbox>
<el-checkbox v-model="choseEnterprise" @change="handChangeChoseEnterprise">技术端</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="18">
......@@ -341,7 +341,7 @@
<el-row :gutter="20">
<el-col :span="6">
<el-form-item label="适用对象:" prop="choseCollege">
<el-checkbox v-model="choseCollege" @change="handChangeChoseCollege">院校</el-checkbox>
<el-checkbox v-model="choseCollege" @change="handChangeChoseCollege">技能端</el-checkbox>
</el-form-item>
</el-col>
<el-col :span="18">
......
src/views/courseInformation/lecturerManagement/index.vue
View file @ dc8b7f35
......@@ -200,7 +200,8 @@ import {
delCmsLecturer,
addCmsLecturer,
updateCmsLecturer,
exportCmsLecturer
exportCmsLecturer,
register
} from '@/api/courseManagement/cmsLecturer'
import { updateResponseUrl } from '@/utils/updateUrl'
import commonField from '@/utils/commonField'
......
src/views/courseInformation/unitManagement/index.vue
View file @ dc8b7f35
......@@ -223,7 +223,7 @@ import {
delSysUnit,
addSysUnit,
updateSysUnit,
exportSysUnit, listUserAll
exportSysUnit, listUserAll, listUnitAdminAll
} from '@/api/sysUnit'
import commonField from '@/utils/commonField'
import { getDict } from '@/api/system/dict/data'
......@@ -343,7 +343,7 @@ export default {
})
},
getUserList() {
listUserAll().then(res => {
listUnitAdminAll().then(res => {
this.userList = res.data
})
},
......@@ -370,6 +370,7 @@ export default {
unitType: this.queryParams.unitType,
unitName: this.queryParams.unitName,
unitNumber: this.queryParams.unitNumber,
username: this.queryParams.username,
exitId: this.queryParams.exitId,
flag: this.queryParams.flag,
lessonType: this.queryParams.lessonType.length > 1 ? '2' : this.queryParams.lessonType.join(',')
......@@ -401,7 +402,8 @@ export default {
unitNumber: undefined,
exitId: undefined,
flag: '1',
lessonType: []
lessonType: [],
lessonTypeSchool: ''
}
this.resetForm('form')
},
......
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