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 @@ ...@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
<div class="first-step" v-if="stepNum == 1"> <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-form-item label="组件名称" prop="name">
<el-input type="text" v-model="portalComponent.name" @blur="componentName" size="small" placeholder="请输入组件名称" style="width:30%;"></el-input> <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> <span class="word-num">{{(portalComponent.name).replace(/\s+/g,"").length}}/20</span>
...@@ -54,10 +54,10 @@ ...@@ -54,10 +54,10 @@
<p class="upload-message" v-if="uploadImgMessage">请上传组件图片</p> <p class="upload-message" v-if="uploadImgMessage">请上传组件图片</p>
</div> --> </div> -->
<el-row> <el-row>
<el-col :span="6"> <el-col :span="8">
<div class="basic-item-icon"> <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-group v-model="certificateLable" @change="selectCertificate" :disabled="componentStatus == 3 || componentStatus == 4">
<el-radio label="是"></el-radio> <el-radio label="是"></el-radio>
<el-radio label="否"></el-radio> <el-radio label="否"></el-radio>
...@@ -78,14 +78,15 @@ ...@@ -78,14 +78,15 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-form-item v-if="hasCertificate" label="组件完成(%)" prop="certificateCondition"> <el-form-item label="组件内的模块完成比率须≥" prop="certificateCondition">
<el-input-number <el-input-number
v-model="portalComponent.certificateCondition" v-model="portalComponent.certificateCondition"
controls-position="right" controls-position="right"
@change="handleChange" @change="handleChange"
:disabled="componentStatus == 3 || componentStatus == 4" :disabled="componentStatus == 3 || componentStatus == 4"
:step="10" :precision="0"
:min="10" :step="1"
:min="0"
:max="100"> :max="100">
</el-input-number> </el-input-number>
</el-form-item> </el-form-item>
...@@ -107,6 +108,13 @@ ...@@ -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-input v-model="item.name" @blur="moduleNameValidate(index)" :disabled="fieldDisabled(item)" size="small" placeholder="请选择模块名称" style="width:288px;"></el-input>
</el-form-item> </el-form-item>
</el-col> </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-col :span="8" v-if="idType == 1">
<el-form-item label="是否对外开放" prop="openFlag"> <el-form-item label="是否对外开放" prop="openFlag">
<el-radio-group v-model="item.openFlag" @change="selectIsOpen(index)" :disabled="fieldDisabled(item) || item.openDisabled"> <el-radio-group v-model="item.openFlag" @change="selectIsOpen(index)" :disabled="fieldDisabled(item) || item.openDisabled">
...@@ -115,6 +123,14 @@ ...@@ -115,6 +123,14 @@
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
</el-col> </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-col :span="6" v-if="idType == 1">
<el-form-item label="是否启用" prop="status"> <el-form-item label="是否启用" prop="status">
<el-radio-group v-model="item.status" @change="selectIsOpenStatus(index)" :disabled="fieldDisabled(item)"> <el-radio-group v-model="item.status" @change="selectIsOpenStatus(index)" :disabled="fieldDisabled(item)">
...@@ -405,14 +421,15 @@ export default { ...@@ -405,14 +421,15 @@ export default {
imageUrl:'', imageUrl:'',
seqNo: '', seqNo: '',
certificateId: '', // 0 没有证书,配置证书为否 certificateId: '', // 0 没有证书,配置证书为否
certificateCondition: '60', // 证书完成率 certificateCondition: '100', // 证书完成率
status: '' status: ''
}, },
componentList: { componentList: {
moduleModelList: [{ moduleModelList: [{
id: '', id: '',
name: '', name: '',
openFlag: '', // 1 否 不开放 2 是 开放 openFlag: '', // 1 否 不开放 2 是 开放,
passType:'1',//1：全部完成 2：无要求
templetModelList: [] templetModelList: []
}] }]
}, },
...@@ -437,7 +454,7 @@ export default { ...@@ -437,7 +454,7 @@ export default {
{ required: true, message: '请选择证书', trigger: 'blur' }, { required: true, message: '请选择证书', trigger: 'blur' },
], ],
"certificateCondition": [ "certificateCondition": [
{ required: true, message: '请选择获得证书完成率', trigger: 'blur' }, { required: true, message: '请输入内容', trigger: 'blur' },
] ]
}, },
moduleRules: { moduleRules: {
...@@ -510,6 +527,10 @@ export default { ...@@ -510,6 +527,10 @@ export default {
}) })
} }
}, },
selectStandard(index){
},
// 删除图片 // 删除图片
deleteImg() { deleteImg() {
vm.portalComponent.imageUrl = '' vm.portalComponent.imageUrl = ''
...@@ -520,14 +541,19 @@ export default { ...@@ -520,14 +541,19 @@ export default {
vm.portalComponent.certificateId = '' vm.portalComponent.certificateId = ''
if(val == '否') { if(val == '否') {
vm.hasCertificate = false vm.hasCertificate = false
vm.portalComponent.certificateCondition = 0 //vm.portalComponent.certificateCondition = 0
}else{ }else{
vm.hasCertificate = true vm.hasCertificate = true
vm.portalComponent.certificateCondition = 60 //vm.portalComponent.certificateCondition = 100
} }
vm.portalComponent.certificateCondition = 100
}, },
// 获取组件完成率 // 获取组件完成率
handleChange(value) { handleChange(value) {
console.log(value)
if(value == 1){
}
vm.portalComponent.certificateCondition = value vm.portalComponent.certificateCondition = value
}, },
// 获取证书下拉列表 // 获取证书下拉列表
...@@ -757,6 +783,9 @@ export default { ...@@ -757,6 +783,9 @@ export default {
} }
} }
}, },
fieldDisabledStandard(item){
return (vm.componentStatus == 3 || vm.componentStatus == 4 );
},
fieldDisabled(item){ fieldDisabled(item){
// return vm.conditionSelect || item.moduleType == 2 || (item.id != '' && item.openFlag == 2) || vm.idType == 2 || item.statusFlag // 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); return vm.newconditionSelect || item.moduleType == 2 || vm.idType == 2 || (vm.componentStatus != 1 && vm.componentStatus != 2 && item.statusFlag);
...@@ -854,9 +883,10 @@ export default { ...@@ -854,9 +883,10 @@ export default {
openFlag: 1, // 1不开放 2开放 openFlag: 1, // 1不开放 2开放
moduleType: 1, // 2为从预设模块中添加 moduleType: 1, // 2为从预设模块中添加
status: 1, // 1 不启用 2启用 status: 1, // 1 不启用 2启用
passType:1,
templetModelList: [] templetModelList: []
}); });
vm.componentList.moduleModelList[(vm.componentList.moduleModelList.length - 1)].openDisabled = true; //vm.componentList.moduleModelList[(vm.componentList.moduleModelList.length - 1)].openDisabled = true;
}, },
// 添加模板 // 添加模板
addTemplate(item,index) { addTemplate(item,index) {
...@@ -1113,7 +1143,11 @@ export default { ...@@ -1113,7 +1143,11 @@ export default {
vm.GET('portal/portalComponent/disableOrStart',req).then((res) => { vm.GET('portal/portalComponent/disableOrStart',req).then((res) => {
if(res.code == "000000") { if(res.code == "000000") {
if(flag == 2) { 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 { } else {
vm.$message.info("暂存成功！") vm.$message.info("暂存成功！")
} }
...@@ -1397,5 +1431,3 @@ export default { ...@@ -1397,5 +1431,3 @@ export default {
} }
} }
</style> </style>
src/views/education/item-component.vue
浏览文件 @ 5422f9e7
...@@ -145,6 +145,9 @@ export default { ...@@ -145,6 +145,9 @@ export default {
vm = this vm = this
vm.idType = localStorage.getItem('storageIdType') vm.idType = localStorage.getItem('storageIdType')
vm.masterAdministratorFlag = localStorage.getItem('storageMaster') vm.masterAdministratorFlag = localStorage.getItem('storageMaster')
if(this.$route.query.pageNum){
vm.searchParam.pageNo = parseInt(this.$route.query.pageNum)
}
vm.search() vm.search()
}, },
// 挂载到Dom完成时 // 挂载到Dom完成时
...@@ -190,7 +193,7 @@ export default { ...@@ -190,7 +193,7 @@ export default {
} }
vm.GET('portal/portalComponent/componentEditRange',req).then((res) => { vm.GET('portal/portalComponent/componentEditRange',req).then((res) => {
if(res.code == "000000") { 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 { }else {
vm.$message.info(res.message) vm.$message.info(res.message)
} }
...@@ -310,5 +313,3 @@ export default { ...@@ -310,5 +313,3 @@ export default {
} }
} }
</style> </style>
src/views/education/item-manager.vue
浏览文件 @ 5422f9e7
...@@ -260,7 +260,7 @@ export default { ...@@ -260,7 +260,7 @@ export default {
if (this.formInline.projectEndtime != "" && this.formInline.projectEndtime !=null) { if (this.formInline.projectEndtime != "" && this.formInline.projectEndtime !=null) {
return ( return (
time.getTime() > time.getTime() >
new Date(this.formInline.projectEndtime).getTime() new Date(this.formInline.projectEndtime).getTime()
); );
} }
} }
...@@ -269,7 +269,7 @@ export default { ...@@ -269,7 +269,7 @@ export default {
disabledDate: time => { disabledDate: time => {
return ( return (
time.getTime() < time.getTime() <
new Date(this.formInline.projectBegintime).getTime() new Date(this.formInline.projectBegintime).getTime()
); //减去一天的时间代表可以选择同一天; ); //减去一天的时间代表可以选择同一天;
} }
}, },
...@@ -279,7 +279,7 @@ export default { ...@@ -279,7 +279,7 @@ export default {
}, },
computed: { computed: {
...mapGetters([ ...mapGetters([
"_token", "_token",
// "idType", // "idType",
// "masterAdministratorFlag" // "masterAdministratorFlag"
]) ])
...@@ -289,6 +289,9 @@ export default { ...@@ -289,6 +289,9 @@ export default {
vm.idType = localStorage.getItem('storageIdType'); vm.idType = localStorage.getItem('storageIdType');
vm.masterAdministratorFlag = localStorage.getItem('storageMaster'); vm.masterAdministratorFlag = localStorage.getItem('storageMaster');
console.log('idType:',vm.idType); console.log('idType:',vm.idType);
if(this.$route.query.pageNum){
this.formInline.pageNo = parseInt(this.$route.query.pageNum)
}
this.$nextTick(function() {; this.$nextTick(function() {;
this.getProjectList(); this.getProjectList();
}); });
...@@ -360,7 +363,7 @@ export default { ...@@ -360,7 +363,7 @@ export default {
let level = row.level; let level = row.level;
if (type === 0) { 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) { } else if (type === 7) {
//提醒审核 //提醒审核
let req = { let req = {
...@@ -542,7 +545,7 @@ export default { ...@@ -542,7 +545,7 @@ export default {
} }
} }
} }
.el-tooltip__popper { .el-tooltip__popper {
max-width:50% max-width:50%
} }
</style> </style>
\ No newline at end of file
src/views/system/item-role.vue
浏览文件 @ 5422f9e7
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="header-title"> <div class="header-title">
查询条件 查询条件
<el-upload <el-upload
v-if="activeUser == 'L1'" v-if="activeUser == 'L1' && authorityType == 1"
class="upload-excel" class="upload-excel"
action="#" action="#"
accept=".xlsx" accept=".xlsx"
...@@ -106,42 +106,61 @@ ...@@ -106,42 +106,61 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" width="350" align="left"> <el-table-column fixed="right" label="操作" width="350" align="left">
<template slot-scope="scope">
<el-button <template slot-scope="scope" >
class="button-text" <div v-if="authorityType == 2">
type="text" <el-button
size="small" class="button-text"
v-show="showButton(scope.row,'L2')" type="text"
@click="openDialog(scope.row,'L2')" size="small"
>升级项目负责人</el-button> v-if="scope.row.projeceRole != 'L2'"
<el-button @click="proChange(scope.row,'L2')"
class="button-text" >升级项目负责人</el-button>
type="text" <el-button
size="small" class="button-text"
v-show="showButton(scope.row,'L3')" type="text"
@click="openDialog(scope.row,'L3')" size="small"
>升级次级负责人</el-button> v-else
<el-button @click="proChange(scope.row,'')"
class="button-text" >取消项目负责人</el-button>
type="text" </div>
size="small" <div v-if="authorityType == 1">
v-show="showButton(scope.row,'L3_2')" <el-button
@click="openDialog(scope.row,'L3_2')" class="button-text"
>降为次级负责人</el-button> type="text"
<el-button size="small"
class="button-text" v-show="showButton(scope.row,'L2')"
type="text" @click="openDialog(scope.row,'L2')"
size="small" >升级项目负责人</el-button>
v-show="showButton(scope.row,'L0')" <el-button
@click="openDialog(scope.row,'L0')" class="button-text"
>降为普通用户</el-button> type="text"
<el-button size="small"
class="button-text" v-show="showButton(scope.row,'L3')"
type="text" @click="openDialog(scope.row,'L3')"
size="small" >升级次级负责人</el-button>
v-show="showAppend(scope.row.projeceRole)" <el-button
@click="addArea(scope.row)" class="button-text"
>追加区域权限</el-button> 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> </template>
</el-table-column> </el-table-column>
<div slot="empty"> <div slot="empty">
...@@ -163,6 +182,18 @@ ...@@ -163,6 +182,18 @@
:total="totalRows" :total="totalRows"
></el-pagination> ></el-pagination>
</div> </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> <el-dialog title :visible.sync="dialog.show" width="30%" center>
<!-- <p v-if="numL3 > 1" class="dialog-p"> <!-- <p v-if="numL3 > 1" class="dialog-p">
确认将{{ dialog.role }} 确认将{{ dialog.role }}
...@@ -359,7 +390,12 @@ export default { ...@@ -359,7 +390,12 @@ export default {
role: "项目负责人", role: "项目负责人",
name: "李雷", name: "李雷",
option: "升级为项目负责人", option: "升级为项目负责人",
full: false full: false,
},
changeDialog:{
show: false,
txt:''
}, },
dialogFull: false, dialogFull: false,
scopeRow: {}, scopeRow: {},
...@@ -384,7 +420,10 @@ export default { ...@@ -384,7 +420,10 @@ export default {
attachRegionId: "", attachRegionId: "",
creator: false, creator: false,
hospitalMasterAdmin: false hospitalMasterAdmin: false,
optionType:'',
optionItem:{},
authorityType:0,
}; };
}, },
created() { created() {
...@@ -396,6 +435,45 @@ export default { ...@@ -396,6 +435,45 @@ export default {
commonUtil.resizeHeight(); commonUtil.resizeHeight();
}, },
methods: { 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() { updateAgain() {
vm.dialogFail = false; vm.dialogFail = false;
}, },
...@@ -497,6 +575,8 @@ export default { ...@@ -497,6 +575,8 @@ export default {
closeLoading(vm); closeLoading(vm);
if (res.code == "000000") { if (res.code == "000000") {
vm.tableData = res.data.projectRoleInfoModels; vm.tableData = res.data.projectRoleInfoModels;
vm.authorityType = res.data.authorityType
vm.totalRows = res.data.total; vm.totalRows = res.data.total;
vm.activeUser = res.data.activeUser; vm.activeUser = res.data.activeUser;
vm.creator = res.data.creator; vm.creator = res.data.creator;
...@@ -1094,4 +1174,4 @@ export default { ...@@ -1094,4 +1174,4 @@ export default {
overflow-y: scroll; overflow-y: scroll;
} }
} }
</style> </style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或