|
@@ -1,30 +1,29 @@
|
|
|
<template>
|
|
|
<div class="content">
|
|
|
- <div class="class-list">
|
|
|
- <div class="activity-target-header">
|
|
|
- <span>测试科目</span>
|
|
|
- </div>
|
|
|
- <div @click="selectActivity(index)" v-for="(item,index) in activityList" :class="index == currentActivityIndex ? 'activity-target-item block-bg block-bg-active':'block-bg activity-target-item'">
|
|
|
- <p class="target-name">
|
|
|
- {{item.classroomName}}
|
|
|
- <span class="activity-status">进行中</span>
|
|
|
- </p>
|
|
|
- <p style="margin-top:6px;">
|
|
|
- <span class="info-label"><Icon type="md-flag" style="margin-right:5px;" size="16" />测试类型:</span>
|
|
|
- <span class="info-value">{{item.type}}</span>
|
|
|
- </p>
|
|
|
- <p style="margin-top:6px;" v-if="item.type == '自主学习'">
|
|
|
- <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />开始时间:</span>
|
|
|
- <span class="info-value">{{item.startTime}}</span>
|
|
|
- </p>
|
|
|
- <p style="margin-top:6px;" v-else>
|
|
|
- <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />结束时间:</span>
|
|
|
- <span class="info-value">{{item.endTime}}</span>
|
|
|
- </p>
|
|
|
- </div>
|
|
|
+ <div class="class-list">
|
|
|
+ <div class="activity-target-header">
|
|
|
+ <span>测试科目</span>
|
|
|
</div>
|
|
|
+ <div @click="selectActivity(index)" v-for="(item,index) in paper" :key="index":class="index == currentActivityIndex ? 'activity-target-item block-bg block-bg-active':'block-bg activity-target-item'">
|
|
|
+ <p class="target-name">
|
|
|
+ {{jsFn.getSubjectName(jsFn.getPeriod($store.state.schoolBaseInfo.schoolBaseInfo, item.periodCode), item.subjectCode)}}
|
|
|
+ <span class="activity-status">进行中</span>
|
|
|
+ </p>
|
|
|
+ <p style="margin-top:6px;">
|
|
|
+ <span class="info-label"><Icon type="md-flag" style="margin-right:5px;" size="16" />测试类型:</span>
|
|
|
+ <span class="info-value">{{typeList[item.level].label}}</span>
|
|
|
+ </p>
|
|
|
+ <p style="margin-top:6px;" >
|
|
|
+ <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />开始时间:</span>
|
|
|
+ <span class="info-value">{{ $tools.formatTime(item.createTime *1000 , 'yyyy-MM-dd')}}</span>
|
|
|
+ </p>
|
|
|
+ <!--<p style="margin-top:6px;" v-else>
|
|
|
+ <span class="info-label"><Icon type="md-time" style="margin-right:5px;" size="16" />结束时间:</span>
|
|
|
+ <span class="info-value">{{item.endTime}}</span>
|
|
|
+ </p>-->
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="class-info">
|
|
|
-
|
|
|
<div class="learn-progress-main dark-iview-table" v-if="currentActivityIndex == 0">
|
|
|
<vuescroll>
|
|
|
<p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:15px;">测验成绩分析</p>
|
|
@@ -52,7 +51,7 @@
|
|
|
<div class="dark-iview-table" v-if="currentActivityIndex != 0">
|
|
|
<p style="color:#EEEEEE;padding-left:15px;font-size:16px;margin-top:15px;">测验成绩评审</p>
|
|
|
<div style="margin-top:15px;margin-left:30px;">
|
|
|
- <grade-list></grade-list>
|
|
|
+ <grade-list :paperInfo="paperData"></grade-list>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -61,8 +60,15 @@
|
|
|
<script>
|
|
|
import Grade from '@/components/learnactivity/GradeChart.vue'
|
|
|
import Table from '@/components/learnactivity/GradeTable.vue'
|
|
|
+ import jsFn from '@/utils/js-fn.js'
|
|
|
import GradeList from '@/components/learnactivity/GradeList.vue'
|
|
|
export default {
|
|
|
+ props: {
|
|
|
+ paper: {
|
|
|
+ type: Array,
|
|
|
+ default:[],
|
|
|
+ }
|
|
|
+ },
|
|
|
components: {
|
|
|
Grade,
|
|
|
Table,
|
|
@@ -70,28 +76,31 @@
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ jsFn,
|
|
|
showAnswer: false,
|
|
|
- currentActivityIndex:0,
|
|
|
- activityList: [
|
|
|
+ currentActivityIndex: 0,
|
|
|
+ studentData: [],
|
|
|
+ studentList: [],
|
|
|
+ testStatus: false,
|
|
|
+ typeList: [
|
|
|
{
|
|
|
- classroomName:'语文',
|
|
|
- classroomCode: '123',
|
|
|
- type: '平常考',
|
|
|
- startTime: '2020-05-06',
|
|
|
- endTime:'2020-07-07'
|
|
|
+ value: '1',
|
|
|
+ label: '联考'
|
|
|
},
|
|
|
{
|
|
|
- classroomName:'数学',
|
|
|
- classroomCode: '123',
|
|
|
- type:'平常考',
|
|
|
- startTime: '2020-05-06',
|
|
|
- endTime:'2020-05-07'
|
|
|
+ value: '2',
|
|
|
+ label: '段考'
|
|
|
},
|
|
|
-
|
|
|
+ {
|
|
|
+ value: '3',
|
|
|
+ label: '平常考'
|
|
|
+ },
|
|
|
+ {
|
|
|
+ value: '4',
|
|
|
+ label: '其他'
|
|
|
+ }
|
|
|
],
|
|
|
- studentData: [],
|
|
|
- studentList: [],
|
|
|
- testStatus:false
|
|
|
+ paperData: {}
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
@@ -99,7 +108,11 @@
|
|
|
this.testStatus = !this.testStatus
|
|
|
},
|
|
|
selectActivity(index) {
|
|
|
+ this.paperData = {}
|
|
|
+ this.currentActivityIndex = 0
|
|
|
this.currentActivityIndex = index
|
|
|
+ this.paperData = this.paper[this.currentActivityIndex]
|
|
|
+ console.log(this.paperData)
|
|
|
},
|
|
|
getData() {
|
|
|
let data = this.$Mock.data.studentList
|
|
@@ -115,7 +128,6 @@
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
-
|
|
|
this.studentList = this.studentData[0].studentScore
|
|
|
}
|
|
|
} else {
|
|
@@ -127,7 +139,14 @@
|
|
|
},
|
|
|
closeAnswerDetail() {
|
|
|
this.showAnswer = false
|
|
|
- }
|
|
|
+ },
|
|
|
+ //dataFormate() {
|
|
|
+ // if (this.paper.length !== 0) {
|
|
|
+ // for (let i = 0; i < this.paper.length; i++) {
|
|
|
+ // this.paper[i].createTime = this.$tools.formatTime(this.paper[i].createTime * 1000)
|
|
|
+ // }
|
|
|
+ // }
|
|
|
+ //}
|
|
|
},
|
|
|
mounted() {
|
|
|
this.getData()
|