Skip to content

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

接口更新

上级 de1fff27
隐藏空白字符变更
内嵌 并排
正在显示 包含 305 行增加 和 305 行删除
src/views/learning/course-training.vue
浏览文件 @ 1228acd6
<template>
<div class="course-training-wrap">
<div class="name-list">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<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="课程完成状态:">
<p class="text">地区: {{region}}</p>
<p class="text">选择机构: {{organization}}</p>
<el-form class="form-update" ref="serchForm" :model="formData" label-width="100px" style="width:40%;">
<el-form-item label="考试成绩等级:">
<el-select
v-model="formData.learnFlag"
v-model="formData.rank"
size="small"
style="width: 100%;"
placeholder="请选择状态"
placeholder="请选择考试通过状态"
>
<el-option
v-for="(item,index) in statusList"
v-for="(item,index) in rankList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="tableType == 2" label="考试成绩等级:">
<el-select v-model="formData.gradeFlag" size="small" style="width: 100%;" placeholder="请选择状态">
<el-option
v-for="(item,index) in rankList"
:key="index"
: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.doctorName"></el-input>
<el-input size="small" placeholder="查询姓名" v-model="formData.name">
</el-input>
</el-form-item>
</el-form>
<div class="form-button">
<el-button @click="searchData()" type="primary">查询</el-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="doctorName" label="姓名" align="center"></el-table-column>
<el-table-column prop="doctorSex" label="性别" align="center"></el-table-column>
<el-table-column prop="doctorAge" 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.learnStatus | joinStatus }}</span>
</template>
</el-table-column>
<el-table-column
v-if="tableType == 1"
prop="finishedTime"
label="完成培训日期"
align="center"
min-width="150"
>
<template slot-scope="scope">
<span>{{ scope.row.finishedTime }}</span>
</template>
</el-table-column>
<el-table-column
v-if="tableType == 2"
prop="passTime"
label="通过考试日期"
min-width="150"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.passTime }}</span>
</template>
</el-table-column>
<el-table-column
v-if="tableType == 2"
prop="gradeName"
label="考试成绩等级"
min-width="80"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.gradeName }}</span>
</template>
</el-table-column>
<el-table :data="joinData" style="width: 100%">
<el-table-column prop="name" label="姓名" min-width="80" align="center"></el-table-column>
<el-table-column prop="sex" label="性别" min-width="100" align="center"></el-table-column>
<el-table-column prop="age" label="年龄" min-width="80" align="center"></el-table-column>
<el-table-column prop="title" label="职称" min-width="80" align="center"></el-table-column>
<el-table-column prop="duty" label="职务" min-width="80" align="center"></el-table-column>
<el-table-column prop="pregress" label="机构" min-width="200" align="center"></el-table-column>
<el-table-column prop="region" label="地区" min-width="80" align="center"></el-table-column>
<el-table-column prop="join" label="是否参与考试" min-width="80" align="center"></el-table-column>
<el-table-column prop="pass" label="是否通过考试" min-width="80" align="center"></el-table-column>
<el-table-column prop="paddTime" label="通过考试日期" min-width="80" align="center"></el-table-column>
<el-table-column prop="level" label="考试成绩等级" min-width="80" align="center"></el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png">
<img src="../../assets/image/no-content1.png" />
<p>没有相关数据，请重新选择查询范围</p>
</div>
</div>
......@@ -101,9 +55,9 @@
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="formData.pageNo"
:current-page="searchParam.pageNo"
:page-sizes="[10, 30, 50]"
:page-size="formData.pageSize"
:page-size="searchParam.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
></el-pagination>
......@@ -113,187 +67,113 @@
</template>
<script>
import BreadCrumb from "../../components/breadcrumb.vue";
import { create } from "domain";
import { mapGetters } from "vuex";
import { openLoading, closeLoading } from "../../utils/utils";
import * as commonUtil from "../../utils/utils";
let vm = null;
export default {
components: {
BreadCrumb
},
props: {
formInline: {
type: Object
}
},
data() {
return {
curmbFirst: "学情报告",
curmbSecond: "项目管理",
curmbSecond: "项目列表",
region: "",
organization: "",
formData: {
doctorName: "",
learnFlag: -1,
gradeFlag: 1,
name: '',
rank: '',
pageNo: 1,
pageSize: 10,
},
region: "",
organization: "",
tableData: [],
tableType: 1,
totalRows: 0,
statusList: [
joinData: [],
totalRows: 0, //数据总数
searchParam: {
pageNo: 1, //当前是第几页
pageSize: 20 //页面总数
},
rankList: [
{
value: -1,
label: "全部"
value: 1,
label: '不通过'
},
{
value: 0,
label: "未参与"
value: 2,
label: '合格'
},
{
value: 1,
label: "参与中"
value: 3,
label: '优秀'
},
{
value: 2,
label: "已完成"
}
],
rankList: [],
queryData: {}
value: 4,
label: '无成绩'
},
]
};
},
// computed: {
// ...mapGetters([
// "_token",
// ])
// },
created() {
vm = this;
vm.getInitData();
vm.getUrlData();
vm.search();
},
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
getHostital() {
let req = {
projectId: vm.queryData.projectId,
hospitalIds: vm.queryData.ids,
};
vm.reportGET("report/portal/getHostitalName", req).then(res => {
if (res.code == "000000") {
}
});
},
getInitData() {
vm.queryData = this.$route.query;
vm.tableType = vm.queryData.tableType;
console.log("queryData", vm.queryData);
if(vm.queryData.type == 4) {
vm.getHostital();
}
},
searchData() {
vm.formData.pageNo = 1;
vm.search();
getUrlData() {
let url = window.location.href;
this.region = vm.getUrlSearch(url,"region");
this.organization = vm.getUrlSearch(url,"organization");
},
// 搜索列表
search() {
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.reportGET("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.joinData = [
{
name: "asd",
sex: "男",
age: 30,
title: "主任医师",
duty: "医生",
pregress: "上海市复旦大学附属华山医院",
region: "上海市徐汇区",
join: "是",
pass: "是",
paddTime: 1562144116000,
level: "合格"
}
vm.reportGET("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: query.examId,
gradeFlag: vm.formData.gradeFlag,
doctorName: vm.formData.doctorName,
pageNo: vm.formData.pageNo,
pageSize: vm.formData.pageSize,
};
console.log("exam req", req);
openLoading(vm);
vm.reportGET("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: '',
rank: '',
pageNo: 1,
pageSize: 10
pageSize: 10,
}
);
// vm.search();
},
// 更改数据显示数量
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
this.formData.pageSize = val;
vm.searchParam.pageSize = val;
vm.search();
},
// 换页
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
this.formData.pageNo = val;
this.search();
vm.searchParam.pageNo = value;
vm.search();
}
}
};
</script>
<style lang="scss">
.course-training-wrap {
.component-content {
background: #fff;
<style lang='scss' rel='stylesheet/scss'>
.name-list {
.component-content{
padding: 10px;
.header-title {
padding: 10px 12px;
font-size: 12px;
color: #449284;
border-bottom: 1px solid #efefef;
}
.course-p {
background: #fff;
.text {
margin: 30px 0 20px 30px;
font-size: 13px;
color: #606266;
......@@ -307,6 +187,13 @@ export default {
position: relative;
left: 50%;
}
.input-box {
margin-top: 40px;
.search-btn {
color: #fff;
border: none;
}
}
}
}
</style>
\ No newline at end of file
</style>
src/views/learning/item-course-analysis.vue
浏览文件 @ 1228acd6
......@@ -94,7 +94,7 @@ export default {
totalRows: 0,
projectId: '',
pageNo: 1,
pageSize: 1,
pageSize: 10,
}
},
created() {
......@@ -179,7 +179,7 @@ export default {
routerData.type = operationData.getSearchType(vm.formInline,checkAll),
routerData.originalFlag = vm.formInline.checked == false ? 0 : 1
this.$router.push({ path: '/course-training', query: routerData});
this.$router.push({ path: '/name-list', query: routerData});
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
......
src/views/learning/item-examination-analysis.vue
浏览文件 @ 1228acd6
......@@ -86,7 +86,7 @@ export default {
],
totalRows: 0, //数据总数
pageNo: 1, //当前是第几页
pageSize: 1, //页面总数
pageSize: 10, //页面总数
};
},
created() {
......@@ -171,7 +171,7 @@ export default {
routerData.type = operationData.getSearchType(vm.formInline,checkAll),
routerData.originalFlag = vm.formInline.checked == false ? 0 : 1
this.$router.push({ path: '/course-training', query: routerData});
this.$router.push({ path: '/name-list', query: routerData});
},
// 更改数据显示数量
handleSizeChange(val) {
......
src/views/learning/name-list.vue
浏览文件 @ 1228acd6
<template>
<div class="name-list">
<div class="name-list-wrap">
<bread-crumb :curmbFirst="curmbFirst" :curmbSecond="curmbSecond"></bread-crumb>
<div class="component-content screenSet" id="screenSet">
<p class="text">地区: {{region}}</p>
<p class="text">选择机构: {{organization}}</p>
<el-form class="form-update" ref="serchForm" :model="formData" label-width="100px" style="width:40%;">
<el-form-item label="考试成绩等级:">
<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.rank"
v-model="formData.learnFlag"
size="small"
style="width: 100%;"
placeholder="请选择考试通过状态"
placeholder="请选择状态"
>
<el-option
v-for="(item,index) in rankList"
v-for="(item,index) in statusList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="tableType == 2" label="考试成绩等级:">
<el-select v-model="formData.gradeFlag" size="small" style="width: 100%;" placeholder="请选择状态">
<el-option
v-for="(item,index) in rankList"
:key="index"
: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="searchData()" type="primary">查询</el-button>
<el-button @click="resetForm()">重置</el-button>
</div>
<el-table :data="joinData" style="width: 100%">
<el-table-column prop="name" label="姓名" min-width="80" align="center"></el-table-column>
<el-table-column prop="sex" label="性别" min-width="100" align="center"></el-table-column>
<el-table-column prop="age" label="年龄" min-width="80" align="center"></el-table-column>
<el-table-column prop="title" label="职称" min-width="80" align="center"></el-table-column>
<el-table-column prop="duty" label="职务" min-width="80" align="center"></el-table-column>
<el-table-column prop="pregress" label="机构" min-width="200" align="center"></el-table-column>
<el-table-column prop="region" label="地区" min-width="80" align="center"></el-table-column>
<el-table-column prop="join" label="是否参与考试" min-width="80" align="center"></el-table-column>
<el-table-column prop="pass" label="是否通过考试" min-width="80" align="center"></el-table-column>
<el-table-column prop="paddTime" label="通过考试日期" min-width="80" align="center"></el-table-column>
<el-table-column prop="level" label="考试成绩等级" min-width="80" align="center"></el-table-column>
<el-table :data="tableData" class="course-table">
<el-table-column prop="doctorName" 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="titleName" label="职称" align="center"></el-table-column>
<el-table-column prop="hospitalName" label="机构" align="center"></el-table-column>
<el-table-column prop="addressName" 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.learnStatus | joinStatus }}</span>
</template>
</el-table-column>
<el-table-column
v-if="tableType == 1"
prop="finishedTime"
label="完成培训日期"
align="center"
min-width="150"
>
<template slot-scope="scope">
<span>{{ scope.row.finishedTime }}</span>
</template>
</el-table-column>
<el-table-column
v-if="tableType == 2"
prop="passTime"
label="通过考试日期"
min-width="150"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.passTime }}</span>
</template>
</el-table-column>
<el-table-column
v-if="tableType == 2"
prop="gradeName"
label="考试成绩等级"
min-width="80"
align="center"
>
<template slot-scope="scope">
<span>{{ scope.row.gradeName }}</span>
</template>
</el-table-column>
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png" />
<img src="../../assets/image/no-content1.png">
<p>没有相关数据，请重新选择查询范围</p>
</div>
</div>
......@@ -55,9 +101,9 @@
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchParam.pageNo"
:current-page="formData.pageNo"
:page-sizes="[10, 30, 50]"
:page-size="searchParam.pageSize"
:page-size="formData.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
></el-pagination>
......@@ -67,113 +113,187 @@
</template>
<script>
import BreadCrumb from "../../components/breadcrumb.vue";
import { create } from "domain";
import { mapGetters } from "vuex";
import { openLoading, closeLoading } from "../../utils/utils";
import * as commonUtil from "../../utils/utils";
let vm = null;
export default {
components: {
BreadCrumb
},
props: {
formInline: {
type: Object
}
},
data() {
return {
curmbFirst: "学情报告",
curmbSecond: "项目列表",
region: "",
organization: "",
curmbSecond: "项目管理",
formData: {
name: '',
rank: '',
doctorName: "",
learnFlag: -1,
gradeFlag: 1,
pageNo: 1,
pageSize: 10,
},
joinData: [],
totalRows: 0, //数据总数
searchParam: {
pageNo: 1, //当前是第几页
pageSize: 20 //页面总数
},
rankList: [
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: "参与中"
},
{
value: 4,
label: '无成绩'
},
]
value: 2,
label: "已完成"
}
],
rankList: [],
queryData: {}
};
},
// computed: {
// ...mapGetters([
// "_token",
// ])
// },
created() {
vm = this;
vm.getUrlData();
vm.getInitData();
vm.search();
},
mounted: function() {
commonUtil.resizeHeight();
},
methods: {
getUrlData() {
let url = window.location.href;
this.region = vm.getUrlSearch(url,"region");
this.organization = vm.getUrlSearch(url,"organization");
getHostital() {
let req = {
projectId: vm.queryData.projectId,
hospitalIds: vm.queryData.ids,
};
vm.reportGET("report/portal/getHostitalName", req).then(res => {
if (res.code == "000000") {
}
});
},
getInitData() {
vm.queryData = this.$route.query;
vm.tableType = vm.queryData.tableType;
console.log("queryData", vm.queryData);
if(vm.queryData.type == 4) {
vm.getHostital();
}
},
searchData() {
vm.formData.pageNo = 1;
vm.search();
},
// 搜索列表
search() {
vm.joinData = [
{
name: "asd",
sex: "男",
age: 30,
title: "主任医师",
duty: "医生",
pregress: "上海市复旦大学附属华山医院",
region: "上海市徐汇区",
join: "是",
pass: "是",
paddTime: 1562144116000,
level: "合格"
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.reportGET("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.reportGET("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: query.examId,
gradeFlag: vm.formData.gradeFlag,
doctorName: vm.formData.doctorName,
pageNo: vm.formData.pageNo,
pageSize: vm.formData.pageSize,
};
console.log("exam req", req);
openLoading(vm);
vm.reportGET("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: '',
rank: '',
name: "",
status: "",
pageNo: 1,
pageSize: 10,
pageSize: 10
}
);
// vm.search();
},
// 更改数据显示数量
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
vm.searchParam.pageSize = val;
vm.search();
this.formData.pageSize = val;
},
// 换页
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
vm.searchParam.pageNo = value;
vm.search();
this.formData.pageNo = val;
this.search();
}
}
};
</script>
<style lang='scss' rel='stylesheet/scss'>
.name-list {
.component-content{
padding: 10px;
<style lang="scss">
.name-list-wrap {
.component-content {
background: #fff;
.text {
padding: 10px;
.header-title {
padding: 10px 12px;
font-size: 12px;
color: #449284;
border-bottom: 1px solid #efefef;
}
.course-p {
margin: 30px 0 20px 30px;
font-size: 13px;
color: #606266;
......@@ -187,13 +307,6 @@ export default {
position: relative;
left: 50%;
}
.input-box {
margin-top: 40px;
.search-btn {
color: #fff;
border: none;
}
}
}
}
</style>
</style>
\ No newline at end of file
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或