|
@@ -3,7 +3,7 @@
|
|
|
<div>
|
|
|
<!-- table 表格 -->
|
|
|
<el-row :gutter="20" class="main-items">
|
|
|
- <el-col class="aside" :span="4" :offset="1" style="padding: 0 !important;">
|
|
|
+ <el-col class="aside" :span="3" :offset="2" style="padding: 0 !important;">
|
|
|
<div
|
|
|
class="table-aside"
|
|
|
v-for="(v, k) in ItemList"
|
|
@@ -13,7 +13,7 @@
|
|
|
>{{v.text}}</div>
|
|
|
</el-col>
|
|
|
<!--数据监控-->
|
|
|
- <el-col :span="18" class="main" v-if="modelindex == 0">
|
|
|
+ <el-col :span="17" class="main" v-if="modelindex == 0">
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="2" :offset="1">
|
|
|
<div class="main-header-item">在线:{{monitorTeacherList.onlineCount}}人</div>
|
|
@@ -21,20 +21,20 @@
|
|
|
<el-col :span="2">
|
|
|
<div class="main-header-item">离线:{{monitorTeacherList.offlineCount}}人</div>
|
|
|
</el-col>
|
|
|
- <el-col :span="4">
|
|
|
+ <el-col :span="6">
|
|
|
<div class="main-header-item">
|
|
|
<span>分配未批改作业:{{monitorTeacherList.unCorrectCount}}份</span>
|
|
|
- <span @click="isShow(monitorTeacherList,2)" class="main-header-link">去分配</span>
|
|
|
+ <span @click="allocation()" class="main-header-link">去分配</span>
|
|
|
</div>
|
|
|
</el-col>
|
|
|
- <el-col :span="8" :offset="6">
|
|
|
+ <el-col :span="8" :offset="4">
|
|
|
<el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
|
|
|
<el-select
|
|
|
v-model="filters.OptionsValue"
|
|
|
@change="InfoWatch"
|
|
|
slot="prepend"
|
|
|
placeholder="选年级"
|
|
|
- minlength="20"
|
|
|
+ maxlength="20"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, k) in options"
|
|
@@ -48,7 +48,7 @@
|
|
|
@change="InfoWatch"
|
|
|
slot="prepend"
|
|
|
placeholder="选科目"
|
|
|
- minlength="20"
|
|
|
+ maxlength="20"
|
|
|
>
|
|
|
<el-option
|
|
|
v-for="(item, k) in grades"
|
|
@@ -157,30 +157,31 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange3"
|
|
|
- @current-change="pageChange3"
|
|
|
- :page-sizes="[10, 20]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(TeacherHomeworkList.pages)"
|
|
|
- ></el-pagination>
|
|
|
+ <div v-if="parseInt(TeacherHomeworkList.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange3"
|
|
|
+ @current-change="pageChange3"
|
|
|
+ :page-sizes="[10, 20]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(TeacherHomeworkList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange"
|
|
|
- @current-change="pageChange"
|
|
|
- :page-sizes="[10, 20, 30, 40]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(monitorTeacherList.pages)"
|
|
|
- ></el-pagination>
|
|
|
- <!-- <div style="float:right;margin-left:15px;">
|
|
|
- <el-button @click="myVisible = false" size="small">取 消</el-button>
|
|
|
- <el-button type="primary" size="small" @click="submit">确定</el-button>
|
|
|
- </div>-->
|
|
|
+ <div v-if="parseInt(monitorTeacherList.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange"
|
|
|
+ @current-change="pageChange"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(monitorTeacherList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
+
|
|
|
<div style="clear:both;"></div>
|
|
|
<div> <el-button @click="routerback()" type="success" round>返回</el-button></div>
|
|
|
</el-col>
|
|
@@ -266,14 +267,16 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange1"
|
|
|
- @current-change="pageChange1"
|
|
|
- :page-sizes="[10, 20, 30, 40]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(DayTeacherList.pages)"
|
|
|
- ></el-pagination>
|
|
|
+ <div v-if="parseInt(DayTeacherList.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange1"
|
|
|
+ @current-change="pageChange1"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(DayTeacherList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
<!-- <div style="float:right;margin-left:15px;">
|
|
|
<el-button @click="myVisible = false" size="small">取 消</el-button>
|
|
|
<el-button type="primary" size="small" @click="submit">确定</el-button>
|
|
@@ -393,14 +396,16 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange2"
|
|
|
- @current-change="pageChange2"
|
|
|
- :page-sizes="[10, 20, 30, 40]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(MothTeacherList.pages)"
|
|
|
- ></el-pagination>
|
|
|
+ <div v-if="parseInt(MothTeacherList.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange2"
|
|
|
+ @current-change="pageChange2"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(MothTeacherList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
<!-- <div style="float:right;margin-left:15px;">
|
|
|
<el-button @click="myVisible = false" size="small">取 消</el-button>
|
|
|
<el-button type="primary" size="small" @click="submit">确定</el-button>
|
|
@@ -452,16 +457,23 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange4"
|
|
|
- @current-change="pageChange4"
|
|
|
- :page-sizes="[10]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(TeacherAllotList.pages)"
|
|
|
- ></el-pagination>
|
|
|
+ <div v-if="parseInt(TeacherAllotList.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange4"
|
|
|
+ @current-change="pageChange4"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(TeacherAllotList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- 无未批改作业 v-if="monitorTeacherList.unCorrectCount==0"-->
|
|
|
+ <div class="no-homework" v-if="isNocheck">
|
|
|
+ <div>无可分配作业</div>
|
|
|
+ <img src="../../assets/img/wu_fen_pei_zuo_ye.png" alt="">
|
|
|
+ </div>
|
|
|
<!--所有未批改作业-->
|
|
|
<div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
|
|
|
<div class="model" style="width:50%" v-if="isPigai">
|
|
@@ -487,14 +499,16 @@
|
|
|
<el-button type="success">去分配</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange3"
|
|
|
- @current-change="pageChange3"
|
|
|
- :page-sizes="[10]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(UnallotHomeworkInfo.pages)"
|
|
|
- ></el-pagination>
|
|
|
+ <div v-if="parseInt(UnallotHomeworkInfo.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange3"
|
|
|
+ @current-change="pageChange3"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(UnallotHomeworkInfo.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -563,7 +577,7 @@
|
|
|
</div>
|
|
|
<!-- 学生详情弹框 -->
|
|
|
<div class="showModel" @click="allShowModel(4)" v-if="ModelStudet"></div>
|
|
|
- <div class="model" style="width:20%;" v-if="ModelStudet">
|
|
|
+ <div class="model" style="width:35%;left:32.5%" v-if="ModelStudet">
|
|
|
<div class="model-text">
|
|
|
<div class="model-manager">
|
|
|
<div>学生详情</div>
|
|
@@ -574,7 +588,7 @@
|
|
|
<div class="model-items">
|
|
|
<div class="model-items-first">
|
|
|
<div>
|
|
|
- <!-- <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img"> -->
|
|
|
+ <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img">
|
|
|
<div class="model-items-first-left">
|
|
|
<div class="Onlinename">{{GetStudentDetail.name}}</div>
|
|
|
<div class="model-items-first-left-down">{{GetStudentDetail.school}}</div>
|
|
@@ -582,7 +596,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="model-items-other model-active">所读年级 : {{GetStudentDetail.grade}}</div>
|
|
|
- <div class="model-items-other">性别 : {{GetStudentDetail.sex}}</div>
|
|
|
+ <div class="model-items-other">性别 : {{GetStudentDetail.sex==1?'男':'女'}}</div>
|
|
|
<div class="model-items-other model-active">联系方式 : {{GetStudentDetail.phone}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -668,14 +682,16 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-pagination
|
|
|
- background
|
|
|
- @size-change="handleSizeChange5"
|
|
|
- @current-change="pageChange5"
|
|
|
- :page-sizes="[10]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
- :total="parseInt(getAllotManagerList.pages)"
|
|
|
- ></el-pagination>
|
|
|
+ <div v-if="parseInt(getAllotManagerList.pages) > 10">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeChange5"
|
|
|
+ @current-change="pageChange5"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ :total="parseInt(getAllotManagerList.pages)"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -710,6 +726,7 @@ export default {
|
|
|
ModelAppor: false, //批改老师详情信息弹框
|
|
|
AllotManagerModel:false, //可分配小组管理员列表弹框
|
|
|
ModelStudet: false, //学生详情弹框
|
|
|
+ isNocheck:false,//没有未批改作业
|
|
|
isDown: false,
|
|
|
options: [
|
|
|
{
|
|
@@ -880,8 +897,8 @@ export default {
|
|
|
// 获取校区管理员监控数据
|
|
|
async InfoWatch() {
|
|
|
this.$store.dispatch("InfoWatch", {
|
|
|
- grade: this.filters.gradesValue,
|
|
|
- subject: this.filters.OptionsValue,
|
|
|
+ grade: this.filters.OptionsValue,
|
|
|
+ subject: this.filters.gradesValue,
|
|
|
teacherName: this.filters.inputValue,
|
|
|
maxCreateTime: this.filters.MaxtimeValue,
|
|
|
pageNo: this.filters.pageNo,
|
|
@@ -892,8 +909,8 @@ export default {
|
|
|
// 获取校区管理员当天数据
|
|
|
async InfoWatchDay() {
|
|
|
this.$store.dispatch("InfoWatchDay", {
|
|
|
- grade: this.filters1.gradesValue,
|
|
|
- subject: this.filters1.OptionsValue,
|
|
|
+ grade: this.filters.OptionsValue,
|
|
|
+ subject: this.filters.gradesValue,
|
|
|
teacherName: this.filters1.inputValue,
|
|
|
maxCreateTime: this.filters1.MaxtimeValue,
|
|
|
pageNo: this.filters1.pageNo,
|
|
@@ -904,8 +921,8 @@ export default {
|
|
|
// 获取校区管理员当月数据
|
|
|
async InfoWatchMoth() {
|
|
|
this.$store.dispatch("InfoWatchMoth", {
|
|
|
- grade: this.filters2.gradesValue,
|
|
|
- subject: this.filters2.OptionsValue,
|
|
|
+ grade: this.filters.OptionsValue,
|
|
|
+ subject: this.filters.gradesValue,
|
|
|
teacherName: this.filters2.inputValue,
|
|
|
maxCreateTime: this.filters2.MaxtimeValue,
|
|
|
pageNo: this.filters2.pageNo,
|
|
@@ -1089,6 +1106,21 @@ export default {
|
|
|
this.GetAllotManagerInfo()
|
|
|
}
|
|
|
},
|
|
|
+ // 去分配
|
|
|
+ allocation(){
|
|
|
+ this.InfoWatch()
|
|
|
+ if (this.monitorTeacherList.unCorrectCount == 0){
|
|
|
+ this.isNocheck = true;
|
|
|
+ var time = setTimeout(function () {
|
|
|
+ console.log('2222')
|
|
|
+ this.isNocheck = true;
|
|
|
+ clearTimeout(time);
|
|
|
+ }, 1000);
|
|
|
+ } else {
|
|
|
+ this.isShow(this.monitorTeacherList,2)
|
|
|
+ }
|
|
|
+
|
|
|
+ },
|
|
|
//关闭弹框
|
|
|
allShowModel(str) {
|
|
|
let _this = this;
|
|
@@ -1404,10 +1436,10 @@ el-table {
|
|
|
height: auto;
|
|
|
position: fixed;
|
|
|
top: 15%;
|
|
|
- left: 25%;
|
|
|
+ left: 30%;
|
|
|
margin: auto;
|
|
|
background: #fff;
|
|
|
- border-radius: 30px;
|
|
|
+ border-radius: 10px;
|
|
|
text-align: center;
|
|
|
}
|
|
|
.modelspec{
|
|
@@ -1481,10 +1513,11 @@ el-table {
|
|
|
justify-content: space-between;
|
|
|
}
|
|
|
.model-items {
|
|
|
- padding: 20px;
|
|
|
+ padding-bottom: 10px;
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
display: inline-block;
|
|
|
+ width: 100%;
|
|
|
}
|
|
|
.model-items-left-top-img {
|
|
|
width: 68px;
|
|
@@ -1540,4 +1573,26 @@ el-table {
|
|
|
.el-pagination {
|
|
|
padding: 30px;
|
|
|
}
|
|
|
+.no-homework{
|
|
|
+ width:16.5%;
|
|
|
+ height:328px;
|
|
|
+ background:rgba(255,255,255,1);
|
|
|
+ box-shadow:0px 0px 14px 0px rgba(228,228,228,1);
|
|
|
+ border-radius:10px;
|
|
|
+ margin: auto;
|
|
|
+ position: fixed;
|
|
|
+ top: 27%;
|
|
|
+ left: 41.75%;
|
|
|
+ text-align: center;
|
|
|
+ padding: 35px;
|
|
|
+ z-index: 1000;
|
|
|
+}
|
|
|
+.no-homework>div{
|
|
|
+ margin-bottom: 25px;
|
|
|
+ font-size: 24px;
|
|
|
+}
|
|
|
+.no-homework>img{
|
|
|
+ width: 226px;
|
|
|
+ height: 203px;
|
|
|
+}
|
|
|
</style>
|