Skip to content

P
pica-admin-IM
提交 5ab0ed42 编写于 作者: zhentian.jia's avatar zhentian.jia
浏览文件
操作

Merge branch 'dev-eduadmin-20190222' of... 

Merge branch 'dev-eduadmin-20190222' of 192.168.110.53:com.pica.cloud.education.frontend/pica.cloud.web-app into dev-eduadmin-20190222
上级 0cf33af8 dbad3b6d
隐藏空白字符变更
内嵌 并排
正在显示 包含 108 行增加 和 31 行删除
src/views/education/create-component.vue
浏览文件 @ 5ab0ed42
...@@ -143,12 +143,12 @@ ...@@ -143,12 +143,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="考试ID" prop="content2"> <el-form-item label="关联考试" prop="content2">
<el-select v-model="item3.content2" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择考试ID" style="width:288px;"> <el-select v-model="item3.content2" @focus="examIDfocus(index,index1,index2,index3)" @change="changeExamID" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择考试ID" style="width:288px;">
<el-option <el-option
v-for="(itemTest,indexTest) in testIdSelect" v-for="(itemTest,indexTest) in testIdSelect"
:key="indexTest" :key="indexTest"
:label="itemTest.onlineExamName" :label="itemTest.id"
:value="itemTest.id"> :value="itemTest.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -157,14 +157,14 @@ ...@@ -157,14 +157,14 @@
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="配置证书" prop="name"> <el-form-item label="配置证书" prop="content3">
<el-radio-group v-model="portCertificateLable" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)"> <el-radio-group v-model="item3.content3" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)">
<el-radio label="是"></el-radio> <el-radio :label="item3.content3">是</el-radio>
<el-radio label="否"></el-radio> <el-radio :label="item3.content3">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10" v-if="item3.content3">
<el-form-item label="选择证书" prop="content3"> <el-form-item label="选择证书" prop="content3">
<el-select v-model="item3.content3" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择证书" style="width:288px;"> <el-select v-model="item3.content3" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择证书" style="width:288px;">
<el-option <el-option
...@@ -190,12 +190,12 @@ ...@@ -190,12 +190,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10">
<el-form-item label="课程ID" prop="content2"> <el-form-item label="关联课程" prop="content2">
<el-select v-model="item3.content2" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择课程ID" style="width:288px;"> <el-select v-model="item3.content2" @focus="courseIDfocus(index,index1,index2,index3)" @change="changeCourseID" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请选择课程ID" style="width:288px;">
<el-option <el-option
v-for="(itemCourse,indexCourse) in courseIdSelect" v-for="(itemCourse,indexCourse) in courseIdSelect"
:key="indexCourse" :key="indexCourse"
:label="itemCourse.name" :label="itemCourse.id"
:value="itemCourse.id"> :value="itemCourse.id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -306,16 +306,27 @@ let validateRepeatWord = function(rule, value, callback, message) { ...@@ -306,16 +306,27 @@ let validateRepeatWord = function(rule, value, callback, message) {
} }
// 判断模块是否重名(对外开放时候验证) // 判断模块是否重名(对外开放时候验证)
let validateModuleName = function(rule, value, callback, message) { let validateModuleName = function(rule, value, callback, message) {
vm.GET('portalComponent/checkModuleName',{name: value}).then((res) => { const reg = /^[\u4e00-\u9fa5]{2,20}$/
if(res.code == '000000') { if(!reg.test(value)) {
if(res.data.resultFlag != 1) { callback(new Error(message))
callback(new Error(message)) return
return }
}else { for(let i = 0;i<vm.componentList.moduleModelList.length;i++) {
callback() if(vm.componentList.moduleModelList[i].openFlag == 2) {
} vm.GET('portalComponent/checkModuleName',{name: value}).then((res) => {
if(res.code == '000000') {
if(res.data.resultFlag > 0) {
callback(new Error(message))
return
}else {
callback()
}
}
})
}else {
callback()
} }
}) }
} }
export default { export default {
components: { components: {
...@@ -325,6 +336,16 @@ export default { ...@@ -325,6 +336,16 @@ export default {
return { return {
columnFormVisible: false, columnFormVisible: false,
itemName: '', itemName: '',
examName: '',
examIndex: '',
examIndex1: '',
examIndex2: '',
examIndex3: '',
courseName: '',
courseIndex: '',
courseIndex1: '',
courseIndex2: '',
courseIndex3: '',
stepNum: 1, stepNum: 1,
isStorage: true, isStorage: true,
componentId: '', componentId: '',
...@@ -337,7 +358,7 @@ export default { ...@@ -337,7 +358,7 @@ export default {
firstTab: '1', firstTab: '1',
hasCertificate: true, hasCertificate: true,
certificateLable: '是', certificateLable: '是',
portCertificateLable: '是', portCertificateLable: '否',
moduleIndex: '', moduleIndex: '',
editableTabs: [{ editableTabs: [{
title: '模块 1', title: '模块 1',
...@@ -372,9 +393,6 @@ export default { ...@@ -372,9 +393,6 @@ export default {
selectResource: { selectResource: {
resourceModuleSelect: '' resourceModuleSelect: ''
}, },
selectModuleForm: {
test: '否'
},
basicStorageRule: { basicStorageRule: {
"name": [ "name": [
{ required: true, message: '输入组件名称', trigger: 'blur' }, { required: true, message: '输入组件名称', trigger: 'blur' },
...@@ -550,6 +568,21 @@ export default { ...@@ -550,6 +568,21 @@ export default {
} }
}) })
}, },
// 根据考试ID填充考试名称
changeExamID(value) {
for(let i = 0;i<vm.testIdSelect.length;i++) {
if(value == vm.testIdSelect[i].id) {
vm.examName = vm.testIdSelect[i].onlineExamName
}
}
vm.componentList.moduleModelList[vm.examIndex].templetModelList[vm.examIndex1].partModelList[vm.examIndex2].partContentModelList[vm.examIndex3].content1 = vm.examName
},
examIDfocus(index,index1,index2,index3) {
vm.examIndex = index
vm.examIndex1 = index1
vm.examIndex2 = index2
vm.examIndex3 = index3
},
// 获取课程下拉列表 // 获取课程下拉列表
getCourseData() { getCourseData() {
vm.GET('portalComponent/CourseList').then((res) => { vm.GET('portalComponent/CourseList').then((res) => {
...@@ -558,6 +591,21 @@ export default { ...@@ -558,6 +591,21 @@ export default {
} }
}) })
}, },
// 根据课程ID填充课程名称
changeCourseID(value) {
for(let i = 0;i<vm.courseIdSelect.length;i++) {
if(value == vm.courseIdSelect[i].id) {
vm.courseName = vm.courseIdSelect[i].name
}
}
vm.componentList.moduleModelList[vm.courseIndex].templetModelList[vm.courseIndex1].partModelList[vm.courseIndex2].partContentModelList[vm.courseIndex3].content1 = vm.courseName
},
courseIDfocus(index,index1,index2,index3) {
vm.courseIndex = index
vm.courseIndex1 = index1
vm.courseIndex2 = index2
vm.courseIndex3 = index3
},
// 获取默认模板 // 获取默认模板
getTemplateData() { getTemplateData() {
vm.GET('portalComponent/TempletConfigList').then((res) => { vm.GET('portalComponent/TempletConfigList').then((res) => {
...@@ -595,14 +643,37 @@ export default { ...@@ -595,14 +643,37 @@ export default {
for(let i = 0;i<vm.componentList.moduleModelList.length;i++) { for(let i = 0;i<vm.componentList.moduleModelList.length;i++) {
if((targetName - 1) == i) { if((targetName - 1) == i) {
if(vm.componentList.moduleModelList[i].id) { if(vm.componentList.moduleModelList[i].id) {
vm.GET('portalComponent/deletePortalModuleById',{id:vm.componentList.moduleModelList[i].id}).then((res) => { if(vm.componentList.moduleModelList[i].templetModelList) {
if( res.code == '000000') { vm.$confirm('删除模块会将改模块下已有模板同时删除，确认需要删除吗？', '提示', {
vm.$message.info('成功删除模块！') confirmButtonText: '确定',
} cancelButtonText: '取消',
vm.getModuleData() type: 'warning'
}) }).then(() => {
vm.GET('portalComponent/deletePortalModuleById',{id:vm.componentList.moduleModelList[i].id}).then((res) => {
if( res.code == '000000') {
vm.$message.info('成功删除模块！')
}
vm.getModuleData()
vm.firstTab = i + ''
})
}).catch(() => {
vm.$message({
type: 'info',
message: '已取消删除'
})
})
}else {
vm.GET('portalComponent/deletePortalModuleById',{id:vm.componentList.moduleModelList[i].id}).then((res) => {
if( res.code == '000000') {
vm.$message.info('成功删除模块！')
}
vm.getModuleData()
vm.firstTab = i + ''
})
}
}else { }else {
vm.componentList.moduleModelList.splice(i,1) vm.componentList.moduleModelList.splice(i,1)
vm.firstTab = i + ''
} }
break break
} }
...@@ -613,7 +684,7 @@ export default { ...@@ -613,7 +684,7 @@ export default {
vm.componentList.moduleModelList.push({ vm.componentList.moduleModelList.push({
id: '', id: '',
name: '', name: '',
openFlag: '', // 1不开放 2开放 openFlag: 1, // 1不开放 2开放
moduleType: 1, // 2为从预设模块中添加 moduleType: 1, // 2为从预设模块中添加
templetModelList: [] templetModelList: []
}) })
...@@ -760,6 +831,12 @@ export default { ...@@ -760,6 +831,12 @@ export default {
}, },
// 完成 // 完成
finishConponent() { finishConponent() {
for(let i=0;i<vm.componentList.moduleModelList.length;i++) {
if(!vm.componentList.moduleModelList[i]) {
vm.$message.info("请添加有效模块后再保存")
return
}
}
vm.POST('portalComponent/insertOrUpdatePortalModule',{model: vm.componentList.moduleModelList}).then((res) => { vm.POST('portalComponent/insertOrUpdatePortalModule',{model: vm.componentList.moduleModelList}).then((res) => {
if( res.code == '000000') { if( res.code == '000000') {
vm.$router.push({ path: 'item-component' }) vm.$router.push({ path: 'item-component' })
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或