From fa11faa07eb31e9dda4ae48d6ba4b2fc32190b3b Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期二, 14 五月 2024 17:28:24 +0800
Subject: [PATCH] feat：答卷统计新需求
---
src/views/answer/sheetStatistics.vue | 46 +++++++++++++++++++++++++---------------------
src/api/dashboard.js | 6 ++++--
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/api/dashboard.js b/src/api/dashboard.js
index b91178d..40292f8 100644
--- a/src/api/dashboard.js
+++ b/src/api/dashboard.js
@@ -1,7 +1,9 @@
-import { post } from '@/utils/request'
+import { get, post } from '@/utils/request'
export default {
index: () => post('/api/admin/dashboard/index'),
- getData: query => post('/api/admin/examPaperAnswer/paperStatistics',query),
+ getData: query => get('/api/admin/examPaperAnswer/statistic', query),
+ getData: query => get('/api/admin/examPaperAnswer/statistic', query),
+ examPaperList: query => get('/api/admin/exam/paper/list', query),
page: query => post('/api/admin/examPaperAnswer/page', query)
}
diff --git a/src/views/answer/sheetStatistics.vue b/src/views/answer/sheetStatistics.vue
index 84f64ed..7abe797 100644
--- a/src/views/answer/sheetStatistics.vue
+++ b/src/views/answer/sheetStatistics.vue
@@ -1,41 +1,36 @@
-
<template>
<div style="padding: 10px">
<el-form :model="queryParam" ref="queryForm" :inline="true " style="display: flex">
- <el-form-item label="璇曞嵎鍚嶇О锛�" >
- <el-input v-model="paperName.paperName"></el-input>
+ <el-form-item label="璇曞嵎锛�" >
+ <el-select v-model="queryParam.examPaperId" filterable placeholder="璇曞嵎">
+ <el-option v-for="item in examPaperList" :key="item.id" :value="item.id" :label="item.name"/>
+ </el-select>
</el-form-item>
-<!-- <el-form-item label="璇曞嵎棰樼洰锛�">-->
-<!-- <el-input v-model="queryParam.paperName"></el-input>-->
-<!-- </el-form-item>-->
+ <el-form-item label="閮ㄩ棬锛�" v-if="true">
+ <el-select v-model="queryParam.departmentId" placeholder="閮ㄩ棬" clearable>
+ <el-option v-for="item in levelEnum" :key="item.key" :value="item.key" :label="item.value"/>
+ </el-select>
+ </el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm">鏌ヨ</el-button>
</el-form-item>
</el-form>
- <div style="display: flex;justify-content: center;color: #0a76a4">
- <div >鏈�浣庡垎锛歿{min}}</div>
- <div style="margin-left: 5px">鏈�楂樺垎锛歿{max}}</div>
- <div style="margin-left: 5px">骞冲潎鍒嗭細{{avg}}</div>
- </div>
<el-row class="echarts-line">
<div id="echarts-moth-user" style="width: 100%;height:400px;" v-loading="loading"/>
</el-row>
</div>
</template>
<script>
-import examPaperAnswerApi from '@/api/examPaperAnwser'
+import { mapGetters, mapState, mapActions } from 'vuex'
import dashboardApi from '@/api/dashboard'
-const animationDuration = 6000
export default {
data(){
return{
+ examPaperList: [],
max:'',
min:'',
avg:'',
- paperName:{
- paperName:''
- },
loading:false,
examPaperCount: 0,
questionCount: 0,
@@ -43,8 +38,8 @@
doQuestionCount: 0,
echartsUserAction: null,
queryParam: {
- paperName:'',
- userName:'',
+ examPaperId: '85',
+ departmentId: '',
subjectId: null,
pageIndex: 1,
pageSize: 10
@@ -53,8 +48,11 @@
}
},
mounted(){
+ dashboardApi.examPaperList().then(res => {
+ this.examPaperList = res.response
+ })
let _this = this
- dashboardApi.getData(this.paperName).then(re => {
+ dashboardApi.getData(this.queryParam).then(re => {
let response = re.response
console.log(response)
_this.avg = response.avg
@@ -105,7 +103,7 @@
search () {
// this.listLoading = true
let _this = this
- dashboardApi.getData(this.paperName).then(re => {
+ dashboardApi.getData(this.queryParam).then(re => {
console.log(re)
let response = re.response
_this.avg = response.avg
@@ -118,7 +116,13 @@
submitForm () {
this.queryParam.pageIndex = 1
this.search()
- },
+ }
+ },
+ computed: {
+ ...mapGetters('enumItem', ['enumFormat']),
+ ...mapState('enumItem', {
+ levelEnum: state => state.user.levelEnum
+ })
}
}
</script>
--
Gitblit v1.8.0