Skip to content

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

Merge branch 'dev-1209-fix' into release-backups

上级 78f9d5bc 125432d7
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 693 行增加 和 161 行删除
src/views/education/create-component.vue
浏览文件 @ 5422f9e7
......@@ -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="175px" 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>
......@@ -54,10 +54,10 @@
<p class="upload-message" v-if="uploadImgMessage">请上传组件图片</p>
</div> -->
<el-row>
<el-col :span="6">
<el-col :span="8">
<div class="basic-item-icon">
<span class="require">*</span>
<el-form-item label="配置证书">
<el-form-item label="配置证书" required>
<el-radio-group v-model="certificateLable" @change="selectCertificate" :disabled="componentStatus == 3 || componentStatus == 4">
<el-radio label="是"></el-radio>
<el-radio label="否"></el-radio>
......@@ -78,14 +78,15 @@
</el-form-item>
</el-col>
</el-row>
<el-form-item v-if="hasCertificate" label="组件完成(%)" prop="certificateCondition">
<el-form-item label="组件内的模块完成比率须≥" prop="certificateCondition">
<el-input-number
v-model="portalComponent.certificateCondition"
controls-position="right"
@change="handleChange"
:disabled="componentStatus == 3 || componentStatus == 4"
:step="10"
:min="10"
:precision="0"
:step="1"
:min="0"
:max="100">
</el-input-number>
</el-form-item>
......@@ -107,6 +108,13 @@
<el-input v-model="item.name" @blur="moduleNameValidate(index)" :disabled="fieldDisabled(item)" size="small" placeholder="请选择模块名称" style="width:288px;"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!-- <el-col :span="10">
<el-form-item label="模块名称" prop="name">
<el-input v-model="item.name" @blur="moduleNameValidate(index)" :disabled="fieldDisabled(item)" size="small" placeholder="请选择模块名称" style="width:288px;"></el-input>
</el-form-item>
</el-col> -->
<el-col :span="8" v-if="idType == 1">
<el-form-item label="是否对外开放" prop="openFlag">
<el-radio-group v-model="item.openFlag" @change="selectIsOpen(index)" :disabled="fieldDisabled(item) || item.openDisabled">
......@@ -115,6 +123,14 @@
</el-radio-group>
</el-form-item>
</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="fieldDisabledStandard(item)">
<el-radio :label="1">全部完成</el-radio>
<el-radio :label="2">无要求</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
<el-col :span="6" v-if="idType == 1">
<el-form-item label="是否启用" prop="status">
<el-radio-group v-model="item.status" @change="selectIsOpenStatus(index)" :disabled="fieldDisabled(item)">
......@@ -405,14 +421,15 @@ export default {
imageUrl:'',
seqNo: '',
certificateId: '', // 0 没有证书,配置证书为否
certificateCondition: '60', // 证书完成率
certificateCondition: '100', // 证书完成率
status: ''
},
componentList: {
moduleModelList: [{
id: '',
name: '',
openFlag: '', // 1 否 不开放 2 是 开放
openFlag: '', // 1 否 不开放 2 是 开放,
passType:'1',//1：全部完成 2：无要求
templetModelList: []
}]
},
......@@ -437,7 +454,7 @@ export default {
{ required: true, message: '请选择证书', trigger: 'blur' },
],
"certificateCondition": [
{ required: true, message: '请选择获得证书完成率', trigger: 'blur' },
{ required: true, message: '请输入内容', trigger: 'blur' },
]
},
moduleRules: {
......@@ -510,6 +527,10 @@ export default {
})
}
},
selectStandard(index){
},
// 删除图片
deleteImg() {
vm.portalComponent.imageUrl = ''
......@@ -520,14 +541,19 @@ export default {
vm.portalComponent.certificateId = ''
if(val == '否') {
vm.hasCertificate = false
vm.portalComponent.certificateCondition = 0
//vm.portalComponent.certificateCondition = 0
}else{
vm.hasCertificate = true
vm.portalComponent.certificateCondition = 60
//vm.portalComponent.certificateCondition = 100
}
vm.portalComponent.certificateCondition = 100
},
// 获取组件完成率
handleChange(value) {
console.log(value)
if(value == 1){
}
vm.portalComponent.certificateCondition = value
},
// 获取证书下拉列表
......@@ -757,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);
......@@ -854,9 +883,10 @@ export default {
openFlag: 1, // 1不开放 2开放
moduleType: 1, // 2为从预设模块中添加
status: 1, // 1 不启用 2启用
passType:1,
templetModelList: []
});
vm.componentList.moduleModelList[(vm.componentList.moduleModelList.length - 1)].openDisabled = true;
//vm.componentList.moduleModelList[(vm.componentList.moduleModelList.length - 1)].openDisabled = true;
},
// 添加模板
addTemplate(item,index) {
......@@ -1113,7 +1143,11 @@ export default {
vm.GET('portal/portalComponent/disableOrStart',req).then((res) => {
if(res.code == "000000") {
if(flag == 2) {
vm.$router.push({ path: 'item-component' })
let query = {}
if(this.$route.query.pageNum){
query = {pageNum:this.$route.query.pageNum}
}
vm.$router.push({ path: 'item-component',query:query })
} else {
vm.$message.info("暂存成功！")
}
......@@ -1397,5 +1431,3 @@ export default {
}
}
</style>
src/views/education/item-component.vue
浏览文件 @ 5422f9e7
......@@ -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
浏览文件 @ 5422f9e7
......@@ -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>
src/views/system/item-role.vue
浏览文件 @ 5422f9e7
......@@ -5,7 +5,7 @@
<div class="header-title">
查询条件
<el-upload
v-if="activeUser == 'L1'"
v-if="activeUser == 'L1' && authorityType == 1"
class="upload-excel"
action="#"
accept=".xlsx"
......@@ -106,42 +106,61 @@
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" width="350" align="left">
<template slot-scope="scope">
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L2')"
@click="openDialog(scope.row,'L2')"
>升级项目负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L3')"
@click="openDialog(scope.row,'L3')"
>升级次级负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L3_2')"
@click="openDialog(scope.row,'L3_2')"
>降为次级负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L0')"
@click="openDialog(scope.row,'L0')"
>降为普通用户</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showAppend(scope.row.projeceRole)"
@click="addArea(scope.row)"
>追加区域权限</el-button>
<template slot-scope="scope" >
<div v-if="authorityType == 2">
<el-button
class="button-text"
type="text"
size="small"
v-if="scope.row.projeceRole != 'L2'"
@click="proChange(scope.row,'L2')"
>升级项目负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-else
@click="proChange(scope.row,'')"
>取消项目负责人</el-button>
</div>
<div v-if="authorityType == 1">
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L2')"
@click="openDialog(scope.row,'L2')"
>升级项目负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L3')"
@click="openDialog(scope.row,'L3')"
>升级次级负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L3_2')"
@click="openDialog(scope.row,'L3_2')"
>降为次级负责人</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showButton(scope.row,'L0')"
@click="openDialog(scope.row,'L0')"
>降为普通用户</el-button>
<el-button
class="button-text"
type="text"
size="small"
v-show="showAppend(scope.row.projeceRole)"
@click="addArea(scope.row)"
>追加区域权限</el-button>
</div>
</template>
</el-table-column>
<div slot="empty">
......@@ -163,6 +182,18 @@
:total="totalRows"
></el-pagination>
</div>
<el-dialog title :visible.sync="changeDialog.show" width="30%" center>
<p v-html="changeDialog.txt">
</p>
<span slot="footer" class="dialog-footer">
<el-button type="default" size="small" @click="changeDialog.show = false">取消</el-button>
<el-button type="primary" size="small" @click="changeFunRole()">确定</el-button>
</span>
</el-dialog>
<el-dialog title :visible.sync="dialog.show" width="30%" center>
<!-- <p v-if="numL3 > 1" class="dialog-p">
确认将{{ dialog.role }}
......@@ -359,7 +390,12 @@ export default {
role: "项目负责人",
name: "李雷",
option: "升级为项目负责人",
full: false
full: false,
},
changeDialog:{
show: false,
txt:''
},
dialogFull: false,
scopeRow: {},
......@@ -384,7 +420,10 @@ export default {
attachRegionId: "",
creator: false,
hospitalMasterAdmin: false
hospitalMasterAdmin: false,
optionType:'',
optionItem:{},
authorityType:0,
};
},
created() {
......@@ -396,6 +435,45 @@ export default {
commonUtil.resizeHeight();
},
methods: {
//add 升、降项目负责人
proChange(item,str){
this.optionType = str;
this.optionItem = item;
let s = ''
s = str != '' ? '确认将项目负责人 <span class="user-name">'+item.userName+'</span> 升级为项目负责人吗?' : '确认取消 <span class="user-name">'+ item.userName+'</span> 项目负责人权限吗?'
this.changeDialog = {
show: true,
txt:s
}
},
changeFunRole() {
let req = {
portalProjectId: this.formInline.portalProjectId,
updateL: this.optionType == '' ? 'L3' : 'L2',
userId: this.optionItem.userId,
numL2: this.numL2,
nowL: this.optionItem.projeceRole
};
// vm.GET("portal/portalProjectOrRole/roleLevelUpdate", req).then(res => {
vm.GET("portal/v2/role/roleLevelUpdate", req).then(res => {
vm.dialog.show = false;
if (res.code == "000000") {
console.log(res);
vm.queryRoleList();
vm.$message({
message: "设置成功！",
type: "success"
});
this.changeDialog = {
show: false,
txt:''
}
} else {
this.$message.error(res.code);
}
});
},
updateAgain() {
vm.dialogFail = false;
},
......@@ -497,6 +575,8 @@ export default {
closeLoading(vm);
if (res.code == "000000") {
vm.tableData = res.data.projectRoleInfoModels;
vm.authorityType = res.data.authorityType
vm.totalRows = res.data.total;
vm.activeUser = res.data.activeUser;
vm.creator = res.data.creator;
......@@ -1094,4 +1174,4 @@ export default {
overflow-y: scroll;
}
}
</style>
\ No newline at end of file
</style>
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或