提交最新代码

src/components/MenuComponent.vue

@@ -24,10 +24,24 @@
       </div>
       <div class="out">
         <img src="../assets/img/out.png" alt class="out-img">
-        <span @click="Loginout">退出</span>
+        <span @click="LoginoutBtn">退出</span>
       </div>
     </el-col>
     <el-col :span="1"></el-col>
+        <!--是否通过-->
+    <div class='showModel' @click="allShowModel()" v-if="hiddenModel"></div>
+    <div class='model' v-if="hiddenModel">
+      <div class='model-text'>
+        <div class="model-text-items">
+          <div><img src="../assets/img/del@2x.png" alt="" @click="allShowModel()" class="model-text-items-close"></div>
+          <div>{{name}}老师您确定退出吗？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel()">否</div>
+        </div>
+      </div>
+    </div>
   </el-col>
 </template>
 
@@ -43,6 +57,7 @@ export default {
     return {
       accessToken:localStorage.getItem("accessToken"), //token
       BASE_URL:IMG_BASE_URL,
+      hiddenModel:false,
       menuData: [
         {
           id: "1",
@@ -74,6 +89,18 @@ export default {
     // initNav() {
     //   this.menuData = JSON.parse(JSON.stringify(this.navsData));
     // },
+    LoginoutBtn(){
+       this.hiddenModel = true;
+    },
+    allShowModel(){
+      this.hiddenModel = false;
+       this.$message("已取消操作!");
+    },
+    ApplyOperate(){
+        this.$store.dispatch("LogOut", {
+             accessToken: this.accessToken
+      });
+    },
     secondNavClick(val, index) {
         sessionStorage.setItem('tabIndex',index);
       this.checkindex = sessionStorage.getItem('tabIndex');
@@ -86,23 +113,6 @@ export default {
         this.$router.push("/home/" + 'TeacherPay');
       }
     },
-    //  账号管理、退出登录
-    Loginout() {
-      this.$confirm("您确定退出吗?", "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning"
-      })
-        .then(() => {
-             this.$store.dispatch("LogOut", {
-             accessToken: this.accessToken
-      });
-        })
-        .catch(() => {
-          // console.log(err)
-          this.$message("已取消操作!");
-        });
-    }
   },
   computed: {
     ...mapGetters(["name", "avatar", "roles"])
@@ -133,6 +143,12 @@ export default {
   color: #52cc60;
   border-bottom: 2px solid #52cc60;
 }
+.el-input__inner, .el-checkbox__inner, .el-textarea__inner, .el-button {
+    font-size: 0.3125rem;
+    text-align: center;
+    line-height: 0!important;
+    padding: 12px 20px!important;
+}
 .navactive {
   color: #52cc60 !important;
   border-bottom: 2px solid #52cc60;
@@ -173,4 +189,70 @@ export default {
   height: 18px;
   display: inline-block;
 }
+ .showModel{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000000;
+    opacity: 0.2;
+    overflow: hidden;
+    z-index: 1000;
+    color: #fff;
+
+  }
+  .model{
+    z-index: 1001;
+    width:40%;
+    height:auto;
+    position: fixed;
+    top: 30%;
+    left: 30%;
+    margin:auto;
+    background: #fff;
+    border-radius:10px;
+    text-align: center;
+  }
+
+  .model-text{
+    background:rgba(255,255,255,1);
+    border-radius:10px;
+  }
+
+  .model-btn{
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 44px;
+    cursor: pointer;
+  }
+  .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-text-items-close{
+    position: absolute;
+    top: 10px;
+    right: -5px;
+  }
+  .model-text-items{
+    position: relative;
+    color: #000000;
+    font-size: 24px;
+    text-align: center;
+    padding: 40px 0 50px 0;
+    margin: 0 33px;
+  }
 </style>

src/components/SuperComponent.vue

@@ -21,9 +21,22 @@
       </div>
       <div class="out">
         <img src="../assets/img/out.png" alt class="out-img">
-        <span @click="Loginout">退出</span>
+        <span @click="LoginoutBtn">退出</span>
       </div>
     </el-col>
+       <div class='showModel' @click="allShowModel()" v-if="hiddenModel"></div>
+    <div class='model' v-if="hiddenModel">
+      <div class='model-text'>
+        <div class="model-text-items">
+          <div><img src="../assets/img/del@2x.png" alt="" @click="allShowModel()" class="model-text-items-close"></div>
+          <div>{{name}}老师您确定退出吗？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel()">否</div>
+        </div>
+      </div>
+    </div>
   </el-col>
 </template>
 
@@ -37,6 +50,7 @@ export default {
   // },
   data() {
     return {
+         hiddenModel:false,
         accessToken:localStorage.getItem("accessToken"), //token
         BASE_URL:IMG_BASE_URL,
       menuData: [ {
@@ -74,6 +88,18 @@ export default {
     // initNav() {
     //   this.menuData = JSON.parse(JSON.stringify(this.navsData));
     // },
+      LoginoutBtn(){
+       this.hiddenModel = true;
+    },
+    allShowModel(){
+      this.hiddenModel = false;
+       this.$message("已取消操作!");
+    },
+    ApplyOperate(){
+        this.$store.dispatch("LogOut", {
+             accessToken: this.accessToken
+      });
+    },
     secondNavClick(val, index) {
 
       sessionStorage.setItem('tabIndex',index);
@@ -225,4 +251,70 @@ export default {
              border-bottom: 5px solid transparent;
              transform: rotate(-45deg);
             }
+            .showModel{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000000;
+    opacity: 0.2;
+    overflow: hidden;
+    z-index: 1000;
+    color: #fff;
+
+  }
+  .model{
+    z-index: 1001;
+    width:40%;
+    height:auto;
+    position: fixed;
+    top: 30%;
+    left: 30%;
+    margin:auto;
+    background: #fff;
+    border-radius:10px;
+    text-align: center;
+  }
+
+  .model-text{
+    background:rgba(255,255,255,1);
+    border-radius:10px;
+  }
+
+  .model-btn{
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 44px;
+    cursor: pointer;
+  }
+  .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-text-items-close{
+    position: absolute;
+    top: 10px;
+    right: -5px;
+  }
+  .model-text-items{
+    position: relative;
+    color: #000000;
+    font-size: 24px;
+    text-align: center;
+    padding: 40px 0 50px 0;
+    margin: 0 33px;
+  }
 </style>

src/main.js

@@ -14,6 +14,7 @@ import 'viewerjs/dist/viewer.css'
 import Vuex from "vuex";
 import store from './store'
 import jQuery from "jquery";
+import postcss from "postcss-pxtorem";
 import "./assets/js/jquery-ui.min.js";
 import * as filters from "./filters";
 // import 'element-ui/lib/theme-chalk/index.css'

src/pages/Home.vue

@@ -184,6 +184,12 @@
 </script>
 
 <style scoped>
+.el-input__inner, .el-checkbox__inner, .el-textarea__inner, .el-button {
+    font-size: 0.3125rem;
+    text-align: center;
+    line-height: 0!important;
+    padding: 12px 20px!important;
+}
   .main_conter{
     min-height: 1000px;
   }

src/pages/home/SchoolManager.vue

@@ -27,8 +27,38 @@
               <span @click="allocation()" class="main-header-link">去分配</span>
             </div>
           </el-col>
-          <el-col :span="8" :offset="1">
-            <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
+          <el-col :span="10">
+          <div class="selectBox">
+              <div class="Ageclass" @click="choiceclass()" @mouseover="selectStyle()" @mouseout="outStyle()">
+              <span class="age-tip">{{selecttitlepag}}</span>
+              <span  :class="[gardeListDown ?'el-icon-caret-top':'el-icon-caret-bottom']"></span>
+            </div>
+            <div class="class-download" v-show="gardeListDown"  @mouseover="selectStyle()" @mouseout="outStyle()">
+              <ul   v-for="(item, k) in options"
+                  :key="k">
+                <li @click="selectTip(item)">{{item.label}}</li>
+              </ul>
+            </div>
+          </div>
+             <div class="selectBox">
+                 <div class="Ageclass" @click="choiceclass()" @mouseover="selectStyle1()" @mouseout="outStyle1()">
+                   <span class="age-tip">{{selecttitleage}}</span>
+                    <span  :class="[gardeListDownage ?'el-icon-caret-top':'el-icon-caret-bottom']"></span>
+                </div>
+                <div class="class-download" v-show="gardeListDownage"  @mouseover="selectStyle1()" @mouseout="outStyle1()">
+              <ul   v-for="(item, k) in grades"
+                  :key="k">
+                <li @click="selectTipage(item)">{{item.label}}</li>
+              </ul>
+            </div>
+          </div>
+              <div class="teach-block">
+                 <div class="miniorteach-Allot">
+              <input type="text"  placeholder="请输入老师" v-model="filters.inputValue"  class="miniorinput-with-Allot">
+              <span @click="InfoWatch" class="miinorSeachIcon el-icon-search"></span>
+              </div>
+              </div>
+            <!-- <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
               <el-select
                 v-model="filters.OptionsValue"
                 @change="InfoWatch"
@@ -58,7 +88,7 @@
                 ></el-option>
               </el-select>
               <el-button @click="InfoWatch" slot="append" icon="el-icon-search"></el-button>
-            </el-input>
+            </el-input> -->
           </el-col>
           <!--<div class="block">-->
           <!--<el-date-picker-->
@@ -164,12 +194,12 @@
                     </div>
                     <div
                       v-if="v.status && !(v.status === 1 && k == 0) "
-                      class="tr-secondsA" style="width:25%;"
+                      class="tr-secondsA" style="width:30%;"
                     >{{v.spendTime}}</div>
                     <div
                       v-if="v.status === 1 && k == 0"
                       class="tr-secondsA"
-                      style="color:#52CC60;width: 25%"
+                      style="color:#52CC60;width: 30%"
                     >{{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>
@@ -178,10 +208,10 @@
                     <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  type="success" plain  v-if="v.isAllot == '1'" @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" style="width: 25%">
+                    <div class="ApporTeacher" 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">
@@ -190,7 +220,7 @@
                           :href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
                         >已检查</a>
                       </el-button>
-                      <span style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
+                      <span class="WorngCount">报错{{v.wrongCount}}</span>
                     </div>
                     <div class="tr-sw180" v-if="v.status === 3 && v.isCheck ===0" style="width: 25%">
                       <el-button type="warning">
@@ -219,8 +249,9 @@
               background
               @size-change="handleSizeChange"
               @current-change="pageChange"
+              :current-page.sync="currentPage"
               :page-sizes="[10]"
-              layout="total, prev, pager, next"
+                 layout="total, prev, pager, next"
               :total="parseInt(monitorTeacherList.pages)"
               :hide-on-single-page="true"
             ></el-pagination>
@@ -238,9 +269,10 @@
             </div>
             <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 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
@@ -290,9 +322,10 @@
               @size-change="handleSizeChange1"
               @current-change="pageChange1"
               :page-sizes="[10]"
-              layout="total, sizes, prev, pager, next, jumper"
+               layout="total, prev, pager, next"
               :total="parseInt(DayTeacherList.pages)"
               :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>
@@ -312,9 +345,13 @@
             </div>
             <div class="teach-time">
               <div class="teach-block">
-                <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
+                 <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>
+                </el-input> -->
               </div>
               <div class="teach-block">
                 <el-date-picker
@@ -387,9 +424,10 @@
               @size-change="handleSizeChange2"
               @current-change="pageChange2"
               :page-sizes="[10]"
-              layout="total, sizes, prev, pager, next, jumper"
+               layout="total, prev, pager, next"
               :total="parseInt(MothTeacherList.pages)"
               :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>
@@ -404,13 +442,24 @@
 
     <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
-    <div class="model teacerMOdel" style="left:20%" v-if="hiddenModel">
+    <div class="model teacerMOdel" style="left:20%;top:5%" v-if="hiddenModel">
       <div class="model-text">
         <div class="model-text-head">
           <div>可分配老师</div>
+            <div class="teach-Allot">
+              <input type="text"  placeholder="请输入老师名字" v-model="inputValueAllot" class="input-with-Allot">
+              <span @click="SearchTeacherAllot" class="SeachIcon el-icon-search"></span>
+              </div>
           <div>{{allotList.Allotgarde}}{{allotList.Allotsubjct}}</div>
         </div>
-        <div class="tr-setNo" v-if="TeacherAllotList.list.length == 0">暂无数据!</div>
+        <div  v-show="this.inputValueAllot =='' && TeacherAllotList.list.length ==0">
+            <img src="../../assets/img/NoTeacherAllot (1).png" alt>
+            <div style="display:block; margin-top:20px;"> 暂无可分配老师!</div>
+         </div>
+          <div v-show="this.inputValueAllot !=='' && TeacherAllotList.list.length ==0">
+            <img src="../../assets/img/SEARCH (1).png" alt>
+            <div style="display:block; margin-top:20px;"> 搜索不到老师!</div>
+         </div>
         <div
           class="model-itemss"
           style="margin:10px;"
@@ -472,42 +521,45 @@
       <div class="model-text">
         <div class="model-text-head">
           <div>所有未批改作业</div>
+           <div>
+            <img src="../../assets/img/del@2x.png" alt @click="allShowModel(2)">
+          </div>
         </div>
         <div>
           <!-- UnallotHomeworkInfo -->
           <!-- <div class="tr-setNo"  v-if="UnallotHomeworkInfo.list.length == 0">
             暂无数据!
           </div>-->
-          <div class="table-heads1">
-            <div>学生</div>
-            <div>等待时长</div>
-            <div>科目</div>
-            <div>年级</div>
-            <div>未批改老师</div>
+          <div class="tr-set table-heads1">
+            <div class="tr-secon width120">学生</div>
+            <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>
           <div class="tr-set" v-for="(v, k) of UnallotHomeworkInfo.list" :key="k">
             <div class="tr-secon">{{k+1}}</div>
-            <div class="tr-secon" style="width:50px;">
+            <div class="tr-secon width120">
               <span>{{v.name}}</span>
             </div>
-            <div class="tr-secon" style="width:60px;">{{v.spendTime}}</div>
-            <div class="tr-secon">{{v.subject}}</div>
-            <div class="tr-secon">{{v.grade}}</div>
+            <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 class="tr-secon">{{v.teacherName}}</div>
-            <div class>
-              <el-button type="success" @click="ToAppovalOline(v)" plain>去批改</el-button>
+            <div class="tr-secon width140">{{v.teacherName}}</div>
+            <div class="width400">
+              <el-button  v-if="v.isAllot == '1'"  type="success" plain @click="ToAppovalOline(v)" >去批改</el-button>
               <el-button type="success" @click="isShow(v,5)">去分配</el-button>
             </div>
           </div>
           <el-pagination
             background
-            @size-change="handleSizeChange3"
-            @current-change="pageChange3"
+            @size-change="handleSizeChange7"
+            @current-change="pageChange7"
             :page-sizes="[10]"
-            layout="total, sizes, prev, pager, next, jumper"
+             layout="total, prev, pager, next"
             :total="parseInt(UnallotHomeworkInfo.pages)"
             :hide-on-single-page="true"
           ></el-pagination>
@@ -520,10 +572,23 @@
       <div class="model-text" style="padding: 0 10px">
         <div class="model-manager">
           <div>作业可分配老师</div>
+            <div class="teach-Allot">
+              <input type="text"  placeholder="请输入老师名字" v-model="AllinputValueAllot" class="input-with-Allot">
+              <span @click="SearchValueAllot" class="SeachIcon el-icon-search"></span>
+              </div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(5)">
           </div>
         </div>
+
+         <div v-show="this.AllinputValueAllot =='' &&TeacherAllotList.list.length ==0">
+            <img src="../../assets/img/NoTeacherAllot (1).png" alt>
+            <div style="display:block; margin-top:20px;"> 暂无可分配老师!</div>
+         </div>
+           <div v-show="this.AllinputValueAllot !=='' && TeacherAllotList.list.length ==0">
+            <img src="../../assets/img/SEARCH (1).png" alt>
+            <div style="display:block; margin-top:20px;"> 搜索不到老师!</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">
@@ -569,7 +634,7 @@
     </div>
     <!-- 老师详情弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="ModelAppor"></div>
-    <div class="model" style="width:35%;left: 32.5%" v-if="ModelAppor">
+    <div class="model" style="width:40%;left: 32.5%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
           <div>批改老师</div>
@@ -607,8 +672,10 @@
           </div>
           <div class="model-items-other model-active">
             可批改时间:
-            <div class="buttonAppoval"  v-show="arrPeriod.length >= 0">
-              <el-button type="info" size="mini" round v-for="(v, k) of arrPeriod" :key="k">{{v}}</el-button>
+            <div class="buttonAppoval">
+               <div class="TeacherApporTime" v-for="(v, k) of arrPeriod" v-show="v" :key="k">
+                  <span>{{v}}</span>
+                </div>
             </div>
           </div>
           <div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
@@ -670,8 +737,11 @@ export default {
       APPOR_BASE_URL: APPOR_BASE_URL,
       isDownindex: "",
       modelindex: 0,
+      currentPage: 1,
       values: [],
       arrGrade: [],
+      inputValueAllot:"",
+      AllinputValueAllot:"",
       NoAllotManagerModel: false, //未批改作业可分配老师弹框
       hiddenModel: false, //分配老师弹框
       isPigai: false, //未批改作业弹框
@@ -679,6 +749,10 @@ export default {
       ModelStudet: false, //学生详情弹框
       isNocheck: false, //没有未批改作业
       isDown: false,
+      gardeListDown:false,
+      gardeListDownage:false,
+      selecttitlepag:"选年级",
+      selecttitleage:"选科目",
       options: [
         {
           value: "0",
@@ -846,6 +920,14 @@ export default {
       //普通的watch监听
       this.pesiorFun();
     },
+     ApporingTeacherstatues(val, oldVal) {
+      //去分配前刷新列表watch监听
+         this.NoAllotManagerModel = false;
+         this.hiddenModel = false;
+        //  this.isPigai = true;
+      this.RefreshTeacherHomework();
+      this.UnallotHomework();
+    },
   },
   computed: {
     ...mapGetters([
@@ -862,7 +944,8 @@ export default {
       "getTeacherIdStatus",
       "BeforetoTeacherAllotCode",
       "BeforetoTeacherstatues",
-      "InfoTeacherstatues"
+      "InfoTeacherstatues",
+      "ApporingTeacherstatues"
       
     ])
   },
@@ -951,6 +1034,15 @@ export default {
         pageSize: this.homeworkLIst.pageSize
       });
     },
+    // 去分配前刷新老师批改作业列表
+    async RefreshTeacherHomework() {
+      this.$store.dispatch("TeacherHomeworkList", {
+        teacherId: this.homeworkLIst.teacherId,
+        maxCreateTime: "",
+        pageNo: 1,
+        pageSize: this.homeworkLIst.pageSize
+      });
+    },
     // 分页查看老师批改作业列表
     async TeacherHomeworkfy() {
       this.$store.dispatch("TeacherHomeworkList", {
@@ -965,9 +1057,23 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade: v.grade,
         subject: v.subject,
+        homeworkId: v.homeworkId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allotList.pageNo,
-        pageSize: this.allotList.pageSize
+        pageSize: this.allotList.pageSize,
+         name:this.inputValueAllot
+      });
+    },
+     // 搜索可分配老师列表
+    async SearchTeacherAllot() {
+      this.$store.dispatch("TeacherAllotList", {
+       grade: this.allotList.Allotgarde,
+        subject: this.allotList.Allotsubjct,
+        homeworkId: this.allotList.homeworkId,
+        maxCreateTime: this.filters.MaxtimeValue,
+        pageNo: this.allotList.pageNo,
+        pageSize: this.allotList.pageSize,
+         name:this.inputValueAllot
       });
     },
     // 可分配老师列表分页
@@ -975,9 +1081,11 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade: this.allotList.Allotgarde,
         subject: this.allotList.Allotsubjct,
+         homeworkId: this.allotList.homeworkId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allotList.pageNo,
-        pageSize: this.allotList.pageSize
+        pageSize: this.allotList.pageSize,
+         name:this.inputValueAllot
       });
     },
     // 未批改作业列表列表
@@ -985,7 +1093,7 @@ export default {
       this.$store.dispatch("UnallotHomeworkList", {
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.homeworkLIst.pageNo,
-        pageSize: this.homeworkLIst.pageSize
+        pageSize: this.homeworkLIst.pageSize,
       });
     },
     // 未批改作业分配老师
@@ -997,6 +1105,7 @@ export default {
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
       this.NoAllotManagerModel = false;
+       this.homeworkLIst.pageNo = 1
       this.UnallotHomework();
       this.isPigai = true;
     },
@@ -1041,14 +1150,17 @@ export default {
       this.modelindex = k;
       if (k === 0) {
         this.filters.pageNo = 1;
+          this.currentPage = 1
         this.InfoWatch();
       }
       if (k === 1) {
         this.filters1.pageNo = 1;
+          this.currentPage = 1
         this.InfoWatchDay();
       }
       if (k === 2) {
         this.filters2.pageNo = 1;
+          this.currentPage = 1
         this.InfoWatchMoth();
       }
     },
@@ -1058,12 +1170,15 @@ export default {
       // $ ( ‘html’ ).css({ ‘overflow’ : ’hidden’ , ’position’: ’fixed’, ’top’: ’- ‘+scroll+’px’})
       if (str == 1) {
         _this.hiddenModel = true;
+        this.allotList.pageNo = 1;
+        this.inputValueAllot = ""
         this.TeacherAllot(v);
         this.allotList.Allotgarde = v.grade;
         this.allotList.Allotsubjct = v.subject;
         this.allotList.homeworkId = v.homeworkId;
       } else if (str == 2) {
         _this.isPigai = true;
+        this.homeworkLIst.pageNo = 1
         this.UnallotHomework();
       } else if (str == 3) {
         _this.ModelAppor = true;
@@ -1077,6 +1192,7 @@ export default {
         this.allNoapprovalList.homeworkId = v.homeworkId;
         _this.NoAllotManagerModel = true;
         _this.isPigai = false;
+        this.AllinputValueAllot = ""
         this.NoapporvalTeacherAllot(v);
         // this.GetAllotManagerInfo()
       }
@@ -1086,9 +1202,23 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade: v.grade || this.allNoapprovalList.Allotgarde,
         subject: v.subject || this.allNoapprovalList.Allotsubjct,
+        homeworkId: v.homeworkId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
-        pageSize: this.allNoapprovalList.pageSize
+        pageSize: this.allNoapprovalList.pageSize,
+         name:this.AllinputValueAllot
+      });
+    },
+        // 搜索未批改作业可分配老师列表
+    async SearchNoapporvalTeacherAllot() {
+      this.$store.dispatch("TeacherAllotList", {
+        grade: this.allNoapprovalList.Allotgarde,
+        subject: this.allNoapprovalList.Allotsubjct,
+         homeworkId:this.allNoapprovalList.homeworkId,
+        maxCreateTime: this.filters.MaxtimeValue,
+        pageNo: 1,
+        pageSize: this.allNoapprovalList.pageSize,
+         name:this.AllinputValueAllot
       });
     },
     // 未批改作业可分配老师分页列表
@@ -1096,9 +1226,11 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade: this.allNoapprovalList.Allotgarde,
         subject: this.allNoapprovalList.Allotsubjct,
+        homeworkId:this.allNoapprovalList.homeworkId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allNoapprovalList.pageNo,
-        pageSize: this.allNoapprovalList.pageSize
+        pageSize: this.allNoapprovalList.pageSize,
+         name:this.AllinputValueAllot
       });
     },
     // 去分配
@@ -1114,6 +1246,10 @@ export default {
         this.isShow(this.monitorTeacherList, 2);
       }
     },
+    // 未批改作业列表搜索可分配老师
+    SearchValueAllot(){
+    this.SearchNoapporvalTeacherAllot()
+    },
     //年月日时间封装
     dayFormatDate: function() {
       let date = new Date();
@@ -1217,16 +1353,24 @@ export default {
       this.allNoapprovalList.pageSize = val;
       this.NoapporvalTeacherAllotfy();
     },
+      handleSizeChange7(val) {
+     this.homeworkLIst.pageSize = val
+      this.UnallotHomework();
+    },
     // 分页
     pageChange(val) {
+      this.currentPage = val
+      // debugger
       this.filters.pageNo = val;
       this.InfoWatch();
     }, // 分页
     pageChange1(val) {
+        this.currentPage = val
       this.filters1.pageNo = val;
       this.InfoWatchDay();
     }, // 分页
     pageChange2(val) {
+        this.currentPage = val
       this.filters2.pageNo = val;
       this.InfoWatchMoth();
     },
@@ -1242,12 +1386,43 @@ export default {
       this.allNoapprovalList.pageNo = val;
       this.NoapporvalTeacherAllotfy();
     },
+        pageChange7(val) {
+     this.homeworkLIst.pageNo = val;
+      this.UnallotHomework();
+    },
     // 排序
     sortChange(sort) {
       this.filters.orderField = sort.prop;
       this.filters.orderAD = sort.order != null ? sort.order : "";
       this.itemListReshow();
-    }
+    },
+    choiceclass(){
+      this.gardeListDown = true;
+    },
+      selectStyle() {
+      this.gardeListDown = true;
+    },
+    outStyle() {
+      this.gardeListDown = false;
+    },
+    selectTip(item){
+      this.filters.OptionsValue = item.str
+      this.InfoWatch()
+      this.selecttitlepag = item.label;
+      this.gardeListDown = false;
+    },
+      selectTipage(item){
+      this.filters.gradesValue = item.str
+      this.InfoWatch()
+      this.selecttitleage = item.label;
+      this.gardeListDownage = false;
+    },
+      selectStyle1() {
+      this.gardeListDownage = true;
+    },
+    outStyle1() {
+      this.gardeListDownage = false;
+    },
     // 获取创建人列表
     // async getUserNameList() {
     //   let {
@@ -1301,6 +1476,7 @@ ul {
   display: flex;
   justify-content: space-between;
   margin: 0 4%;
+  padding-left:4%;
 }
 .teach-time{
   text-align: right;
@@ -1319,7 +1495,7 @@ el-table {
 }
 .main-header-item {
   font-size: 16px;
-  /* font-weight: 700; */
+  font-weight: 700;
 }
 .model-manager {
   display: flex;
@@ -1342,6 +1518,10 @@ el-table {
 .input-with-select .el-input-group__prepend {
   background-color: #fff;
 }
+.WorngCount{
+color:red;
+font-size:12px;
+}
 .el-select-dropdown__list {
   padding: 15px 0 !important;
 }
@@ -1359,10 +1539,6 @@ el-table {
   background-color: #52cc60;
   color: #fff;
 }
-.el-input__inner {
-  /* height: 32px; */
-}
-
 .table-img {
   width: 36px;
   height: 36px;
@@ -1383,9 +1559,10 @@ el-table {
   justify-content: space-around;
 }
 .table-heads1 {
-  margin-left: 15%;
-  width: 60%;
-  color: #3ab548;
+  margin-left: 60px!important;
+  margin-right:280px!important;
+  background-color: #fff!important;
+  color: #3ab548!important;
   font-size: 14px;
   text-align: center;
   display: flex;
@@ -1397,6 +1574,10 @@ el-table {
 .table-head > div {
   width: 13.528%;
 }
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
 .tr {
   width: 100%;
   color: #393939;
@@ -1422,8 +1603,11 @@ el-table {
   justify-content: space-around;
   color: #393939;
   font-size: 12px;
-  margin: 5px;
+  margin:0px;
+  /* height:40px; */
+  line-height:40px;
 }
+
 .tr-setNo {
   display: flex;
   justify-content: space-around;
@@ -1436,48 +1620,128 @@ el-table {
   text-align: center;
   word-wrap: break-word;
   width: 40px;
+  line-height:50px;
 }
 .tr-second {
   background-color: #fbfbfb;
   display: flex;
   color: #393939;
-  font-size: 20px;
+  font-size: 12px;
   word-wrap: break-word;
+  width: 80%;
+  margin:0 auto;
 }
 .tr-seconds {
   text-align: center;
-  font-size: 14px;
+  font-size: 10px;
   word-wrap: break-word;
-  margin: 0 50px;
   /* height: 30px; */
 }
 .width40 {
-  width: 100px;
+  width: 200px!important;
 }
-.tr-sw180 {
-  width: 230px;
+.width120{
+  width: 200px;
+}
+.tr-sw80 {
+  width: 120px;
   text-align: center;
 }
+.width140{
+width: 140px!important;
+}
+.width400{
+  width: 350px;
+  padding:10px;
+  text-align:right!important;
+}
+.tr-sw180 {
+  width: 400px!important;
+  text-align: right;
+  padding-right:38px;
+}
+.ApporTeacher{
+  width: 400px!important;
+  text-align: right;
+}
 .tr-secondsA {
   text-align: center;
   font-size: 14px;
   word-wrap: break-word;
-  width: 280px;
+  width: 380px;
 }
 .tr-w120 {
-  width: 200px;
+  width: 260px!important;
   text-align: left;
   display: inline-block;
   /*height: 80px;*/
   /*line-height: 80px;*/
 }
+/* .el-button{
+  padding:0;
+} */
+.el-button--success.is-plain{
+  width: 100px;
+  height:30px;
+  font-size:10px;
+  text-align:center;
+  line-height:10px;
+}
+.el-button--success{
+width: 100px;
+  height:30px;
+  font-size:10px;
+  text-align:center;
+   line-height:5px;
+}
+.el-button--warning {
+   width: 100px;
+  height:30px;
+  font-size:10px;
+  text-align:center;
+   line-height:5px;
+    padding:10px;
+}
+.el-button--info {
+   width: 100px;
+  height:30px;
+  font-size:10px;
+  text-align:center;
+   line-height:5px;
+   padding:10px;
+}
+.el-input__inner, .el-checkbox__inner, .el-textarea__inner, .el-button {
+  font-size:10px;
+  text-align:center;
+   line-height:0px!important;
+    padding:0px!important;
+}
+.TeacherApporTime {
+  text-align:center;
+  display: inline-block;
+  height: 40px;
+  width: 80px;
+  color: #706f6f;
+  background: #b6b6b6;
+  border-color: #929492;
+  border-radius: 20px;
+  font-size: 14px;
+  line-height: 40px;
+  cursor: pointer;
+  margin:0 5px;
+}
+.TeacherApporTime:hover{
+    color: #fff;
+    background-color: #909399;
+    border-color: #909399;
+}
 .teach-style{
   display: inline-block;
   text-align: left;
 }
 .teach-style-name{
   font-size: 24px;
-  margin-left: 10px
+  margin-left: 5px
 }
 .tr-second-check {
   color: #3ab548;
@@ -1520,6 +1784,7 @@ el-table {
   border-radius: 10px;
   text-align: center;
   min-width: 450px!important;
+  padding:20px;
 }
 .teacerMOdel{
    width: 40%!important;
@@ -1581,8 +1846,7 @@ el-table {
 }
 .buttonAppoval {
   display: inline-block;
-}
-.el-button.is-round{
+  height: 40px;
 }
 .model-items-left-top {
   display: flex;
@@ -1600,7 +1864,7 @@ el-table {
   /*display: flex;*/
   /*justify-content: space-between;*/
   /*display: inline-block;*/
-  width: 40%;
+  width: 45%;
   display: inline-block;
 }
 .model-items-left-top-img {
@@ -1654,4 +1918,130 @@ el-table {
   margin-right: 20px;
   margin-bottom: 30px;
 }
+.input-with-Allot{
+  border: #b6b6b6;
+  border-radius:15px;
+  height: 30px;
+  width: 220px;
+  font-size: 8px;
+  color:#b6b6b6;
+  text-align:left;
+  line-height:30px;
+  background: #F1F2F4;
+  padding:0 10px;
+  float:left;
+    outline:none!important;
+  box-shadow: none;
+}
+.teach-Allot{
+width: 350px;
+position:relative;
+}
+.SeachIcon{
+  position:absolute;
+  font-size: 16px;
+  color:#b6b6b6;
+  right:42%;
+  top:15%;
+  cursor: pointer;
+}
+.Dayinput-with-Allot{
+  border: #b6b6b6;
+  border-radius:20px;
+  height: 40px;
+  width: 300px;
+  font-size: 8px;
+  color:#b6b6b6;
+  text-align:left;
+  line-height:40px;
+  background: #F1F2F4;
+  padding:0 10px;
+  float:left;
+    outline:none!important;
+  box-shadow: none;
+}
+.Dayteach-Allot{
+width: 400px;
+position:relative;
+height: 40px;
+top:15px;
+}
+.DaySeachIcon{
+  position:absolute;
+  font-size: 20px;
+  color:#b6b6b6;
+  right:30%;
+  margin-top:10px;
+  cursor: pointer;
+}
+.selectBox{
+position:relative;
+float:left;
+display: inline-block;
+}
+.Ageclass{
+  display:inline-block;
+  height: 40px;
+  width: 120px;
+  background-color: #F1F2F4;
+  line-height:40px;
+  font-size: 16px;
+  cursor: pointer;
+}
+.age-tip{
+  width: 80%;
+  height: 40px;
+  color:#747070;
+  font-size: 12px;
+}
+.class-download{
+  background-color: #fff;
+  width: 160px;
+    z-index:999999;
+    position:absolute;
+  border:1px solid #e0dddd;
+  border-radius:5px;
+  top:58px;
+}
+.class-download ul li{
+  height: 40px;
+  line-height:40px;
+  text-align:center;
+  cursor: pointer;
+  color:#b6b6b6;
+}
+.class-download ul li:hover{
+  background-color: #52cc60;
+  color:#ffff;
+}
+.miniorinput-with-Allot{
+  border: #b6b6b6;
+  border-radius:5px;
+  height: 40px;
+  width: 280px;
+  font-size: 8px;
+  color:#b6b6b6;
+  text-align:left;
+  line-height:40px;
+  background: #F1F2F4;
+  padding:0 10px;
+  float:left;
+    outline:none!important;
+  box-shadow: none;
+}
+.miniorteach-Allot{
+  float:left;
+width: 280px;
+position:relative;
+height: 40px;
+top:15px;
+}
+.miinorSeachIcon{
+  position:absolute;
+  font-size: 20px;
+  color:#b6b6b6;
+  right:5%;
+  margin-top:10px;
+  cursor: pointer;
+}
 </style>

src/pages/home/TeacherPay.vue

@@ -40,7 +40,7 @@
               @size-change="handleSizeChange1"
               @current-change="pageChange1"
               :page-sizes="[10]"
-              layout="total, sizes, prev, pager, next, jumper"
+             layout="total, prev, pager, next"
               :total="parseInt(errorWarningList.pages)"
               :hide-on-single-page="true"
             ></el-pagination>
@@ -49,7 +49,7 @@
         </el-row>
       </el-col>
     </el-row>
-      <div class="showModel"  v-if="NoAllotManagerModel">
+      <div class="showModel" @click="updateIsShowCarouselPictureModal()" v-if="NoAllotManagerModel">
             <div class="modal-cancel" @click="updateIsShowCarouselPictureModal()">X</div>
             <div class="detailinfo">
               <div class="detailImg">
@@ -185,10 +185,10 @@ export default {
   position: fixed;
   top: 0;
   left: 0;
-  background: #000000e7;
+ background-color : rgba(5, 5, 5, 0.5);
   opacity: 1!important;
   overflow: hidden!important;
-  color: #fff;
+  /* color: #fff; */
 }
   .modal-cancel {
       position: absolute;
@@ -198,24 +198,26 @@ export default {
       height: 50px;
       text-align: center;
       line-height: 50px;
-      background: #eee;
+      background-color : rgba(66, 56, 56, 0.5);
       border-radius: 100px;
       font-size: 16;
-      color:#000000;
+      color:#eee;
       cursor: pointer;
     }
     .detailinfo{
       position: absolute;
       left:50%;
-      margin-left:-490px;
-      top: 20px;
-      width: 980px;
-      height: 800px;
+      margin-left:-650px;
+      top: 10%;
+      width: 1300px;
+      height: 1000px;
       /* background: #eee; */
       text-align: center;
       line-height: 50px;
       border-radius: 100px;
       font-size: 16;
+      z-index:9999;
+          opacity: 1!important;
       color:#000000;
      padding:50px!important;
     }
@@ -224,8 +226,8 @@ export default {
       position: absolute;
       left:0;
       top: 20px;
-      width: 450px;
-      height: 550px;
+      width: 600px;
+      height: 700px;
       text-align: center;
       line-height: 50px;
       border-radius: 15px;
@@ -239,8 +241,8 @@ export default {
       position: absolute;
       right:0;
       top: 20px;
-      width: 450px;
-      height: 550px;
+      width: 600px;
+      height: 700px;
       text-align: center;
       line-height: 50px;
       border-radius: 15px;
@@ -250,8 +252,8 @@ export default {
       /* cursor: pointer; */
     }
    .detailImg img{
-      width: 450px;
-      height: 550px;
+      width: 600px;
+      height: 700px;
        border-radius: 15px;
    }
    .tipsesson{
@@ -309,6 +311,10 @@ export default {
       left:50px;
       bottom: 50px;
    }
+   .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
 html,
 body {
   height: 100%;
@@ -438,7 +444,7 @@ el-table {
   justify-content: space-around;
 }
 .tr-first > div {
-  width: 13.528%;
+  width: 14.528%;
 }
 .tr-s {
   display: flex;
@@ -513,18 +519,6 @@ el-table {
 .tr-active {
   color: #3ab548;
 }
-.showModel {
-  width: 100%;
-  height: 100%;
-  position: fixed;
-  top: 0;
-  left: 0;
-  background: #000000;
-  opacity: 0.2;
-  overflow: hidden;
-  z-index: 1000;
-  color: #fff;
-}
 .model {
   z-index: 10000;
   width: 60%;

src/pages/super/CheckTeacherAudit.vue

@@ -465,7 +465,10 @@
   .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
-
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
   .table-img{
     width:36px;
     height:36px;
@@ -550,6 +553,12 @@
     color: #393939;
 
   }
+  .el-input__inner, .el-checkbox__inner, .el-textarea__inner, .el-button {
+    font-size: 0.3125rem;
+    text-align: center;
+    line-height: 0!important;
+    padding: 12px 20px!important;
+}
   .textarea{
     background: #F6F7FB !important;
     font-size: 20px;

src/pages/super/CheckTeacherPay.vue

@@ -80,7 +80,7 @@
             @size-change="handleSizeChange"
             @current-change="pageChange"
             :page-sizes="[10]"
-            layout="total, sizes, prev, pager, next, jumper"
+          layout="total, prev, pager, next"
             :total= parseInt(getTeacherSalaryList.pages)
           ></el-pagination>
         </div>
@@ -321,6 +321,10 @@
     color: #999999;
     font-size: 18px;
   }
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
   .main-items{
     color: #393939;
     text-align: center;

src/pages/super/HomeWorkRecover.vue

@@ -432,6 +432,10 @@
     top: 10px;
     right: 15px;
   }
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
   .model-text-items{
     position: relative;
     color: #000000;

src/pages/super/HomeworkRecycle.vue

@@ -66,7 +66,7 @@
             @size-change="handleSizeChange1"
             @current-change="pageChange1"
             :page-sizes="[10]"
-            layout="total, sizes, prev, pager, next, jumper"
+           layout="total, prev, pager, next"
             :total= parseInt(homeworkRecoveryList.pages)
           ></el-pagination>
         </div>
@@ -104,7 +104,7 @@
                 >
                 <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 class="model-items-left-top-number">等待张数：{{v.waitCount}}</div>
                 </div>
               </div>
               <div>
@@ -122,7 +122,7 @@
             @size-change="handleSizeChange"
             @current-change="pageChange"
             :page-sizes="[10]"
-            layout="total, sizes, prev, pager, next, jumper"
+          layout="total, prev, pager, next"
             :total="parseInt(TeacherAllotList.pages)"
           ></el-pagination>
         </div>
@@ -419,6 +419,10 @@
     text-decoration: underline;
     cursor: pointer;
   }
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
   .pages{
     margin: 15px 0;
   }

src/pages/super/SuperAdmin.vue

@@ -125,7 +125,10 @@
               </div>
             </div>
             <div>
-              <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)" icon="el-icon-bottom">降级</el-button>
+                <div class="closeTeacherID" @click="isShow(2,getManagerDetail.name)">
+                  <span class="el-icon-close">降级</span>
+                </div>
+              <!-- <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)" icon="el-icon-bottom">降级</el-button> -->
             </div>
           </div>
           <div class="model-items-other model-active" >批改科目 : {{getManagerDetail.subject}}</div>
@@ -412,7 +415,10 @@
   .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
-
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color:#52cc60!important;
+    color: #fff;
+}
   .table-img{
     width:36px;
     height:36px;
@@ -553,6 +559,23 @@
     background-color:#F6F7FB;
     font-size: 16px !important;
     color: #393939;
-
   }
+  .closeTeacherID {
+   display: inline-block;
+  height: 40px;
+  width: 100px;
+  color: #f56c6c;
+  background: #fef0f0;
+  border-color: #fbc4c4;
+  border-radius: 20px;
+  font-size: 14px;
+  line-height: 40px;
+  cursor: pointer;
+  border: 1px solid;
+}
+.closeTeacherID:hover {
+  color: #fff;
+  background-color: #f56c6c;
+  border-color: #f56c6c;
+}
 </style>

src/store/getters.js

@@ -32,5 +32,6 @@ const getters = {
   pictureIndex :state => state.user.pictureIndex,
   InfoTeacherstatues :state => state.user.InfoTeacherstatues,
   GetTeacherstatues :state => state.user.GetTeacherstatues,
+  ApporingTeacherstatues :state => state.user.ApporingTeacherstatues,
 }
 export default getters

src/store/modules/user.js

@@ -39,6 +39,7 @@ const user = {
     pictureIndex:0,
     InfoTeacherstatues:"",
     GetTeacherstatues:"",
+    ApporingTeacherstatues:""
   },
 
   mutations: {
@@ -117,6 +118,9 @@ const user = {
     SET_GET_SUCCESS_TEACHERINFO_STUS:(state,InfoTeacherstatues) => {
       state.InfoTeacherstatues = InfoTeacherstatues
     },
+    SET_APPORING_STATUS:(state,ApporingTeacherstatues) => {
+      state.ApporingTeacherstatues = ApporingTeacherstatues
+    },
     SET_GET_SUCCESS_MANAGER_DETAIL:(state,GetTeacherstatues) => {
       state.GetTeacherstatues = GetTeacherstatues
     },
@@ -303,8 +307,18 @@ const user = {
         return new Promise((resolve, reject) => {
           axios.post(TeacherAllotList, data).then(response => {
             const data = response.data || {}
-            commit('SET_TEACHER_ALLOTIST', data);
-            resolve(response)
+            if (response.code === '999'){
+              commit('SET_TEACHER_ALLOTIST', data);
+              resolve(response)
+            }
+            if (response.code === '000'){
+              Message.error(response.msg)
+                commit('SET_APPORING_STATUS',new Date());
+              resolve(response)
+            }
+            if (response.code === "") {
+              Message.error("出了点小问题，噢噢。。。")
+            }
           }).catch(error => {
             reject(error)
           })
@@ -402,6 +416,11 @@ const user = {
                     commit('SET_GET_SUCCESS_CODE',new Date());
                     // Message.success('分配成功')
                   }
+                  if (response.code === '000'){
+                    Message.error(response.msg)
+                      commit('SET_APPORING_STATUS',new Date());
+                    resolve(response)
+                  }
                 }).catch(error => {
                   reject(error)
                 })