Skip to content

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

测试用例修改的细节问题

上级 8a590ebc
隐藏空白字符变更
内嵌 并排
正在显示 包含 134 行增加 和 241 行删除
src/router/router.js
浏览文件 @ 20376d19
......@@ -19,7 +19,6 @@ const reportLis = r => require.ensure([], () => r(require('../views/learning/rep
const itemList = r => require.ensure([], () => r(require('../views/learning/item-list.vue')), 'item-list')
const nameList = r => require.ensure([], () => r(require('../views/learning/name-list.vue')), 'name-list')
const dataAlignment = r => require.ensure([], () => r(require('../views/learning/data-alignment.vue')), 'data-alignment')
const courseTraining = r => require.ensure([], () => r(require('../views/learning/course-training.vue')), 'course-training')
const exportDownload = r => require.ensure([], () => r(require('../views/learning/export-download.vue')), 'export-download')
export default [{
......@@ -73,9 +72,6 @@ export default [{
},{
path: '/name-list',
component: nameList
},{
path: '/course-training',
component: courseTraining
},
{
path: '/export-download',
......
src/utils/filter.js
浏览文件 @ 20376d19
......@@ -196,13 +196,11 @@ const vueFilter = {
},
recordValue: (value) => {
if(value == 1) {
return '合格'
return '无成绩'
}else if(value == 2) {
return '不通过'
}else if(value == 3) {
return '优秀'
}else if(value == 4) {
return '无成绩'
return '通过'
}
},
exportStatus: (value) => {
......
src/views/learning/course-training.vue 已删除 100644 → 0
浏览文件 @ 8a590ebc
<template>
<div class="name-list">
<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="考试成绩等级:">
<el-select
v-model="formData.rank"
size="small"
style="width: 100%;"
placeholder="请选择考试通过状态"
>
<el-option
v-for="(item,index) in rankList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</el-form-item>
<el-form-item label="查询姓名: ">
<el-input size="small" placeholder="查询姓名" v-model="formData.name">
</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="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" />
<p>没有相关数据，请重新选择查询范围</p>
</div>
</div>
</el-table>
<div class="pagination">
<el-pagination
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="searchParam.pageNo"
:page-sizes="[10, 30, 50]"
:page-size="searchParam.pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="totalRows"
></el-pagination>
</div>
</div>
</div>
</template>
<script>
import BreadCrumb from "../../components/breadcrumb.vue";
let vm = null;
export default {
components: {
BreadCrumb
},
data() {
return {
curmbFirst: "学情报告",
curmbSecond: "项目列表",
region: "",
organization: "",
formData: {
name: '',
rank: '',
pageNo: 1,
pageSize: 10,
},
joinData: [],
totalRows: 0, //数据总数
searchParam: {
pageNo: 1, //当前是第几页
pageSize: 20 //页面总数
},
rankList: [
{
value: 1,
label: '不通过'
},
{
value: 2,
label: '合格'
},
{
value: 3,
label: '优秀'
},
{
value: 4,
label: '无成绩'
},
]
};
},
created() {
vm = this;
vm.getUrlData();
vm.search();
},
methods: {
getUrlData() {
let url = window.location.href;
this.region = vm.getUrlSearch(url,"region");
this.organization = vm.getUrlSearch(url,"organization");
},
// 搜索列表
search() {
vm.joinData = [
{
name: "asd",
sex: "男",
age: 30,
title: "主任医师",
duty: "医生",
pregress: "上海市复旦大学附属华山医院",
region: "上海市徐汇区",
join: "是",
pass: "是",
paddTime: 1562144116000,
level: "合格"
}
];
},
// 重置搜索信息
resetForm() {
vm.formData = Object.assign(
{},
{
name: '',
rank: '',
pageNo: 1,
pageSize: 10,
}
);
// vm.search();
},
// 更改数据显示数量
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
vm.searchParam.pageSize = val;
vm.search();
},
// 换页
handleCurrentChange(val) {
console.log(`当前页: ${val}`);
vm.searchParam.pageNo = value;
vm.search();
}
}
};
</script>
<style lang='scss' rel='stylesheet/scss'>
.name-list {
.component-content{
padding: 10px;
background: #fff;
.text {
margin: 30px 0 20px 30px;
font-size: 13px;
color: #606266;
}
.form-update {
margin: 30px 0px 0px 20px;
}
.form-button {
width: 45%;
top: -62px;
position: relative;
left: 50%;
}
.input-box {
margin-top: 40px;
.search-btn {
color: #fff;
border: none;
}
}
}
}
</style>
src/views/learning/data-alignment.vue
浏览文件 @ 20376d19
......@@ -59,7 +59,7 @@
<el-button @click="searchData()" type="primary">查询</el-button>
<el-button @click="resetForm()">重置</el-button>
</div>
<div class="line"></div>
<!-- <div class="line"></div> -->
<p class="explain">说明：只有被勾选中的人才会归入数据统计范围，不勾的不会统计</p>
<el-table
class="data-main"
......@@ -193,12 +193,12 @@ export default {
mounted: function() {
//父组件传值
this.$on("search", () => {
this.lookedDoctor = [];
this.changedDoctor = [];
this.changedDoctor2 = [];
// this.lookedDoctor = [];
// this.changedDoctor = [];
// this.changedDoctor2 = [];
// this.$refs.multipleTable.clearSelection();
this.resetForm();
this.$refs.multipleTable.clearSelection();
this.search();
// this.search();
});
},
methods: {
......@@ -244,6 +244,9 @@ export default {
vm.search();
},
search() {
setTimeout(function(){
openLoading(vm);
},20);
let checkAll = operationData.hasAll(vm.formInline.organization);
let req = {
projectId: vm.projectId,
......@@ -254,9 +257,8 @@ export default {
pageNo: vm.formData.pageNo,
pageSize: vm.formData.pageSize,
};
openLoading(vm);
vm.reportGET("report/portal/getProjectData", req).then(res => {
closeLoading(vm);
// closeLoading(vm);
if (res.code == "000000") {
vm.tableData = res.data.projectData;
vm.totalRows = res.data.count;
......@@ -299,6 +301,10 @@ export default {
},
//重置
resetForm() {
this.lookedDoctor = [];
this.changedDoctor = [];
this.changedDoctor2 = [];
this.$refs.multipleTable.clearSelection();
vm.formData = Object.assign(
{},
{
......@@ -308,6 +314,7 @@ export default {
pageSize: 10,
}
);
vm.search();
},
saveUpdate() {
this.dialogVisible = true;
......@@ -323,6 +330,7 @@ export default {
closeLoading(vm);
vm.$message(res.message);
if (res.code == "000000") {
this.$emit("closeSearch");
}
});
this.dialogVisible = false;
......
src/views/learning/item-course-analysis.vue
浏览文件 @ 20376d19
......@@ -9,6 +9,7 @@
<span class="weight">{{ item.num }} </span> {{ item.unit }}
</div>
</el-card>
<div v-if="index+1 !== cardData.length" class="line"></div>
</div>
<el-table
:data="tableData"
......@@ -158,7 +159,12 @@ export default {
vm.reportGET("report/portalProjectCourse/getTotal", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if(res.data.projectCourseCount == 0 ) {
vm.$message("没有相关数据，请重新选择查询范围");
}
vm.setCardData(res.data)
} else {
vm.$message(res.message);
}
});
let reqList = req;
......@@ -207,10 +213,26 @@ export default {
.title:after {
clear: both
}
.el-card {
border-width: 0px;
}
.el-card.is-always-shadow {
box-shadow: 0 0 0 0 rgba(0, 0, 0, 0.1);
}
.line {
background: #e4e4e4;
height: 80px;
width: 1px;
float: left;
margin-top: 20px;
}
.box-card {
width: 32%;
margin-right: 1%;
float: left;
.el-card__header {
border-bottom-width: 0;
}
.title {
text-align: center;
}
......
src/views/learning/item-crowd-analysis.vue
浏览文件 @ 20376d19
......@@ -97,6 +97,9 @@ export default {
vm.reportGET("report/portal/getPeoplesDetails", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if(res.data.educationList.length == 0 && res.data.jobTitle.length == 0 ) {
vm.$message("没有相关数据，请重新选择查询范围");
}
this.showData = true;
this.crowdData = res.data;
setTimeout(function() {
......@@ -109,6 +112,8 @@ export default {
// this.jobDivision();
// this.getSexData();
// this.ageDivision();
} else {
vm.$message(res.message);
}
});
},
......
src/views/learning/item-examination-analysis.vue
浏览文件 @ 20376d19
<template>
<div class="examination-analysis">
<div class="box">
<el-card class="box-card" v-for="(item , index) in cardData" :key="index">
<div v-for="(item , index) in cardData" :key="index" class="box">
<el-card class="box-card">
<div slot="header" class="title">
<span class="weight">{{ item.title }}</span>
</div>
......@@ -10,6 +10,7 @@
{{ item.unit }}
</div>
</el-card>
<div v-if="index+1 !== cardData.length" class="line"></div>
</div>
<div class="table">
<el-table :data="tableData" style="width: 100%" border>
......@@ -148,7 +149,12 @@ export default {
vm.reportGET("report/portalProjectExam/getTotal", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if(res.data.projectExamCount == 0 ) {
vm.$message("没有相关数据，请重新选择查询范围");
}
vm.setCardData(res.data);
} else {
vm.$message(res.message);
}
});
let reqList = req;
......@@ -196,15 +202,39 @@ export default {
<style lang='scss' rel='stylesheet/scss'>
.examination-analysis {
background: #fff;
.el-card {
border-width: 0px;
}
.el-card.is-always-shadow {
box-shadow: 0 0 0 0 rgba(0, 0, 0, 0.1);
}
.line {
background: #e4e4e4;
height: 80px;
width: 1px;
float: left;
margin-top: 20px;
}
.box {
overflow: hidden;
}
.table {
margin-top: 30px;
}
.box-card {
width: 49%;
width: 48%;
margin-right: 1%;
float: left;
.el-card__header {
border-bottom-width: 0;
}
.title {
text-align: center;
}
.box-content {
text-align: center;
height: 40px;
font-size: 15px;
}
}
}
</style>
src/views/learning/item-list.vue
浏览文件 @ 20376d19
......@@ -56,7 +56,7 @@
<div class="button-group">
<el-button type="default" size="small" @click="changeDate">数据修改</el-button>
<!-- <el-button type="default" size="small" @click="update" v-else>修改范围</el-button> -->
<el-button type="default" size="small" @click="exportExcel">导出明细</el-button>
<el-button type="default" size="small" :disabled="exportStatus" @click="exportExcel">导出明细</el-button>
</div>
<el-tabs v-model="activeName" @tab-click="handleClick" :before-leave="beforeLeave">
<el-tab-pane label="参与情况" name="first">
......@@ -110,6 +110,7 @@
<data-alignment
ref="childAlignment"
@closeDialog="dialogUpdate = false"
@closeSearch="closeSearch"
:formInline="formInline"
:dialogData="dialogData"
:organizationList="organizationList"
......@@ -150,6 +151,7 @@ export default {
curmbSecond: "项目列表",
projectId: "",
projectName: "",
exportStatus: false,
organizationList: [],
optionsRegion: [],
props: {
......@@ -417,6 +419,10 @@ export default {
num = this.tags.length;
return num;
},
closeSearch() {
vm.dialogUpdate = false;
vm.search();
},
search() {
// console.log(this.formInline,this.activeName);
if (this.activeName == "first") {
......@@ -458,8 +464,13 @@ export default {
vm.$message("请选择地区");
return;
}
//按钮置灰三秒
vm.exportStatus = true;
setTimeout(function() {
vm.exportStatus = false;
},3000);
this.dialogVisible = true;
//download接口
let checkAll = operationData.hasAll(vm.formInline.organization)
let req = {
projectId : vm.projectId,
......@@ -514,6 +525,10 @@ export default {
);
},
changeDate() {
if (vm.formInline.region.length == 0) {
vm.$message("请选择地区");
return;
}
this.setDialogData();
this.dialogUpdate = true;
this.$nextTick(function() {
......
src/views/learning/item-part-in.vue
浏览文件 @ 20376d19
......@@ -132,7 +132,11 @@ export default {
closeLoading(vm);
if (res.code == "000000") {
this.getCardData(res.data);
// this.getRank(res.data);
if(res.data.participateHospitalCount == 0 && res.data.participatePeopleCount == 0) {
vm.$message("没有相关数据，请重新选择查询范围");
}
} else {
vm.$message(res.message);
}
});
vm.reportGET("report/portal/top", req).then(res => {
......@@ -186,6 +190,10 @@ export default {
title: "应参与机构数",
num: data.participateHospitalCount,
},
{
title: "已参与机构数",
num: data.hasParticipateHospitalCount,
},
{
title: "应参与人数",
num: data.participatePeopleCount,
......@@ -195,9 +203,10 @@ export default {
num: data.hasParticipatePeopleCount,
},
{
title: "项目获证人数",
title: data.type == 1 ? "项目完成人数" : "项目获证人数",
num: data.acquireCertificatePeopleCount,
}];
},
];
for(let i=0;i<data.manyCertificate.length;i++) {
let obj = {
title: data.manyCertificate[i].name,
......@@ -232,8 +241,9 @@ export default {
margin-top: 20px;
}
.box-card {
width: 15%;
width: 13%;
margin-right: 1%;
font-size: 14px;
float: left;
.el-card__header {
border-bottom-width: 0;
......@@ -244,6 +254,7 @@ export default {
.box-content {
text-align: center;
height: 40px;
font-size: 15px;
}
}
.charts {
......
src/views/learning/name-list.vue
浏览文件 @ 20376d19
......@@ -222,8 +222,13 @@ export default {
vm.reportGET("report/portalProjectCourse/getUserList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if(res.data.totalCount == 0 ) {
vm.$message("没有相关数据，请重新选择查询范围");
}
vm.tableData = res.data.list;
vm.totalRows = res.data.totalCount;
} else {
vm.$message(res.message);
}
});
} else if (this.tableType == 2) {
......@@ -252,8 +257,13 @@ export default {
vm.reportGET("report/portalProjectExam/getUserList", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if(res.data.totalCount == 0 ) {
vm.$message("没有相关数据，请重新选择查询范围");
}
vm.tableData = res.data.list;
vm.totalRows = res.data.totalCount;
} else {
vm.$message(res.message);
}
});
}
......@@ -262,13 +272,14 @@ export default {
vm.formData = Object.assign(
{},
{
name: "",
status: "",
doctorName: "",
learnFlag: -1,
gradeFlag: 1,
pageNo: 1,
pageSize: 10
pageSize: 10,
}
);
// vm.search();
vm.search();
},
handleSizeChange(val) {
console.log(`每页 ${val} 条`);
......
src/views/learning/report-list.vue
浏览文件 @ 20376d19
......@@ -55,7 +55,7 @@
<div slot="empty">
<div class="table-empty">
<img src="../../assets/image/no-content1.png" />
<p>没有相关数据，请重新选择查询范围</p>
<p>没有找到符合的结果</p>
</div>
</div>
</el-table>
......@@ -108,16 +108,7 @@ export default {
value: 2
}
],
tableData: [
// table数据
{
id: 53,
name: "one",
status: 1,
startTime: 1561707289000,
endTime: 1561707567000
}
],
tableData: [],
totalRows: 0, //数据总数
idType: '',
};
......@@ -147,8 +138,13 @@ export default {
vm.GET("portal/portalInfo/getPortalReportProject", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if(res.data.totalRows == 0) {
vm.$message("没有找到符合的结果");
}
vm.tableData = res.data.projectList;
vm.totalRows = res.data.totalRows;
} else {
vm.$message(res.message);
}
});
},
......@@ -160,7 +156,7 @@ export default {
pageNo: 1, //当前是第几页
pageSize: 10 //页面总数
};
// vm.search();
vm.search();
},
// 更改数据显示数量
handleSizeChange(val) {
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或