|
|
@@ -8,7 +8,7 @@
|
|
|
<el-col :span="20" class="main" :offset="2">
|
|
|
|
|
|
<el-table
|
|
|
- :data="homeworkRecoveryList"
|
|
|
+ :data="homeworkRecoveryList.list"
|
|
|
:header-cell-class-name="tableheaderClassName"
|
|
|
:header-cell-style="{
|
|
|
'color': '#999999',
|
|
|
@@ -45,7 +45,7 @@
|
|
|
header-align="center"
|
|
|
>
|
|
|
<template slot-scope="scope">
|
|
|
- <span class="allocation">{{scope.row.ownReplenish==1?'有':'无'}}</span>
|
|
|
+ <span >{{scope.row.ownReplenish==1?'有':'否'}}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
@@ -54,38 +54,77 @@
|
|
|
header-align="center"
|
|
|
width="450"
|
|
|
>
|
|
|
- <template slot-scope="">
|
|
|
- <span class="allocation">去分配</span>
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <span class="allocation" @click="isShow(scope.row.grade,scope.row.subject,scope.row.homeworkId)">去分配</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
<!-- 分页显示 -->
|
|
|
- <!--<div class="page-block" v-if="parseInt(homeworkRecoveryList.pages) > 0">-->
|
|
|
- <!--<el-pagination-->
|
|
|
- <!--background-->
|
|
|
- <!--@size-change="handleSizeChange"-->
|
|
|
- <!--@current-change="pageChange"-->
|
|
|
- <!--:page-sizes="[10]"-->
|
|
|
- <!--layout="total, sizes, prev, pager, next, jumper"-->
|
|
|
- <!--:total= parseInt(homeworkRecoveryList.pages)-->
|
|
|
- <!--></el-pagination>-->
|
|
|
- <!--</div>-->
|
|
|
+ <div class="page-block" v-if="parseInt(homeworkRecoveryList.pages) > 0">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange1"
|
|
|
+ @current-change="pageChange1"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total= parseInt(homeworkRecoveryList.pages)
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</el-col>
|
|
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
|
<!--弹框-->
|
|
|
- <div class='showModel' @click="allShowModel(2)" v-if="isPigai"></div>
|
|
|
- <div class='model' v-if="isPigai">
|
|
|
- <div class='model-text'>
|
|
|
- <div class="model-text-items">
|
|
|
- <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(2)" class="model-text-items-close"></div>
|
|
|
- <div>是否导出表格？</div>
|
|
|
+ <!--所有未批改可分配老师列表弹框-->
|
|
|
+ <div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
|
|
|
+ <div class="model" style="width:50%" v-if="isPigai">
|
|
|
+ <div class="model-text" style="padding: 0 30px">
|
|
|
+ <div class="model-manager">
|
|
|
+ <div>作业可分配老师</div>
|
|
|
+ <div>
|
|
|
+ <img src="../../assets/img/del@2x.png" alt @click="allShowModel(2)">
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="allocation-items" v-for="(v, k) in TeacherAllotList.list" :key="k" >
|
|
|
+ <div class="model-items-left">
|
|
|
+ <div class="model-items-left-top">
|
|
|
+ <div>
|
|
|
+ <img
|
|
|
+ :src="BASE_URL + v.imgUrl"
|
|
|
+ v-if="v.imgUrl"
|
|
|
+ alt
|
|
|
+ class="model-items-left-top-img"
|
|
|
+ >
|
|
|
+ <img
|
|
|
+ src="../../assets/img/user.jpg"
|
|
|
+ v-if="!v.imgUrl"
|
|
|
+ alt
|
|
|
+ class="model-items-left-top-img"
|
|
|
+ >
|
|
|
+ <div style="display: inline-block;text-align: left;">
|
|
|
+ <div style="font-size: 24px;margin-left: 10px">{{v.name}}</div>
|
|
|
+ <div class="model-items-left-top-number">等待学生：{{v.waitCount}}</div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div>
|
|
|
+ <el-button
|
|
|
+ @click="GOtoTeacherAllot(v)"
|
|
|
+ type="success"
|
|
|
+ >分配</el-button>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- <div class="model-btn">
|
|
|
- <div class="model-btn-items main-gay">是</div>
|
|
|
- <div class="model-btn-items model-grdeen">否</div>
|
|
|
+ <div class="pages">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ @current-change="pageChange"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(TeacherAllotList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -104,7 +143,19 @@
|
|
|
selMonth:'',
|
|
|
hiddenModel:false,
|
|
|
isPigai:false,
|
|
|
- list:[],
|
|
|
+ // homeworkRecoveryList:{
|
|
|
+ // list:[
|
|
|
+ // {
|
|
|
+ // createTime:1111,
|
|
|
+ // subject:'英语',
|
|
|
+ // studentName:4621,
|
|
|
+ // ownReplenish:888,
|
|
|
+ // uncorrectedCount:1,
|
|
|
+ // grade:'一年级',
|
|
|
+ // homeworkId:'1545623108745210'
|
|
|
+ // },
|
|
|
+ // ],
|
|
|
+ // },
|
|
|
filters: {
|
|
|
actvNm: "",
|
|
|
actvCrtUserId: "",
|
|
|
@@ -118,12 +169,21 @@
|
|
|
count: 0,
|
|
|
orderField: "",
|
|
|
orderAD: ""
|
|
|
+ },
|
|
|
+ allotList:{
|
|
|
+ pageNo: 1,
|
|
|
+ pageSize: 10,
|
|
|
+ count: 0,
|
|
|
+ grade:'',
|
|
|
+ subject:'',
|
|
|
+ homeworkId:''
|
|
|
}
|
|
|
};
|
|
|
},
|
|
|
watch: {},
|
|
|
+ // ,'homeworkRecoveryList'
|
|
|
computed: {
|
|
|
- ...mapGetters(["getUser",'homeworkRecoveryList'])
|
|
|
+ ...mapGetters(["getUser",'homeworkRecoveryList','TeacherAllotList'])
|
|
|
},
|
|
|
methods: {
|
|
|
...mapActions(["setUser"]),
|
|
|
@@ -132,17 +192,12 @@
|
|
|
return "table-head-th";
|
|
|
},
|
|
|
//弹框
|
|
|
- isShow(str){
|
|
|
- let _this = this;
|
|
|
- console.log(str)
|
|
|
- if (str == 1){
|
|
|
- _this.hiddenModel = true;
|
|
|
- _this.isPigai = false;
|
|
|
- } else if (str == 2){
|
|
|
- _this.isPigai = true;
|
|
|
- _this.hiddenModel = false;
|
|
|
- }
|
|
|
-
|
|
|
+ isShow(str,t,id){
|
|
|
+ this.isPigai = true;
|
|
|
+ this.allotList.grade = str;
|
|
|
+ this.allotList.subject = t;
|
|
|
+ this.allotList.homeworkId = id
|
|
|
+ this.TeacherAllot()
|
|
|
},
|
|
|
//关闭弹框
|
|
|
allShowModel(str) {
|
|
|
@@ -177,11 +232,32 @@
|
|
|
maxCreateTime: this.formatDate()
|
|
|
});
|
|
|
},
|
|
|
-
|
|
|
+ // 可分配老师列表
|
|
|
+ async TeacherAllot() {
|
|
|
+ this.$store.dispatch("TeacherAllotList", {
|
|
|
+ grade: this.allotList.grade,
|
|
|
+ subject: this.allotList.subject,
|
|
|
+ maxCreateTime: this.formatDate(),
|
|
|
+ pageNo: this.allotList.pageNo,
|
|
|
+ pageSize: this.allotList.pageSize
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 分配老师
|
|
|
+ async GOtoTeacherAllot(v) {
|
|
|
+ this.$store.dispatch("toTeacherAllot", {
|
|
|
+ teacherId: v.teacherId,
|
|
|
+ homeworkId: this.allotList.homeworkId
|
|
|
+ });
|
|
|
+ this.isPigai = false
|
|
|
+ },
|
|
|
// 分页
|
|
|
pageChange(val) {
|
|
|
+ this.allotList.pageNo = val;
|
|
|
+ this.TeacherAllot();
|
|
|
+ },
|
|
|
+ pageChange1(val) {
|
|
|
this.filters.pageNo = val;
|
|
|
- this.GetTeacherSalaryList();
|
|
|
+ this.HomeworkRecoveryList();
|
|
|
},
|
|
|
changeDateSlot(dateSlot) {
|
|
|
if (dateSlot) {
|
|
|
@@ -209,8 +285,12 @@
|
|
|
}
|
|
|
},
|
|
|
handleSizeChange(val) {
|
|
|
+ this.allotList.pageSize = val;
|
|
|
+ this.TeacherAllot();
|
|
|
+ },
|
|
|
+ handleSizeChange1(val) {
|
|
|
this.filters.pageSize = val;
|
|
|
- this.GetTeacherSalaryList();
|
|
|
+ this.HomeworkRecoveryList();
|
|
|
},
|
|
|
// 排序
|
|
|
sortChange(sort) {
|
|
|
@@ -255,21 +335,13 @@
|
|
|
text-align: center;
|
|
|
line-height: 80px;
|
|
|
}
|
|
|
- .main-header-item{
|
|
|
- font-size: 16px;
|
|
|
- color: #7E7E7E;
|
|
|
- }
|
|
|
+
|
|
|
|
|
|
.input-with-select .el-input-group__prepend {
|
|
|
background-color: #fff;
|
|
|
}
|
|
|
|
|
|
- .table-img{
|
|
|
- width:36px;
|
|
|
- height:36px;
|
|
|
- border-radius:6px;
|
|
|
- }
|
|
|
- .showModel{
|
|
|
+ .showModel {
|
|
|
width: 100%;
|
|
|
height: 100%;
|
|
|
position: fixed;
|
|
|
@@ -280,75 +352,74 @@
|
|
|
overflow: hidden;
|
|
|
z-index: 1000;
|
|
|
color: #fff;
|
|
|
-
|
|
|
}
|
|
|
- .model{
|
|
|
- z-index: 1001;
|
|
|
- width:40%;
|
|
|
- height:auto;
|
|
|
+ .model {
|
|
|
+ z-index: 10000;
|
|
|
+ width: 60%;
|
|
|
+ height: auto;
|
|
|
position: fixed;
|
|
|
- top: 30%;
|
|
|
+ top: 15%;
|
|
|
left: 30%;
|
|
|
- margin:auto;
|
|
|
+ margin: auto;
|
|
|
background: #fff;
|
|
|
- border-radius:10px;
|
|
|
+ border-radius: 10px;
|
|
|
text-align: center;
|
|
|
}
|
|
|
- .scope-name{
|
|
|
- margin-left: 13px;
|
|
|
- }
|
|
|
|
|
|
- .model-text{
|
|
|
- background:rgba(255,255,255,1);
|
|
|
- border-radius:10px;
|
|
|
+ .model-text {
|
|
|
+ background: rgba(255, 255, 255, 1);
|
|
|
+ border-radius: 10px;
|
|
|
}
|
|
|
|
|
|
- .model-btn{
|
|
|
- display: flex;
|
|
|
- justify-content: space-around;
|
|
|
- margin-bottom: 44px;
|
|
|
- }
|
|
|
- .model-btn-items{
|
|
|
- width:154px;
|
|
|
- height:50px;
|
|
|
- line-height: 50px;
|
|
|
- text-align: center;
|
|
|
- font-size: 18px;
|
|
|
- border-radius:4px;
|
|
|
- }
|
|
|
- .main-gay{
|
|
|
- background:rgba(246,247,251,1);
|
|
|
- color: #7E7E7E;
|
|
|
- }
|
|
|
- .model-grdeen{
|
|
|
- background-color: #52CC60;
|
|
|
- color: #fff;
|
|
|
+ .model-items-left {
|
|
|
+ width: 100%;
|
|
|
+ color: #393939;
|
|
|
+ font-size: 24px;
|
|
|
}
|
|
|
- .model-text-items-close{
|
|
|
- position: absolute;
|
|
|
- top: 10px;
|
|
|
- right: 15px;
|
|
|
+ .model-items-left-top {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
}
|
|
|
- .model-text-items{
|
|
|
+
|
|
|
+ .model-items-left-top-img {
|
|
|
+ width: 68px;
|
|
|
+ height: 68px;
|
|
|
+ border-radius: 8px;
|
|
|
position: relative;
|
|
|
- color: #000000;
|
|
|
- font-size: 24px;
|
|
|
- text-align: center;
|
|
|
- padding: 40px 0 50px 0;
|
|
|
+ bottom: 25px;
|
|
|
}
|
|
|
- .page-block{
|
|
|
- text-align: center !important;
|
|
|
- margin-top: 15px;
|
|
|
+ .model-items-left-top-number {
|
|
|
+ color: #7e7e7e;
|
|
|
+ font-size: 18px;
|
|
|
+ margin-left: 10px;
|
|
|
}
|
|
|
+
|
|
|
.el-table .table-head-th{
|
|
|
background-color:#F6F7FB;
|
|
|
font-size: 16px !important;
|
|
|
color: #393939;
|
|
|
|
|
|
}
|
|
|
+ .model-manager {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ margin: 30px;
|
|
|
+ color: #393939;
|
|
|
+ font-size: 24px;
|
|
|
+ }
|
|
|
+ .allocation-items{
|
|
|
+ width: 45%;
|
|
|
+ display: inline-block;
|
|
|
+ margin-right: 20px;
|
|
|
+ margin-bottom:30px;
|
|
|
+ }
|
|
|
.allocation{
|
|
|
color: #52CC60;
|
|
|
font-size: 20px;
|
|
|
text-decoration: underline;
|
|
|
+ cursor: pointer;
|
|
|
+ }
|
|
|
+ .pages{
|
|
|
+ margin: 15px 0;
|
|
|
}
|
|
|
</style>
|
TheLittlePrince