提交最新代码

src/pages/Super.vue

@@ -137,7 +137,8 @@
       },
 				//获取提醒次数
 			 getRemindCounts() {
-			  this.$store.dispatch("GetRemindCountInfo", {});
+        //  debugger
+			  this.$store.dispatch("toTeacherAllotInfo", {});
 			},
       //  账号管理、退出登录
       handleCommand(command) {

src/pages/home/SchoolManager.vue

@@ -77,7 +77,8 @@
                     v-model="filters.inputValue"
                     class="miniorinput-with-Allot"
                   />
-                  <span @click="InfoWatch" class="miinorSeachIcon el-icon-search"></span>
+                  <span v-if="this.Activeindex == false" @click="InfoWatch" class="miinorSeachIcon el-icon-search"></span>
+                     <span v-if="this.Activeindex == true" @click="InfoKonwTeacherWatchList" class="miinorSeachIcon el-icon-search"></span>
                 </div>
               </div>
             </el-col>
@@ -137,7 +138,7 @@
                     <img
                       src="../../assets/img/attt.png"
                       alt
-                      v-if="!v.imgUrl"
+                      v-if="v.imgUrl ==''"
                       @click="isShow(v,3)"
                       class="table-img"
                     />
@@ -166,7 +167,7 @@
                     <img
                       src="../../assets/img/attt.png"
                       alt
-                      v-if="!v.imgUrl"
+                      v-if="v.imgUrl ==''"
                       @click="isShow(v,3)"
                       class="table-img"
                     />
@@ -195,7 +196,7 @@
                     <img
                       src="../../assets/img/attt.png"
                       alt
-                      v-if="!v.imgUrl"
+                      v-if="v.imgUrl ==''"
                       @click="isShow(v,3)"
                       class="table-img"
                     />
@@ -231,7 +232,8 @@
                     <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-if="Activeindex == false">未批改</span>
+                      <span v-if="Activeindex == true">未匹配</span>
                       (
                       <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
                     </div>
@@ -239,13 +241,14 @@
                       v-if="v.status === 2"
                       class="tr-seconds width40"
                       style="color:#FFC303;width: 50%"
-                    >
-                      批改中
+                    > <span v-if="Activeindex == false">批改中</span>
+                      <span v-if="Activeindex == true">匹配中</span>
                       (
                       <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
                     </div>
                     <div v-if="v.status === 3" class="tr-seconds width40" style="width: 50%">
-                      已批改 (
+                      <span v-if="Activeindex == false">已批改</span>
+                      <span v-if="Activeindex == true">已匹配</span> (
                       <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
                     </div>
                     <div class="tr-sw180" v-if="v.status === 2" style="width: 25%"></div>
@@ -253,9 +256,10 @@
                       <el-button
                         type="success"
                         plain
-                        v-if="v.isAllot == '1'"
+                        v-if="v.isAllot == '1' && Activeindex == false"
                         @click="ToAppovalOline(v)"
-                      >去批改</el-button>
+                      ><span>去批改</span>
+                      </el-button>
                       <el-button @click="isShow(v,1)" type="success">去分配</el-button>
                     </div>
                     <div
@@ -276,7 +280,9 @@
                           :href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
                         >已检查</a>-->
                       </el-button>
-                      <span class="WorngCount">报错{{v.wrongCount}}</span>
+                        <span class="WorngCount" v-if="v.wrongCount > 0" style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
+                         <span   class="WorngCount" v-if="v.wrongCount == 0" style="color:#fbfbfb;font-size:12px;">报错{{v.wrongCount}}</span>
+                      <!-- <span class="WorngCount">报错{{v.wrongCount}}</span> -->
                     </div>
                     <div
                       class="tr-sw180"
@@ -363,17 +369,18 @@
                         v-model="filters1.inputValue"
                         class="Dayinput-with-Allot"
                       />
-                      <span @click="InfoWatchDay" class="DaySeachIcon el-icon-search"></span>
+                      <span v-if="this.DayActiveindex == false" @click="InfoWatchDay" class="DaySeachIcon el-icon-search"></span>
+                         <span v-if="this.DayActiveindex == true" @click="InfoKonwTeacherDayApprvalList" class="DaySeachIcon el-icon-search"></span>
                     </div>
                   </div>
                   <div class="teach-block">
                     <el-date-picker
-                      @change="InfoWatchDay"
+                      @change="InfoWatchDayDatas"
                       v-model="filters1.MaxtimeValue"
                       value-format="yyyy-MM-dd"
                       type="date"
                       :picker-options="pickerOptions0"
-                      placeholder="filters1.MaxtimeValue"
+                      placeholder="选择日期"
                     ></el-date-picker>
                   </div>
                 </div>
@@ -488,7 +495,8 @@
                         v-model="filters2.inputValue"
                         class="Dayinput-with-Allot"
                       />
-                      <span @click="InfoWatchMoth" class="DaySeachIcon el-icon-search"></span>
+                      <span v-if="this.MonthActiveindex == false" @click="InfoWatchMoth" class="DaySeachIcon el-icon-search"></span>
+                        <span v-if="this.MonthActiveindex == true"  @click="InfoKonwTeacherMonthApprvalList" 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>
@@ -496,11 +504,11 @@
                   </div>
                   <div class="teach-block">
                     <el-date-picker
-                      @change="InfoWatchMoth"
+                      @change="InfoWatchMonthDatas"
                       v-model="filters2.MaxtimeValue"
                       type="month"
                       value-format="yyyy-MM"
-                      placeholder="filters2.MaxtimeValue"
+                      placeholder="选择月"
                       :picker-options="pickerOptions0"
                     ></el-date-picker>
                   </div>
@@ -568,7 +576,7 @@
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
                   <div style="width:240px;">{{v.avgTime}}</div>
-                  <div>{{v.attendance}}</div>
+                  <div>{{v.accuracyRate}}</div>
                 </div>
               </div>
             </div>
@@ -690,7 +698,8 @@
     <div class="model" style="width:50%; top:10%;" v-if="isPigai">
       <div class="model-text">
         <div class="model-text-head">
-          <div>所有未批改作业</div>
+          <div v-if="this.Activeindex == false">所有未批改作业</div>
+           <div v-if="this.Activeindex == true">所有未匹配作业</div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(2)" />
           </div>
@@ -705,7 +714,8 @@
             <div class="tr-secon width140" style="text-align:right">等待时长</div>
             <div class="tr-secon tr-sw80">科目</div>
             <div class="tr-secon tr-sw80">年级</div>
-            <div class="tr-secon width140">未批改老师</div>
+         <div class="tr-secon width140" v-if="this.Activeindex == false">未批改老师</div>
+                <div class="tr-secon width140" v-if="this.Activeindex == true">未匹配老师</div>
           </div>
           <div class="tr-set" v-for="(v, k) of UnallotHomeworkInfo.list" :key="k">
             <div class="tr-secon">{{k+1}}</div>
@@ -715,17 +725,28 @@
             <div class="tr-secon width140">{{v.spendTime}}</div>
             <div class="tr-secon tr-sw80">{{v.subject}}</div>
             <div class="tr-secon tr-sw80">{{v.grade}}</div>
-            <div v-if="v.status === 1" class="tr-secon">未批改</div>
-            <div v-if="v.status === 2" class="tr-secon">批改中</div>
-            <div v-if="v.status === 3" class="tr-secon">已批改</div>
+            <div v-if="v.status === 1" class="tr-secon">
+              <span v-if="Activeindex == false">未批改</span>
+              <span v-if="Activeindex == true">未匹配</span>
+            </div>
+            <div v-if="v.status === 2" class="tr-secon">
+              <span v-if="Activeindex == false">批改中</span>
+               <span v-if="Activeindex == true"> 匹配中</span>
+            </div>
+            <div v-if="v.status === 3" class="tr-secon">
+              <span v-if="Activeindex == false">已批改</span>
+              <span v-if="Activeindex == true">已匹配</span>
+              </div>
             <div class="tr-secon width140">{{v.teacherName}}</div>
             <div class="width400">
               <el-button
-                v-if="v.isAllot == '1'"
+                v-if="v.isAllot == '1' && Activeindex == false"
                 type="success"
                 plain
                 @click="AllToAppovalOline(v)"
-              >去批改</el-button>
+              >
+               <span>去批改</span>
+              </el-button>
               <el-button type="success" @click="isShow(v,5)">去分配</el-button>
             </div>
           </div>
@@ -830,7 +851,8 @@
     <div class="model" style="width:40%;left: 32.5%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
-          <div>批改老师</div>
+          <div  v-if="this.Activeindex == false">批改老师</div>
+              <div  v-if="this.Activeindex == true">匹配知识点老师</div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(3)" />
           </div>
@@ -858,12 +880,13 @@
               </div>
             </div>
           </div>
-          <div class="model-items-other model-active">批改科目 : {{GetTeacherDetail.subject}}</div>
-          <div class="model-items-other">
+          <div class="model-items-other model-active" v-if="this.Activeindex == false">批改科目 : {{GetTeacherDetail.subject}}</div>
+            <div class="model-items-other" v-if="this.Activeindex == true">批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div class="model-items-other" v-if="this.Activeindex == false">
             批改年级 :
             <span v-for="(v, k) of arrGrade" :key="k">{{v}},</span>
           </div>
-          <div class="model-items-other model-active">
+          <div class="model-items-other model-active" >
             可批改时间:
             <div class="buttonAppoval">
               <div class="TeacherApporTime" v-for="(v, k) of arrPeriod" v-show="v" :key="k">
@@ -873,14 +896,15 @@
           </div>
           <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" v-if="this.Activeindex == false">批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+           <div class="model-items-other" v-if="this.Activeindex == true">匹配正确率 : {{GetTeacherDetail.accuracyRate}}</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"
+            class="model-items-other model-active" v-if="this.Activeindex == false"
           >家长满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
         </div>
       </div>
@@ -1143,7 +1167,14 @@ export default {
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize
       });
-      this.InfoWatch();
+         if (this.Activeindex == false){
+          this.InfoWatch();
+            this.UnallotHomework();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+          this.unmatchHomework()
+      }
     },
     InfoTeacherstatues(val, oldVal) {
       //普通的watch监听
@@ -1154,8 +1185,13 @@ export default {
       this.NoAllotManagerModel = false;
       this.hiddenModel = false;
       //  this.isPigai = true;
-      this.RefreshTeacherHomework();
-      this.UnallotHomework();
+         this.RefreshTeacherHomework();
+        if (this.Activeindex == false){
+            this.UnallotHomework();
+      }
+       if (this.Activeindex == true){
+          this.unmatchHomework()
+      }
     }
   },
   computed: {
@@ -1372,7 +1408,6 @@ export default {
       this.$set(this.TeacherAllotList.list, k, v);
       this.NoAllotManagerModel = false;
       this.homeworkLIst.pageNo = 1;
-      this.UnallotHomework();
       this.isPigai = true;
     },
     // 分配老师
@@ -1395,9 +1430,13 @@ export default {
     },
     // 数据监控手动批改
     handApor() {
+        this.isDown = false;
         this.TeacherType = 8;
         this.TeacherApporvalStyle = 1;
          this.TeacherCheackStyle = 2;
+         this.filters.OptionsValue = '';
+         this.filters.gradesValue = '';
+        this.filters.inputValue = '';
       this.Activeindex = false;
       this.filters.pageNo = 1;
       //  this.showApporAways = false;
@@ -1405,10 +1444,14 @@ export default {
     },
     // 数据监控匹配知识点老师
     AutoApor() {
+        this.isDown = false;
         this.TeacherType = 13;
            this.TeacherApporvalStyle = 3;
          this.TeacherCheackStyle = 4;
       this.Activeindex = true;
+       this.filters.OptionsValue = '';
+         this.filters.gradesValue = '';
+        this.filters.inputValue = '';
       // this.showApporAways = true;
       this.filters.pageNo = 1;
       this.InfoKonwTeacherWatchList();
@@ -1429,6 +1472,8 @@ export default {
     DayhandApor() {
       this.DayActiveindex = false;
       this.filters1.pageNo = 1;
+      this.filters1.MaxtimeValue = '';
+      this.filters1.inputValue = '';
       //  this.showApporAways = false;
       this.InfoWatchDay();
     },
@@ -1436,6 +1481,8 @@ export default {
     DayAutoApor() {
       this.DayActiveindex = true;
       // this.showApporAways = true;
+        this.filters1.MaxtimeValue = '';
+      this.filters1.inputValue = '';
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
     },
@@ -1452,10 +1499,20 @@ export default {
         managerId: this.managerId || ""
       });
     },
+    InfoWatchDayDatas (){
+        if (this.DayActiveindex == false){
+            this.InfoWatchDay();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherDayApprvalList()
+      }
+    },
     // 当月数据手动批改
     MonthhandApor() {
       this.MonthActiveindex = false;
       this.filters2.pageNo = 1;
+      this.filters2.MaxtimeValue = '';
+      this.filters2.inputValue = '';
       //  this.showApporAways = false;
       this.InfoWatchMoth();
     },
@@ -1463,6 +1520,8 @@ export default {
     MonthAutoApor() {
       this.MonthActiveindex = true;
       // this.showApporAways = true;
+      this.filters2.MaxtimeValue = '';
+      this.filters2.inputValue = '';
       this.filters2.pageNo = 1;
       this.InfoKonwTeacherMonthApprvalList();
     },
@@ -1479,6 +1538,14 @@ export default {
         managerId: this.managerId || ""
       });
     },
+     InfoWatchMonthDatas (){
+        if (this.MonthActiveindex == false){
+            this.InfoWatchMoth();
+      }
+       if (this.MonthActiveindex == true){
+          this.InfoKonwTeacherMonthApprvalList()
+      }
+    },
       WatchhandleSizeChange(val) {
       this.filters.pageSize = val;
       this.InfoKonwTeacherWatchList();
@@ -1821,13 +1888,23 @@ export default {
     },
     selectTip(item) {
       this.filters.OptionsValue = item.str;
-      this.InfoWatch();
+       if (this.Activeindex == false){
+          this.InfoWatch();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+      }
       this.selecttitlepag = item.label;
       this.gardeListDown = false;
     },
     selectTipage(item) {
       this.filters.gradesValue = item.str;
-      this.InfoWatch();
+    if (this.Activeindex == false){
+          this.InfoWatch();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+      }
       this.selecttitleage = item.label;
       this.gardeListDownage = false;
     },

src/pages/super/CheckTeacherPay.vue

@@ -15,7 +15,7 @@
                   placeholder="选择月"
                   value-format="yyyy-MM"
                   :picker-options="pickerOptions0"
-                  @change="GetTeacherSalaryList()"
+                  @change="GetTeacherSalaryListDatas()"
                 ></el-date-picker>
               </div>
             </div>
@@ -82,8 +82,9 @@
             background
             @size-change="handleSizeChange"
             @current-change="pageChange"
-            :page-sizes="[10]"
-            layout="total,prev, pager, next"
+              :current-page.sync="currentPage"
+            :page-sizes="[10,50,100,200]"
+            layout="sizes,total,prev, pager, next"
                :hide-on-single-page="true"
             :total="parseInt(getTeacherSalaryList.pages)"
           ></el-pagination>
@@ -123,8 +124,9 @@
             background
             @size-change="handleSizeChange1"
             @current-change="pageChange1"
-            :page-sizes="[10]"
-            layout="total,prev, pager, next"
+              :page-sizes="[10,50,100,200]"
+               :current-page.sync="currentPage"
+            layout="sizes, total,prev, pager, next"
                :hide-on-single-page="true"
             :total="parseInt(GetKnowledgeTeacherSalaryList.pages)"
           ></el-pagination>
@@ -170,6 +172,8 @@ export default {
       selMonth: "",
       hiddenModel: false,
       isPigai: false,
+      currentPageSize:10,
+      currentPage:1,
       ItemList: [
         {
           text: "数据监控"
@@ -261,7 +265,7 @@ export default {
               "\n" +
               arr[i].name +
               "," +
-              arr[i].attendanceDays +
+              arr[i].attendanceCount +
               "," +
               arr[i].autoLowGradeCount +
               "," +
@@ -327,7 +331,7 @@ export default {
               "\n" +
               arr[i].name +
               "," +
-              arr[i].attendanceDays +
+              arr[i].attendanceCount +
               "," +
               arr[i].correctCount +
               "," +
@@ -349,6 +353,9 @@ export default {
       this.Activeindex = false;
        this.showApporAways = false;
        this.filters.pageNo = 1;
+       this.selMonth = '';
+     this.filters.pageSize = 10;
+       this.currentPage = 1;
        this.GetTeacherSalaryList()
     },
     // 匹配知识点老师
@@ -356,6 +363,9 @@ export default {
       this.Activeindex = true;
       this.showApporAways = true;
        this.filters0.pageNo = 1;
+       this.selMonth = '';
+         this.currentPage = 1;
+         this.filters0.pageSize = 10;
       this.GetKnownleageSalaryList();
     },
     GetKnownleageSalaryList (){
@@ -412,13 +422,23 @@ export default {
         maxCreateTime: this.formatDate()
       });
     },
+    GetTeacherSalaryListDatas(){
+        if (this.Activeindex == false){
+            this.GetTeacherSalaryList();
+      }
+       if (this.Activeindex == true){
+          this.GetKnownleageSalaryList()
+      }
+    },
     // 分页
     pageChange(val) {
+       this.currentPage = val;
       this.filters.pageNo = val;
       this.GetTeacherSalaryList();
     },
        // 分页
     pageChange1(val) {
+       this.currentPage = val;
       this.filters0.pageNo = val;
       this.GetKnownleageSalaryList();
     },

src/pages/super/HomeworkRecycle.vue

@@ -258,7 +258,7 @@
       async GOtoTeacherAllot(v) {
         this.$store.dispatch("toTeacherAllot", {
           teacherId: v.teacherId,
-             type: v.type,
+            type:this.allotList.TeacherType,
            originTeacherId:"",
           homeworkId: this.allotList.homeworkId
         });

src/pages/super/HomeworkTotally.vue

@@ -20,22 +20,27 @@
                 end-placeholder="结束日期"
                 value-format="yyyy-MM-dd"
                 align="right"
-                 :picker-options="pickerOptions0"
+               :picker-options="pickerOptions0"
               ></el-date-picker>
             </div>
           </el-col>
         </el-row>
         <el-row>
-          <!-- {{FindSubjectCharts}} -->
-          <el-col class="chartdiv">
+          <el-col class="chartdiv" v-if="chartData1">
             <HomeworkTotalList :chartData="chartData1"></HomeworkTotalList>
           </el-col>
-          <el-col class="chartdiv">
+          <el-col class="chartdiv" v-if="chartData2">
             <HomeworkTotalList :chartData="chartData2"></HomeworkTotalList>
           </el-col>
-          <el-col class="chartdiv">
+          <el-col class="chartdiv" v-if="chartData3">
             <HomeworkTotalList :chartData="chartData3"></HomeworkTotalList>
           </el-col>
+           <el-col class="chartdiv" v-if="!chartData1 && !chartData2 && !chartData3">
+             <div>
+                  <img src="../../assets/img/SEARCH (1).png" alt />
+          <div style="display:block; margin-top:20px;">暂无数据!</div>
+             </div>
+          </el-col>
         </el-row>
       </el-col>
     </el-row>

src/pages/super/SchoolManager.vue

@@ -76,7 +76,8 @@
                   v-model="filters.inputValue"
                   class="miniorinput-with-Allot"
                 />
-                <span @click="InfoWatch" class="miinorSeachIcon el-icon-search"></span>
+                  <span v-if="this.Activeindex == false" @click="InfoWatch" class="miinorSeachIcon el-icon-search"></span>
+                     <span v-if="this.Activeindex == true" @click="InfoKonwTeacherWatchList" class="miinorSeachIcon el-icon-search"></span>
               </div>
             </div>
           </el-col>
@@ -135,7 +136,7 @@
                     <img
                       src="../../assets/img/attt.png"
                       alt
-                      v-if="!v.imgUrl"
+                      v-if="v.imgUrl ==''"
                       @click="isShow(v,3)"
                       class="table-img"
                     />
@@ -164,7 +165,7 @@
                     <img
                       src="../../assets/img/attt.png"
                       alt
-                      v-if="!v.imgUrl"
+                      v-if="v.imgUrl ==''"
                       @click="isShow(v,3)"
                       class="table-img"
                     />
@@ -193,7 +194,7 @@
                     <img
                       src="../../assets/img/attt.png"
                       alt
-                      v-if="!v.imgUrl"
+                      v-if="v.imgUrl ==''"
                       @click="isShow(v,3)"
                       class="table-img"
                     />
@@ -230,7 +231,8 @@
                     <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: 10%">
-                      未批改
+                      <span v-if="Activeindex == false">未批改</span>
+                      <span v-if="Activeindex == true">未匹配</span>
                       (
                       <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
                     </div>
@@ -239,11 +241,15 @@
                       class="tr-seconds width40"
                       style="color:#FFC303;width: 10%"
                     >
-                      批改中 (
+                      <span v-if="Activeindex == false">批改中</span>
+                      <span v-if="Activeindex == true">匹配中</span>
+                      (
                       <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
                     </div>
                     <div v-if="v.status === 3" class="tr-seconds width40" style="width: 10%">
-                      已批改 (
+                      <span v-if="Activeindex == false">已批改</span>
+                      <span v-if="Activeindex == true">已匹配</span>
+                      (
                       <span>{{v.feedbackCount}}/{{v.picTotal}}</span>)
                     </div>
                     <div class="tr-sw180" v-if="v.status === 2" style="width: 25%"></div>
@@ -265,7 +271,8 @@
                           style="text-decoration:none;color:#ffffff;"
                         >已检查</span>
                       </el-button>
-                      <span style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
+                      <span v-if="v.wrongCount > 0" style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
+                         <span  v-if="v.wrongCount == 0" style="color:#fbfbfb;font-size:12px;">报错{{v.wrongCount}}</span>
                     </div>
                     <div
                       class="tr-sw180"
@@ -356,16 +363,17 @@
                         v-model="filters1.inputValue"
                         class="Dayinput-with-Allot"
                       />
-                      <span @click="InfoWatchDay" class="DaySeachIcon el-icon-search"></span>
+                     <span v-if="this.DayActiveindex == false" @click="InfoWatchDay" class="DaySeachIcon el-icon-search"></span>
+                         <span v-if="this.DayActiveindex == true" @click="InfoKonwTeacherDayApprvalList" class="DaySeachIcon el-icon-search"></span>
                     </div>
                   </div>
                   <div class="teach-block">
                     <el-date-picker
-                      @change="InfoWatchDay"
+                      @change="InfoWatchDayDatas"
                       v-model="filters1.MaxtimeValue"
                       value-format="yyyy-MM-dd"
                       type="date"
-                      placeholder="filters1.MaxtimeValue"
+                      placeholder="选择日期"
                       :picker-options="pickerOptions0"
                     >></el-date-picker>
                   </div>
@@ -485,16 +493,17 @@
                         v-model="filters2.inputValue"
                         class="Dayinput-with-Allot"
                       />
-                      <span @click="InfoWatchMoth" class="DaySeachIcon el-icon-search"></span>
+                       <span v-if="this.MonthActiveindex == false" @click="InfoWatchMoth" class="DaySeachIcon el-icon-search"></span>
+                        <span v-if="this.MonthActiveindex == true"  @click="InfoKonwTeacherMonthApprvalList" class="DaySeachIcon el-icon-search"></span>
                     </div>
                   </div>
                   <div class="teach-block">
                     <el-date-picker
-                      @change="InfoWatchMoth"
+                      @change="InfoWatchMonthDatas"
                       v-model="filters2.MaxtimeValue"
                       type="month"
                       value-format="yyyy-MM"
-                      placeholder="filters2.MaxtimeValue"
+                      placeholder="选择月"
                       :picker-options="pickerOptions0"
                     ></el-date-picker>
                   </div>
@@ -580,7 +589,7 @@
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
                   <div style="width:240px;">{{v.avgTime}}</div>
-                  <div>{{v.attendance}}</div>
+                  <div>{{v.accuracyRate}}</div>
                 </div>
               </div>
             </div>
@@ -717,7 +726,8 @@
             <div class="tr-secon width140" style="text-align:center margin-left:10px;">等待时长</div>
             <div class="tr-secon tr-sw80">科目</div>
             <div class="tr-secon tr-sw80">年级</div>
-            <div class="tr-secon width140">未批改老师</div>
+            <div class="tr-secon width140" v-if="this.Activeindex == false">未批改老师</div>
+                <div class="tr-secon width140" v-if="this.Activeindex == true">未匹配老师</div>
           </div>
           <div class="tr-set" v-for="(v, k) of UnallotHomeworkInfo.list" :key="k">
             <div class="tr-secon">{{k+1}}</div>
@@ -727,9 +737,18 @@
             <div class="tr-secon width140">{{v.spendTime}}</div>
             <div class="tr-secon tr-sw80">{{v.subject}}</div>
             <div class="tr-secon tr-sw80">{{v.grade}}</div>
-            <div v-if="v.status === 1" class="tr-secon">未批改</div>
-            <div v-if="v.status === 2" class="tr-secon">批改中</div>
-            <div v-if="v.status === 3" class="tr-secon">已批改</div>
+            <div v-if="v.status === 1" class="tr-secon">
+               <span v-if="this.Activeindex == false">未批改</span>
+              <span v-if="this.Activeindex == true">未匹配</span>
+            </div>
+            <div v-if="v.status === 2" class="tr-secon">
+               <span v-if="this.Activeindex == false">批改中</span>
+              <span v-if="this.Activeindex == true">匹配中</span>
+            </div>
+            <div v-if="v.status === 3" class="tr-secon">
+               <span v-if="this.Activeindex == false">已批改</span>
+              <span v-if="this.Activeindex == true">已匹配</span>
+            </div>
             <div class="tr-secon width140">{{v.teacherName}}</div>
             <div class="tr-s width400">
               <!-- <el-button type="" plain @click="ToAppovalOline(v)">去批改</el-button> -->
@@ -766,7 +785,8 @@
     <div class="model" style="width:40%;left: 32.5%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
-          <div>批改老师</div>
+          <div v-if="this.Activeindex == false">批改老师</div>
+           <div v-if="this.Activeindex == true">匹配知识点老师</div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(3)" />
           </div>
@@ -803,7 +823,7 @@
                 <div class="closeTeacherID" @click="isShow(GetTeacherDetail,6)">
                   <span class="el-icon-close">封号</span>
                 </div>
-                <div class="UpTeacherID" @click="isShow(GetTeacherDetail,5)">
+                <div v-if="this.Activeindex == false" class="UpTeacherID" @click="isShow(GetTeacherDetail,5)">
                   <span class="el-icon-upload2">升级</span>
                 </div>
               </div>
@@ -814,8 +834,9 @@
               </div>
             </div>
           </div>
-          <div class="model-items-other model-active">批改科目 : {{GetTeacherDetail.subject}}</div>
-          <div class="model-items-other">
+          <div class="model-items-other model-active" v-if="this.Activeindex == false">批改科目 : {{GetTeacherDetail.subject}}</div>
+            <div class="model-items-other" v-if="this.Activeindex == true">批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div class="model-items-other" v-if="this.Activeindex == false">
             批改年级 :
             <span v-for="(v, k) of arrGrade" :key="k">{{v}},</span>
           </div>
@@ -829,14 +850,15 @@
           </div>
           <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" v-if="this.Activeindex == false">批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+           <div class="model-items-other" v-if="this.Activeindex == true">匹配正确率 : {{GetTeacherDetail.accuracyRate}}</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"
+            class="model-items-other model-active" v-if="this.Activeindex == false"
           >家长满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
           <div style="display:inline-block">
             <div class="UpTeacherID" style="width:80px" @click="isShow(GetTeacherDetail,8)">
@@ -1533,7 +1555,6 @@ export default {
       this.$set(this.TeacherAllotList.list, k, v);
       this.NoAllotManagerModel = false;
       this.homeworkLIst.pageNo = 1;
-      this.UnallotHomework();
       this.isPigai = true;
     },
     // 封号
@@ -1784,20 +1805,28 @@ export default {
     },
     // 手动批改
     handApor() {
+       this.isDown = false;
       this.TeacherType = 8;
       this.TeacherCheackStyle = 2;
       this.TeacherIdType = 8;
       this.Activeindex = false;
       this.filters.pageNo = 1;
+       this.filters.OptionsValue = '';
+         this.filters.gradesValue = '';
+        this.filters.inputValue = '';
       //  this.showApporAways = false;
       this.InfoWatch();
     },
     // 匹配知识点老师
     AutoApor() {
+        this.isDown = false;
       this.TeacherType = 13;
       this.TeacherIdType = 13;
       this.TeacherCheackStyle = 4;
       this.Activeindex = true;
+       this.filters.OptionsValue = '';
+         this.filters.gradesValue = '';
+        this.filters.inputValue = '';
       // this.showApporAways = true;
       this.filters.pageNo = 1;
       this.InfoKonwTeacherWatchList();
@@ -1817,6 +1846,8 @@ export default {
     DayhandApor() {
       this.DayActiveindex = false;
       this.filters1.pageNo = 1;
+       this.filters1.MaxtimeValue = '';
+      this.filters1.inputValue = '';
       //  this.showApporAways = false;
       this.InfoWatchDay();
     },
@@ -1824,6 +1855,8 @@ export default {
     DayAutoApor() {
       this.DayActiveindex = true;
       // this.showApporAways = true;
+       this.filters1.MaxtimeValue = '';
+      this.filters1.inputValue = '';
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
     },
@@ -1840,10 +1873,20 @@ export default {
         managerId: this.managerId || ""
       });
     },
+       InfoWatchDayDatas (){
+        if (this.DayActiveindex == false){
+            this.InfoWatchDay();
+      }
+       if (this.DayActiveindex == true){
+          this.InfoKonwTeacherDayApprvalList()
+      }
+    },
     // 当月数据手动批改
     MonthhandApor() {
       this.MonthActiveindex = false;
       this.filters2.pageNo = 1;
+         this.filters2.MaxtimeValue = '';
+      this.filters2.inputValue = '';
       //  this.showApporAways = false;
       this.InfoWatchMoth();
     },
@@ -1851,6 +1894,8 @@ export default {
     MonthAutoApor() {
       this.MonthActiveindex = true;
       // this.showApporAways = true;
+         this.filters2.MaxtimeValue = '';
+      this.filters2.inputValue = '';
       this.filters2.pageNo = 1;
       this.InfoKonwTeacherMonthApprvalList();
     },
@@ -1867,6 +1912,14 @@ export default {
         managerId: this.managerId || ""
       });
     },
+       InfoWatchMonthDatas (){
+        if (this.MonthActiveindex == false){
+            this.InfoWatchMoth();
+      }
+       if (this.MonthActiveindex == true){
+          this.InfoKonwTeacherMonthApprvalList()
+      }
+    },
     WatchhandleSizeChange(val) {
       this.filters.pageSize = val;
       this.InfoKonwTeacherWatchList();
@@ -2005,13 +2058,23 @@ export default {
     },
     selectTip(item) {
       this.filters.OptionsValue = item.str;
-      this.InfoWatch();
+      if (this.Activeindex == false){
+          this.InfoWatch();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+      }
       this.selecttitlepag = item.label;
       this.gardeListDown = false;
     },
     selectTipage(item) {
       this.filters.gradesValue = item.str;
-      this.InfoWatch();
+     if (this.Activeindex == false){
+          this.InfoWatch();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+      }
       this.selecttitleage = item.label;
       this.gardeListDownage = false;
     },
@@ -2040,7 +2103,12 @@ export default {
   watch: {
     getTeacherIdStatus(val, oldVal) {
       //普通的watch监听
-      this.InfoWatch();
+      if (this.Activeindex == false){
+          this.InfoWatch();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+      }
     },
     BeforetoTeacherstatues(val, oldVal) {
       //普通的watch监听
@@ -2051,7 +2119,14 @@ export default {
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize
       });
-      this.InfoWatch();
+        if (this.Activeindex == false){
+          this.InfoWatch();
+            this.UnallotHomework();
+      }
+       if (this.Activeindex == true){
+          this.InfoKonwTeacherWatchList();
+          this.unmatchHomework()
+      }
     },
     InfoTeacherstatues(val, oldVal) {
       //普通的watch监听
@@ -2062,7 +2137,7 @@ export default {
       this.NoAllotManagerModel = false;
       this.hiddenModel = false;
       //  this.isPigai = true;
-      this.RefreshTeacherHomework();
+           this.RefreshTeacherHomework();
     },
     // 质检当前作业状态:href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
     currtHomeworkStatus(val, oldVal) {

src/store/modules/user.js

@@ -549,6 +549,8 @@ const user = {
                 commit('SET_GET_SUCCESS_TEACHER',new Date());
                 resolve(response)
                 Message.success('分配成功')
+              } else {
+                Message.error(data.msg)
               }
             }).catch(error => {
               reject(error)