|
|
@@ -17,15 +17,14 @@
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="24">
|
|
|
<el-col :span="14" :offset="0">
|
|
|
- <div class="main-header-item displayBox">在线：{{monitorTeacherList.onlineCount}}人</div>
|
|
|
- <div class="main-header-item displayBox">离线：{{monitorTeacherList.offlineCount}}人</div>
|
|
|
- <div class="main-header-item displayBox">
|
|
|
- <span>平均响应时间：{{monitorTeacherList.avgreSpeed}}/份</span>
|
|
|
- </div>
|
|
|
- <div class="main-header-item displayBox">
|
|
|
- <span>分配未批改作业：{{monitorTeacherList.unCorrectCount}}份</span>
|
|
|
- <span @click="allocation()" class="main-header-link">去分配</span>
|
|
|
- </div>
|
|
|
+ <div
|
|
|
+ @click="handApor()"
|
|
|
+ :class="{Apporvalactive:Activeindex == false,ApporStyles:true}"
|
|
|
+ >批改老师</div>
|
|
|
+ <div
|
|
|
+ @click="AutoApor()"
|
|
|
+ :class="{Apporvalactive:Activeindex == true,ApporStyles:true}"
|
|
|
+ >匹配知识点老师</div>
|
|
|
</el-col>
|
|
|
<el-col :span="10">
|
|
|
<div class="selectBox">
|
|
|
@@ -83,16 +82,39 @@
|
|
|
</div>
|
|
|
</el-col>
|
|
|
</el-col>
|
|
|
+ <el-col :span="14" :offset="1">
|
|
|
+ <div class="main-header-item displayBox">在线：{{monitorTeacherList.onlineCount}}人</div>
|
|
|
+ <div class="main-header-item displayBox">离线：{{monitorTeacherList.offlineCount}}人</div>
|
|
|
+ <div class="main-header-item displayBox">
|
|
|
+ <span>平均响应时间：{{monitorTeacherList.avgreSpeed}}/份</span>
|
|
|
+ </div>
|
|
|
+ <div class="main-header-item displayBox" v-if="this.Activeindex == false">
|
|
|
+ <span>分配未批改作业：{{monitorTeacherList.unCorrectCount}}份</span>
|
|
|
+ <span @click="allocation()" class="main-header-link">去分配</span>
|
|
|
+ </div>
|
|
|
+ <div class="main-header-item displayBox" v-if="this.Activeindex == true">
|
|
|
+ <span>分配未匹配作业：{{monitorTeacherList.unCorrectCount}}份</span>
|
|
|
+ <span @click="allocationApporval()" class="main-header-link">去分配</span>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="24">
|
|
|
- <div class="table">
|
|
|
+ <div
|
|
|
+ class="table"
|
|
|
+ v-if="monitorTeacherList.list !== undefined && monitorTeacherList.list.length ==0"
|
|
|
+ >暂无数据！</div>
|
|
|
+ <div
|
|
|
+ class="table"
|
|
|
+ v-if="monitorTeacherList.list !== undefined && monitorTeacherList.list.length >0"
|
|
|
+ >
|
|
|
<div class="table-head">
|
|
|
<div>头像</div>
|
|
|
<div>姓名</div>
|
|
|
<div>等待作业数</div>
|
|
|
<div>作业最长等待时长</div>
|
|
|
- <div>今日累计批改时间</div>
|
|
|
+ <div v-if="this.Activeindex == false">今日累计批改时间</div>
|
|
|
+ <div v-if="this.Activeindex == true">今日累计匹配时间</div>
|
|
|
<div>今日响应速度</div>
|
|
|
<div>状态</div>
|
|
|
</div>
|
|
|
@@ -199,26 +221,33 @@
|
|
|
<div
|
|
|
v-if="v.status && !(v.status === 1 && k == 0) "
|
|
|
class="tr-secondsA"
|
|
|
- style="width:30%;"
|
|
|
+ style="width:50%;"
|
|
|
>{{v.spendTime}}</div>
|
|
|
<div
|
|
|
v-if="v.status === 1 && k == 0"
|
|
|
class="tr-secondsA"
|
|
|
- style="color:#52CC60;width: 30%"
|
|
|
+ style="color:#52CC60;width: 50%"
|
|
|
>{{v.spendTime}}</div>
|
|
|
- <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%">未批改
|
|
|
- (<span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
|
|
|
+ <div class="tr-seconds widthSu" style="width: 10%">{{v.subject}}</div>
|
|
|
+ <div class="tr-seconds widthSu" style="width: 10%">{{v.grade}}</div>
|
|
|
+ <div v-if="v.status === 1" class="tr-seconds width40" style="width: 50%">
|
|
|
+ 未批改
|
|
|
+ (
|
|
|
+ <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
|
|
|
</div>
|
|
|
<div
|
|
|
v-if="v.status === 2"
|
|
|
class="tr-seconds width40"
|
|
|
- style="color:#FFC303;width: 10%"
|
|
|
- >批改中
|
|
|
- (<span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
|
|
|
+ style="color:#FFC303;width: 50%"
|
|
|
+ >
|
|
|
+ 批改中
|
|
|
+ (
|
|
|
+ <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
|
|
|
+ </div>
|
|
|
+ <div v-if="v.status === 3" class="tr-seconds width40" style="width: 50%">
|
|
|
+ 已批改 (
|
|
|
+ <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
|
|
|
</div>
|
|
|
- <div v-if="v.status === 3" class="tr-seconds width40" style="width: 10%">已批改 (<span>{{v.feedbackCount}}/{{v.picTotal}}</span>)</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
|
|
|
@@ -281,7 +310,8 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
+ <div v-if="this.Activeindex == false">
|
|
|
+ <el-pagination
|
|
|
background
|
|
|
@size-change="handleSizeChange"
|
|
|
@current-change="pageChange"
|
|
|
@@ -291,55 +321,93 @@
|
|
|
:total="parseInt(monitorTeacherList.pages)"
|
|
|
:hide-on-single-page="true"
|
|
|
></el-pagination>
|
|
|
- <div style="clear:both;"></div>
|
|
|
+ </div>
|
|
|
+ <!-- 数据监控分页匹配知识点老师 -->
|
|
|
+ <div v-if="this.Activeindex == true">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="WatchhandleSizeChange"
|
|
|
+ @current-change="WatchpageChange"
|
|
|
+ :page-sizes="[10, 20, 30, 40]"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
+ :total="parseInt(monitorTeacherList.pages)"
|
|
|
+ :hide-on-single-page="true"
|
|
|
+ :current-page.sync="currentPage"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
<!--当天-->
|
|
|
<el-col :span="18" class="main" v-if="modelindex == 1">
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
- <div class="main-header-num">
|
|
|
+ <el-col :span="24" :offset="0">
|
|
|
+ <el-col :span="8" :offset="0">
|
|
|
+ <div
|
|
|
+ @click="DayhandApor()"
|
|
|
+ :class="{Apporvalactive:DayActiveindex == false,ApporStyles:true}"
|
|
|
+ >批改老师</div>
|
|
|
+ <div
|
|
|
+ @click="DayAutoApor()"
|
|
|
+ :class="{Apporvalactive:DayActiveindex == true,ApporStyles:true}"
|
|
|
+ >匹配知识点老师</div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="16" :offset="0">
|
|
|
+ <div class="main-header-num">
|
|
|
+ <div class="teach-time">
|
|
|
+ <div class="teach-block">
|
|
|
+ <div class="Dayteach-Allot">
|
|
|
+ <input
|
|
|
+ type="text"
|
|
|
+ placeholder="请输入老师名字"
|
|
|
+ v-model="filters1.inputValue"
|
|
|
+ class="Dayinput-with-Allot"
|
|
|
+ />
|
|
|
+ <span @click="InfoWatchDay" class="DaySeachIcon el-icon-search"></span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="teach-block">
|
|
|
+ <el-date-picker
|
|
|
+ @change="InfoWatchDay"
|
|
|
+ v-model="filters1.MaxtimeValue"
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
+ type="date"
|
|
|
+ :picker-options="pickerOptions0"
|
|
|
+ placeholder="filters1.MaxtimeValue"
|
|
|
+ ></el-date-picker>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </el-col>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="6" :offset="0">
|
|
|
<div class="main-header-item">
|
|
|
今日报错总次数:
|
|
|
<span style="color:red;">{{DayTeacherList.wrongCount}}次</span>
|
|
|
</div>
|
|
|
- <div class="teach-time">
|
|
|
- <div class="teach-block">
|
|
|
- <div class="Dayteach-Allot">
|
|
|
- <input
|
|
|
- type="text"
|
|
|
- placeholder="请输入老师名字"
|
|
|
- v-model="filters1.inputValue"
|
|
|
- class="Dayinput-with-Allot"
|
|
|
- />
|
|
|
- <span @click="InfoWatchDay" class="DaySeachIcon el-icon-search"></span>
|
|
|
- </div>
|
|
|
- </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>
|
|
|
- </div>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="24">
|
|
|
- <div class="table">
|
|
|
+ <div
|
|
|
+ class="table"
|
|
|
+ v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length ==0"
|
|
|
+ >暂无数据！</div>
|
|
|
+ <div
|
|
|
+ class="table"
|
|
|
+ v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length >0"
|
|
|
+ >
|
|
|
<div class="table-head">
|
|
|
<div>头像</div>
|
|
|
<div>姓名</div>
|
|
|
<div>被报错</div>
|
|
|
- <div>纠正次数</div>
|
|
|
+ <div>纠正次数</div>
|
|
|
<div>科目</div>
|
|
|
- <div>批改有效总张数</div>
|
|
|
- <div>正确率</div>
|
|
|
- <div>家长满意度</div>
|
|
|
- <div style="width:240px;">平均批改时间</div>
|
|
|
+ <div v-if="this.DayActiveindex == false">批改有效总张数</div>
|
|
|
+ <div v-if="this.DayActiveindex == true">匹配总张数</div>
|
|
|
+ <div>正确率</div>
|
|
|
+ <div style="width:240px;" v-if="this.DayActiveindex == false">平均批改时间</div>
|
|
|
+ <div style="width:240px;" v-if="this.DayActiveindex == true">平均匹配时间</div>
|
|
|
<div>出勤</div>
|
|
|
</div>
|
|
|
<div class="tr" v-for="(v, k) of DayTeacherList.list" :key="k">
|
|
|
@@ -351,11 +419,10 @@
|
|
|
<div>{{v.name}}</div>
|
|
|
<div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
|
|
|
<div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
|
|
|
- <div class="tr-active">{{v.correctNums}}次</div>
|
|
|
+ <div class="tr-active">{{v.correctNums}}次</div>
|
|
|
<div class="tr-active">{{v.subject}}</div>
|
|
|
<div>{{v.homeworkPicCount}}/张</div>
|
|
|
- <div>{{v.accuracyRate}}</div>
|
|
|
- <div>{{v.satisfactionDegree}}</div>
|
|
|
+ <div>{{v.accuracyRate}}</div>
|
|
|
<div style="width:240px;">{{v.avgTime}}</div>
|
|
|
<div>{{v.attendance}}</div>
|
|
|
<!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
|
|
|
@@ -363,8 +430,21 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
+ <!-- 数据监控当天分页匹配知识点老师 -->
|
|
|
+ <div v-if="this.DayActiveindex == true">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeDayChange1"
|
|
|
+ @current-change="pageDayChange1"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
+ :total="parseInt(DayTeacherList.pages)"
|
|
|
+ :current-page.sync="currentPage"
|
|
|
+ :hide-on-single-page="true"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
+ <div v-if="this.DayActiveindex == false">
|
|
|
+ <el-pagination
|
|
|
background
|
|
|
@size-change="handleSizeChange1"
|
|
|
@current-change="pageChange1"
|
|
|
@@ -374,49 +454,60 @@
|
|
|
:hide-on-single-page="true"
|
|
|
:current-page.sync="currentPage"
|
|
|
></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 style="clear:both;"></div>
|
|
|
+ </div>
|
|
|
+ <!-- 分页显示 -->
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
<!--当月-->
|
|
|
<el-col :span="18" class="main" v-if="modelindex == 2">
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
- <div class="main-header-num">
|
|
|
- <div class="main-header-item">
|
|
|
- 当月报错总次数:
|
|
|
- <span style="color:red;">{{MothTeacherList.totalWrongCount}}次</span>
|
|
|
- </div>
|
|
|
- <div class="teach-time">
|
|
|
- <div class="teach-block">
|
|
|
- <div class="Dayteach-Allot">
|
|
|
- <input
|
|
|
- type="text"
|
|
|
- placeholder="请输入老师名字"
|
|
|
- v-model="filters2.inputValue"
|
|
|
- class="Dayinput-with-Allot"
|
|
|
- />
|
|
|
- <span @click="InfoWatchMoth" class="DaySeachIcon el-icon-search"></span>
|
|
|
+ <el-col :span="24" :offset="0">
|
|
|
+ <el-col :span="7" :offset="0">
|
|
|
+ <div
|
|
|
+ @click="MonthhandApor()"
|
|
|
+ :class="{Apporvalactive:MonthActiveindex == false,ApporStyles:true}"
|
|
|
+ >批改老师</div>
|
|
|
+ <div
|
|
|
+ @click="MonthAutoApor()"
|
|
|
+ :class="{Apporvalactive:MonthActiveindex == true,ApporStyles:true}"
|
|
|
+ >匹配知识点老师</div>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="17" :offset="0">
|
|
|
+ <div class="main-header-numNew">
|
|
|
+ <div class="main-header-item">
|
|
|
+ 当月报错总次数:
|
|
|
+ <span style="color:red;">{{MothTeacherList.totalWrongCount}}次</span>
|
|
|
</div>
|
|
|
- <!-- <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
|
|
|
+ <div class="teach-time">
|
|
|
+ <div class="teach-block">
|
|
|
+ <div class="Dayteach-Allot">
|
|
|
+ <input
|
|
|
+ type="text"
|
|
|
+ placeholder="请输入老师名字"
|
|
|
+ v-model="filters2.inputValue"
|
|
|
+ class="Dayinput-with-Allot"
|
|
|
+ />
|
|
|
+ <span @click="InfoWatchMoth" class="DaySeachIcon el-icon-search"></span>
|
|
|
+ </div>
|
|
|
+ <!-- <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>
|
|
|
+ </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"
|
|
|
+ :picker-options="pickerOptions0"
|
|
|
+ ></el-date-picker>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <!--</el-col>-->
|
|
|
+ </el-col>
|
|
|
+ </el-col>
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="4" :offset="1">
|
|
|
@@ -426,10 +517,12 @@
|
|
|
<div class="main-header-item">批改总份数：{{MothTeacherList.totalHomeworkCount}}</div>
|
|
|
</el-col>-->
|
|
|
<el-col :span="4">
|
|
|
- <div class="main-header-item">批改总张数：{{MothTeacherList.totalHomeworkPicCount }}</div>
|
|
|
+ <div class="main-header-item" v-if="this.MonthActiveindex == false">批改总张数：{{MothTeacherList.totalHomeworkPicCount }}</div>
|
|
|
+ <div class="main-header-item" v-if="this.MonthActiveindex == true">匹配总张数：{{MothTeacherList.totalHomeworkPicCount }}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="6">
|
|
|
- <div class="main-header-item">批改平均时间：{{MothTeacherList.totalAvgTime}}</div>
|
|
|
+ <div class="main-header-item" v-if="this.MonthActiveindex == false">批改平均时间：{{MothTeacherList.totalAvgTime}}</div>
|
|
|
+ <div class="main-header-item" v-if="this.MonthActiveindex == true">平均匹配时间：{{MothTeacherList.totalAvgTime}}</div>
|
|
|
</el-col>
|
|
|
<el-col :span="4">
|
|
|
<div class="main-header-item">家长满意度：{{MothTeacherList.totalSatisfactionDegree}}</div>
|
|
|
@@ -440,17 +533,25 @@
|
|
|
</el-row>
|
|
|
<el-row :gutter="20" class="main-header">
|
|
|
<el-col :span="24">
|
|
|
- <div class="table">
|
|
|
+ <div
|
|
|
+ class="table"
|
|
|
+ v-if="MothTeacherList.list !== undefined && MothTeacherList.list.length ==0"
|
|
|
+ >暂无数据！</div>
|
|
|
+ <div
|
|
|
+ class="table"
|
|
|
+ v-if="MothTeacherList.list !== undefined && MothTeacherList.list.length >0"
|
|
|
+ >
|
|
|
<div class="table-head">
|
|
|
<div>头像</div>
|
|
|
<div>姓名</div>
|
|
|
<div>被报错</div>
|
|
|
- <div>纠正次数</div>
|
|
|
+ <div>纠正次数</div>
|
|
|
<div>科目</div>
|
|
|
- <div>批改有效总张数</div>
|
|
|
+ <div v-if="this.MonthActiveindex == false">批改有效总张数</div>
|
|
|
+ <div v-if="this.MonthActiveindex == true">匹配总张数</div>
|
|
|
<div>正确率</div>
|
|
|
- <div>家长满意度</div>
|
|
|
- <div style="width:240px;">平均批改时间</div>
|
|
|
+ <div style="width:240px;" v-if="this.MonthActiveindex == false">平均批改时间</div>
|
|
|
+ <div style="width:240px;" v-if="this.MonthActiveindex == true">平均匹配时间</div>
|
|
|
<div>出勤率</div>
|
|
|
</div>
|
|
|
<div class="tr" v-for="(v, k) of MothTeacherList.list" :key="k">
|
|
|
@@ -462,18 +563,18 @@
|
|
|
<div>{{v.name}}</div>
|
|
|
<div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
|
|
|
<div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
|
|
|
- <div class="tr-active">{{v.correctNums}}次</div>
|
|
|
+ <div class="tr-active">{{v.correctNums}}次</div>
|
|
|
<div class="tr-active">{{v.subject}}</div>
|
|
|
<div>{{v.homeworkPicCount}}/张</div>
|
|
|
<div>{{v.accuracyRate}}</div>
|
|
|
- <div>{{v.satisfactionDegree}}</div>
|
|
|
<div style="width:240px;">{{v.avgTime}}</div>
|
|
|
<div>{{v.attendance}}</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 分页显示 -->
|
|
|
- <el-pagination
|
|
|
+ <div v-if="this.MonthActiveindex == false">
|
|
|
+ <el-pagination
|
|
|
background
|
|
|
@size-change="handleSizeChange2"
|
|
|
@current-change="pageChange2"
|
|
|
@@ -483,11 +584,21 @@
|
|
|
:hide-on-single-page="true"
|
|
|
:current-page.sync="currentPage"
|
|
|
></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 style="clear:both;"></div>
|
|
|
+ </div>
|
|
|
+
|
|
|
+ <!-- 知识点匹配 -->
|
|
|
+ <div v-if="this.MonthActiveindex == true">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="handleSizeMonthChange2"
|
|
|
+ @current-change="pageMonthChange2"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
+ :total="parseInt(MothTeacherList.pages)"
|
|
|
+ :current-page.sync="currentPage"
|
|
|
+ :hide-on-single-page="true"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
</el-col>
|
|
|
@@ -618,7 +729,8 @@
|
|
|
<el-button type="success" @click="isShow(v,5)">去分配</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <el-pagination
|
|
|
+ <div v-if="this.Activeindex == false">
|
|
|
+ <el-pagination
|
|
|
background
|
|
|
@size-change="handleSizeChange7"
|
|
|
@current-change="pageChange7"
|
|
|
@@ -627,6 +739,18 @@
|
|
|
:total="parseInt(UnallotHomeworkInfo.pages)"
|
|
|
:hide-on-single-page="true"
|
|
|
></el-pagination>
|
|
|
+ </div>
|
|
|
+ <div v-if="this.Activeindex == true">
|
|
|
+ <el-pagination
|
|
|
+ background
|
|
|
+ @size-change="WatchApporvalhandleSizeChange7"
|
|
|
+ @current-change="WatchApporvalpageChange7"
|
|
|
+ :page-sizes="[10]"
|
|
|
+ layout="total, prev, pager, next"
|
|
|
+ :total="parseInt(UnallotHomeworkInfo.pages)"
|
|
|
+ :hide-on-single-page="true"
|
|
|
+ ></el-pagination>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -750,7 +874,10 @@
|
|
|
<div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
|
|
|
<div class="model-items-other model-active">上次登录时间 : {{GetTeacherDetail.lastOnlineTime}}</div>
|
|
|
<div class="model-items-other">批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
|
|
|
- <div class="model-items-other model-active">被报错总次数 : <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span></div>
|
|
|
+ <div class="model-items-other model-active">
|
|
|
+ 被报错总次数 :
|
|
|
+ <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
|
|
|
+ </div>
|
|
|
<div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div>
|
|
|
<div
|
|
|
class="model-items-other model-active"
|
|
|
@@ -795,7 +922,7 @@
|
|
|
<script>
|
|
|
import { IMG_BASE_URL, APPOR_BASE_URL } from "@/ImgConfig";
|
|
|
import { mapGetters, mapActions } from "vuex";
|
|
|
-import { Loading } from 'element-ui';
|
|
|
+import { Loading } from "element-ui";
|
|
|
export default {
|
|
|
components: {},
|
|
|
name: "actvResolveLabel",
|
|
|
@@ -825,8 +952,19 @@ export default {
|
|
|
isDown: false,
|
|
|
gardeListDown: false,
|
|
|
gardeListDownage: false,
|
|
|
+ Activeindex: false,
|
|
|
+ DayActiveindex: false,
|
|
|
+ MonthActiveindex:false,
|
|
|
selecttitlepag: "选年级",
|
|
|
selecttitleage: "选科目",
|
|
|
+ TeacherType: 8,
|
|
|
+ TeacherCheackStyle:2,
|
|
|
+ TeacherApporvalStyle:1,
|
|
|
+ pickerOptions0: {
|
|
|
+ disabledDate(time) {
|
|
|
+ return time.getTime() > Date.now() - 8.64e6;
|
|
|
+ }
|
|
|
+ },
|
|
|
options: [
|
|
|
{
|
|
|
value: "0",
|
|
|
@@ -978,7 +1116,7 @@ export default {
|
|
|
"&teacherId=" +
|
|
|
this.homeworkLIst.teacherId +
|
|
|
"&state=" +
|
|
|
- 1
|
|
|
+ this.TeacherApporvalStyle
|
|
|
);
|
|
|
},
|
|
|
// 质检当前作业状态:href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
|
|
|
@@ -993,7 +1131,7 @@ export default {
|
|
|
"&teacherId=" +
|
|
|
this.homeworkLIst.teacherId +
|
|
|
"&state=" +
|
|
|
- 2
|
|
|
+ this.TeacherCheackStyle
|
|
|
);
|
|
|
},
|
|
|
BeforetoTeacherstatues(val, oldVal) {
|
|
|
@@ -1005,6 +1143,7 @@ export default {
|
|
|
pageNo: this.homeworkLIst.pageNo,
|
|
|
pageSize: this.homeworkLIst.pageSize
|
|
|
});
|
|
|
+ this.InfoWatch();
|
|
|
},
|
|
|
InfoTeacherstatues(val, oldVal) {
|
|
|
//普通的watch监听
|
|
|
@@ -1172,7 +1311,8 @@ export default {
|
|
|
maxCreateTime: this.filters.MaxtimeValue,
|
|
|
pageNo: this.allotList.pageNo,
|
|
|
pageSize: this.allotList.pageSize,
|
|
|
- name: this.inputValueAllot
|
|
|
+ name: this.inputValueAllot,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
},
|
|
|
// 搜索可分配老师列表
|
|
|
@@ -1185,7 +1325,8 @@ export default {
|
|
|
originTeacherId: this.homeworkLIst.teacherId,
|
|
|
pageNo: this.allotList.pageNo,
|
|
|
pageSize: this.allotList.pageSize,
|
|
|
- name: this.inputValueAllot
|
|
|
+ name: this.inputValueAllot,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
},
|
|
|
// 可分配老师列表分页
|
|
|
@@ -1198,7 +1339,8 @@ export default {
|
|
|
maxCreateTime: this.filters.MaxtimeValue,
|
|
|
pageNo: this.allotList.pageNo,
|
|
|
pageSize: this.allotList.pageSize,
|
|
|
- name: this.inputValueAllot
|
|
|
+ name: this.inputValueAllot,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
},
|
|
|
// 未批改作业列表列表
|
|
|
@@ -1209,12 +1351,22 @@ export default {
|
|
|
pageSize: this.homeworkLIst.pageSize
|
|
|
});
|
|
|
},
|
|
|
+ // 未匹配作业列表列表
|
|
|
+ async unmatchHomework() {
|
|
|
+ this.$store.dispatch("UnmatchHomeworkList", {
|
|
|
+ maxCreateTime: this.filters.MaxtimeValue,
|
|
|
+ pageNo: this.homeworkLIst.pageNo,
|
|
|
+ pageSize: this.homeworkLIst.pageSize,
|
|
|
+ managerId: this.managerId
|
|
|
+ });
|
|
|
+ },
|
|
|
// 未批改作业分配老师
|
|
|
async GOtoTeacherAllotAppovar(v, k) {
|
|
|
this.$store.dispatch("toTeacherAllot", {
|
|
|
teacherId: v.teacherId,
|
|
|
homeworkId: this.allNoapprovalList.homeworkId,
|
|
|
- originTeacherId: this.allNoapprovalList.teacherId
|
|
|
+ originTeacherId: this.allNoapprovalList.teacherId,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
v.type = 1;
|
|
|
this.$set(this.TeacherAllotList.list, k, v);
|
|
|
@@ -1228,7 +1380,8 @@ export default {
|
|
|
this.$store.dispatch("toTeacherAllot", {
|
|
|
teacherId: v.teacherId,
|
|
|
homeworkId: this.allotList.homeworkId,
|
|
|
- originTeacherId: this.homeworkLIst.teacherId
|
|
|
+ originTeacherId: this.homeworkLIst.teacherId,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
v.type = 1;
|
|
|
this.$set(this.TeacherAllotList.list, k, v);
|
|
|
@@ -1240,6 +1393,116 @@ export default {
|
|
|
teacherId: v.teacherId
|
|
|
});
|
|
|
},
|
|
|
+ // 数据监控手动批改
|
|
|
+ handApor() {
|
|
|
+ this.TeacherType = 8;
|
|
|
+ this.TeacherApporvalStyle = 1;
|
|
|
+ this.TeacherCheackStyle = 2;
|
|
|
+ this.Activeindex = false;
|
|
|
+ this.filters.pageNo = 1;
|
|
|
+ // this.showApporAways = false;
|
|
|
+ this.InfoWatch();
|
|
|
+ },
|
|
|
+ // 数据监控匹配知识点老师
|
|
|
+ AutoApor() {
|
|
|
+ this.TeacherType = 13;
|
|
|
+ this.TeacherApporvalStyle = 3;
|
|
|
+ this.TeacherCheackStyle = 4;
|
|
|
+ this.Activeindex = true;
|
|
|
+ // this.showApporAways = true;
|
|
|
+ this.filters.pageNo = 1;
|
|
|
+ this.InfoKonwTeacherWatchList();
|
|
|
+ },
|
|
|
+ // 数据监控匹配知识点老师
|
|
|
+ InfoKonwTeacherWatchList() {
|
|
|
+ this.$store.dispatch("InfoKonwTeacherWatch", {
|
|
|
+ grade: this.filters.OptionsValue,
|
|
|
+ subject: this.filters.gradesValue,
|
|
|
+ teacherName: this.filters.inputValue,
|
|
|
+ maxCreateTime: "",
|
|
|
+ pageNo: this.filters.pageNo,
|
|
|
+ pageSize: this.filters.pageSize,
|
|
|
+ managerId: this.managerId || ""
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 当天数据手动批改
|
|
|
+ DayhandApor() {
|
|
|
+ this.DayActiveindex = false;
|
|
|
+ this.filters1.pageNo = 1;
|
|
|
+ // this.showApporAways = false;
|
|
|
+ this.InfoWatchDay();
|
|
|
+ },
|
|
|
+ // 当天数据匹配知识点老师
|
|
|
+ DayAutoApor() {
|
|
|
+ this.DayActiveindex = true;
|
|
|
+ // this.showApporAways = true;
|
|
|
+ this.filters1.pageNo = 1;
|
|
|
+ this.InfoKonwTeacherDayApprvalList();
|
|
|
+ },
|
|
|
+ // 当天数据匹配知识点老师
|
|
|
+ InfoKonwTeacherDayApprvalList() {
|
|
|
+ this.$store.dispatch("MonitorKnowTeacherOneDayInfo", {
|
|
|
+ grade: this.filters.OptionsValue,
|
|
|
+ subject: this.filters.gradesValue,
|
|
|
+ teacherName: this.filters1.inputValue,
|
|
|
+ maxCreateTime: "",
|
|
|
+ oneDay: this.filters1.MaxtimeValue,
|
|
|
+ pageNo: this.filters1.pageNo,
|
|
|
+ pageSize: this.filters1.pageSize,
|
|
|
+ managerId: this.managerId || ""
|
|
|
+ });
|
|
|
+ },
|
|
|
+ // 当月数据手动批改
|
|
|
+ MonthhandApor() {
|
|
|
+ this.MonthActiveindex = false;
|
|
|
+ this.filters2.pageNo = 1;
|
|
|
+ // this.showApporAways = false;
|
|
|
+ this.InfoWatchMoth();
|
|
|
+ },
|
|
|
+ // 当月数据匹配知识点老师
|
|
|
+ MonthAutoApor() {
|
|
|
+ this.MonthActiveindex = true;
|
|
|
+ // this.showApporAways = true;
|
|
|
+ this.filters2.pageNo = 1;
|
|
|
+ this.InfoKonwTeacherMonthApprvalList();
|
|
|
+ },
|
|
|
+ // 当月数据匹配知识点老师
|
|
|
+ InfoKonwTeacherMonthApprvalList() {
|
|
|
+ this.$store.dispatch("MonitorKnowTeacherOneMonthInfo", {
|
|
|
+ grade: this.filters.OptionsValue,
|
|
|
+ subject: this.filters.gradesValue,
|
|
|
+ teacherName: this.filters2.inputValue,
|
|
|
+ maxCreateTime: "",
|
|
|
+ oneMonth: this.filters2.MaxtimeValue,
|
|
|
+ pageNo: this.filters2.pageNo,
|
|
|
+ pageSize: this.filters2.pageSize,
|
|
|
+ managerId: this.managerId || ""
|
|
|
+ });
|
|
|
+ },
|
|
|
+ WatchhandleSizeChange(val) {
|
|
|
+ this.filters.pageSize = val;
|
|
|
+ this.InfoKonwTeacherWatchList();
|
|
|
+ },
|
|
|
+ handleSizeDayChange1(val) {
|
|
|
+ this.filters1.pageSize = val;
|
|
|
+ this.InfoKonwTeacherDayApprvalList();
|
|
|
+ },
|
|
|
+ handleSizeMonthChange2(val) {
|
|
|
+ this.filters2.pageSize = val;
|
|
|
+ this.InfoKonwTeacherMonthApprvalList();
|
|
|
+ },
|
|
|
+ WatchpageChange(val) {
|
|
|
+ this.filters.pageNo = val;
|
|
|
+ this.InfoKonwTeacherWatchList();
|
|
|
+ },
|
|
|
+ pageDayChange1(val) {
|
|
|
+ this.filters1.pageNo = val;
|
|
|
+ this.InfoKonwTeacherDayApprvalList();
|
|
|
+ },
|
|
|
+ pageMonthChange2(val) {
|
|
|
+ this.filters2.pageNo = val;
|
|
|
+ this.InfoKonwTeacherMonthApprvalList();
|
|
|
+ },
|
|
|
async pesiorFun() {
|
|
|
var arr = this.GetTeacherDetail.grade.split(",");
|
|
|
this.arrPeriod = this.GetTeacherDetail.period.split(",");
|
|
|
@@ -1264,16 +1527,19 @@ export default {
|
|
|
selectTitle(k) {
|
|
|
this.modelindex = k;
|
|
|
if (k === 0) {
|
|
|
+ this.Activeindex = false;
|
|
|
this.filters.pageNo = 1;
|
|
|
this.currentPage = 1;
|
|
|
this.InfoWatch();
|
|
|
}
|
|
|
if (k === 1) {
|
|
|
+ this.DayActiveindex = false;
|
|
|
this.filters1.pageNo = 1;
|
|
|
this.currentPage = 1;
|
|
|
this.InfoWatchDay();
|
|
|
}
|
|
|
if (k === 2) {
|
|
|
+ this.MonthActiveindex = false;
|
|
|
this.filters2.pageNo = 1;
|
|
|
this.currentPage = 1;
|
|
|
this.InfoWatchMoth();
|
|
|
@@ -1311,6 +1577,10 @@ export default {
|
|
|
this.AllinputValueAllot = "";
|
|
|
this.NoapporvalTeacherAllot(v);
|
|
|
// this.GetAllotManagerInfo()
|
|
|
+ } else if (str == 10) {
|
|
|
+ _this.isPigai = true;
|
|
|
+ this.homeworkLIst.pageNo = 1;
|
|
|
+ this.unmatchHomework();
|
|
|
}
|
|
|
},
|
|
|
// 未批改作业可分配老师列表
|
|
|
@@ -1323,7 +1593,8 @@ export default {
|
|
|
maxCreateTime: this.filters.MaxtimeValue,
|
|
|
pageNo: 1,
|
|
|
pageSize: this.allNoapprovalList.pageSize,
|
|
|
- name: this.AllinputValueAllot
|
|
|
+ name: this.AllinputValueAllot,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
},
|
|
|
// 搜索未批改作业可分配老师列表
|
|
|
@@ -1336,7 +1607,8 @@ export default {
|
|
|
maxCreateTime: this.filters.MaxtimeValue,
|
|
|
pageNo: 1,
|
|
|
pageSize: this.allNoapprovalList.pageSize,
|
|
|
- name: this.AllinputValueAllot
|
|
|
+ name: this.AllinputValueAllot,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
},
|
|
|
// 未批改作业可分配老师分页列表
|
|
|
@@ -1349,10 +1621,11 @@ export default {
|
|
|
maxCreateTime: this.filters.MaxtimeValue,
|
|
|
pageNo: this.allNoapprovalList.pageNo,
|
|
|
pageSize: this.allNoapprovalList.pageSize,
|
|
|
- name: this.AllinputValueAllot
|
|
|
+ name: this.AllinputValueAllot,
|
|
|
+ type:this.TeacherType,
|
|
|
});
|
|
|
},
|
|
|
- // 去分配
|
|
|
+ // 未批改作业去分配
|
|
|
allocation() {
|
|
|
var noHomework = document.getElementById("noHomework");
|
|
|
this.InfoWatch();
|
|
|
@@ -1365,6 +1638,20 @@ export default {
|
|
|
this.isShow(this.monitorTeacherList, 2);
|
|
|
}
|
|
|
},
|
|
|
+
|
|
|
+ // 未分配作业去分配
|
|
|
+ allocationApporval() {
|
|
|
+ var noHomework = document.getElementById("noHomework");
|
|
|
+ this.InfoKonwTeacherWatchList();
|
|
|
+ if (this.monitorTeacherList.unCorrectCount == 0) {
|
|
|
+ noHomework.style.display = "block";
|
|
|
+ setTimeout(function() {
|
|
|
+ noHomework.style.display = "none";
|
|
|
+ }, 1000);
|
|
|
+ } else {
|
|
|
+ this.isShow(this.monitorTeacherList, 10);
|
|
|
+ }
|
|
|
+ },
|
|
|
// 未批改作业列表搜索可分配老师
|
|
|
SearchValueAllot() {
|
|
|
this.SearchNoapporvalTeacherAllot();
|
|
|
@@ -1476,6 +1763,10 @@ export default {
|
|
|
this.homeworkLIst.pageSize = val;
|
|
|
this.UnallotHomework();
|
|
|
},
|
|
|
+ WatchApporvalhandleSizeChange7(val) {
|
|
|
+ this.homeworkLIst.pageSize = val;
|
|
|
+ this.unmatchHomework();
|
|
|
+ },
|
|
|
// 分页
|
|
|
pageChange(val) {
|
|
|
this.currentPage = val;
|
|
|
@@ -1509,6 +1800,10 @@ export default {
|
|
|
this.homeworkLIst.pageNo = val;
|
|
|
this.UnallotHomework();
|
|
|
},
|
|
|
+ WatchApporvalpageChange7(val) {
|
|
|
+ this.homeworkLIst.pageNo = val;
|
|
|
+ this.unmatchHomework();
|
|
|
+ },
|
|
|
// 排序
|
|
|
sortChange(sort) {
|
|
|
this.filters.orderField = sort.prop;
|
|
|
@@ -1597,6 +1892,10 @@ ul {
|
|
|
margin: 0 4%;
|
|
|
padding-left: 4%;
|
|
|
}
|
|
|
+.main-header-numNew {
|
|
|
+ display: flex;
|
|
|
+ justify-content: space-between;
|
|
|
+}
|
|
|
.teach-time {
|
|
|
text-align: right;
|
|
|
}
|
|
|
@@ -1757,7 +2056,10 @@ el-table {
|
|
|
/* height: 30px; */
|
|
|
}
|
|
|
.width40 {
|
|
|
- width: 200px !important;
|
|
|
+ width: 300px !important;
|
|
|
+}
|
|
|
+.widthSu {
|
|
|
+ width: 120px !important;
|
|
|
}
|
|
|
.width120 {
|
|
|
width: 200px;
|
|
|
@@ -2110,11 +2412,11 @@ el-table {
|
|
|
font-size: 16px;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
-.displayBox{
|
|
|
- display:inline-block;
|
|
|
- float:left;
|
|
|
- text-align:left!important;
|
|
|
- padding:0 25px;
|
|
|
+.displayBox {
|
|
|
+ display: inline-block;
|
|
|
+ float: left;
|
|
|
+ text-align: left !important;
|
|
|
+ padding: 0 25px;
|
|
|
}
|
|
|
.age-tip {
|
|
|
width: 80%;
|
|
|
@@ -2172,4 +2474,19 @@ el-table {
|
|
|
margin-top: 10px;
|
|
|
cursor: pointer;
|
|
|
}
|
|
|
+.ApporStyles {
|
|
|
+ display: inline-block;
|
|
|
+ width: 180px;
|
|
|
+ height: 40px;
|
|
|
+ line-height: 40px;
|
|
|
+ background-color: #fff;
|
|
|
+ border-radius: 20px;
|
|
|
+ font-size: 16px;
|
|
|
+ color: #7c819d;
|
|
|
+ cursor: pointer;
|
|
|
+}
|
|
|
+.Apporvalactive {
|
|
|
+ background-color: #52cc60;
|
|
|
+ color: #fff;
|
|
|
+}
|
|
|
</style>
|
TheLittlePrince