Skip to content

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

update 对接api

上级 c4a92048
隐藏空白字符变更
内嵌 并排
正在显示 包含 161 行增加 和 105 行删除
src/utils/fetch.js
浏览文件 @ 6c242d7a
......@@ -55,7 +55,7 @@ service.interceptors.request.use(config => {
if( process.env.BUILD_ENV == "development" ){ // 本地开发环境
// console.log('环境变量>>>> ', process.env.BUILD_ENV);
// config.headers['token'] = '367F0B613A604751AC94CE12CD4E0E53';
config.headers['token'] = '9E2D6A95B90043D9A2FC7A5DE4FE47F2';
config.headers['token'] = '874879EF8F0F477F85D8FF1A9BFEC634';
}else{
config.headers['token'] = localStorage.getItem('storageToken')
}
......
src/utils/filter.js
浏览文件 @ 6c242d7a
......@@ -158,10 +158,12 @@ const vueFilter = {
}
},
joinStatus: (value) => {
if(value == "1") {
return '是'
}else {
return '否'
if(value == "0") {
return '未参与'
}else if(value == "1") {
return '参与中'
}else {
return '已完成'
}
},
reportStatus: (value) => {
......
src/utils/operation.js
浏览文件 @ 6c242d7a
......@@ -304,7 +304,7 @@ export function getRegionOption() {
value: 310115000000,
label: '西湖区'
}, {
value: 310115000001,
value: 5,
label: '东湖区'
}]
}]
......@@ -325,7 +325,8 @@ export function getLearnOrganization(data) {
for (let i = 0; i < data.length; i++) {
let obj = {
label: data[i].hospital_name,
value: data[i].hospital_id
value: data[i].hospital_id,
index: i,
};
organization.push(obj);
}
......
src/views/learning/course-training.vue
浏览文件 @ 6c242d7a
......@@ -2,12 +2,18 @@
<div class="course-training-wrap">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<p class="course-p">地区：{{ region }}</p>
<p class="course-p">选择机构：{{ organization }}</p>
<el-form class="form-update" ref="serchForm" :model="formData" label-width="100px" style="width:40%;">
<p class="course-p">地区：{{ queryData.region }}</p>
<p class="course-p">选择机构：{{ queryData.organization }}</p>
<el-form
class="form-update"
ref="serchForm"
:model="formData"
label-width="100px"
style="width:40%;"
>
<el-form-item v-if="tableType == 1" label="课程完成状态:">
<el-select
v-model="formData.status"
v-model="formData.learnFlag"
size="small"
style="width: 100%;"
placeholder="请选择状态"
......@@ -21,62 +27,66 @@
</el-select>
</el-form-item>
<el-form-item v-if="tableType == 2" label="考试成绩等级:">
<el-select
v-model="formData.rank"
size="small"
style="width: 100%;"
placeholder="请选择状态"
>
<el-select v-model="formData.gradeFlag" size="small" style="width: 100%;" placeholder="请选择状态">
<el-option
v-for="(item,index) in rankList"
:key="index"
:label="item.label"
:value="item.value"
:label="item.gradeName"
:value="item.gradeFlag"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="查询姓名: ">
<el-input size="small" placeholder="查询姓名" v-model="formData.name">
</el-input>
<el-input size="small" placeholder="查询姓名" v-model="formData.doctorName"></el-input>
</el-form-item>
</el-form>
<div class="form-button">
<el-button @click="search()" type="primary">查询</el-button>
<el-button @click="resetForm()">重置</el-button>
</div>
<el-table
:data="tableData"
class="course-table">
<el-table-column prop="name" label="姓名" align="center">
</el-table-column>
<el-table-column prop="sex" label="性别" align="center">
</el-table-column>
<el-table-column prop="age" label="年龄" align="center">
</el-table-column>
<el-table-column prop="professional" label="职称" align="center">
</el-table-column>
<el-table-column prop="organization" label="机构" align="center">
</el-table-column>
<el-table-column prop="region" label="地区" align="center">
</el-table-column>
<el-table-column v-if="tableType == 1" prop="join" label="参与课程状态" align="center">
<el-table :data="tableData" class="course-table">
<el-table-column prop="doctorName" label="姓名" align="center"></el-table-column>
<el-table-column prop="doctorSex" label="性别" align="center"></el-table-column>
<el-table-column prop="age" label="年龄" align="center"></el-table-column>
<el-table-column prop="doctorTitle" label="职称" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="机构" align="center"></el-table-column>
<el-table-column prop="countyName" label="地区" align="center"></el-table-column>
<el-table-column v-if="tableType == 1" prop="learnStatus" label="参与课程状态" align="center">
<template slot-scope="scope">
<span>{{ scope.row.join | joinStatus }}</span>
<span>{{ scope.row.learnStatus | joinStatus }}</span>
</template>
</el-table-column>
<el-table-column v-if="tableType == 1" prop="date" label="完成培训日期" align="center" min-width="150">
<el-table-column
v-if="tableType == 1"
prop="finishedTime"
label="完成培训日期"
align="center"
min-width="150"
>
<template slot-scope="scope">
<span>{{ scope.row.date | liveDateFilter }}</span>
<span>{{ scope.row.finishedTime }}</span>
</template>
</el-table-column>
<el-table-column v-if="tableType == 2" prop="paddTime" label="通过考试日期" min-width="150" align="center">
<el-table-column
v-if="tableType == 2"
prop="passTime"
label="通过考试日期"
min-width="150"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.passDate | liveDateFilter }}</span>
<span>{{ scope.row.passTime }}</span>
</template>
</el-table-column>
<el-table-column v-if="tableType == 2" prop="level" label="考试成绩等级" min-width="80" align="center">
<el-table-column
v-if="tableType == 2"
prop="gradeName"
label="考试成绩等级"
min-width="80"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.rank | recordValue }}</span>
<span>{{ scope.row.gradeName }}</span>
</template>
</el-table-column>
</el-table>
......@@ -116,37 +126,37 @@ export default {
curmbFirst: "学情报告",
curmbSecond: "项目管理",
formData: {
name: '',
status: '',
rank: '',
doctorName: "",
learnFlag: -1,
gradeFlag: 1,
pageNo: 1,
pageSize: 10,
},
region: '',
organization: '',
region: "",
organization: "",
tableData: [],
tableType: 1,
totalRows: 0,
statusList: [
{
value: 1,
label: '未参与'
value: -1,
label: "全部"
},
{
value: 2,
label: '参与中'
value: 0,
label: "未参与"
},
{
value: 3,
label: '已完成'
value: 1,
label: "参与中"
},
],
rankList: [
{
value: 1,
label: '不通过',
value: 2,
label: "已完成"
}
],
rankList: [],
queryData: {}
};
},
// computed: {
......@@ -156,45 +166,83 @@ export default {
// },
created() {
vm = this;
// console.log("formInline:", this.formInline);
vm.getUrlData();
vm.getInitData();
vm.search();
},
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
getUrlData() {
let url = window.location.href;
this.tableType = vm.getUrlSearch(url,"tableType");
this.region = vm.getUrlSearch(url,"region");
this.organization = vm.getUrlSearch(url,"organization");
getInitData() {
vm.queryData = this.$route.query;
vm.tableType = vm.queryData.tableType;
console.log("queryData", vm.queryData);
},
search() {
console.log(this.formData.name);
this.tableData = [{
name: '张三',
sex: '男',
age: '30',
professional: '主任医师',
post: '医生',
organization: '上海复旦大学附属华山医院',
region: '上海静安区',
join: 1,
complete: 1,
date: 1562144416000,
passDate: 1562155416000,
rank: 1,
}];
let query = this.queryData;
if (this.tableType == 1) {
//课程分析
// console.log('this.tableType',this.tableType)
let req = {
projectId: query.projectId,
originalFlag: query.originalFlag,
ids: query.ids,
type: query.type,
courseId: query.courseId,
learnFlag: vm.formData.learnFlag,
doctorName: vm.formData.doctorName,
pageNo: vm.formData.pageNo,
pageSize: vm.formData.pageSize,
};
console.log("course req", req);
openLoading(vm);
vm.GET("report/portalProjectCourse/getUserList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.tableData = res.data.list;
vm.totalRows = res.data.totalCount;
}
});
} else if (this.tableType == 2) {
//考试分析
let reqRank = {
projectId: query.projectId,
}
vm.GET("report/portalProjectExam/getGradeList", reqRank).then(res => {
if (res.code == "000000") {
vm.rankList = res.data.list;
}
});
let req = {
projectId: query.projectId,
originalFlag: query.originalFlag,
ids: query.ids,
type: query.type,
examId: 1,
gradeFlag: vm.formData.gradeFlag,
doctorName: vm.formData.doctorName,
pageNo: vm.formData.pageNo,
pageSize: vm.formData.pageSize,
};
console.log("exam req", req);
openLoading(vm);
vm.GET("report/portalProjectExam/getUserList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.tableData = res.data.list;
vm.totalRows = res.data.totalCount;
}
});
}
},
resetForm() {
vm.formData = Object.assign(
{},
{
name: '',
status: '',
name: "",
status: "",
pageNo: 1,
pageSize: 10,
pageSize: 10
}
);
vm.search();
......@@ -207,7 +255,7 @@ export default {
console.log(`当前页: ${val}`);
this.formData.pageNo = val;
this.search();
},
}
}
};
</script>
......
src/views/learning/item-course-analysis.vue
浏览文件 @ 6c242d7a
......@@ -140,7 +140,7 @@ export default {
projectId: vm.projectId,
ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
type: operationData.getSearchType(vm.formInline),
OriginalFlag: vm.formInline.checked == false ? 0 : 1
originalFlag: vm.formInline.checked == false ? 0 : 1
};
console.log("3 req", req);
openLoading(vm);
......@@ -162,8 +162,17 @@ export default {
},
checkName(data) {
console.log('dialogData',this.dialogData);
// this.$router.push("course-training?tableType=1&courseId="+data.courseId+"&region="+this.dialogData.region+"&organization="+this.dialogData.organization);
this.$router.push({ path: '/course-training', query: this.dialogData});
let checkAll = operationData.hasAll(vm.formInline.organization)
let routerData = {};
routerData = this.dialogData;
routerData.projectId = vm.projectId;
routerData.tableType = 1;
routerData.courseId = data.courseId;
routerData.ids = operationData.getIds(vm.formInline,vm.organizationList,checkAll);
routerData.type = operationData.getSearchType(vm.formInline),
routerData.originalFlag = vm.formInline.checked == false ? 0 : 1
this.$router.push({ path: '/course-training', query: routerData});
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
......
src/views/learning/item-crowd-analysis.vue
浏览文件 @ 6c242d7a
......@@ -93,7 +93,8 @@ export default {
projectId: vm.projectId,
cityOrHospitalId: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
kind: operationData.getSearchType(vm.formInline),
type: this.radio,
type: vm.radio,
originalFlag: vm.formInline.checked == false ? 0 : 1
};
console.log("2 req", req);
openLoading(vm);
......
src/views/learning/item-examination-analysis.vue
浏览文件 @ 6c242d7a
......@@ -121,7 +121,7 @@ export default {
projectId: vm.projectId,
ids: operationData.getIds(vm.formInline,vm.organizationList,checkAll),
type: operationData.getSearchType(vm.formInline),
OriginalFlag: vm.formInline.checked == false ? 0 : 1
originalFlag: vm.formInline.checked == false ? 0 : 1
};
console.log("4 req", req);
openLoading(vm);
......@@ -142,20 +142,14 @@ export default {
});
//
vm.tableData= [
{
id: 22,
name: "asd",
joinNum: 123123,
passNum: 123,
goodNum: 12,
startNum: 111
}
];
},
// 跳转查看名单页面
goPage(data) {
vm.$router.push("course-training?tableType=2&id="+data.id+"&region="+this.dialogData.region+"&organization="+this.dialogData.organization);
let routerData = this.dialogData;
routerData.tableType = 2
routerData.id = data.examId;
this.$router.push({ path: '/course-training', params: routerData});
// vm.$router.push("course-training?tableType=2&id="+data.examId+"&region="+this.dialogData.region+"&organization="+this.dialogData.organization);
},
// 更改数据显示数量
handleSizeChange(val) {
......
src/views/learning/item-list.vue
浏览文件 @ 6c242d7a
......@@ -29,7 +29,7 @@
>
<el-option
v-for="item in organizationList"
:key="item.value"
:key="item.index"
:label="item.label"
:value="item.value"
></el-option>
......@@ -196,9 +196,9 @@ export default {
},
dialogData: {
region: "",
regionData: "",
// regionData: "",
organization: "",
organizationData: "",
// organizationData: "",
},
tags: [],
activeName: "first",
......@@ -242,7 +242,7 @@ export default {
setTimeout(function() {
// console.log(vm.$refs["cascaderRegion"].inputValue);
vm.dialogData.region = vm.$refs["cascaderRegion"].inputValue;
// vm.dialogData.regionData = value[value.length-1];
// console.log('vm.dialogData.region',vm.dialogData.region)
}, 20);
// console.log('region',value,vm.formInline);
......@@ -372,6 +372,7 @@ export default {
closeLoading(vm);
if (res.code == "000000") {
this.organizationList = operationData.getLearnOrganization(res.data.hospitalList);
debugger;
}
});
},
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或