Skip to content

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

多张页面api对接

上级 a22cb9e9
展开全部 显示空白字符变更
内嵌 并排
正在显示 包含 741 行增加 和 434 行删除
src/utils/filter.js
浏览文件 @ c9a22f5f
......@@ -232,6 +232,28 @@ const vueFilter = {
}
return avgTime;
},
learnTimeValue: (value) => {
let s = parseInt(value),m = 0, h = 0;//秒，分，小时
if(s==NaN){//错误error
return '';
}
if(s > 60) {
m = parseInt(s/60);
s = parseInt(s%60);
if(m > 60) {
h = parseInt(m/60);
m = parseInt(m%60);
}
}
let result = ""+parseInt(s)+"秒";
if(m > 0) {
result = ""+parseInt(m)+"分"+result;
}
if(h > 0) {
result = ""+parseInt(h)+"小时"+result;
}
return result;
},
getTotalTime: (value) => {
let time = value +'分钟';
return time;
......@@ -286,5 +308,39 @@ const vueFilter = {
let rate = num + '%';
return rate;
},
sexValue: (value) => {
if(value == 1) {
return '男';
} else if(value == 2) {
return '女';
} else if(value == 0) {
return '未知';
}
},
joinFlagValue: (value) => {
if(value == 1) {
return '已参与';
} else if(value == 2) {
return '未参与';
}
},
finishFlagValue: (value) => {
if(value == 1) {
return '已完成';
} else if(value == 2) {
return '未完成';
}
},
certGradeValue: (value) => {
if(value == 1) {
return '优秀';
} else if(value == 2) {
return '良好';
} else if(value == 3) {
return '及格';
} else if(value == 4) {
return '不及格';
}
},
}
export default vueFilter
\ No newline at end of file
src/utils/learning/chartData.js
浏览文件 @ c9a22f5f
此差异已折叠。
src/views/learning/item-course-analysis.vue
浏览文件 @ c9a22f5f
......@@ -24,7 +24,7 @@
<el-table-column prop="finishCount" label="完成培训人数" align="center"></el-table-column>
<el-table-column fixed="right" label="操作" min-width="50" align="center">
<template slot-scope="scope">
<el-button @click="checkName(scope.row)" type="text" size="small">查看名单</el-button>
<el-button class="button-jump" @click="checkName(scope.row)" type="text" size="small">查看名单</el-button>
</template>
</el-table-column>
<div slot="empty">
......@@ -36,6 +36,7 @@
</el-table>
<div class="pagination">
<el-pagination
class="pagination"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -146,10 +147,12 @@ export default {
originalFlag: vm.formInline.checked == false ? 0 : 1,
regionId: vm.formInline.region[vm.formInline.region.length - 1],
timeFlag: vm.formInline.timeFlag,
pageNo: vm.pageNo,
pageSize: vm.pageSize,
};
// console.log("3 req", req);
openLoading(vm);
vm.POST("stats/report/course/"+vm.pageNo+'/'+vm.pageSize, req).then(res => {
vm.POST("stats/report/course", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
if (type !== 2) {
......@@ -273,8 +276,16 @@ export default {
}
.course-table {
top: 20px;
padding: 0 10px 0 10px;
margin-bottom: 20px;
padding: 0;
width: 95%;
margin:0 auto 20px auto;
.button-jump {
color: #449284;
}
}
.pagination {
margin-top: 30px;
margin-right: 13px;
}
}
</style>
\ No newline at end of file
src/views/learning/item-examination-analysis.vue
浏览文件 @ c9a22f5f
......@@ -13,13 +13,21 @@
<div class="spacing"></div>
<div class="chart-title">完成项目考试次数情况</div>
<div class="chart" id="examTimes" ref="examTimes"></div>
<div class="chart-remarks">注：本报表数据来源包括用户参加正式考试，不包含摸底考试。</div>
<div class="chart-remarks">注：本报表数据来源包括用户参加正式考试次数，不包含摸底考试次数。</div>
<div class="spacing"></div>
<div class="chart-title">完成项目考试分数情况</div>
<!-- <div class="chart-title">完成项目考试分数情况</div> -->
<div class="chart-title-more">
<p>完成项目考试分数情况</p>
<el-radio-group class="rank-radio" size="medium" v-model="rankType" @change="changeRank">
<el-radio-button label="1">1分</el-radio-button>
<el-radio-button label="5">5分</el-radio-button>
<el-radio-button label="10">10分</el-radio-button>
</el-radio-group>
</div>
<div class="chart" id="examScore" ref="examScore"></div>
<div class="chart-remarks">注：本报表数据来源包括用户参加正式考试，不包含摸底考试。</div>
<div class="spacing"></div>
<div class="table">
<el-table :data="tableData" style="width: 100%" border>
<el-table :data="tableData" border class="exam-table">
<el-table-column prop="examType" label="类型" align="center"></el-table-column>
<el-table-column prop="examName" label="考试名" min-width="150" align="center"></el-table-column>
<el-table-column prop="doctorCount" label="应参与考试人数" align="center"></el-table-column>
......@@ -33,7 +41,7 @@
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="100">
<template slot-scope="scope">
<el-button type="text" size="small" @click="goPage(scope.row)">查看名单</el-button>
<el-button class="button-jump" type="text" size="small" @click="goPage(scope.row)">查看名单</el-button>
</template>
</el-table-column>
<div slot="empty">
......@@ -43,10 +51,10 @@
</div>
</div>
</el-table>
</div>
<!-- 分页 -->
<div class="pagination">
<el-pagination
class="pagination"
background
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
......@@ -97,7 +105,8 @@ export default {
chart0: {},
chart1: {}
},
scoreData: {}
examData: {},
rankType: '1',
};
},
created() {
......@@ -145,7 +154,7 @@ export default {
vm.POST("stats/report/exam", req).then(res => {
closeLoading(vm);
if (res.code == "000000") {
vm.scoreData = res.data;
vm.examData = res.data;
vm.setCardData(res.data);
vm.setExamTimes(res.data.examTimesList);
vm.setExamScore(res.data.examScoreList);
......@@ -230,6 +239,16 @@ export default {
vm.echartsData.chart0 = myChart;
vm.updateResize();
},
changeRank(value) {
console.log(value);
if(value == '1') {
vm.setExamScore(vm.examData.examScoreList);
} else if(value == '5') {
vm.setExamScore(vm.examData.fiveExamScoreList);
} else if(value == '10') {
vm.setExamScore(vm.examData.tenExamScoreList);
}
},
setExamScore(data) {
let myChart = echarts.init(this.$refs.examScore);
let xAxisData = [];
......@@ -356,23 +375,66 @@ export default {
}
.chart-title {
position: relative;
margin-top: 17px;
margin-top: 30px;
margin-left: 30px;
height: 25px;
font-size:18px;
font-weight:600;
line-height: 25px;
color: #000000;
}
.chart-title-more {
position: relative;
width: 100%;
height: 60px;
font-size: 18px;
font-weight: 600;
line-height: 60px;
height: 70px;
p {
position: relative;
float: left;
width: 400px;
margin-top: 30px;
margin-left: 30px;
height: 25px;
font-size:18px;
font-weight:600;
line-height: 25px;
color: #000000;
}
.rank-radio {
position: relative;
margin: 30px 30px 0 0;
float: right;
.el-radio-button__inner {
padding: 7px 29px;
}
}
}
.chart {
position: relative;
margin: 20px auto 0 auto;
width: 860px;
height: 350px;
margin: 0 auto 0 auto;
width: 1064px;
height: 380px;
}
.chart-remarks {
position: relative;
height: 66px;
padding: 20px 0 30px 30px;
font-size: 16px;
font-weight: 400;
line-height: 16px;
color: #666666;
}
.exam-table {
top: 20px;
padding: 0;
width: 95%;
margin:0 auto 20px auto;
.button-jump {
color: #449284;
}
}
.pagination {
margin-top: 30px;
margin-right: 13px;
}
}
</style>
src/views/learning/item-learning-effect.vue
浏览文件 @ c9a22f5f
......@@ -12,10 +12,12 @@
</div>
<div class="spacing"></div>
<div class="chart-title">不同学历完成项目前后正确率对比</div>
<div class="chart" ref="education"></div>
<div class="chartEdu" ref="education"></div>
<div class="chart-remarks">注：本报表数据来源仅仅统计同时包含摸底考和正式考的课程培训。</div>
<div class="spacing"></div>
<div class="chart-title">培训前后知识点掌握情况</div>
<div class="chart" ref="learning"></div>
<div class="chartLearn" ref="learning"></div>
<div class="chart-remarks">注：本报表数据来源仅包括有摸底考的课程培训。</div>
</div>
</template>
......@@ -190,21 +192,34 @@ export default {
}
.chart-title {
position: relative;
margin-top: 17px;
margin-top: 30px;
margin-left: 30px;
width: 100%;
height: 60px;
font-size: 18px;
font-weight: 600;
line-height: 60px;
height: 25px;
font-size:18px;
font-weight:600;
line-height: 25px;
color: #000000;
}
.chart {
.chartEdu {
position: relative;
margin: 20px auto 0 auto;
width: 1064px;
height: 380px;
}
.chartLearn {
position: relative;
margin: 20px auto 0 auto;
// width: 100%;
width: 860px;
height: 350px;
width: 1064px;
height: 462px;
}
.chart-remarks {
position: relative;
height: 66px;
padding: 20px 0 30px 30px;
font-size: 16px;
font-weight: 400;
line-height: 16px;
color: #666666;
}
}
</style>
src/views/learning/item-list.vue
浏览文件 @ c9a22f5f
......@@ -261,6 +261,8 @@ export default {
}
],
areaLen: 1,
hospitalCnt: 0,
hospitalId: [],
};
},
computed: {
......@@ -285,21 +287,6 @@ export default {
},
methods: {
getDisplay(type) {
// let req = {
// projectId: vm.projectId,
// projectName: vm.projectName,
// };
// openLoading(vm);
// vm.reportGET("report/portal/display", req).then(res => {
// closeLoading(vm);
// if (res.code == "000000") {
// vm.showOriginal = res.data.status;
// vm.roleType = res.data.roleType;
// vm.displayExam = res.data.existExam;
// vm.flag = res.data.flag;
// }
// });
let reqInfo = {
projectId: vm.projectId,
};
......@@ -436,6 +423,23 @@ export default {
vm.optionsRegion = operationData.setRegionOptionNew(
res.data.list
);
// vm.gethHspitalsCnt();
vm.search();
}
});
},
gethHspitalsCnt() {
let req = {
projectId: vm.projectId,
regionId: vm.formInline.region[vm.formInline.region.length - 1]
};
vm.GET("stats/region/hospitals/cnt", req).then(res => {
if (res.code == "000000") {
vm.hospitalCnt = res.data.hospitalCnt;
vm.hospitalCnt = 1;
if(vm.hospitalCnt == 1) {
vm.hospitalId[0] = res.data.list[0].hospitalId;
}
vm.search();
}
});
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或