|
@@ -157,30 +157,31 @@
|
|
|
>暂无数据!</div>
|
|
|
<div v-if="isDownindex === k && isDown">
|
|
|
<div class="tr-second" v-for="(v, k) of TeacherHomeworkList.list" :key="k">
|
|
|
- <div class="tr-seconds" style="width:50px;">{{k+1}}</div>
|
|
|
- <div class="tr-seconds tr-w120">
|
|
|
+ <div class="tr-seconds" style="width:6%;">{{k+1}}</div>
|
|
|
+ <div class="tr-seconds tr-w120" style="width:14%;">
|
|
|
<span @click="isShow(v,4)" style="cursor: pointer;" class="tr-second-check">查看</span>
|
|
|
<span>{{v.name}}</span>
|
|
|
</div>
|
|
|
<div
|
|
|
v-if="v.status && !(v.status === 1 && k == 0) "
|
|
|
- class="tr-secondsA"
|
|
|
+ class="tr-secondsA" style="width:25%;"
|
|
|
>{{v.spendTime}}</div>
|
|
|
<div
|
|
|
v-if="v.status === 1 && k == 0"
|
|
|
class="tr-secondsA"
|
|
|
- style="color:#52CC60"
|
|
|
+ style="color:#52CC60;width: 25%"
|
|
|
>{{v.spendTime}}</div>
|
|
|
- <div class="tr-seconds width40">{{v.subject}}</div>
|
|
|
- <div class="tr-seconds width40">{{v.grade}}</div>
|
|
|
- <div v-if="v.status === 1" class="tr-seconds width40">未批改</div>
|
|
|
- <div v-if="v.status === 2" class="tr-seconds width40" style="color:#FFC303">批改中</div>
|
|
|
- <div v-if="v.status === 3" class="tr-seconds width40">已批改</div>
|
|
|
- <div class="tr-sw180" v-if="v.status === 1">
|
|
|
+ <div class="tr-seconds width40" style="width: 10%">{{v.subject}}</div>
|
|
|
+ <div class="tr-seconds width40" style="width: 10%">{{v.grade}}</div>
|
|
|
+ <div v-if="v.status === 1" class="tr-seconds width40" style="width: 10%">未批改</div>
|
|
|
+ <div v-if="v.status === 2" class="tr-seconds width40" style="color:#FFC303;width: 10%">批改中</div>
|
|
|
+ <div v-if="v.status === 3" class="tr-seconds width40" style="width: 10%">已批改</div>
|
|
|
+ <div class="tr-sw180" v-if="v.status === 2" style="width: 25%"></div>
|
|
|
+ <div class="tr-sw180" v-if="v.status === 1" style="width: 25%">
|
|
|
<el-button type plain @click="ToAppovalOline(v)">去批改</el-button>
|
|
|
<el-button @click="isShow(v,1)" type="success">去分配</el-button>
|
|
|
</div>
|
|
|
- <div class="tr-sw180" v-if="v.status === 3 && v.isCheck ===1">
|
|
|
+ <div class="tr-sw180" v-if="v.status === 3 && v.isCheck ===1" style="width: 25%">
|
|
|
<span>{{v.checkCount}}</span>
|
|
|
<span style="color:#bbbbbb;">/{{v.picTotal}}</span>
|
|
|
<el-button type="info">
|
|
@@ -191,7 +192,7 @@
|
|
|
</el-button>
|
|
|
<span style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
|
|
|
</div>
|
|
|
- <div class="tr-sw180" v-if="v.status === 3 && v.isCheck ===0">
|
|
|
+ <div class="tr-sw180" v-if="v.status === 3 && v.isCheck ===0" style="width: 25%">
|
|
|
<el-button type="warning">
|
|
|
<a
|
|
|
style="text-decoration:none;color:#ffffff;"
|
|
@@ -206,7 +207,7 @@
|
|
|
@size-change="handleSizeChange3"
|
|
|
@current-change="pageChange3"
|
|
|
:page-sizes="[10, 20]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
:total="parseInt(TeacherHomeworkList.pages)"
|
|
|
:hide-on-single-page="true"
|
|
|
></el-pagination>
|
|
@@ -219,7 +220,7 @@
|
|
|
@size-change="handleSizeChange"
|
|
|
@current-change="pageChange"
|
|
|
:page-sizes="[10]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
:total="parseInt(monitorTeacherList.pages)"
|
|
|
:hide-on-single-page="true"
|
|
|
></el-pagination>
|
|
@@ -230,30 +231,28 @@
|
|
|
<!--当天-->
|
|
|
<el-col :span="18" class="main" v-if="modelindex == 1">
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
- <el-col :span="5">
|
|
|
+ <div class="main-header-num">
|
|
|
<div class="main-header-item">
|
|
|
今日报错总次数:
|
|
|
<span style="color:red;">{{DayTeacherList.wrongCount}}次</span>
|
|
|
</div>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6" :offset="5">
|
|
|
- <!-- <input type="text" placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-new">
|
|
|
- <el-button @click="InfoWatchDay" type="primary" icon="el-icon-search"></el-button>-->
|
|
|
- <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
|
|
|
- <el-button @click="InfoWatchDay" slot="append" icon="el-icon-search"></el-button>
|
|
|
- </el-input>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4">
|
|
|
- <div class="block">
|
|
|
- <el-date-picker
|
|
|
- @change="InfoWatchDay"
|
|
|
- v-model="filters1.MaxtimeValue"
|
|
|
- value-format="yyyy-MM-dd"
|
|
|
- type="date"
|
|
|
- placeholder="filters1.MaxtimeValue"
|
|
|
- ></el-date-picker>
|
|
|
+ <div class="teach-time">
|
|
|
+ <div class="teach-block">
|
|
|
+ <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
|
|
|
+ <el-button @click="InfoWatchDay" slot="append" icon="el-icon-search"></el-button>
|
|
|
+ </el-input>
|
|
|
+ </div>
|
|
|
+ <div class="teach-block">
|
|
|
+ <el-date-picker
|
|
|
+ @change="InfoWatchDay"
|
|
|
+ v-model="filters1.MaxtimeValue"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="date"
|
|
|
+ placeholder="filters1.MaxtimeValue"
|
|
|
+ ></el-date-picker>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </el-col>
|
|
|
+ </div>
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="24">
|
|
@@ -308,28 +307,29 @@
|
|
|
<!--当月-->
|
|
|
<el-col :span="18" class="main" v-if="modelindex == 2">
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
- <el-col :span="6">
|
|
|
+ <div class="main-header-num">
|
|
|
<div class="main-header-item">
|
|
|
当月报错总次数:
|
|
|
<span style="color:red;">{{MothTeacherList.totalWrongCount}}次</span>
|
|
|
</div>
|
|
|
- </el-col>
|
|
|
- <el-col :span="6" :offset="5">
|
|
|
- <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
|
|
|
- <el-button @click="InfoWatchMoth" slot="append" icon="el-icon-search"></el-button>
|
|
|
- </el-input>
|
|
|
- </el-col>
|
|
|
- <el-col :span="4" >
|
|
|
- <div class="block">
|
|
|
- <el-date-picker
|
|
|
- @change="InfoWatchMoth"
|
|
|
- v-model="filters2.MaxtimeValue"
|
|
|
- type="month"
|
|
|
- value-format="yyyy-MM"
|
|
|
- placeholder="filters2.MaxtimeValue"
|
|
|
- ></el-date-picker>
|
|
|
+ <div class="teach-time">
|
|
|
+ <div class="teach-block">
|
|
|
+ <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
|
|
|
+ <el-button @click="InfoWatchMoth" slot="append" icon="el-icon-search"></el-button>
|
|
|
+ </el-input>
|
|
|
+ </div>
|
|
|
+ <div class="teach-block">
|
|
|
+ <el-date-picker
|
|
|
+ @change="InfoWatchMoth"
|
|
|
+ v-model="filters2.MaxtimeValue"
|
|
|
+ type="month"
|
|
|
+ value-format="yyyy-MM"
|
|
|
+ placeholder="filters2.MaxtimeValue"
|
|
|
+ ></el-date-picker>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </el-col>
|
|
|
+ </div>
|
|
|
+ <!--</el-col>-->
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="4" :offset="1">
|
|
@@ -408,7 +408,7 @@
|
|
|
|
|
|
<!--可分配老师-->
|
|
|
<div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
|
|
|
- <div class="model" style="width:40%; height:40%;top:5%" v-if="hiddenModel">
|
|
|
+ <div class="model" style="left: 20%" v-if="hiddenModel">
|
|
|
<div class="model-text">
|
|
|
<div class="model-text-head">
|
|
|
<div>可分配老师</div>
|
|
@@ -458,7 +458,7 @@
|
|
|
@size-change="handleSizeChange4"
|
|
|
@current-change="pageChange4"
|
|
|
:page-sizes="[10]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
:total="parseInt(TeacherAllotList.pages)"
|
|
|
:hide-on-single-page="true"
|
|
|
></el-pagination>
|
|
@@ -544,8 +544,8 @@
|
|
|
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="teach-style">
|
|
|
+ <div class="teach-style-name">{{v.name}}</div>
|
|
|
<div class="model-items-left-top-number">等待张数:{{v.teacherCount}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -565,7 +565,7 @@
|
|
|
@size-change="handleSizeChange6"
|
|
|
@current-change="pageChange6"
|
|
|
:page-sizes="[10]"
|
|
|
- layout="total, sizes, prev, pager, next, jumper"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
:total="parseInt(TeacherAllotList.pages)"
|
|
|
:hide-on-single-page="true"
|
|
|
></el-pagination>
|
|
@@ -1301,6 +1301,17 @@ ul {
|
|
|
line-height: 60px;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
+.main-header-num{
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+ margin: 0 4%;
|
|
|
+}
|
|
|
+.teach-time{
|
|
|
+ text-align: right;
|
|
|
+}
|
|
|
+.teach-block{
|
|
|
+ display: inline-block;
|
|
|
+}
|
|
|
el-table {
|
|
|
color: #999999;
|
|
|
font-size: 18px;
|
|
@@ -1464,6 +1475,14 @@ el-table {
|
|
|
/*height: 80px;*/
|
|
|
/*line-height: 80px;*/
|
|
|
}
|
|
|
+.teach-style{
|
|
|
+ display: inline-block;
|
|
|
+ text-align: left;
|
|
|
+}
|
|
|
+.teach-style-name{
|
|
|
+ font-size: 24px;
|
|
|
+ margin-left: 10px
|
|
|
+}
|
|
|
.tr-second-check {
|
|
|
color: #3ab548;
|
|
|
font-size: 17px;
|
|
@@ -1578,8 +1597,10 @@ el-table {
|
|
|
}
|
|
|
.model-itemss {
|
|
|
padding: 10px 0;
|
|
|
- display: flex;
|
|
|
- justify-content: space-between;
|
|
|
+ /*display: flex;*/
|
|
|
+ /*justify-content: space-between;*/
|
|
|
+ /*display: inline-block;*/
|
|
|
+ width: 40%;
|
|
|
display: inline-block;
|
|
|
}
|
|
|
.model-items-left-top-img {
|
|
@@ -1602,6 +1623,7 @@ el-table {
|
|
|
}
|
|
|
.el-pagination {
|
|
|
padding: 30px;
|
|
|
+ overflow: hidden;
|
|
|
}
|
|
|
.no-homework {
|
|
|
width: 16.5%;
|