|
|
@@ -78,8 +78,8 @@
|
|
|
</div>
|
|
|
<div class="search_nav">
|
|
|
<div class="right">
|
|
|
- <span :class="{ active: stype == 1 }">按问卷查看</span>
|
|
|
- <!-- <span :class="{active: stype == 2}">按人员查看</span> -->
|
|
|
+ <span :class="{ active: stype == 1 }" @click="checkDataType(1)">按问卷查看</span>
|
|
|
+ <span :class="{active: stype == 2}" @click="checkDataType(2)">按人员查看</span>
|
|
|
</div>
|
|
|
<div class="left">
|
|
|
<span class="list" :class="{ active: stype2 == 1 }" @click="checkStype2(1)"></span>
|
|
|
@@ -89,13 +89,13 @@
|
|
|
<div style="width: calc(100% - 20px);margin: 0 auto;">
|
|
|
<div class="student_head">
|
|
|
<div class="choose">
|
|
|
- <div class="student_search" v-if="typeArray.length">
|
|
|
+ <div class="student_search" v-if="typeArray.length && stype == 1">
|
|
|
<el-select v-model="typeCheck" placeholder="请选择类型" clearable @change="search">
|
|
|
<el-option v-for="(item, index) in typeArray" :key="index" :label="item.name"
|
|
|
:value="item.id"></el-option>
|
|
|
</el-select>
|
|
|
</div>
|
|
|
- <div class="student_search" style="width:100px">
|
|
|
+ <div class="student_search" style="width:100px" v-if="stype == 1">
|
|
|
<!-- <span></span> -->
|
|
|
<el-select v-model="groupA" @change="search">
|
|
|
<el-option value="0" label="我的"></el-option>
|
|
|
@@ -121,7 +121,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="pb_content_body" style="height: 100%;width: 100%;">
|
|
|
- <div class="student_table" v-loading="isLoading" v-if="stype2 == 1">
|
|
|
+ <div class="student_table" v-loading="isLoading" v-if="stype == 1 && stype2 == 1">
|
|
|
<div class="course_box">
|
|
|
<div class="test_box" v-for="(item, index) in course" :key="index">
|
|
|
<div class="test_top">
|
|
|
@@ -197,9 +197,9 @@
|
|
|
<div class="course_empty" v-if="course.length == 0">暂无数据</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-table ref="table" :data="course" border v-loading="isLoading"
|
|
|
+ <el-table ref="table" :data="course" border v-loading="isLoading" :key="1"
|
|
|
:header-cell-style="{ color: '#00000066', fontSize: '16px', fontWeight: 'unset' }"
|
|
|
- :row-class-name="tableRowClassName2" v-if="stype2 == 2" class="tableClass">
|
|
|
+ :row-class-name="tableRowClassName2" v-if="stype == 1 && stype2 == 2" class="tableClass">
|
|
|
<el-table-column label="序号" width="100px" align="center">
|
|
|
<template slot-scope="scope">
|
|
|
{{ scope.$index + 1 }}
|
|
|
@@ -240,11 +240,71 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
+ <div class="student_table" v-loading="isLoading" v-if="stype == 2 && stype2 == 1">
|
|
|
+ <div class="course_box">
|
|
|
+ <div class="test_box" v-for="(item, index) in course2" :key="index">
|
|
|
+ <div class="test_top">
|
|
|
+ <div class="test_top_img"></div>
|
|
|
+ <div class="test_top_title">
|
|
|
+ <span>{{ item.name }}</span>
|
|
|
+ <!-- <span>创建人：{{ item.uname }}</span> -->
|
|
|
+ <span>提交数量：{{ item.worksCount }}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="test_time">
|
|
|
+ <span><span>已完成表单</span></span><span>{{ item.testCount }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="test_time">
|
|
|
+ <span><span>教研室</span></span><el-tooltip :content="item.className ? item.className : '无'" placement="top" effect="dark">
|
|
|
+ <!-- content to trigger tooltip here -->
|
|
|
+ <span>{{ item.className ? item.className : '无' }}</span>
|
|
|
+ </el-tooltip>
|
|
|
+ </div>
|
|
|
+ <!-- <div class="test_btn">
|
|
|
+ <div class="test_o_btn">
|
|
|
+ <el-tooltip content="查看" placement="top" effect="dark">
|
|
|
+ <span class="check" @click="checkToTest2(item.userid)"></span>
|
|
|
+ </el-tooltip>
|
|
|
+ </div>
|
|
|
+ </div> -->
|
|
|
+ </div>
|
|
|
+ <div class="course_empty" v-if="stype == 1 && course.length == 0">暂无数据</div>
|
|
|
+ <div class="course_empty" v-if="stype == 2 && course2.length == 0">暂无数据</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <el-table ref="table" :data="course2" border v-loading="isLoading" :key="2"
|
|
|
+ :header-cell-style="{ color: '#00000066', fontSize: '16px', fontWeight: 'unset' }"
|
|
|
+ :row-class-name="tableRowClassName2" v-if="stype == 2 && stype2 == 2" class="tableClass">
|
|
|
+ <el-table-column label="序号" width="100px" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.$index + 1 }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="name" label="教师姓名" min-width="80" align="center">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column label="教研室" min-width="80" align="center">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ {{ scope.row.className ? scope.row.className : '无' }}
|
|
|
+ </template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="worksCount" label="已提交数量" min-width="80" align="center">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column prop="testCount" label="已完成表单" min-width="80" align="center">
|
|
|
+ </el-table-column>
|
|
|
+ <!-- <el-table-column label="操作" width="350px">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-button @click="checkToTest2(scope.row.userid)" type="text" size="small">详情</el-button>
|
|
|
+ </template>
|
|
|
+ </el-table-column> -->
|
|
|
+ </el-table>
|
|
|
</div>
|
|
|
<div class="student_page">
|
|
|
<el-pagination background layout="prev, pager, next" :page-size="pageSize" :total="total"
|
|
|
- v-if="page && course.length" style="padding: 0 0 20px 0;"
|
|
|
+ v-if="stype == 1 && page && course.length" style="padding: 0 0 20px 0;"
|
|
|
@current-change="handleCurrentChange"></el-pagination>
|
|
|
+ <el-pagination background layout="prev, pager, next" :page-size="pageSize2" :total="total2"
|
|
|
+ v-if="stype == 2 && page2 && course2.length" style="padding: 0 0 20px 0;"
|
|
|
+ @current-change="handleCurrentChange2"></el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
<el-dialog :visible.sync="dialogVisible1" size="tiny">
|
|
|
@@ -370,9 +430,17 @@ export default {
|
|
|
stype2: 1,
|
|
|
scid:{},
|
|
|
dialogVisibleShare:false,
|
|
|
+ page2: 1,
|
|
|
+ total2: 0,
|
|
|
+ pageSize2: 20,
|
|
|
+ course2: [],
|
|
|
+
|
|
|
};
|
|
|
},
|
|
|
methods: {
|
|
|
+ random(){
|
|
|
+ return Math.random().toString(36).substr(2);
|
|
|
+ },
|
|
|
tableRowClassName2({ row, rowIndex }) {
|
|
|
if ((rowIndex + 1) % 2 === 0) {
|
|
|
return "rowClass";
|
|
|
@@ -467,6 +535,21 @@ export default {
|
|
|
this.role
|
|
|
);
|
|
|
},
|
|
|
+ checkToTest2(uid){
|
|
|
+ this.$router.push(
|
|
|
+ "/checkToTest2?uid=" +
|
|
|
+ uid +
|
|
|
+ "&userid=" +
|
|
|
+ this.userid +
|
|
|
+ "&oid=" +
|
|
|
+ this.oid +
|
|
|
+ "&org=" +
|
|
|
+ this.org +
|
|
|
+ "&type=2" +
|
|
|
+ "&role=" +
|
|
|
+ this.role
|
|
|
+ );
|
|
|
+ },
|
|
|
tableRowClassName({ row, rowIndex }) {
|
|
|
if ((rowIndex + 1) % 2 === 0) {
|
|
|
return "even_row";
|
|
|
@@ -522,6 +605,10 @@ export default {
|
|
|
this.page = val;
|
|
|
this.getCourse();
|
|
|
},
|
|
|
+ handleCurrentChange2(val){
|
|
|
+ this.page2 = val
|
|
|
+ this.getCourse2();
|
|
|
+ },
|
|
|
init() { },
|
|
|
handleClose(done) {
|
|
|
done();
|
|
|
@@ -562,8 +649,13 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
searchCourse() {
|
|
|
- this.page = 1;
|
|
|
- this.getCourse();
|
|
|
+ if(this.stype == 1){
|
|
|
+ this.page = 1
|
|
|
+ this.getCourse();
|
|
|
+ }else if(this.stype == 2){
|
|
|
+ this.page2 = 1
|
|
|
+ this.getCourse2();
|
|
|
+ }
|
|
|
},
|
|
|
clear() {
|
|
|
if (this.CourseType.length) {
|
|
|
@@ -572,8 +664,13 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
this.typeCheck = ''
|
|
|
- this.page = 1
|
|
|
- this.getCourse();
|
|
|
+ if(this.stype == 1){
|
|
|
+ this.page = 1
|
|
|
+ this.getCourse();
|
|
|
+ }else if(this.stype == 2){
|
|
|
+ this.page2 = 1
|
|
|
+ this.getCourse2();
|
|
|
+ }
|
|
|
},
|
|
|
getCourse() {
|
|
|
var typeE = [];
|
|
|
@@ -634,6 +731,27 @@ export default {
|
|
|
console.error(err);
|
|
|
});
|
|
|
},
|
|
|
+ getCourse2(){
|
|
|
+ this.isLoading = true;
|
|
|
+ let params = {
|
|
|
+ oid: this.oid,
|
|
|
+ org: this.org,
|
|
|
+ type: this.typeCheck,
|
|
|
+ cn: this.courseName,
|
|
|
+ page: this.page2,
|
|
|
+ pageSize: this.pageSize2,
|
|
|
+ };
|
|
|
+ this.ajax
|
|
|
+ .get(this.$store.state.api + "selectTesttCourse2", params)
|
|
|
+ .then((res) => {
|
|
|
+ this.isLoading = false;
|
|
|
+ this.total2 = res.data[0].length > 0 ? res.data[0][0].num : 0;
|
|
|
+ this.course2 = res.data[0];
|
|
|
+ })
|
|
|
+ .catch((err) => {
|
|
|
+ console.error(err);
|
|
|
+ });
|
|
|
+ },
|
|
|
getTypeName() {
|
|
|
this.$forceUpdate();
|
|
|
this.page = 1;
|
|
|
@@ -865,9 +983,26 @@ export default {
|
|
|
this.stype2 = type
|
|
|
}
|
|
|
},
|
|
|
+ checkDataType(type) {
|
|
|
+ if (this.stype != type) {
|
|
|
+ this.stype = type
|
|
|
+ if(type == 1){
|
|
|
+ this.page = 1
|
|
|
+ this.getCourse()
|
|
|
+ }else{
|
|
|
+ this.page2 = 1
|
|
|
+ this.getCourse2()
|
|
|
+ }
|
|
|
+ }
|
|
|
+ },
|
|
|
search() {
|
|
|
- this.page = 1;
|
|
|
- this.getCourse();
|
|
|
+ if(this.stype == 1){
|
|
|
+ this.page = 1
|
|
|
+ this.getCourse();
|
|
|
+ }else if(this.stype == 2){
|
|
|
+ this.page2 = 1
|
|
|
+ this.getCourse2();
|
|
|
+ }
|
|
|
},
|
|
|
checkProblem(res) {
|
|
|
this.problemCourse = res;
|
|
|
@@ -898,7 +1033,11 @@ export default {
|
|
|
activated() {
|
|
|
console.log(1);
|
|
|
this.selectAllType();
|
|
|
- this.getCourse();
|
|
|
+ if(this.stype == 1){
|
|
|
+ this.getCourse();
|
|
|
+ }else if(this.stype == 2){
|
|
|
+ this.getCourse2();
|
|
|
+ }
|
|
|
this.selectTestType();
|
|
|
},
|
|
|
mounted() {
|
|
|
@@ -908,7 +1047,11 @@ export default {
|
|
|
}
|
|
|
this.page = 1;
|
|
|
this.selectAllType();
|
|
|
- this.getCourse();
|
|
|
+ if(this.stype == 1){
|
|
|
+ this.getCourse();
|
|
|
+ }else if(this.stype == 2){
|
|
|
+ this.getCourse2();
|
|
|
+ }
|
|
|
this.selectTestType();
|
|
|
},
|
|
|
};
|
|
|
@@ -1548,7 +1691,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.test_box>.test_time>span:nth-child(1) {
|
|
|
- width: 70px;
|
|
|
+ width: 85px;
|
|
|
display: flex;
|
|
|
}
|
|
|
|
