Skip to content

P
pica.cloud.web-education-admin
提交 6f685031 编写于 作者: chendeli's avatar chendeli
浏览文件
操作

组件提示文案修改

上级 aad05678
隐藏空白字符变更
内嵌 并排
正在显示 包含 31 行增加 和 24 行删除
src/views/education/create-component.vue
浏览文件 @ 6f685031
......@@ -22,7 +22,7 @@
</div>
</div>
<div class="first-step" v-if="stepNum == 1">
<el-form ref="basicInfoForm" class="basic-form" :model="portalComponent" :rules="rules" label-width="125px" label-suffix=":" size="small" style="margin-bottom:30px;">
<el-form ref="basicInfoForm" class="basic-form" :model="portalComponent" :rules="rules" label-width="130px" label-suffix=":" size="small" style="margin-bottom:30px;">
<el-form-item label="组件名称" prop="name">
<el-input type="text" v-model="portalComponent.name" @blur="componentName" size="small" placeholder="请输入组件名称" style="width:30%;"></el-input>
<span class="word-num">{{(portalComponent.name).replace(/\s+/g,"").length}}/20</span>
......@@ -78,7 +78,7 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item label="组件完成(%)" prop="certificateCondition">
<el-form-item label="组件内的模块完成比率须≥" prop="certificateCondition">
<el-input-number
v-model="portalComponent.certificateCondition"
controls-position="right"
......@@ -125,7 +125,7 @@
</el-col>
<el-col :span="8" v-if="idType == 1">
<el-form-item label="通过标准" prop="passType">
<el-radio-group v-model="item.passType" @change="selectStandard(index)" :disabled="fieldDisabled(item) || item.openDisabled">
<el-radio-group v-model="item.passType" @change="selectStandard(index)" :disabled="fieldDisabledStandard(item)">
<el-radio :label="1">全部完成</el-radio>
<el-radio :label="2">无要求</el-radio>
</el-radio-group>
......@@ -454,7 +454,7 @@ export default {
{ required: true, message: '请选择证书', trigger: 'blur' },
],
"certificateCondition": [
{ required: true, message: '请选择获得证书完成率', trigger: 'blur' },
{ required: true, message: '请输入内容', trigger: 'blur' },
]
},
moduleRules: {
......@@ -783,6 +783,9 @@ export default {
}
}
},
fieldDisabledStandard(item){
return (vm.componentStatus == 3 || vm.componentStatus == 4 );
},
fieldDisabled(item){
// return vm.conditionSelect || item.moduleType == 2 || (item.id != '' && item.openFlag == 2) || vm.idType == 2 || item.statusFlag
return vm.newconditionSelect || item.moduleType == 2 || vm.idType == 2 || (vm.componentStatus != 1 && vm.componentStatus != 2 && item.statusFlag);
......@@ -793,14 +796,14 @@ export default {
},
// 选择是否启用状态
selectIsOpenStatus(index) {
//const status = vm.componentList.moduleModelList[index].status;
// if(status == 1){
// vm.componentList.moduleModelList[index].openFlag = 1;
// vm.componentList.moduleModelList[index].openDisabled = true;
// }else{
// vm.componentList.moduleModelList[index].openDisabled = false;
// }
// vm.$forceUpdate();
const status = vm.componentList.moduleModelList[index].status;
if(status == 1){
vm.componentList.moduleModelList[index].openFlag = 1;
vm.componentList.moduleModelList[index].openDisabled = true;
}else{
vm.componentList.moduleModelList[index].openDisabled = false;
}
vm.$forceUpdate();
},
// 模块是否对外开放
selectIsOpen(index) {
......@@ -1140,7 +1143,7 @@ export default {
vm.GET('portal/portalComponent/disableOrStart',req).then((res) => {
if(res.code == "000000") {
if(flag == 2) {
vm.$router.push({ path: 'item-component' })
vm.$router.push({ path: 'item-component',query: {pageNum:this.$route.query.pageNum} })
} else {
vm.$message.info("暂存成功！")
}
......
src/views/education/edit-manager.vue
浏览文件 @ 6f685031
......@@ -1775,7 +1775,7 @@ export default {
if (res.code == "000000") {
//notify
if (type == 2) {
this.$router.push("item-manager");
this.$router.push("item-manager?pageNum="+this.$route.query.pageNum);
}
}
});
......
src/views/education/item-component.vue
浏览文件 @ 6f685031
......@@ -145,6 +145,9 @@ export default {
vm = this
vm.idType = localStorage.getItem('storageIdType')
vm.masterAdministratorFlag = localStorage.getItem('storageMaster')
if(this.$route.query.pageNum){
vm.searchParam.pageNo = parseInt(this.$route.query.pageNum)
}
vm.search()
},
// 挂载到Dom完成时
......@@ -190,7 +193,7 @@ export default {
}
vm.GET('portal/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}})
vm.$router.push({path: 'create-component',query: {id:row.id,status: row.status,resultFlag: res.data.resultFlag,pageNum:vm.searchParam.pageNo}})
}else {
vm.$message.info(res.message)
}
......@@ -310,5 +313,3 @@ export default {
}
}
</style>
src/views/education/item-manager.vue
浏览文件 @ 6f685031
......@@ -260,7 +260,7 @@ export default {
if (this.formInline.projectEndtime != "" && this.formInline.projectEndtime !=null) {
return (
time.getTime() >
new Date(this.formInline.projectEndtime).getTime()
new Date(this.formInline.projectEndtime).getTime()
);
}
}
......@@ -269,7 +269,7 @@ export default {
disabledDate: time => {
return (
time.getTime() <
new Date(this.formInline.projectBegintime).getTime()
new Date(this.formInline.projectBegintime).getTime()
); //减去一天的时间代表可以选择同一天;
}
},
......@@ -279,7 +279,7 @@ export default {
},
computed: {
...mapGetters([
"_token",
"_token",
// "idType",
// "masterAdministratorFlag"
])
......@@ -289,6 +289,9 @@ export default {
vm.idType = localStorage.getItem('storageIdType');
vm.masterAdministratorFlag = localStorage.getItem('storageMaster');
console.log('idType:',vm.idType);
if(this.$route.query.pageNum){
this.formInline.pageNo = parseInt(this.$route.query.pageNum)
}
this.$nextTick(function() {;
this.getProjectList();
});
......@@ -360,7 +363,7 @@ export default {
let level = row.level;
if (type === 0) {
//编辑
this.$router.push("edit-manager?projectId=" + projectId +"&level="+level);
this.$router.push("edit-manager?projectId=" + projectId +"&level="+level+'&pageNum='+this.formInline.pageNo);
} else if (type === 7) {
//提醒审核
let req = {
......@@ -542,7 +545,7 @@ export default {
}
}
}
.el-tooltip__popper {
max-width:50%
.el-tooltip__popper {
max-width:50%
}
</style>
\ No newline at end of file
</style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或