Skip to content

T
tea-resources-web
Commit e0d71420 authored by WBY1026's avatar WBY1026
Browse files
Options

数据统计12完成

parent 9919e930
Show whitespace changes
Inline Side-by-side
Showing with 666 additions and 90 deletions
src/api/dataStatistics/classView.js
View file @ e0d71420
......@@ -44,6 +44,61 @@ export function getJobClassify() {
method: 'get'
})
}
/**
* 查询下列表
* @param params
* @returns {AxiosPromise}
*/
export function getCourseView(rows, page) {
return request({
url: '/blesson/getCourseView?rows=' + rows + '&page=' + page,
method: 'get'
})
}
// 查询侧拉列表
// 学习总人数
export function getTotalLearn(businessId, page, rows) {
return request({
url: '/blesson/getTotalLearn?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 未开始学习人数
export function getNotStart(businessId, page, rows) {
return request({
url: '/blesson/getNotStart?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 学习中人数
export function getLearning(businessId, page, rows) {
return request({
url: '/blesson/getLearning?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 学习完成人数
export function getFinish(businessId, page, rows) {
return request({
url: '/blesson/getFinish?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 参与考核人数
export function getExamed(businessId, page, rows) {
return request({
url: '/blesson/getExamed?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// ===============================
/**
......@@ -61,7 +116,6 @@ export function queryEmail(params) {
}
/**
* 查询email
* @param params
......
src/api/dataStatistics/companyView.js 0 → 100644
View file @ e0d71420
import request from '@/utils/request'
/**
* 查询左上
* @param params
* @returns {AxiosPromise}
*/
export function getEnterprisesView() {
return request({
url: '/sysunit/getEnterprisesView',
method: 'get'
})
}
/**
* 查询右上
* @param params
* @returns {AxiosPromise}
*/
export function getCollegesView(flag) {
return request({
url: '/sysunit/getCollegesView',
method: 'get'
})
}
/**
* 查询左下
* @param params
* @returns {AxiosPromise}
*/
export function getEnterprisesPeopleView(flag) {
return request({
url: '/sysunit/getEnterprisesPeopleView',
method: 'get'
})
}
/**
* 查询右下
* @param params
* @returns {AxiosPromise}
*/
export function getCollegesPeopleView() {
return request({
url: '/sysunit/getCollegesPeopleView',
method: 'get'
})
}
/**
* 查询右列表
* @param params
* @returns {AxiosPromise}
*/
export function getPayRank() {
return request({
url: '/sysunit/getPayRank',
method: 'get'
})
}
/**
* 查询下列表
* @param params
* @returns {AxiosPromise}
*/
export function getUnitView(rows, page) {
return request({
url: '/sysunit/getUnitView?rows=' + rows + '&page=' + page,
method: 'get'
})
}
// 查询侧拉列表
// 学员人数
export function getStudentNumber(businessId, page, rows) {
return request({
url: '/sysunit/getStudentNumber?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 付费课程数
export function getPayed(businessId, page, rows) {
return request({
url: '/sysunit/getPayed?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 试用课程
export function getLearning(businessId, page, rows) {
return request({
url: '/sysunit/getNoPayed?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 完成必修人数
export function getFinish(businessId, page, rows) {
return request({
url: '/sysunit/getFinish?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 未完成必修
export function getNotFinish(businessId, page, rows) {
return request({
url: '/sysunit/getNotFinish?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// 考核详细
export function getExam(businessId, page, rows) {
return request({
url: '/sysunit/getExam?businessId=' + businessId + '&page=' + page + '&rows=' + rows,
method: 'get'
})
}
// ===============================
/**
* 查询email
* @param params
* @returns {AxiosPromise}
*/
export function queryEmail(params) {
return request({
baseURL: process.env.VUE_APP_INTERNAL,
url: '/log/verify/queryEmail',
method: 'get',
params
})
}
/**
* 查询email
* @param params
* @returns {AxiosPromise}
*/
// export function sendEmail(params) {
// return request({
// baseURL: process.env.VUE_APP_INTERNAL,
// url: '/log/verify/sendEmail',
// method: 'post',
// data: params
// })
// }
/**
* 验证登录
* @param params
* @returns {AxiosPromise}
*/
// export function verUrl(params) {
// return request({
// baseURL: process.env.VUE_APP_INTERNAL,
// url: '/log/verify/verUrl',
// method: 'post',
// data: params
// })
// }
/**
* 验证登录
* @param params
* @returns {AxiosPromise}
*/
// export function updatePassW(params) {
// return request({
// baseURL: process.env.VUE_APP_INTERNAL,
// url: '/log/verify/updatePassW',
// method: 'get',
// params: params
// })
// }
src/views/dataStatistics/classView/index.vue
View file @ e0d71420
......@@ -92,9 +92,9 @@
<!-- 内容 -->
<div style="width: 90%; margin-left: 5%;">
<div>课程名称:</div>
<div>未开始人数:</div>
<el-table v-loading="loading" border :data="detailList">
<span style="width: 50%;">课程:{{ this.detailQueryParams.class }}</span>
<span style="margin-left: 60%;">{{this.detailQueryParams.label}}:{{ this.detailQueryParams.labelInfo }}</span>
<el-table v-loading="loading" border :data="detailList" height="700">
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column v-for="(column, index) in drawerHead" :key="index"
:label="column.label" align="center" :prop="column.prop">
......@@ -116,7 +116,7 @@
<script>
import { getDataCache, setDataCache } from '@/assets/js/filterData'
import { getDifficultyLevel, getClassPlan, getTecClassify, getJobClassify } from '@/api/dataStatistics/classView'
import { getDifficultyLevel, getClassPlan, getTecClassify, getJobClassify, getCourseView, getTotalLearn, getNotStart,getLearning,getFinish,getExamed } from '@/api/dataStatistics/classView'
import { color } from 'echarts'
export default {
name: 'classView',
......@@ -191,42 +191,47 @@ export default {
],
// 抽屉列表信息
detailList: [
{
userType: '1',
companyType: '2',
affiliatedUnit: '3',
loginName: '4',
userName: '5',
},
{
userType: '1',
companyType: '2',
affiliatedUnit: '3',
loginName: '4',
userName: '5',
},
{
userType: '1',
companyType: '2',
affiliatedUnit: '3',
loginName: '4',
userName: '5',
},
{
userType: '1',
companyType: '2',
affiliatedUnit: '3',
loginName: '4',
userName: '5',
},
// {
// userType: '1',
// companyType: '2',
// affiliatedUnit: '3',
// loginName: '4',
// userName: '5',
// },
// {
// userType: '1',
// companyType: '2',
// affiliatedUnit: '3',
// loginName: '4',
// userName: '5',
// },
// {
// userType: '1',
// companyType: '2',
// affiliatedUnit: '3',
// loginName: '4',
// userName: '5',
// },
// {
// userType: '1',
// companyType: '2',
// affiliatedUnit: '3',
// loginName: '4',
// userName: '5',
// },
],
// 抽屉列表查询参数
detailTotal: 20,
detailQueryParams: {
id: '',
column: '',
page: 1,
rows: 10,
class: '',
label: '',
labelInfo: '',
username: '',
loginTime: ''
loginTime: '',
},
// 饼图数据
data: {
......@@ -323,6 +328,7 @@ export default {
},
mounted() {
this.list = []
this.init()
this.drawChart1()
this.drawChart2()
......@@ -336,23 +342,135 @@ export default {
this.bar2()
},
methods: {
/** 查询登录日志列表 */
/** 查询下方列表 */
getList() {
// this.loading = true
// list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
// this.list = response.rows
// this.total = response.total
// this.loading = false
// })
},
/** 查询登录日志列表 */
this.loading = true
// 获取下方列表数据
getCourseView(this.queryParams.rows, this.queryParams.page)
.then((res)=>{
let data = res.data
this.list = data.records
this.total = data.total
this.loading = false
})
.catch((err)=>{
console.log(err);
})
},
/** 查询弹窗出来的列表 */
detailGetList() {
// this.loading = true
// list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
// this.list = response.rows
// this.total = response.total
// this.loading = false
// })
switch (this.detailQueryParams.column) {
case 'totalNumber':
this.drawer = true
console.log(this.detailQueryParams.id);
getTotalLearn(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '用户类型',prop: 'userType'},
{label: '单位类型',prop: 'unitType'},
{label: '所属单位',prop: 'unitName'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'notStart':
this.drawer = true
getNotStart(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '用户类型',prop: 'userType'},
{label: '单位类型',prop: 'unitType'},
{label: '所属单位',prop: 'unitName'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'learning':
this.drawer = true
getLearning(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '用户类型',prop: 'userType'},
{label: '单位类型',prop: 'unitType'},
{label: '所属单位',prop: 'unitName'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'finish':
this.drawer = true
getFinish(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '用户类型',prop: 'userType'},
{label: '单位类型',prop: 'unitType'},
{label: '所属单位',prop: 'unitName'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'examed':
this.drawer = true
getExamed(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '用户类型',prop: 'userType'},
{label: '单位类型',prop: 'unitType'},
{label: '所属单位',prop: 'unitName'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
default:
// console.log('Unknown fruit.');
}
},
// 初始化
......@@ -447,6 +565,18 @@ export default {
})
// 获取下方列表数据
getCourseView(this.queryParams.rows, this.queryParams.page)
.then((res)=>{
// console.log('========');
// console.log(res);
let data = res.data
this.list = data.records
this.total = data.total
})
.catch((err)=>{
console.log(err);
})
......@@ -459,13 +589,21 @@ export default {
},
// 获取被点击的格的信息
clickTable(row,column,event,cell) {
this.drawer = true
// 行信息
console.log(row)
// 列信息
console.log(column)
console.log(event)
console.log(cell)
this.detailList = []
this.detailQueryParams.page = 1
this.detailQueryParams.rows = 10
// // 行的信息
// console.log('--------------------');
// console.log(row);
// // 列的信息
// console.log('--------------------');
// console.log(column);
this.detailQueryParams.id = row.businessId
this.detailQueryParams.column = column.property
this.detailQueryParams.class = row.lessonName
this.detailQueryParams.label = column.label
this.detailQueryParams.labelInfo = row[column.property]
this.detailGetList(this.detailQueryParams.rows, this.detailQueryParams.page)
},
// 按钮切换
......
src/views/dataStatistics/companyView/index.vue
View file @ e0d71420
......@@ -45,10 +45,10 @@
stripe
:header-cell-style="{background:'rgb(250,250,250)'}">
<el-table-column type="index" width="55" label="排名" align="center" />
<el-table-column label="单位名称" align="center" prop="companyName" />
<el-table-column label="单位类型" align="center" prop="companyType" width="130"
<el-table-column label="单位名称" align="center" prop="unitName" />
<el-table-column label="单位类型" align="center" prop="unitType" width="130"
:show-overflow-tooltip="true" />
<el-table-column label="购买课程数" align="center" prop="classNum" :show-overflow-tooltip="true" />
<el-table-column label="购买课程数" align="center" prop="classNumber" :show-overflow-tooltip="true" />
</el-table>
</div>
......@@ -97,8 +97,8 @@
<!-- 内容 -->
<div style="width: 90%; margin-left: 5%;">
<div>课程名称:</div>
<div>未开始人数:</div>
<span>单位:{{ this.detailQueryParams.unitName }}</span>
<span style="margin-left: 60%;">{{this.detailQueryParams.label}}:{{ this.detailQueryParams.labelInfo }}</span>
<el-table v-loading="loading" border :data="detailList">
<el-table-column type="index" width="55" label="序号" align="center" />
<el-table-column v-for="(column, index) in drawerHead" :key="index"
......@@ -122,6 +122,7 @@
<script>
import { getDataCache, setDataCache } from '@/assets/js/filterData'
import { getEnterprisesView,getEnterprisesPeopleView,getCollegesView,getCollegesPeopleView, getPayRank, getUnitView,getStudentNumber,getPayed,getLearning,getFinish,getNotFinish,getExam } from '@/api/dataStatistics/companyView'
export default {
name: 'companyView',
......@@ -142,19 +143,19 @@ export default {
// 排名列表
rankList: [
{
companyName: 'xxxxxx',
companyType: '企业',
classNum: '20门'
unitName: 'xxxxxx',
unitType: '企业',
classNumber: '20门'
},
{
companyName: 'xxxxxx',
companyType: '院校',
classNum: '16门'
unitName: 'xxxxxx',
unitType: '院校',
classNumber: '16门'
},
{
companyName: 'xxxxxx',
companyType: '企业',
classNum: '20门'
unitName: 'xxxxxx',
unitType: '企业',
classNumber: '5门'
},
],
......@@ -255,6 +256,11 @@ export default {
detailQueryParams: {
page: 1,
rows: 10,
id: '',
column: '',
unitName: '',
label: '',
labelInfo: '',
username: '',
loginTime: ''
},
......@@ -272,25 +278,217 @@ export default {
},
created() {
},
mounted() {
this.list = []
this.init()
},
methods: {
/** 查询分页 */
init() {
getEnterprisesView()
.then((res)=>{
let data = res.data
this.cardInfo.companyNum = data.number
this.cardInfo.newCompanyNum = data.addNumber
})
.catch((err)=>{
console.log(err);
})
getEnterprisesPeopleView()
.then((res)=>{
let data = res.data
this.cardInfo.companyUserNum = data.totalNumber
this.cardInfo.activeUsers = data.liveNumber
})
.catch((err)=>{
console.log(err);
})
getCollegesView()
.then((res)=>{
let data = res.data
this.cardInfo.schoolNum = data.number
this.cardInfo.newSchoolNum = data.addNumber
})
.catch((err)=>{
console.log(err);
})
getCollegesPeopleView()
.then((res)=>{
let data = res.data
this.cardInfo.schoolUserNum = data.totalNumber
this.cardInfo.InschoolUserNum = data.learnNumber
})
.catch((err)=>{
console.log(err);
})
// 获取右侧排行
getPayRank()
.then((res)=>{
let data = res.data
this.rankList = data
})
.catch((err)=>{
console.log(err);
})
this.getList()
},
/** 获取下方列表 */
getList() {
// this.loading = true
// list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
// this.list = response.rows
// this.total = response.total
// this.loading = false
// })
// 获取下方列表
getUnitView(this.queryParams.rows, this.queryParams.page)
.then((res)=>{
let data = res.data
this.list = data.records
this.total = data.total
this.loading = false
})
.catch((err)=>{
console.log(err);
})
},
/** 查询分页 */
detailGetList() {
// this.loading = true
// list(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
// this.list = response.rows
// this.total = response.total
// this.loading = false
// })
switch (this.detailQueryParams.column) {
case 'studentNumber':
this.drawer = true
console.log(this.detailQueryParams.id);
getStudentNumber(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
{label: '手机号',prop: 'phone'},
{label: '职位/专业',prop: 'position'},
{label: '状态',prop: 'status'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'payed':
this.drawer = true
getPayed(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '课程名称',prop: 'lessonName'},
{label: '课程讲师',prop: 'lessonTeacher'},
{label: '开始日期',prop: 'start'},
{label: '结束日期',prop: 'end'},
{label: '剩余有效天数',prop: 'day'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'noPay':
this.drawer = true
getLearning(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '课程名称',prop: 'lessonName'},
{label: '课程讲师',prop: 'lessonTeacher'},
{label: '开始日期',prop: 'start'},
{label: '结束日期',prop: 'end'},
{label: '剩余有效天数',prop: 'day'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'finish':
this.drawer = true
getFinish(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '课程名称',prop: 'lessonName'},
{label: '课程讲师',prop: 'lessonTeacher'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
{label: '完成日期',prop: 'date'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'notFinish':
this.drawer = true
getNotFinish(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '课程名称',prop: 'lessonName'},
{label: '课程讲师',prop: 'lessonTeacher'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
{label: '学习进度',prop: 'schedule'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
case 'exam':
this.drawer = true
console.log('========');
getExam(this.detailQueryParams.id,this.detailQueryParams.page,this.detailQueryParams.rows)
.then((res)=>{
let data = res.data
this.detailList = data.records
this.drawerHead = [
{label: '课程名称',prop: 'lessonName'},
{label: '满分/及格线',prop: 'line'},
{label: '登录名',prop: 'userName'},
{label: '用户姓名',prop: 'name'},
{label: '考核成绩(分)',prop: 'score'},
]
this.detailTotal = data.total
})
.catch((err)=>{
console.log(err);
})
break;
default:
// console.log('Unknown fruit.');
}
},
// 右侧弹窗关闭逻辑
handleClose(done) {
......@@ -298,13 +496,20 @@ export default {
},
// 获取被点击的格的信息
clickTable(row,column,event,cell) {
this.drawer = true
// 行信息
console.log(row)
// 列信息
console.log(column)
console.log(event)
console.log(cell)
this.detailList = []
this.detailQueryParams.page = 1
this.detailQueryParams.rows = 10
// // 行的信息
// console.log('====');
// console.log(row);
// // 列的信息
// console.log(column.property);
this.detailQueryParams.id = row.businessId
this.detailQueryParams.column = column.property
this.detailQueryParams.unitName = row.unitName
this.detailQueryParams.label = column.label
this.detailQueryParams.labelInfo = row[column.property]
this.detailGetList(this.detailQueryParams.rows, this.detailQueryParams.page)
},
}
}
......@@ -389,7 +594,7 @@ export default {
margin-left: 1%;
margin-top: 20px;
width: 98%;
height: 500px;
// height: 500px;
border-radius: 4px;
// box-shadow: 0 0 5px rgba(63, 63, 63, 0.4);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment