Skip to content

P
pica-admin-consultation
提交 f11396c3 编写于 作者: huangwensu's avatar huangwensu
浏览文件
操作

自动填充名称

上级 a191576c
隐藏空白字符变更
内嵌 并排
正在显示 包含 51 行增加 和 38 行删除
src/style/common.scss
浏览文件 @ f11396c3
...@@ -125,6 +125,7 @@ html,body{ ...@@ -125,6 +125,7 @@ html,body{
.screenSet{ .screenSet{
// width: 163vh !important; // width: 163vh !important;
// height: 66vh !important; // height: 66vh !important;
height: 430px !important;
margin: 88px 30px 0px; margin: 88px 30px 0px;
overflow: auto; overflow: auto;
} }
...@@ -133,6 +134,7 @@ html,body{ ...@@ -133,6 +134,7 @@ html,body{
.screenSet{ .screenSet{
// width: 166vh !important; // width: 166vh !important;
// height: 78vh !important; // height: 78vh !important;
height: 800px !important;
overflow: auto; overflow: auto;
margin: 88px 30px 0px; margin: 88px 30px 0px;
} }
......
src/utils/validate.js
浏览文件 @ f11396c3
...@@ -31,7 +31,7 @@ export function isvalidUsername(str) { ...@@ -31,7 +31,7 @@ export function isvalidUsername(str) {
return reg.test(str) return reg.test(str)
} }
// 2-150个字符 // 2-150个中英文字符
export function validateWord150(rule, value, callback, message) { export function validateWord150(rule, value, callback, message) {
if(!/^[\u4e00-\u9fffa-zA-Z]{2,150}$/.test(value)) { if(!/^[\u4e00-\u9fffa-zA-Z]{2,150}$/.test(value)) {
callback(new Error(message)) callback(new Error(message))
...@@ -39,6 +39,14 @@ export function isvalidUsername(str) { ...@@ -39,6 +39,14 @@ export function isvalidUsername(str) {
callback() callback()
} }
} }
// 考试30个中英文字符
export function validateWord30(value,message) {
if(!/^[\u4e00-\u9fffa-zA-Z]{0,30}$/.test(value)) {
callback(new Error('考试名称长度不超过30个中文字符长度'))
} else {
callback()
}
}
/* 通用密码验证(数字、字母、下划线或特殊字符且长度为0-150位) */ /* 通用密码验证(数字、字母、下划线或特殊字符且长度为0-150位) */
export function isValidPassword(rule, value, callback, message) { export function isValidPassword(rule, value, callback, message) {
if (!/^(?:\d+|[a-zA-Z]+|[!@#$%^&*]+){0,150}$/.test(value)) { if (!/^(?:\d+|[a-zA-Z]+|[!@#$%^&*]+){0,150}$/.test(value)) {
......
src/views/education/create-component.vue
浏览文件 @ f11396c3
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
style="margin-right:0px;">{{_item.name}}</el-button> style="margin-right:0px;">{{_item.name}}</el-button>
</div> </div>
<div v-for="(item1,index1) in item.templetModelList" :key="index1"> <div v-for="(item1,index1) in item.templetModelList" :key="index1">
<el-form ref="templateForm" :model="item1" :rules="templateRules" label-suffix=":" label-width="130px" style="width:100%;"> <el-form ref="templateForm" :model="item1" label-suffix=":" label-width="110px" style="width:100%;">
<div class="template-content"> <div class="template-content">
<div class="template-content-div"> <div class="template-content-div">
<div class="title"> <div class="title">
...@@ -138,15 +138,17 @@ ...@@ -138,15 +138,17 @@
<div class="partText" v-if="index2 > 0">{{item2.introduce}}</div> <div class="partText" v-if="index2 > 0">{{item2.introduce}}</div>
<div v-for="(item3,index3) in item2.partContentModelList" :key="index3"> <div v-for="(item3,index3) in item2.partContentModelList" :key="index3">
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10" class="item-icon">
<el-form-item label="考试名称" prop="content1"> <span class="require">*</span>
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请输入考试名称" style="width:288px;"></el-input> <el-form-item label="考试名称">
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" maxlength='30' placeholder="请输入考试名称" style="width:288px;"></el-input>
<span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span> <span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span>
<span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span> <span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10" class="item-icon">
<el-form-item label="关联考试" prop="content2"> <span class="require">*</span>
<el-form-item label="关联考试">
<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-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"
...@@ -159,16 +161,18 @@ ...@@ -159,16 +161,18 @@
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="10"> <el-col :span="10" class="item-icon">
<el-form-item label="配置证书" prop="certificateFlag"> <span class="require">*</span>
<el-form-item label="配置证书">
<el-radio-group v-model="item3.certificateFlag" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)"> <el-radio-group v-model="item3.certificateFlag" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)">
<el-radio :label="2">是</el-radio> <el-radio :label="2">是</el-radio>
<el-radio :label="1">否</el-radio> <el-radio :label="1">否</el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10" v-if="item3.content3"> <el-col :span="10" v-if="item3.content3" class="item-icon">
<el-form-item label="选择证书" prop="content3"> <span class="require">*</span>
<el-form-item label="选择证书">
<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
v-for="(itemCertificate,indexCertificate) in certificateIdSelect" v-for="(itemCertificate,indexCertificate) in certificateIdSelect"
...@@ -186,15 +190,17 @@ ...@@ -186,15 +190,17 @@
<div v-if="item2.type == 2"> <div v-if="item2.type == 2">
<div class="partText" v-if="index2 > 0">{{item2.introduce}}</div> <div class="partText" v-if="index2 > 0">{{item2.introduce}}</div>
<el-row v-for="(item3,index3) in item2.partContentModelList" :key="index3"> <el-row v-for="(item3,index3) in item2.partContentModelList" :key="index3">
<el-col :span="10"> <el-col :span="10" class="item-icon">
<el-form-item label="课程名称" prop="content1"> <span class="require">*</span>
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请输入课程名称" style="width:288px;"></el-input> <el-form-item label="课程名称">
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" maxlength='30' placeholder="请输入课程名称" style="width:288px;"></el-input>
<span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span> <span v-if="item2.numFlag == 2 && index3 == 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-circle-plus" @click="addMatterCourse(index,index1,index2)" style="color:#449284;"></i></span>
<span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span> <span v-if="item2.numFlag == 2 && index3 > 0 && item.moduleType == 1 && componentId && item.openFlag == 1"><i class="el-icon-delete" @click="deleteMatterCourse(index,index1,index2,index3)" style="color:red;"></i></span>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="10"> <el-col :span="10" class="item-icon">
<el-form-item label="关联课程" prop="content2"> <span class="require">*</span>
<el-form-item label="关联课程">
<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-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"
...@@ -434,28 +440,14 @@ export default { ...@@ -434,28 +440,14 @@ export default {
"openFlag": [ "openFlag": [
{ required: true, message: '请选择是否对外开放', trigger: 'blur' } { required: true, message: '请选择是否对外开放', trigger: 'blur' }
] ]
},
templateRules: {
// "content1": [
// { required: true, message: '请输入名称', trigger: 'blur' },
// ],
// "content2": [
// { required: true, message: '请输入关联id', trigger: 'blur' },
// ],
// 'certificateFlag': [
// { required: true, message: '请选择是否配置证书', trigger: 'blur' },
// ],
// 'content3': [
// { required: true, message: '请选择证书', trigger: 'blur' }
// ]
} }
} }
}, },
created() { created() {
vm = this vm = this
vm.componentId = this.$route.query.id vm.componentId = vm.$route.query.id
vm.componentStatus = this.$route.query.status vm.componentStatus = vm.$route.query.status
vm.resultFlag = this.$route.query.resultFlag // 判断可编辑基础信息还是全部信息 1 为全部 2 为基础 vm.resultFlag = vm.$route.query.resultFlag // 判断可编辑基础信息还是全部信息 1 为全部 2 为基础
vm.getCertificateList() // 获取证书列表 vm.getCertificateList() // 获取证书列表
vm.componentBasicInfo() // 根据ID查询组件基本信息 vm.componentBasicInfo() // 根据ID查询组件基本信息
}, },
...@@ -617,7 +609,9 @@ export default { ...@@ -617,7 +609,9 @@ export default {
courseName = vm.courseIdSelect[i].name courseName = vm.courseIdSelect[i].name
} }
} }
vm.componentList.moduleModelList[vm.courseIndex].templetModelList[vm.courseIndex1].partModelList[vm.courseIndex2].partContentModelList[vm.courseIndex3].content1 = courseName if(!vm.componentList.moduleModelList[vm.courseIndex].templetModelList[vm.courseIndex1].partModelList[vm.courseIndex2].partContentModelList[vm.courseIndex3].content1) {
vm.componentList.moduleModelList[vm.courseIndex].templetModelList[vm.courseIndex1].partModelList[vm.courseIndex2].partContentModelList[vm.courseIndex3].content1 = courseName
}
}, },
courseIDfocus(index,index1,index2,index3) { courseIDfocus(index,index1,index2,index3) {
vm.courseIndex = index vm.courseIndex = index
...@@ -731,8 +725,9 @@ export default { ...@@ -731,8 +725,9 @@ export default {
certificateFlag: 1, // 是否有证书 1无 2有 certificateFlag: 1, // 是否有证书 1无 2有
id: '', id: '',
seqNo: '', seqNo: '',
content_1: '', content1: '',
content_2: '' content2: '',
content3: ''
}] }]
}) })
}else if(item.partConfigModelList[i].type == 2) { // 课程 }else if(item.partConfigModelList[i].type == 2) { // 课程
...@@ -992,7 +987,6 @@ export default { ...@@ -992,7 +987,6 @@ export default {
overflow: hidden; overflow: hidden;
height: 60px; height: 60px;
border-bottom: 1px solid #efefef; border-bottom: 1px solid #efefef;
// background: #fff;
.el-step.is-simple .el-step__head { .el-step.is-simple .el-step__head {
display: none; display: none;
} }
...@@ -1078,6 +1072,15 @@ export default { ...@@ -1078,6 +1072,15 @@ export default {
font-size: 12px; font-size: 12px;
} }
} }
.item-icon {
position: relative;
span.require {
position: absolute;
left: 37px;
top: 12px;
color: #F56C6C;
}
}
} }
.matter-test,.train-test, .matter-train-test{ .matter-test,.train-test, .matter-train-test{
.tip { .tip {
...@@ -1089,7 +1092,7 @@ export default { ...@@ -1089,7 +1092,7 @@ export default {
} }
.partText { .partText {
font-size: 12px; font-size: 12px;
margin-left: 67px; margin-left: 44px;
color: #999; color: #999;
padding: 0px 0 15px; padding: 0px 0 15px;
} }
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或