Skip to content

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

添加学科页面和职称考页面

上级 edb5358d
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 1116 行增加 和 5165 行删除
src/router/router.js
浏览文件 @ 6d58eb4e
......@@ -13,6 +13,9 @@ const editManager = r => require.ensure([], () => r(require('../views/education/
const itemRole = r => require.ensure([], () => r(require('../views/system/item-role.vue')), 'item-role')
const msgPush = r => require.ensure([], () => r(require('../views/msgpush/msg-push.vue')), 'msg-push')
const editCme = r => require.ensure([], () => r(require('../views/education/edit-cme.vue')), 'edit-cme')
const editProfessionalExam = r => require.ensure([], () => r(require('../views/education/edit-professional-exam.vue')), 'edit-professional-exam')
const subjectManager = r => require.ensure([], () => r(require('../views/education/subject-manager.vue')), 'subject-manager')
const editSubject = r => require.ensure([], () => r(require('../views/education/edit-subject.vue')), 'edit-subject')
import patientsRouters from './patients'
import followRouters from './follow'
......@@ -91,6 +94,15 @@ export default [{
},{
path: '/edit-cme',
component: editCme
},{
path: '/edit-professional-exam',
component: editProfessionalExam
},{
path: '/subject-manager',
component: subjectManager
},{
path: '/edit-subject',
component: editSubject
},{
path: '/item-component',
component: itemComponent
......
src/utils-o/utils.js
浏览文件 @ 6d58eb4e
......@@ -305,7 +305,8 @@ const GetLocalIPAddress = () => {
// // check();
// });
// $.getScript('http://pv.sohu.com/cityjson?ie=utf-8', function () {
return returnCitySN["cip"];
// return returnCitySN["cip"];
return '';
// });
// return ip;
};
......
src/utils/fetch.js
浏览文件 @ 6d58eb4e
......@@ -54,9 +54,9 @@ service.interceptors.request.use(config => {
}
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境qgit
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
config.headers['token'] = '28731437A7EF482ABC5DF4D4DB13B3ED';
// config.headers['token'] = '28731437A7EF482ABC5DF4D4DB13B3ED';
// config.headers['token'] = localStorage.getItem('storageToken')
config.headers['token'] = localStorage.getItem('storageToken')
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
src/utils/utils.js
浏览文件 @ 6d58eb4e
......@@ -307,7 +307,8 @@ const GetLocalIPAddress = () => {
// // check();
// });
// $.getScript('http://pv.sohu.com/cityjson?ie=utf-8', function () {
return returnCitySN["cip"];
// return returnCitySN["cip"];
return '';
// });
// return ip;
};
......@@ -803,3 +804,7 @@ export const setOptionLabel = (self,selfModel,selfEId,selfEName,list,listEId,lis
}
return;
};
export function deepCopy(obj) {
return obj ? JSON.parse(JSON.stringify(obj)) : obj;
}
src/views/education/edit-cme copy.vue → src/views/education/edit-professional-exam.vue
浏览文件 @ 6d58eb4e
......@@ -89,8 +89,10 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="13">
<el-form-item label="项目时间：" required>
<el-col :span="5">
<el-col :span="10">
<el-form-item prop="projectBegintime">
<el-date-picker
v-model="formData.projectBegintime"
......@@ -104,8 +106,8 @@
></el-date-picker>
</el-form-item>
</el-col>
<el-col class="line" :span="1">~</el-col>
<el-col :span="5">
<el-col class="line" :span="2">~</el-col>
<el-col :span="10">
<el-form-item label prop="projectEndtime">
<el-date-picker
v-model="formData.projectEndtime"
......@@ -121,7 +123,22 @@
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="项目简介：" prop="projectIntro">
</el-col>
<el-col :span="10">
<el-form-item label="卡类型：" prop="cardType">
<el-select size="small" v-model="formData.cardType" placeholder="请选择卡类型">
<el-option
v-for="item in cardTypeList"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="简介：" prop="projectIntro">
<el-col :span="13">
<el-input
size="small"
......@@ -290,8 +307,7 @@
</el-form-item> -->
<el-form-item label="项目类型：">
<el-radio-group v-model="formData.cmeType" :disabled="projectId && projectStatus != 1" size="small">
<el-radio :label="1">自营项目</el-radio>
<el-radio :label="2">中华医学会二类</el-radio>
<el-radio :label="3">职称考项目</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item v-show="formData.cmeType == 1" label="学分名称：" prop="creditId">
......@@ -360,7 +376,7 @@
<el-radio :label="1">使用小生态范围</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="人员权限设定" v-show="projectType != 2">
<el-form-item label="人员权限设定" v-show="projectType != 5">
<el-radio-group
size="small"
v-model="formData.authorityType"
......@@ -1085,7 +1101,7 @@
</div>
</div>
<el-form-item required label="配置证书：" v-show="projectType != 2">
<el-form-item required label="配置证书：" v-show="projectType != 5">
<el-col :span="10">
<el-radio-group
class="el-configure"
......@@ -1385,11 +1401,12 @@ export default {
//cme新增
projectNo: "",
projectLevel: "",
cardType: "",
projectLeaderId: "",
projectSubject: "",
mustKnow: "",
creditId: "",
cmeType: 1,
cmeType: 3,
cmeCredit: '',
examBtnUrl: '',
},
......@@ -1581,6 +1598,7 @@ export default {
uploadType: "",
//cme新增
projectLevelList: [],
cardTypeList: [],
projectLeaderList: [],
creditList: [],
creditTip: "",
......@@ -1762,22 +1780,25 @@ export default {
// projectNo: [
// { required: true, message: "请输入项目编号", trigger: "blur" },
// ],
projectLevel: [
{ required: true, message: "请选择项目等级", trigger: "change" }
// projectLevel: [
// { required: true, message: "请选择项目等级", trigger: "change" }
// ],
cardType: [
{ required: true, message: "请选择卡类型", trigger: "change" }
],
// projectLeaderId: [
// { required: true, message: "请选择项目负责人", trigger: "change" },
// ],
projectSubject: [
{ required: true, message: "请输入项目所属学科", trigger: "blur" }
],
mustKnow: [
{ required: true, message: "请输入学习须知", trigger: "blur" },
{ min: 1, max: 200, message: "超出可输入的最大长度", trigger: "blur" }
],
creditId: [
{ required: true, validator: checkCmeCreditId, trigger: "change,blur" }
],
// projectSubject: [
// { required: true, message: "请输入项目所属学科", trigger: "blur" }
// ],
// mustKnow: [
// { required: true, message: "请输入学习须知", trigger: "blur" },
// { min: 1, max: 200, message: "超出可输入的最大长度", trigger: "blur" }
// ],
// creditId: [
// { required: true, validator: checkCmeCreditId, trigger: "change,blur" }
// ],
cmeCredit: [
{ required: true, validator: checkCmeCredit, trigger: "blur" },
// { min: 0.1, max: 100, message: "请输入0.1～100数字，可小数", trigger: "blur" }
......@@ -1797,7 +1818,7 @@ export default {
(this.projectId = vm.getUrlSearch(window.location.href, "projectId")),
(this.peopleLevel = vm.getUrlSearch(window.location.href, "level"));
if (this.projectType == 2) {
if (this.projectType == 5) {
//CME情况下
this.rules = this.rules2;
this.formData.learnableFlag = 1;
......@@ -1975,6 +1996,7 @@ export default {
//cme新增
projectNo: editData.projectData.projectNo,
projectLevel: editData.projectData.projectLevel,
cardType: editData.projectData.cardType,
projectLeaderId: editData.projectData.projectLeaderId,
projectSubject: editData.projectData.projectSubject,
mustKnow: editData.projectData.mustKnow,
......@@ -1983,7 +2005,7 @@ export default {
cmeCredit: editData.projectData.cmeCredit || '',
examBtnUrl: editData.projectData.examBtnUrl || '',
};
if (vm.projectType == 2) {
if (vm.projectType == 5) {
vm.formData.learnableFlag = 1;
vm.initCreditTip();
}
......@@ -2113,6 +2135,7 @@ export default {
projectType: this.projectType,
projectNo: this.formData.projectNo,
projectLevel: this.formData.projectLevel,
cardType: this.formData.cardType,
projectLeaderId: this.formData.projectLeaderId,
projectSubject: this.formData.projectSubject,
mustKnow: this.formData.mustKnow,
......@@ -2156,13 +2179,13 @@ export default {
}
//}
//creditId学分id的特殊处理
if (this.projectType == 2) {
if (this.projectType == 5) {
if (option == "add" || option == "storage") {
projectModel.creditId = this.formData.creditId;
}
}
if (option == "edit" || option == "storageEdit") {
if (this.projectType == 2) {
if (this.projectType == 5) {
projectModel.creditId = this.beforeCreditId;
}
//编辑
......@@ -2505,9 +2528,9 @@ export default {
},
//点击下一步
nextStep(moveType) {
if(this.formData.cmeType == 2) {
moveType = 2;
}
// if(this.formData.cmeType == 2) {
// moveType = 2;
// }
if (this.active == 0) {
let formName = "formData";
let removeState = this.submitForm(formName);
......@@ -2538,7 +2561,7 @@ export default {
if (res.code == "000000") {
//移动到第二页 选择范围
// this.operationLast();
if (moveType == 1 && vm.projectType == 2) {
if (moveType == 1 && vm.projectType == 5) {
this.dialogCme = true;
return;
}
......@@ -3693,7 +3716,7 @@ export default {
},
showScopeTypeCME() {
if (this.projectStatus == "" || this.projectStatus == 1) {
if (this.peopleLevel != "L3" && this.projectType != 2) {
if (this.peopleLevel != "L3" && this.projectType != 5) {
return false;
}
}
......@@ -3719,7 +3742,7 @@ export default {
this.projectStatus == 1 ||
this.projectStatus == 2
) {
if (this.peopleLevel != "L3" && this.projectType != 2) {
if (this.peopleLevel != "L3" && this.projectType != 5) {
return false;
}
}
......@@ -3730,7 +3753,7 @@ export default {
if (this.peopleLevel == "L3" || this.peopleLevel == "L0") {
return true;
}
if (this.projectType == 2) {
if (this.projectType == 5) {
return true;
}
return false;
......
src/views/education/edit-subject.vue 0 → 100644
浏览文件 @ 6d58eb4e
此差异已折叠。
src/views/education/item-manager.vue
浏览文件 @ 6d58eb4e
......@@ -223,6 +223,7 @@
<el-radio :label="1">普通项目</el-radio>
<el-radio :label="2">CME项目</el-radio>
<el-radio :label="3">开放模板</el-radio>
<el-radio :label="5">职称考试</el-radio>
</el-radio-group>
<span slot="footer" class="dialog-footer">
<el-button @click="centerDialogVisible = false">取 消</el-button>
......@@ -465,6 +466,9 @@ export default {
toTemplatePage(isPreview = 0) {
this.$router.push("template-open?projectType=3&isPreview=" + isPreview);
},
toProfessionalExamPage(isPreview = 0) {
this.$router.push("edit-professional-exam?projectType=5&isPreview=" + isPreview);
},
toEditCustomPage(isPreview = 0) {
this.setKind(0);
this.$router.push("edit-custom?projectType=4&isPreview=" + isPreview);
......@@ -478,12 +482,14 @@ export default {
},
handleCreateProject() {
if (this.newProjectType == 1) {
// 1 普通项目 2 CME项目
// 1 普通项目 2 CME项目 5 职称考试
this.toPage();
} else if (this.newProjectType == 2) {
this.toCmePage();
} else if (this.newProjectType == 3) {
this.toTemplatePage();
} else if (this.newProjectType == 5) {
this.toProfessionalExamPage();
}
},
......@@ -716,6 +722,15 @@ export default {
projectId + "&level=" + level + "&pageNum=" + this.formInline.pageNo +
"&projectStatus=" + row.projectStatus
);
} else if (row.projectType === 5) {
this.$router.push(
"edit-professional-exam?projectType=5&projectId=" +
projectId +
"&level=" +
level +
"&pageNum=" +
this.formInline.pageNo
);
}
} else if (type === 7) {
//提醒审核
......
src/views/education/subject-manager.vue 0 → 100644
浏览文件 @ 6d58eb4e
此差异已折叠。
src/views/layout/slidebar.vue
浏览文件 @ 6d58eb4e
......@@ -410,6 +410,12 @@
index: 'advert-simple-manage'
};
const subjectManager = {
title: '学科管理',
icon: 'el-icon-setting',
index: 'subject-manager'
};
const eduRole = {
title: '角色权限',
icon: 'el-icon-menu',
......@@ -470,6 +476,7 @@
};
vm.items[1].subs.push(subjectManager);
vm.items[1].subs.push(itemComponent);
vm.items[1].subs.push(templateManager);
vm.items[1].subs.push(followSider);
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或