Skip to content

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

bug修复

上级 cbe04461
隐藏空白字符变更
内嵌 并排
正在显示 包含 42 行增加 和 37 行删除
src/views/education/create-component.vue
浏览文件 @ a46b9e7a
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
<el-form ref="basicInfoForm" class="basic-form" :model="portalComponent" :rules="rules" label-width="125px" label-suffix=":" size="mini" style="margin-bottom:30px;"> <el-form ref="basicInfoForm" class="basic-form" :model="portalComponent" :rules="rules" label-width="125px" label-suffix=":" size="mini" style="margin-bottom:30px;">
<el-form-item label="组件名称" prop="name"> <el-form-item label="组件名称" prop="name">
<el-input type="text" v-model="portalComponent.name" @blur="componentName" size="mini" placeholder="请输入组件名称" style="width:30%;"></el-input> <el-input type="text" v-model="portalComponent.name" @blur="componentName" size="mini" placeholder="请输入组件名称" style="width:30%;"></el-input>
<span class="word-num">0/20</span> <span class="word-num">{{(portalComponent.name).replace(/\s+/g,"").length}}/20</span>
<p class="component-name" v-if="isStorage">输入组件名称</p> <p class="component-name" v-if="isStorage">输入组件名称</p>
</el-form-item> </el-form-item>
<el-form-item label="组件简介" prop="introduce"> <el-form-item label="组件简介" prop="introduce">
<el-input type="textarea" rows="4" cols="10" v-model="portalComponent.introduce" size="mini" placeholder="请输入组件简介" style="width:37%;"></el-input> <el-input type="textarea" rows="4" cols="10" v-model="portalComponent.introduce" size="mini" placeholder="请输入组件简介" style="width:37%;"></el-input>
<span class="word-num">0/150</span> <span class="word-num">{{(portalComponent.introduce).replace(/\s+/g,"").length}}/150</span>
</el-form-item> </el-form-item>
<el-form-item label="组件图片" prop="imageUrl"> <el-form-item label="组件图片" prop="imageUrl">
<el-upload <el-upload
...@@ -301,8 +301,7 @@ let validateRepeatWord = function(rule, value, callback, message) { ...@@ -301,8 +301,7 @@ let validateRepeatWord = function(rule, value, callback, message) {
vm.GET('portalComponent/checkComponentName',req).then((res) => { vm.GET('portalComponent/checkComponentName',req).then((res) => {
if(res.code == '000000') { if(res.code == '000000') {
if(res.data.resultFlag == 2) { if(res.data.resultFlag == 2) {
callback(new Error('该组件名称已存在，请使用一个新的组件名称')) callback(new Error(message))
return
}else { }else {
callback() callback()
} }
...@@ -314,11 +313,6 @@ let validateRepeatWord = function(rule, value, callback, message) { ...@@ -314,11 +313,6 @@ let validateRepeatWord = function(rule, value, callback, message) {
} }
// 判断模块是否重名(对外开放时候验证) // 判断模块是否重名(对外开放时候验证)
let validateModuleName = function(rule, value, callback, message) { let validateModuleName = function(rule, value, callback, message) {
// const reg = /^[\u4e00-\u9fa5]{2,20}$/
// if(!reg.test(value)) {
// callback(new Error('输入长度为2-20个字符'))
// return
// }
for(let i = 0;i<vm.componentList.moduleModelList.length;i++) { for(let i = 0;i<vm.componentList.moduleModelList.length;i++) {
if(vm.componentList.moduleModelList[i].openFlag == 2) { if(vm.componentList.moduleModelList[i].openFlag == 2) {
vm.GET('portalComponent/checkModuleName',{name: value}).then((res) => { vm.GET('portalComponent/checkModuleName',{name: value}).then((res) => {
...@@ -410,17 +404,13 @@ export default { ...@@ -410,17 +404,13 @@ export default {
{ required: true, message: '输入组件名称', trigger: 'blur' }, { required: true, message: '输入组件名称', trigger: 'blur' },
{ min: 2, max: 20, message: '输入长度为2-20个字符', trigger: 'blur' }, { min: 2, max: 20, message: '输入长度为2-20个字符', trigger: 'blur' },
{ validator: function(rule, value, callback) { { validator: function(rule, value, callback) {
validateRepeatWord(rule, value, callback, '输入长度为2-20个字符') validateRepeatWord(rule, value, callback, '该组件名称已存在，请使用一个新的组件名称')
}, },
trigger: 'blur' } trigger: 'blur' }
], ],
"introduce": [ "introduce": [
{ required: true, message: '请输入组件简介', trigger: 'blur' }, { required: true, message: '请输入组件简介', trigger: 'blur' },
{ min: 1, max: 150, message: '超出可输入的最大长度', trigger: 'blur' }, { min: 1, max: 150, message: '超出可输入的最大长度', trigger: 'blur' }
// { validator: function(rule, value, callback) {
// validateWord150(rule, value, callback, '超出可输入的最大长度')
// },
// trigger: 'blur' }
], ],
"imageUrl": [ "imageUrl": [
{ required: true, message: '请上传组件图片', trigger: 'blur' }, { required: true, message: '请上传组件图片', trigger: 'blur' },
...@@ -542,7 +532,7 @@ export default { ...@@ -542,7 +532,7 @@ export default {
if (valid) { if (valid) {
vm.submitBasic(flag,url) vm.submitBasic(flag,url)
} else { } else {
return false; return false
} }
}) })
} }
...@@ -551,24 +541,38 @@ export default { ...@@ -551,24 +541,38 @@ export default {
vm.isStorage = false vm.isStorage = false
}, },
submitBasic(flag,url) { submitBasic(flag,url) {
vm.portalComponent.idType = vm.idType let req = {
vm.portalComponent.id = vm.componentId token: vm._token,
vm.POST(url,{ model: vm.portalComponent }).then((res) => { name: vm.portalComponent.name,
if( res.code == '000000') { idType: vm.idType // 1内部 2外部
if(!vm.componentId) { }
vm.componentId = res.data vm.GET('portalComponent/checkComponentName',req).then((res) => {
} if(res.code == '000000') {
if(flag == 2) { if(res.data.resultFlag == 2) {
vm.stepNum = 2 return
vm.getTemplateData() }else {
vm.getModuleData() vm.portalComponent.idType = vm.idType
vm.getTestListData() vm.portalComponent.id = vm.componentId
vm.getCourseData() vm.POST(url,{ model: vm.portalComponent }).then((res) => {
} else { if( res.code == '000000') {
vm.$message.info("暂存成功！") if(!vm.componentId) {
vm.componentId = res.data
}
if(flag == 2) {
vm.stepNum = 2
vm.getTemplateData()
vm.getModuleData()
vm.getTestListData()
vm.getCourseData()
} else {
vm.$message.info("暂存成功！")
}
}
})
} }
} }
}) })
}, },
// 上传组件图片 // 上传组件图片
beforeAvatarUpload(file) { beforeAvatarUpload(file) {
......
src/views/education/item-component.vue
浏览文件 @ a46b9e7a
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<el-table-column label="操作" fixed="right" align="center" min-width="200"> <el-table-column label="操作" fixed="right" align="center" min-width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="primary" size="small" @click="editComponentList(scope.row)">编辑</el-button> <el-button type="primary" size="small" @click="editComponentList(scope.row)">编辑</el-button>
<el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2 || scope.row.status == 4" size="small" @click="enableAndDisable(scope.row,1)">启用</el-button> <el-button type="primary" v-if="scope.row.status == 2 || scope.row.status == 4" size="small" @click="enableAndDisable(scope.row,1)">启用</el-button>
<el-button type="primary" v-if="scope.row.status == 3" size="small" @click="enableAndDisable(scope.row,2)">禁用</el-button> <el-button type="primary" v-if="scope.row.status == 3" size="small" @click="enableAndDisable(scope.row,2)">禁用</el-button>
<el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2" size="small" @click="deleteComponent(scope.row)">删除</el-button> <el-button type="primary" v-if="scope.row.status == 1 || scope.row.status == 2" size="small" @click="deleteComponent(scope.row)">删除</el-button>
</template> </template>
...@@ -215,11 +215,12 @@ export default { ...@@ -215,11 +215,12 @@ export default {
message: '操作成功!' message: '操作成功!'
}); });
vm.search() vm.search()
} else { if(res.message != 'success') {
vm.$message({ vm.$message({
message: res.message, message: res.message,
type: 'warning' type: 'warning'
}); })
}
} }
}).catch(function (error) { }).catch(function (error) {
vm.$message.error(error); vm.$message.error(error);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或