修复以及最新代码合并

src/App.vue

@@ -75,6 +75,10 @@ botton {
     padding: 0;
     font-size: 12px;
 }
+ul{
+  text-align: center;
+  margin: 10px 0 !important;
+}
 table {
     border-collapse: initial;
     border-spacing: 0;

src/pages/Login.vue

@@ -31,12 +31,12 @@ export default {
   },
   methods: {
     WxLoginCtl() {
-      // this.$router.push({
-      //   path: "/aikmt/Redirect_uri",
-      //   query: {
-      //     unionid: "oPHg8wVj5EyFkLImpL62YOSOagSI"
-      //   }
-      // });
+      this.$router.push({
+        path: "/aikmt/Redirect_uri",
+        query: {
+          unionid: "oPHg8wXraekgH5YKVHvD3H7Ujynw"
+        }
+      });
     },
     async getTKByUnionid() {
       if (window.location.href.indexOf("unionid") >= 0) {

src/pages/Super.vue

@@ -262,4 +262,10 @@
   .ativityTimeFrame .el-radio {
     margin-left: 15px;
   }
+  .el-table .table-head-th{
+    background-color:#F6F7FB;
+    font-size: 16px !important;
+    color: #393939;
+
+  }
 </style>

src/pages/aikmt/Redirect_uri.vue

@@ -29,40 +29,40 @@ export default {
     };
   },
   created() {
-    // this.getTKByUnionid();
-    this.getTKByCode();
+    this.getTKByUnionid();
+    // this.getTKByCode();
     // debugger
   },
   computed: {
     ...mapGetters(["token"])
   },
   methods: {
-    // async getTKByUnionid() {
-    //   if (window.location.href.indexOf("unionid") >= 0) {
-    //     //  debugger
-    //     // 如果url中包含code,则保存到store中
-    //     let unionid = window.location.href.split("?")[1];
-    //     unionid = unionid.substring(8);
-    //     let WxCode = unionid;
-    //     this.WxCode = WxCode;
-    //     this.$store.dispatch("UnionidLogin", {
-    //       unionid: this.WxCode         
-    //     });
-    //   }
-    //   return
-    // }
-    async getTKByCode(){
-       if (window.location.href.indexOf('code') >= 0) {
-          // 如果url中包含code,则保存到store中
-          let code = window.location.href.split("?")[1];
-          code = code.substring(5);
-          let WxCode = code
-          this.WxCode = WxCode
-        }
-             this.$store.dispatch('GET_TOKEN', {
-               code: this.WxCode
-          });
+    async getTKByUnionid() {
+      if (window.location.href.indexOf("unionid") >= 0) {
+        //  debugger
+        // 如果url中包含code,则保存到store中
+        let unionid = window.location.href.split("?")[1];
+        unionid = unionid.substring(8);
+        let WxCode = unionid;
+        this.WxCode = WxCode;
+        this.$store.dispatch("UnionidLogin", {
+          unionid: this.WxCode         
+        });
+      }
+      return
     }
+    // async getTKByCode(){
+    //    if (window.location.href.indexOf('code') >= 0) {
+    //       // 如果url中包含code,则保存到store中
+    //       let code = window.location.href.split("?")[1];
+    //       code = code.substring(5);
+    //       let WxCode = code
+    //       this.WxCode = WxCode
+    //     }
+    //          this.$store.dispatch('GET_TOKEN', {
+    //            code: this.WxCode
+    //       });
+    // }
   },
   mounted() {}
 };

src/pages/home/SchoolManager.vue

@@ -3,7 +3,7 @@
   <div>
     <!-- table 表格 -->
     <el-row :gutter="20" class="main-items">
-      <el-col class="aside" :span="4" :offset="1" style="padding: 0 !important;">
+      <el-col class="aside" :span="3" :offset="2" style="padding: 0 !important;">
         <div
           class="table-aside"
           v-for="(v, k) in ItemList"
@@ -13,7 +13,7 @@
         >{{v.text}}</div>
       </el-col>
       <!--数据监控-->
-      <el-col :span="18" class="main" v-if="modelindex == 0">
+      <el-col :span="17" class="main" v-if="modelindex == 0">
         <el-row :gutter="20" class="main-header">
           <el-col :span="2" :offset="1">
             <div class="main-header-item">在线：{{monitorTeacherList.onlineCount}}人</div>
@@ -21,13 +21,13 @@
           <el-col :span="2">
             <div class="main-header-item">离线：{{monitorTeacherList.offlineCount}}人</div>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="5">
             <div class="main-header-item">
               <span>分配未批改作业：{{monitorTeacherList.unCorrectCount}}份</span>
-              <span @click="isShow(monitorTeacherList,2)" class="main-header-link">去分配</span>
+              <span @click="allocation()" class="main-header-link">去分配</span>
             </div>
           </el-col>
-          <el-col :span="8" :offset="6">
+          <el-col :span="8" :offset="5">
             <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
               <el-select
                 v-model="filters.OptionsValue"
@@ -174,18 +174,16 @@
               </div>
             </div>
             <!-- 分页显示 -->
-            <el-pagination
-            background
-            @size-change="handleSizeChange"
-            @current-change="pageChange"
-            :page-sizes="[10, 20, 30, 40]"
-             layout="total, sizes, prev, pager, next, jumper"
-             :total= parseInt(monitorTeacherList.pages)
-            ></el-pagination>
-            <!-- <div style="float:right;margin-left:15px;">
-            <el-button @click="myVisible = false" size="small">取 消</el-button>
-            <el-button type="primary" size="small" @click="submit">确定</el-button>
-          </div> -->
+            <div v-if="parseInt(monitorTeacherList.pages) > 10">
+              <el-pagination
+                background
+                @size-change="handleSizeChange"
+                @current-change="pageChange"
+                :page-sizes="[10]"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total= parseInt(monitorTeacherList.pages)
+              ></el-pagination>
+            </div>
             <div style="clear:both;"></div>
           </el-col>
         </el-row>
@@ -270,14 +268,16 @@
               </div>
             </div>
             <!-- 分页显示 -->
-            <el-pagination
-            background
-            @size-change="handleSizeChange1"
-            @current-change="pageChange1"
-            :page-sizes="[10, 20, 30, 40]"
-             layout="total, sizes, prev, pager, next, jumper"
-              :total= parseInt(DayTeacherList.pages)
-            ></el-pagination>
+            <div v-if="parseInt(DayTeacherList.pages) > 10">
+              <el-pagination
+              background
+              @size-change="handleSizeChange1"
+              @current-change="pageChange1"
+              :page-sizes="[10]"
+               layout="total, sizes, prev, pager, next, jumper"
+                :total= parseInt(DayTeacherList.pages)
+              ></el-pagination>
+            </div>
             <!-- <div style="float:right;margin-left:15px;">
             <el-button @click="myVisible = false" size="small">取 消</el-button>
             <el-button type="primary" size="small" @click="submit">确定</el-button>
@@ -390,14 +390,16 @@
               </div>
             </div>
             <!-- 分页显示 -->
-            <el-pagination
-            background
-            @size-change="handleSizeChange2"
-            @current-change="pageChange2"
-            :page-sizes="[10, 20, 30, 40]"
-             layout="total, sizes, prev, pager, next, jumper"
-           :total= parseInt(MothTeacherList.pages)
-            ></el-pagination>
+            <div v-if="parseInt(MothTeacherList.pages) > 10">
+              <el-pagination
+              background
+              @size-change="handleSizeChange2"
+              @current-change="pageChange2"
+              :page-sizes="[10]"
+               layout="total, sizes, prev, pager, next, jumper"
+             :total= parseInt(MothTeacherList.pages)
+              ></el-pagination>
+            </div>
             <!-- <div style="float:right;margin-left:15px;">
             <el-button @click="myVisible = false" size="small">取 消</el-button>
             <el-button type="primary" size="small" @click="submit">确定</el-button>
@@ -426,7 +428,7 @@
               <div>
                  <img :src="BASE_URL + v.imgUrl" v-if="v.imgUrl" alt class="model-items-left-top-img">
                 <img src="../../assets/img/user.jpg" v-if="!v.imgUrl" alt class="model-items-left-top-img">
-                <div style="display: inline-block">
+                <div style="display: inline-block;text-align: left">
                   <div style="font-size: 24px">{{v.name}}</div>
                   <div class="model-items-left-top-number">等待学生：{{v.waitCount}}</div>
                 </div>
@@ -446,6 +448,8 @@
             </div>
           </div>
         </div>
+        <!-- 分页显示 -->
+        <div v-if="parseInt(TeacherAllotList.pages) > 10">
             <el-pagination
             background
             @size-change="handleSizeChange4"
@@ -454,8 +458,15 @@
              layout="total, sizes, prev, pager, next, jumper"
              :total= parseInt(TeacherAllotList.pages)
             ></el-pagination>
+        </div>
       </div>
     </div>
+
+    <!-- 无未批改作业 v-if="monitorTeacherList.unCorrectCount==0"-->
+    <div class="no-homework" v-if="isNocheck">
+        <div>无可分配作业</div>
+        <img src="../../assets/img/wu_fen_pei_zuo_ye.png" alt="">
+    </div>
     <!--所有未批改作业-->
     <div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
     <div class="model" style="width:50%" v-if="isPigai">
@@ -484,6 +495,7 @@
               <el-button type="success">去分配</el-button>
             </div>
           </div>
+          <div v-if="parseInt(UnallotHomeworkInfo.pages) > 10">
             <el-pagination
             background
             @size-change="handleSizeChange3"
@@ -493,13 +505,14 @@
              :total= parseInt(UnallotHomeworkInfo.pages)
               :hide-on-single-page="true"
             ></el-pagination>
+          </div>
         </div>
   
       </div>
     </div>
     <!-- 老师详情弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="ModelAppor"></div>
-    <div class="model" style="width:40%" v-if="ModelAppor">
+    <div class="model" style="width:35%;left: 32.5%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
           <div>批改老师</div>
@@ -511,7 +524,7 @@
           <div class="model-items-first">
             <div>
               <img :src="BASE_URL + GetTeacherDetail.imgUrl" v-if="GetTeacherDetail.imgUrl"  alt class="model-items-first-img">
-                 <img src="../../assets/img/user.jpg" v-if="!GetTeacherDetail.imgUrl" alt class="model-items-first-img">
+              <img src="../../assets/img/user.jpg" v-if="!GetTeacherDetail.imgUrl" alt class="model-items-first-img">
               <div class="model-items-first-left">
                 <div class="Onlinename">{{GetTeacherDetail.name}}</div>
                 <div v-if="GetTeacherDetail.status ===1" class="Online">（在线）</div>
@@ -524,19 +537,19 @@
           <div class="model-items-other">批改年级 : <span v-for="(v, k) of arrGrade" :key=k>{{v}},</span></div>
           <div class="model-items-other model-active">
             可批改时间：
-            <el-button type="info" round>{{GetTeacherDetail.period}}</el-button>
+            <div v-if="v"><el-button type="info" round v-for="(v, k) of arrPeriod" :key=k>{{v}}</el-button></div>
           </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  model-active-last">被报错总次数 : {{GetTeacherDetail.wrongCount}}</div>
+                <div class="model-items-other  model-active">被报错总次数 : {{GetTeacherDetail.wrongCount}}</div>
                    <div class="model-items-other">满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
         </div>
       </div>
     </div>
       <!-- 学生详情弹框 -->
     <div class="showModel" @click="allShowModel(4)" v-if="ModelStudet"></div>
-    <div class="model"  style="width:20%;" v-if="ModelStudet">
+    <div class="model"  style="width:35%;left: 32.5%" v-if="ModelStudet">
       <div class="model-text">
         <div class="model-manager">
           <div>学生详情</div>
@@ -547,7 +560,8 @@
         <div class="model-items">
           <div class="model-items-first">
             <div>
-              <!-- <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img"> -->
+               <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img">
+              <img src="../../assets/img/user.jpg" v-if="!GetStudentDetail.imgUrl" alt class="model-items-first-img">
               <div class="model-items-first-left">
                 <div class="Onlinename">{{GetStudentDetail.name}}</div>
                 <div class="model-items-first-left-down">{{GetStudentDetail.school}}</div>
@@ -555,7 +569,7 @@
             </div>
           </div>
           <div class="model-items-other model-active">所读年级 : {{GetStudentDetail.grade}}</div>
-          <div class="model-items-other">性别 : {{GetStudentDetail.sex}}</div>
+          <div class="model-items-other">性别 : {{GetStudentDetail.sex==1?'男':'女'}}</div>
           <div class="model-items-other model-active">联系方式 : {{GetStudentDetail.phone}}</div>
         </div>
       </div>
@@ -582,6 +596,7 @@ export default {
       isPigai: false,//未批改作业弹框
       ModelAppor:false,//批改老师详情信息弹框
       ModelStudet:false, //学生详情弹框
+      isNocheck:false,//没有未批改作业
       isDown: false,
       options: [
         {
@@ -752,8 +767,8 @@ export default {
     // 获取校区管理员监控数据
     async InfoWatch() {
       this.$store.dispatch("InfoWatch", {
-        grade: this.filters.gradesValue,
-        subject: this.filters.OptionsValue,
+        grade: this.filters.OptionsValue,
+        subject: this.filters.gradesValue,
         teacherName: this.filters.inputValue,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.filters.pageNo,
@@ -764,8 +779,8 @@ export default {
     // 获取校区管理员当天数据
     async InfoWatchDay() {
       this.$store.dispatch("InfoWatchDay", {
-        grade: this.filters1.gradesValue,
-        subject: this.filters1.OptionsValue,
+        grade: this.filters.OptionsValue,
+        subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
         maxCreateTime: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
@@ -776,8 +791,8 @@ export default {
     // 获取校区管理员当月数据
     async InfoWatchMoth() {
       this.$store.dispatch("InfoWatchMoth", {
-        grade: this.filters2.gradesValue,
-        subject: this.filters2.OptionsValue,
+        grade: this.filters.OptionsValue,
+        subject: this.filters.gradesValue,
         teacherName: this.filters2.inputValue,
         maxCreateTime: this.filters2.MaxtimeValue,
         pageNo: this.filters2.pageNo,
@@ -848,7 +863,7 @@ export default {
         teacherId: v.teacherId,
       });
          var arr = this.GetTeacherDetail.grade.split(',');
-        this.arrPeriod = this.GetTeacherDetail.period.split(';');
+        this.arrPeriod = this.GetTeacherDetail.period.split(',');
         var arrList = [];
         for (var i in arr) {
           if (arr[i] == '一年级' || arr[i] == '二年级') {
@@ -902,6 +917,21 @@ export default {
         this.GetStudentInfo(v)
       }
     },
+    // 去分配
+    allocation(){
+      this.InfoWatch()
+      if (this.monitorTeacherList.unCorrectCount == 0){
+          this.isNocheck = true;
+        var time = setTimeout(function () {
+          console.log('2222')
+          this.isNocheck = true;
+          clearTimeout(time);
+        }, 1000);
+      } else {
+        this.isShow(this.monitorTeacherList,2)
+      }
+
+    },
     //关闭弹框
     allShowModel(str) {
       let _this = this;
@@ -1130,6 +1160,10 @@ el-table {
 .tr-first > div {
   width: 13.528%;
 }
+.tr-s{
+  display: flex;
+  justify-content: space-around;
+}
 .tr-set {
   background-color: #fbfbfb;
   display: flex;
@@ -1157,6 +1191,7 @@ el-table {
   display: flex;
   color: #393939;
   font-size: 20px;
+  word-wrap:break-word
 }
 .tr-seconds {
    text-align: center;
@@ -1212,10 +1247,10 @@ width: 60px;
   height: auto;
   position: fixed;
   top: 15%;
-  left: 25%;
+  left: 30%;
   margin: auto;
   background: #fff;
-  border-radius: 30px;
+  border-radius: 10px;
   text-align: center;
 }
 .model-text {
@@ -1224,6 +1259,7 @@ width: 60px;
 }
  .model-items-first{
     padding: 0 34px;
+    width: 100%;
     display: flex;
     justify-content: space-between;
   }
@@ -1281,6 +1317,7 @@ width: 60px;
   display: flex;
   justify-content: space-between;
   display: inline-block;
+  width: 45%;
 }
 .model-items-left-top-img {
   width: 68px;
@@ -1294,6 +1331,7 @@ width: 60px;
   font-size: 18px;
   margin-left: 10px;
 }
+
 .today-time {
   color: #7e7e7e;
   font-size: 18px;
@@ -1302,4 +1340,26 @@ width: 60px;
 .el-pagination{
 padding:30px;
 }
+  .no-homework{
+    width:16.5%;
+    height:328px;
+    background:rgba(255,255,255,1);
+    box-shadow:0px 0px 14px 0px rgba(228,228,228,1);
+    border-radius:10px;
+    margin: auto;
+    position: fixed;
+    top: 27%;
+    left: 41.75%;
+    text-align: center;
+    padding: 35px;
+    z-index: 1000;
+  }
+  .no-homework>div{
+    margin-bottom: 25px;
+    font-size: 24px;
+  }
+  .no-homework>img{
+    width: 226px;
+    height: 203px;
+  }
 </style>

src/pages/super/CheckTeacherAudit.vue

@@ -10,6 +10,11 @@
         <el-table
           :data="list"
           :header-cell-class-name="tableheaderClassName"
+          :header-cell-style="{
+          'background-color': '#F6F7FB',
+          'color': '#393939',
+          'font-size': '16px'
+           }"
           size="medium"
           border
           stripe
@@ -18,7 +23,7 @@
             label="注册老师"
             header-align="center"
           >
-            <template scope="scope">
+            <template slot-scope="scope">
               <div class="scope-list">
                 <img :src='BASE_URL+scope.row.imgUrl' alt="" class="table-img" v-if="scope.row.imgUrl">
                 <img src="../../assets/img/user.jpg" alt="" v-if="!scope.row.imgUrl" class="table-img">
@@ -41,7 +46,7 @@
             prop=""
             label="批改年级"
             header-align="center">
-              <template scope="scope">
+              <template slot-scope="scope">
                 <div v-if="v">
                     <div v-for="(v, k) of scope.row.gradeList" :key=k>{{v}}</div>
                 </div>
@@ -52,7 +57,7 @@
             label="可批改时间"
             header-align="center"
           >
-            <template scope="scope">
+            <template slot-scope="scope">
                   <div v-if="v">
                     <el-button type="info" round v-for="(v, k) of scope.row.periodList" :key=k>{{v}}</el-button>
                 </div>
@@ -60,7 +65,7 @@
           </el-table-column>
 
           <el-table-column prop="status" label="" header-align="center" width="250">
-            <template scope="scope">
+            <template slot-scope="scope">
               <el-button type="danger" @click="isShow(2,scope.row.teacherId,scope.row.name)">不通过</el-button>
               <el-button type="primary" @click="isShow(1,scope.row.teacherId,scope.row.name)">通过</el-button>
             </template>

src/pages/super/CheckTeacherPay.vue

@@ -26,6 +26,11 @@
         <el-table
           :data="getTeacherSalaryList.list"
           :header-cell-class-name="tableheaderClassName"
+          :header-cell-style="{
+          'background-color': '#F6F7FB',
+          'color': '#393939',
+          'font-size': '16px'
+           }"
           size="medium"
           border
           stripe
@@ -34,10 +39,12 @@
             label="注册老师"
             header-align="center"
           >
-            <template scope="scope">
-              <img :src='BASE_URL+scope.row.imgUrl' alt="" class="table-img" v-if="scope.row.imgUrl">
-              <img src="../../assets/img/user.jpg" alt="" v-if="!scope.row.imgUrl" class="table-img">
-              <span class="scope-name">{{scope.row.name}}</span>
+            <template slot-scope="scope">
+              <div class="scope-list">
+                <img :src='BASE_URL+scope.row.imgUrl' alt="" class="table-img" v-if="scope.row.imgUrl">
+                <img src="../../assets/img/user.jpg" alt="" v-if="!scope.row.imgUrl" class="table-img">
+                <span class="scope-name">{{scope.row.name}}</span>
+              </div>
             </template>
           </el-table-column>
           <el-table-column
@@ -178,7 +185,7 @@
             let arr = this.getTeacherSalaryList.list;
             let str = '注册老师,1～2年级0.6元/份,3～4年级0.8元/份,5～6年级1.2元/份,总计/元';
             for (let i = 0; i < arr.length; i++) {
-              str += "\n" + arr[i].name + ',' + arr[i].lowGradeCount + ',' + arr[i].middleGradeCount + ',' + arr[i].highGradeCount
+              str += "\n" + arr[i].name + ',' + arr[i].lowGradeCount + ',' + arr[i].middleGradeCount + ',' + arr[i].highGradeCount + ',' + arr[i].total
             }
             var uri = 'data:text/csv;charset=utf-8,' + encodeURIComponent(str);
             var downloadLink = document.createElement("a");
@@ -325,6 +332,7 @@
     line-height: 80px;
   }
   .main-header-item{
+    cursor: pointer;
     font-size: 16px;
     color: #7E7E7E;
   }
@@ -415,4 +423,8 @@
     text-align: center !important;
     margin-top: 15px;
   }
+  .scope-list{
+    margin-left: 18px;
+    text-align: left;
+  }
 </style>

src/pages/super/HomeworkRecycle.vue

@@ -10,6 +10,11 @@
         <el-table
           :data="list"
           :header-cell-class-name="tableheaderClassName"
+          :header-cell-style="{
+          'background-color': '#F6F7FB',
+          'color': '#393939',
+          'font-size': '16px'
+           }"
           size="medium"
           stripe
         >
@@ -47,7 +52,7 @@
             header-align="center"
             width="450"
           >
-            <template scope="">
+            <template slot-scope="">
                 <span class="allocation">去分配</span>
             </template>
           </el-table-column>

src/pages/super/SchoolManager.vue

@@ -3,7 +3,7 @@
   <div>
     <!-- table 表格 -->
     <el-row :gutter="20" class="main-items">
-      <el-col class="aside" :span="4" :offset="1" style="padding: 0 !important;">
+      <el-col class="aside" :span="3" :offset="2" style="padding: 0 !important;">
         <div
           class="table-aside"
           v-for="(v, k) in ItemList"
@@ -13,7 +13,7 @@
         >{{v.text}}</div>
       </el-col>
       <!--数据监控-->
-      <el-col :span="18" class="main" v-if="modelindex == 0">
+      <el-col :span="17" class="main" v-if="modelindex == 0">
         <el-row :gutter="20" class="main-header">
           <el-col :span="2" :offset="1">
             <div class="main-header-item">在线：{{monitorTeacherList.onlineCount}}人</div>
@@ -21,20 +21,20 @@
           <el-col :span="2">
             <div class="main-header-item">离线：{{monitorTeacherList.offlineCount}}人</div>
           </el-col>
-          <el-col :span="4">
+          <el-col :span="6">
             <div class="main-header-item">
               <span>分配未批改作业：{{monitorTeacherList.unCorrectCount}}份</span>
-              <span @click="isShow(monitorTeacherList,2)" class="main-header-link">去分配</span>
+              <span @click="allocation()" class="main-header-link">去分配</span>
             </div>
           </el-col>
-          <el-col :span="8" :offset="6">
+          <el-col :span="8" :offset="4">
             <el-input placeholder="请输入老师名字" v-model="filters.inputValue" class="input-with-select">
               <el-select
                 v-model="filters.OptionsValue"
                 @change="InfoWatch"
                 slot="prepend"
                 placeholder="选年级"
-                minlength="20"
+                maxlength="20"
               >
                 <el-option
                   v-for="(item, k) in options"
@@ -48,7 +48,7 @@
                 @change="InfoWatch"
                 slot="prepend"
                 placeholder="选科目"
-                minlength="20"
+                maxlength="20"
               >
                 <el-option
                   v-for="(item, k) in grades"
@@ -160,14 +160,16 @@
                     </div>
                   </div>
                   <!-- 分页显示 -->
-                  <el-pagination
-                    background
-                    @size-change="handleSizeChange3"
-                    @current-change="pageChange3"
-                    :page-sizes="[10, 20]"
-                    layout="total, sizes, prev, pager, next, jumper"
-                    :total="parseInt(TeacherHomeworkList.pages)"
-                  ></el-pagination>
+                  <div v-if="parseInt(TeacherHomeworkList.pages) > 10">
+                    <el-pagination
+                      background
+                      @size-change="handleSizeChange3"
+                      @current-change="pageChange3"
+                      :page-sizes="[10, 20]"
+                      layout="total, sizes, prev, pager, next, jumper"
+                      :total="parseInt(TeacherHomeworkList.pages)"
+                    ></el-pagination>
+                  </div>
                 </div>
               </div>
             </div>
@@ -270,14 +272,16 @@
               </div>
             </div>
             <!-- 分页显示 -->
-            <el-pagination
-              background
-              @size-change="handleSizeChange1"
-              @current-change="pageChange1"
-              :page-sizes="[10, 20, 30, 40]"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="parseInt(DayTeacherList.pages)"
-            ></el-pagination>
+            <div v-if="parseInt(DayTeacherList.pages) > 10">
+              <el-pagination
+                background
+                @size-change="handleSizeChange1"
+                @current-change="pageChange1"
+                :page-sizes="[10]"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="parseInt(DayTeacherList.pages)"
+              ></el-pagination>
+            </div>
             <!-- <div style="float:right;margin-left:15px;">
             <el-button @click="myVisible = false" size="small">取 消</el-button>
             <el-button type="primary" size="small" @click="submit">确定</el-button>
@@ -397,14 +401,16 @@
               </div>
             </div>
             <!-- 分页显示 -->
-            <el-pagination
-              background
-              @size-change="handleSizeChange2"
-              @current-change="pageChange2"
-              :page-sizes="[10, 20, 30, 40]"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total="parseInt(MothTeacherList.pages)"
-            ></el-pagination>
+            <div v-if="parseInt(MothTeacherList.pages) > 10">
+              <el-pagination
+                background
+                @size-change="handleSizeChange2"
+                @current-change="pageChange2"
+                :page-sizes="[10]"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="parseInt(MothTeacherList.pages)"
+              ></el-pagination>
+            </div>
             <!-- <div style="float:right;margin-left:15px;">
             <el-button @click="myVisible = false" size="small">取 消</el-button>
             <el-button type="primary" size="small" @click="submit">确定</el-button>
@@ -456,16 +462,23 @@
             </div>
           </div>
         </div>
-        <el-pagination
-          background
-          @size-change="handleSizeChange4"
-          @current-change="pageChange4"
-          :page-sizes="[10]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="parseInt(TeacherAllotList.pages)"
-        ></el-pagination>
+        <div v-if="parseInt(TeacherAllotList.pages) > 10">
+          <el-pagination
+            background
+            @size-change="handleSizeChange4"
+            @current-change="pageChange4"
+            :page-sizes="[10]"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="parseInt(TeacherAllotList.pages)"
+          ></el-pagination>
+        </div>
       </div>
     </div>
+    <!-- 无未批改作业 v-if="monitorTeacherList.unCorrectCount==0"-->
+    <div class="no-homework" v-if="isNocheck">
+      <div>无可分配作业</div>
+      <img src="../../assets/img/wu_fen_pei_zuo_ye.png" alt="">
+    </div>
     <!--所有未批改作业-->
     <div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
     <div class="model" style="width:50%" v-if="isPigai">
@@ -508,7 +521,7 @@
     </div>
     <!-- 老师详情弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="ModelAppor"></div>
-    <div class="model" style="width:60%" v-if="ModelAppor">
+    <div class="model" style="width:35%;left: 32.5%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
           <div>批改老师</div>
@@ -516,7 +529,7 @@
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(3)">
           </div>
         </div>
-        <div class="model-items" style="width:80%">
+        <div class="model-items">
           <div class="model-items-first">
             <div>
               <img
@@ -556,12 +569,12 @@
           </div>
           <div class="model-items-other model-active">
             可批改时间：
-            <el-button type="info" round>{{GetTeacherDetail.period}}</el-button>
+            <div v-if="v"><el-button type="info" round v-for="(v, k) of arrPeriod" :key="k">{{v}}</el-button></div>
           </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 model-active-last">被报错总次数 : {{GetTeacherDetail.wrongCount}}</div>
+          <div class="model-items-other model-active">被报错总次数 : {{GetTeacherDetail.wrongCount}}</div>
           <div class="model-items-other">满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
             <div style="display:inline-block">
               <el-button type="success" icon="el-icon-user-solid" plain round @click="isShow(GetTeacherDetail,8)"><i class="el-icon-bottom"></i><span>重新分配组</span></el-button>
@@ -571,7 +584,7 @@
     </div>
     <!-- 学生详情弹框 -->
     <div class="showModel" @click="allShowModel(4)" v-if="ModelStudet"></div>
-    <div class="model" style="width:20%;" v-if="ModelStudet">
+    <div class="model" style="width:35%;left:32.5%" v-if="ModelStudet">
       <div class="model-text">
         <div class="model-manager">
           <div>学生详情</div>
@@ -582,7 +595,8 @@
         <div class="model-items">
           <div class="model-items-first">
             <div>
-              <!-- <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img"> -->
+               <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img">
+              <img src="../../assets/img/user.jpg" v-if="!GetStudentDetail.imgUrl" alt class="model-items-first-img">
               <div class="model-items-first-left">
                 <div class="Onlinename">{{GetStudentDetail.name}}</div>
                 <div class="model-items-first-left-down">{{GetStudentDetail.school}}</div>
@@ -590,7 +604,7 @@
             </div>
           </div>
           <div class="model-items-other model-active">所读年级 : {{GetStudentDetail.grade}}</div>
-          <div class="model-items-other">性别 : {{GetStudentDetail.sex}}</div>
+          <div class="model-items-other">性别 : {{GetStudentDetail.sex==1?'男':'女'}}</div>
           <div class="model-items-other model-active">联系方式 : {{GetStudentDetail.phone}}</div>
         </div>
       </div>
@@ -639,12 +653,15 @@
     </div>
        <!--可分配小组管理员列表弹框-->
     <div class="showModel" @click="allShowModel(8)" v-if="AllotManagerModel"></div>
-    <div class="model" style="width:60%" v-if="AllotManagerModel">
-      <div class="model-text">
-        <div class="model-text-head">
+    <div class="model" style="width:44.5%" v-if="AllotManagerModel">
+      <div class="model-text" style="padding: 0 30px">
+        <div class="model-manager">
           <div>可分配小组</div>
+          <div>
+            <img src="../../assets/img/del@2x.png" alt @click="allShowModel(8)">
+          </div>
         </div>
-        <div class="model-items" v-for="(v, k) in getAllotManagerList.list" :key="k">
+        <div class="allocation-items" v-for="(v, k) in getAllotManagerList.list" :key="k" >
           <div class="model-items-left">
             <div class="model-items-left-top">
               <div>
@@ -660,8 +677,8 @@
                   alt
                   class="model-items-left-top-img"
                 >
-                <div style="display: inline-block">
-                  <div style="font-size: 24px">{{v.name}}</div>
+                <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.teacherCount}}</div>
                 </div>
               </div>
@@ -676,14 +693,16 @@
             </div>
           </div>
         </div>
-        <el-pagination
-          background
-          @size-change="handleSizeChange5"
-          @current-change="pageChange5"
-          :page-sizes="[10]"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="parseInt(getAllotManagerList.pages)"
-        ></el-pagination>
+        <div v-if="parseInt(getAllotManagerList.pages) > 10">
+          <el-pagination
+            background
+            @size-change="handleSizeChange5"
+            @current-change="pageChange5"
+            :page-sizes="[10]"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="parseInt(getAllotManagerList.pages)"
+          ></el-pagination>
+        </div>
       </div>
     </div>
   </div>
@@ -718,6 +737,7 @@ export default {
       ModelAppor: false, //批改老师详情信息弹框
       AllotManagerModel:false, //可分配小组管理员列表弹框
       ModelStudet: false, //学生详情弹框
+      isNocheck:false,//没有未批改作业
       isDown: false,
       options: [
         {
@@ -888,8 +908,8 @@ export default {
     // 获取校区管理员监控数据
     async InfoWatch() {
       this.$store.dispatch("InfoWatch", {
-        grade: this.filters.gradesValue,
-        subject: this.filters.OptionsValue,
+        grade: this.filters.OptionsValue,
+        subject: this.filters.gradesValue,
         teacherName: this.filters.inputValue,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.filters.pageNo,
@@ -900,8 +920,8 @@ export default {
     // 获取校区管理员当天数据
     async InfoWatchDay() {
       this.$store.dispatch("InfoWatchDay", {
-        grade: this.filters1.gradesValue,
-        subject: this.filters1.OptionsValue,
+        grade: this.filters.OptionsValue,
+        subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
         maxCreateTime: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
@@ -912,8 +932,8 @@ export default {
     // 获取校区管理员当月数据
     async InfoWatchMoth() {
       this.$store.dispatch("InfoWatchMoth", {
-        grade: this.filters2.gradesValue,
-        subject: this.filters2.OptionsValue,
+        grade: this.filters.OptionsValue,
+        subject: this.filters.gradesValue,
         teacherName: this.filters2.inputValue,
         maxCreateTime: this.filters2.MaxtimeValue,
         pageNo: this.filters2.pageNo,
@@ -1007,7 +1027,8 @@ export default {
         teacherId: v.teacherId
       });
       var arr = this.GetTeacherDetail.grade.split(",");
-      this.arrPeriod = this.GetTeacherDetail.period.split(";");
+      this.arrPeriod = this.GetTeacherDetail.period.split(",");
+      console.log(this.arrPeriod)
       var arrList = [];
       for (var i in arr) {
         if (arr[i] == "一年级" || arr[i] == "二年级") {
@@ -1097,6 +1118,21 @@ export default {
         this.GetAllotManagerInfo()
       }
     },
+    // 去分配
+    allocation(){
+      this.InfoWatch()
+      if (this.monitorTeacherList.unCorrectCount == 0){
+        this.isNocheck = true;
+        var time = setTimeout(function () {
+          console.log('2222')
+          this.isNocheck = true;
+          clearTimeout(time);
+        }, 1000);
+      } else {
+        this.isShow(this.monitorTeacherList,2)
+      }
+
+    },
     //关闭弹框
     allShowModel(str) {
       let _this = this;
@@ -1432,22 +1468,22 @@ width: 60px;
   height: auto;
   position: fixed;
   top: 15%;
-  left: 25%;
+  left: 30%;
   margin: auto;
   background: #fff;
-  border-radius: 30px;
+  border-radius: 10px;
   text-align: center;
 }
 .modelspec{
    z-index: 10000;
-  width: 20%;
+  width: 35.5%;
   height: auto;
   position: fixed;
   top: 30%;
-  left: 35%;
+  left: 32.5%;
   margin: auto;
   background: #fff;
-  border-radius: 30px;
+  border-radius: 10px;
   text-align: center;
 }
 .model-text {
@@ -1509,10 +1545,11 @@ width: 60px;
   justify-content: space-between;
 }
 .model-items {
-  padding: 20px;
+  padding-bottom: 10px;
   display: flex;
   justify-content: space-between;
   display: inline-block;
+  width: 100%;
 }
 .model-items-left-top-img {
   width: 68px;
@@ -1521,20 +1558,23 @@ width: 60px;
   position: relative;
   bottom: 25px;
 }
+  .model-btn-items{
+    font-size: 18px;
+  }
   .main-gay{
     background:rgba(246,247,251,1);
     color: #7E7E7E;
-    width: 50px;
-    height: 30px;
-    line-height:30px;
+    width: 154px;
+    height: 50px;
+    line-height:50px;
     cursor: pointer;
   }
   .model-grdeen{
     background-color: #52CC60;
     color: #fff;
-      width: 50px;
-    height: 30px;
-     line-height:30px;
+      width: 154px;
+    height: 50px;
+     line-height:50px;
     cursor: pointer;
   }
   .model-text-items-close{
@@ -1568,4 +1608,32 @@ width: 60px;
 .el-pagination {
   padding: 30px;
 }
+.no-homework{
+  width:16.5%;
+  height:328px;
+  background:rgba(255,255,255,1);
+  box-shadow:0px 0px 14px 0px rgba(228,228,228,1);
+  border-radius:10px;
+  margin: auto;
+  position: fixed;
+  top: 27%;
+  left: 41.75%;
+  text-align: center;
+  padding: 35px;
+  z-index: 1000;
+}
+.no-homework>div{
+  margin-bottom: 25px;
+  font-size: 24px;
+}
+.no-homework>img{
+  width: 226px;
+  height: 203px;
+}
+  .allocation-items{
+    width: 45%;
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom:30px;
+  }
 </style>

src/pages/super/SuperAdmin.vue

@@ -15,7 +15,11 @@
         <el-table
           :data="getManagerList.list"
           :header-cell-class-name="tableheaderClassName"
-          :cell-style="cellStyle"
+          :header-cell-style="{
+          'background-color': '#F6F7FB',
+          'color': '#393939',
+          'font-size': '16px'
+           }"
           size="medium"
           border
         >
@@ -23,7 +27,7 @@
             label="小组管理员"
             header-align="center"
           >
-            <template scope="scope">
+            <template slot-scope="scope">
               <div class="scope-list">
                 <img :src='BASE_URL+scope.row.imgUrl' alt="" class="table-img" v-if="scope.row.imgUrl">
                 <img src="../../assets/img/user.jpg" alt="" v-if="!scope.row.imgUrl" class="table-img">
@@ -65,14 +69,14 @@
             prop=""
             label="是否在线"
             header-align="center">
-            <template scope="scope">
+            <template slot-scope="scope">
                 <span v-if="scope.$index==0&&parseInt(getManagerList.pageNo)==1">自己</span>
                 <span v-if="scope.$index>0&&parseInt(getManagerList.pageNo)==1">{{scope.row.status}}</span>
                 <span v-if="parseInt(getManagerList.pageNo)>1">{{scope.row.status}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="status" label="" header-align="center" width="250">
-            <template scope="scope">
+            <template slot-scope="scope">
               <el-button type="success"  @click="groupDetail(scope.row.managerId)" >小组详情</el-button>
               <el-button type="success" plain @click="isShow(1,scope.row.managerId)" v-if="scope.$index>0">管理员详情</el-button>
             </template>
@@ -113,16 +117,16 @@
               </div>
             </div>
             <div>
-              <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)"><i class="el-icon-bottom"></i><span>降级</span></el-button>
+              <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)" icon="el-icon-bottom"><span>降级</span></el-button>
             </div>
           </div>
           <div class="model-items-other model-active">批改科目 : {{getManagerDetail.subject}}</div> 
-          <div class="model-items-other">批改年级 :<div v-if="k>=0"> <span v-for="(v, k) of arrGrade" :key=k class="scope-name">{{v}}</span></div></div>
-          <div class="model-items-other model-active">可批改时间： <div v-if="k>=0"><span v-if="v"><el-button type="info" round v-for="(v, k) of arrPeriod" :key=k >{{v}}</el-button></span></div></div>
+          <div class="model-items-other">批改年级 :<span v-for="(v, k) of arrGrade" :key=k class="grade-name" v-if="k>=0">{{v}}</span></div>
+          <div class="model-items-other model-active"><span>可批改时间：</span> <span ><el-button type="info" round v-for="(v, k) of arrPeriod" :key=k v-if="k>=0">{{v}}</el-button></span></div>
           <div class="model-items-other">手机号 : {{getManagerDetail.phone}}</div>
           <div class="model-items-other model-active-last">上次登录时间 : {{getManagerDetail.lastOnlineTime}}</div>
         </div>
-k
+
       </div>
     </div>
     <!--所有未批改作业-->
@@ -238,6 +242,7 @@ k
           pageNo: this.filters.pageNo,
           pageSize: this.filters.pageSize
         });
+
       },
       // 查看校区管理员详情
       async GetManagerDetail(str) {
@@ -463,7 +468,7 @@ k
     background-color: #F6F7FB;
   }
   .model-active-last{
-    border-radius:0 0 30px 30px;
+    border-radius:0 0 10px 10px;
     background-color: #F6F7FB;
   }
 
@@ -510,7 +515,12 @@ k
   .scope-name{
     margin-left: 13px;
     color: #393939;
+    font-size: 13px;
+  }
+  .grade-name{
+    color: #393939;
     font-size: 16px;
+    margin:0 10px;
   }
   .page-block{
     text-align: center !important;