Skip to content

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

图标替换

上级 b71ada0b
隐藏空白字符变更
内嵌 并排
正在显示 包含 58 行增加 和 32 行删除
src/utils/validate.js
浏览文件 @ 63f2555a
...@@ -31,10 +31,13 @@ export function isvalidUsername(str) { ...@@ -31,10 +31,13 @@ export function isvalidUsername(str) {
return reg.test(str) return reg.test(str)
} }
// 2-150个中文 // 2-150个字符
export function validateWord150(str) { export function validateWord150(rule, value, callback, message) {
const reg = /^[\u4e00-\u9fa5]{2,150}$/ if(!/^[\u4e00-\u9fffa-zA-Z]{2,150}$/.test(value)) {
return reg.test(str) callback(new Error(message))
} else {
callback()
}
} }
/* 通用密码验证(数字、字母、下划线或特殊字符且长度为0-150位) */ /* 通用密码验证(数字、字母、下划线或特殊字符且长度为0-150位) */
export function isValidPassword(rule, value, callback, message) { export function isValidPassword(rule, value, callback, message) {
......
src/views/education/create-component.vue
浏览文件 @ 63f2555a
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
<div class="btn-container"> <div class="btn-container">
<el-button v-if="stepNum == 1 && (componentStatus == 1 || !componentStatus)" @click="storageAndNext(1)" type="default" size="small">暂存</el-button> <el-button v-if="stepNum == 1 && (componentStatus == 1 || !componentStatus)" @click="storageAndNext(1)" type="default" size="small">暂存</el-button>
<el-button v-if="stepNum == 1" @click="storageAndNext(2)" type="primary" size="small" style="margin-left:0;">下一步</el-button> <el-button v-if="stepNum == 1" @click="storageAndNext(2)" type="primary" size="small" style="margin-left:0;">下一步</el-button>
<el-button v-if="stepNum == 2 && (componentStatus == 1 || !componentStatus)" @click="finishConponent(1)" type="default" size="small">暂存</el-button> <el-button v-if="stepNum == 2 && (componentStatus == 1 || !componentStatus)" @click="finishConponent(1)" :disabled="resultFlag == 2" type="default" size="small">暂存</el-button>
<el-button v-if="stepNum == 2" @click="finishConponent(2)" type="primary" size="small" style="margin-left:0;">完成</el-button> <el-button v-if="stepNum == 2" @click="finishConponent(2)" :disabled="resultFlag == 2" type="primary" size="small" style="margin-left:0;">完成</el-button>
</div> </div>
</div> </div>
<div class="first-step" v-if="stepNum == 1"> <div class="first-step" v-if="stepNum == 1">
...@@ -127,8 +127,8 @@ ...@@ -127,8 +127,8 @@
{{item1.name}} {{item1.name}}
<span v-if="item.moduleType == 1 && componentId && item.openFlag == 1"> <span v-if="item.moduleType == 1 && componentId && item.openFlag == 1">
变更顺序: 变更顺序:
<i class="el-icon-arrow-down" @click="sortUp(index,index1)"></i> <i class="el-icon-caret-bottom" @click="sortUp(index,index1)" style="font-size:17px;"></i>
<i class="el-icon-arrow-up" @click="sortDown(index,index1)"></i> <i class="el-icon-caret-top" @click="sortDown(index,index1)" style="font-size:17px;"></i>
<i class="el-icon-delete" @click="deleteTemplate(index,index1)" style="color:red;"></i> <i class="el-icon-delete" @click="deleteTemplate(index,index1)" style="color:red;"></i>
</span> </span>
</div> </div>
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="考试名称" prop="content1"> <el-form-item label="考试名称" prop="content1">
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请输入考试名称" style="width:288px;"></el-input> <el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" 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-outline" @click="addMatterCourse(index,index1,index2)" style="color:#0486FE;"></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>
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<el-col :span="10"> <el-col :span="10">
<el-form-item label="课程名称" prop="content1"> <el-form-item label="课程名称" prop="content1">
<el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" placeholder="请输入课程名称" style="width:288px;"></el-input> <el-input v-model="item3.content1" :disabled="item.moduleType == 2 || (componentId && item.openFlag == 2)" size="mini" 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-outline" @click="addMatterCourse(index,index1,index2)" style="color:#0486FE;"></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>
...@@ -353,6 +353,7 @@ export default { ...@@ -353,6 +353,7 @@ export default {
stepNum: 1, stepNum: 1,
componentId: '', componentId: '',
componentStatus: '', componentStatus: '',
resultFlag: '',
isStorage: false, isStorage: false,
dialogTitle: '选择模板', dialogTitle: '选择模板',
curmbFirst: '教培项目', curmbFirst: '教培项目',
...@@ -415,9 +416,6 @@ export default { ...@@ -415,9 +416,6 @@ export default {
"imageUrl": [ "imageUrl": [
{ required: true, message: '请上传组件图片', trigger: 'blur' }, { required: true, message: '请上传组件图片', trigger: 'blur' },
], ],
"certificateId": [
{ required: true, message: '请选择是否配置证书', trigger: 'blur' },
],
"certificateId": [ "certificateId": [
{ required: true, message: '请选择证书', trigger: 'blur' }, { required: true, message: '请选择证书', trigger: 'blur' },
], ],
...@@ -438,12 +436,18 @@ export default { ...@@ -438,12 +436,18 @@ export default {
] ]
}, },
templateRules: { templateRules: {
"name": [ // "content1": [
{ required: true, message: '请输入考试名称', trigger: 'blur' }, // { required: true, message: '请输入名称', trigger: 'blur' },
], // ],
"id": [ // "content2": [
{ required: true, message: '请输入考试id', trigger: 'blur' }, // { required: true, message: '请输入关联id', trigger: 'blur' },
] // ],
// 'certificateFlag': [
// { required: true, message: '请选择是否配置证书', trigger: 'blur' },
// ],
// 'content3': [
// { required: true, message: '请选择证书', trigger: 'blur' }
// ]
} }
} }
}, },
...@@ -451,6 +455,7 @@ export default { ...@@ -451,6 +455,7 @@ export default {
vm = this vm = this
vm.componentId = this.$route.query.id vm.componentId = this.$route.query.id
vm.componentStatus = this.$route.query.status vm.componentStatus = this.$route.query.status
vm.resultFlag = this.$route.query.resultFlag // 判断可编辑基础信息还是全部信息 1 为全部 2 为基础
vm.getCertificateList() // 获取证书列表 vm.getCertificateList() // 获取证书列表
vm.componentBasicInfo() // 根据ID查询组件基本信息 vm.componentBasicInfo() // 根据ID查询组件基本信息
}, },
...@@ -580,13 +585,15 @@ export default { ...@@ -580,13 +585,15 @@ export default {
}, },
// 根据考试ID填充考试名称 // 根据考试ID填充考试名称
changeExamID(value) { changeExamID(value) {
let examName let examName = ''
for(let i = 0;i<vm.testIdSelect.length;i++) { for(let i = 0;i<vm.testIdSelect.length;i++) {
if(value == vm.testIdSelect[i].id) { if(value == vm.testIdSelect[i].id) {
examName = vm.testIdSelect[i].onlineExamName examName = vm.testIdSelect[i].onlineExamName
} }
} }
vm.componentList.moduleModelList[vm.examIndex].templetModelList[vm.examIndex1].partModelList[vm.examIndex2].partContentModelList[vm.examIndex3].content1 = examName if(!vm.componentList.moduleModelList[vm.examIndex].templetModelList[vm.examIndex1].partModelList[vm.examIndex2].partContentModelList[vm.examIndex3].content1) {
vm.componentList.moduleModelList[vm.examIndex].templetModelList[vm.examIndex1].partModelList[vm.examIndex2].partContentModelList[vm.examIndex3].content1 = examName
}
}, },
examIDfocus(index,index1,index2,index3) { examIDfocus(index,index1,index2,index3) {
vm.examIndex = index vm.examIndex = index
...@@ -855,7 +862,7 @@ export default { ...@@ -855,7 +862,7 @@ export default {
status: 2 status: 2
} }
if(!vm.componentList.moduleModelList[i].name) { if(!vm.componentList.moduleModelList[i].name) {
vm.$message.info("请输入第"+ parseInt(i + 1) +"个模块名称") vm.$message.info("请输入模块名称")
return return
} }
if(!vm.componentList.moduleModelList[i]) { if(!vm.componentList.moduleModelList[i]) {
...@@ -902,13 +909,6 @@ export default { ...@@ -902,13 +909,6 @@ export default {
vm.GET('portalComponent/ModuleList',{openFlag: 2}).then((res) => { vm.GET('portalComponent/ModuleList',{openFlag: 2}).then((res) => {
if( res.code == '000000') { if( res.code == '000000') {
vm.resourceArray = res.data.moduleModelList vm.resourceArray = res.data.moduleModelList
for(let i = 0;i<vm.componentList.moduleModelList.length;i++) {
for(let j=0;j<vm.resourceArray.length;j++) {
if(vm.componentList.moduleModelList[i].id == vm.resourceArray[j].id) {
vm.resourceArray.splice(j,1)
}
}
}
} }
}) })
}, },
...@@ -925,7 +925,22 @@ export default { ...@@ -925,7 +925,22 @@ export default {
submitDialog() { submitDialog() {
vm.columnFormVisible = false vm.columnFormVisible = false
vm.dialogData.moduleType = 2 vm.dialogData.moduleType = 2
vm.componentList.moduleModelList.push(vm.dialogData) for(let i = 0;i<vm.componentList.moduleModelList.length;i++) {
if(vm.componentList.moduleModelList[i].id == vm.dialogData.id) {
vm.$confirm('该模块已经被添加到本组件，是否还需要再添加一次？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vm.componentList.moduleModelList.push(vm.dialogData)
}).catch(() => {
vm.$message({
type: 'info',
message: '已取消选择'
})
})
}
}
} }
} }
} }
......
src/views/education/item-component.vue
浏览文件 @ 63f2555a
...@@ -148,9 +148,17 @@ export default { ...@@ -148,9 +148,17 @@ export default {
createComponent() { createComponent() {
vm.$router.push({path: 'create-component'}) vm.$router.push({path: 'create-component'})
}, },
// 编辑 // 编辑(验证可编辑范围)
editComponentList(row) { editComponentList(row) {
vm.$router.push({path: 'create-component',query: {id:row.id,status: row.status}}) let req = {
token: 'C1C5360EEC754092B9EC244147B35BB7',
componentId: row.id
}
vm.GET('portalComponent/componentEditRange',req).then((res) => {
if(res.code == "000000") {
vm.$router.push({path: 'create-component',query: {id:row.id,status: row.status,resultFlag: res.data.resultFlag}})
}
})
}, },
// 启用(禁用) // 启用(禁用)
enableAndDisable(row,flag) { enableAndDisable(row,flag) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或