提交最新代码

src/ImgConfig/index.js

@@ -4,8 +4,12 @@ if (process.env.NODE_ENV === 'development') {
     IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
     APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html' //测试环境作业批改地址
 } else {
-    IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-    APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html'; //正式环境作业批改地址地址;
+    // IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+    IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
+
+    APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html' //测试环境作业批改地址
+    // APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html'; //正式环境作业批改地址地址;
+    // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html' //实习环境作业批改地址
 }
 export {
     IMG_BASE_URL,

src/config/index.js

@@ -1,10 +1,10 @@
 let BASE_URL = ''
 if (process.env.NODE_ENV === 'development') {
-    // BASE_URL = 'http://localhost:8080/sharingschool'
-    // BASE_URL = 'http://127.0.0.1:8080'
     BASE_URL = 'https://xt.sharingschool.com/sz'
 } else {
-    BASE_URL = 'https://t.sharingschool.com/sz';
+    BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
+    // BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址
+    // BASE_URL = 'https://sx.sharingschool.com'  //实习环境地址
 }
 const TIME_OUT = 10000
 

src/pages/Login.vue

@@ -62,6 +62,9 @@ export default {
         this.$store.dispatch("GET_TOKEN", {
           code: this.WxCode
         });
+        // 清除重定向url中参数ocde,
+      window.history.replaceState({}, "", `${location.pathname}`);
+      console.log(location.pathname)
       }
       return
     }

src/pages/home/SchoolManager.vue

@@ -86,24 +86,37 @@
                 <!-- 在线 -->
                 <div v-if="v.status == '1'" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
-                    <i style="cursor:pointer;"
+                    <i
+                      style="cursor:pointer;"
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
                       @click="dropDown(v,k)"
                     ></i>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" v-if="v.imgUrl" @click="isShow(v,3)">
-                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
+                    <img
+                      :src="BASE_URL + v.imgUrl"
+                      alt
+                      class="table-img"
+                      v-if="v.imgUrl"
+                      @click="isShow(v,3)"
+                    >
+                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
                   <div class="tr-active">{{v.maxWaitTime}}</div>
-                  <div  style="width:200px;">{{v.totalCorrectTime}}</div>
+                  <div style="width:200px;">{{v.totalCorrectTime}}</div>
                   <div>{{v.respSpeed}}</div>
                   <div>在线</div>
                 </div>
                 <!-- 离线 -->
-                <div v-if="v.status == '2'" style="color:#BEBEBE" class="tr-first" :class="{BgcColor:k%2 !== 1}">
+                <div
+                  v-if="v.status == '2'"
+                  style="color:#BEBEBE"
+                  class="tr-first"
+                  :class="{BgcColor:k%2 !== 1}"
+                >
                   <div>
-                    <i style="cursor:pointer;"
+                    <i
+                      style="cursor:pointer;"
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
                       @click="dropDown(v,k)"
                     ></i>
@@ -112,14 +125,20 @@
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
                   <div>{{v.maxWaitTime}}</div>
-                  <div  style="width:200px;">{{v.totalCorrectTime}}</div>
+                  <div style="width:200px;">{{v.totalCorrectTime}}</div>
                   <div>{{v.respSpeed}}</div>
                   <div>离线</div>
                 </div>
                 <!-- 封号 -->
-                <div v-if="v.status == '3'" style="color:#FF6767" class="tr-first" :class="{BgcColor:k%2 !== 1}">
+                <div
+                  v-if="v.status == '3'"
+                  style="color:#FF6767"
+                  class="tr-first"
+                  :class="{BgcColor:k%2 !== 1}"
+                >
                   <div>
-                    <i style="cursor:pointer;"
+                    <i
+                      style="cursor:pointer;"
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
                       @click="dropDown(v,k)"
                     ></i>
@@ -128,7 +147,7 @@
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
                   <div>{{v.maxWaitTime}}</div>
-                  <div  style="width:200px;">{{v.totalCorrectTime}}</div>
+                  <div style="width:200px;">{{v.totalCorrectTime}}</div>
                   <div>{{v.respSpeed}}</div>
                   <div>已封号</div>
                 </div>
@@ -143,8 +162,15 @@
                       <span @click="isShow(v,4)" style="cursor: pointer;" class="tr-second-check">查看</span>
                       <span>{{v.name}}</span>
                     </div>
-                     <div  v-if="v.status && !(v.status === 1 && k == 0) " class="tr-secondsA">{{v.spendTime}}</div>
-                     <div v-if="v.status === 1 && k == 0" class="tr-secondsA" style="color:#52CC60">{{v.spendTime}}</div>
+                    <div
+                      v-if="v.status && !(v.status === 1 && k == 0) "
+                      class="tr-secondsA"
+                    >{{v.spendTime}}</div>
+                    <div
+                      v-if="v.status === 1 && k == 0"
+                      class="tr-secondsA"
+                      style="color:#52CC60"
+                    >{{v.spendTime}}</div>
                     <div class="tr-seconds width40">{{v.subject}}</div>
                     <div class="tr-seconds width40">{{v.grade}}</div>
                     <div v-if="v.status === 1" class="tr-seconds width40">未批改</div>
@@ -205,12 +231,15 @@
       <el-col :span="18" class="main" v-if="modelindex == 1">
         <el-row :gutter="20" class="main-header">
           <el-col :span="5">
-         <div class="main-header-item">今日报错总次数:<span style="color:red;">{{DayTeacherList.wrongCount}}次</span></div> 
+            <div class="main-header-item">
+              今日报错总次数:
+              <span style="color:red;">{{DayTeacherList.wrongCount}}次</span>
+            </div>
           </el-col>
           <el-col :span="4" :offset="10">
             <!-- <input type="text" placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-new">
-                <el-button @click="InfoWatchDay"  type="primary"  icon="el-icon-search"></el-button> -->
-            <el-input  placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
+            <el-button @click="InfoWatchDay"  type="primary"  icon="el-icon-search"></el-button>-->
+            <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
               <el-button @click="InfoWatchDay" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
@@ -243,18 +272,18 @@
                 <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
-                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
-                   <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
+                  <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkCount}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div style="width:240px;">{{v.avgTime}}</div>
                   <div>{{v.attendance}}</div>
-                     <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
-                   <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div> -->
+                  <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
+                  <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div>-->
                 </div>
               </div>
             </div>
@@ -280,11 +309,13 @@
       <el-col :span="18" class="main" v-if="modelindex == 2">
         <el-row :gutter="20" class="main-header">
           <el-col :span="5">
-             <div class="main-header-item">当月报错总次数:<span style="color:red;">{{MothTeacherList.totalWrongCount}}次</span></div> 
+            <div class="main-header-item">
+              当月报错总次数:
+              <span style="color:red;">{{MothTeacherList.totalWrongCount}}次</span>
+            </div>
           </el-col>
           <el-col :span="4" :offset="10">
             <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
-
               <el-button @click="InfoWatchMoth" slot="append" icon="el-icon-search"></el-button>
             </el-input>
           </el-col>
@@ -306,7 +337,7 @@
           </el-col>
           <!-- <el-col :span="4">
             <div class="main-header-item">批改总份数：{{MothTeacherList.totalHomeworkCount}}</div>
-          </el-col> -->
+          </el-col>-->
           <el-col :span="4">
             <div class="main-header-item">批改总张数：{{MothTeacherList.totalHomeworkPicCount }}</div>
           </el-col>
@@ -339,11 +370,11 @@
                 <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
-                    <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
-                     <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
-                   <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
+                  <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
+                  <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkCount}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
@@ -515,7 +546,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.teacherCount}}</div>
+                  <div class="model-items-left-top-number">等待张数：{{v.teacherCount}}</div>
                 </div>
               </div>
               <div>
@@ -580,7 +611,7 @@
           </div>
           <div class="model-items-other model-active">
             可批改时间:
-            <div class="buttonAppoval" v-show="arrPeriod.length>1">
+            <div class="buttonAppoval"  v-show="arrPeriod.length >= 0">
               <el-button type="info" round v-for="(v, k) of arrPeriod" :key="k">{{v}}</el-button>
             </div>
           </div>
@@ -627,7 +658,7 @@
   </div>
 </template>
 <script>
-import { IMG_BASE_URL,APPOR_BASE_URL } from '@/ImgConfig'
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/ImgConfig";
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {},
@@ -635,42 +666,42 @@ export default {
   props: {},
   data() {
     return {
-       unionid:localStorage.getItem("unionid"),
-      accessToken:localStorage.getItem("accessToken"), //token
-      managerId:"",// 超级管理员登陆ID
-      ApporhomeworkId:"",
-      BASE_URL:IMG_BASE_URL,
-      APPOR_BASE_URL:APPOR_BASE_URL,
+      unionid: localStorage.getItem("unionid"),
+      accessToken: localStorage.getItem("accessToken"), //token
+      managerId: "", // 超级管理员登陆ID
+      ApporhomeworkId: "",
+      BASE_URL: IMG_BASE_URL,
+      APPOR_BASE_URL: APPOR_BASE_URL,
       isDownindex: "",
       modelindex: 0,
       values: [],
-      arrGrade:[],
-      NoAllotManagerModel:false, //未批改作业可分配老师弹框
+      arrGrade: [],
+      NoAllotManagerModel: false, //未批改作业可分配老师弹框
       hiddenModel: false, //分配老师弹框
-      isPigai: false,//未批改作业弹框
-      ModelAppor:false,//批改老师详情信息弹框
-      ModelStudet:false, //学生详情弹框
-      isNocheck:false,//没有未批改作业
+      isPigai: false, //未批改作业弹框
+      ModelAppor: false, //批改老师详情信息弹框
+      ModelStudet: false, //学生详情弹框
+      isNocheck: false, //没有未批改作业
       isDown: false,
       options: [
         {
           value: "0",
           label: "1~2年级",
-          str:'一年级,二年级'
+          str: "一年级,二年级"
         },
         {
           value: "1",
           label: "3~4年级",
-          str:'三年级,四年级'
+          str: "三年级,四年级"
         },
         {
           value: "2",
           label: "5~6年级",
-          str:'五年级,六年级'
+          str: "五年级,六年级"
         },
         {
           value: "3",
-          label: "全部",
+          label: "全部"
           // str:''
         }
       ],
@@ -678,21 +709,21 @@ export default {
         {
           value: "0",
           label: "语文",
-          str:"语文"
+          str: "语文"
         },
         {
           value: "1",
           label: "数学",
-          str:"数学"
+          str: "数学"
         },
         {
           value: "2",
           label: "英语",
-          str:"英语"
+          str: "英语"
         },
         {
           value: "3",
-          label: "全部",
+          label: "全部"
           // str:""
         }
       ],
@@ -719,7 +750,7 @@ export default {
         count: 100,
         orderField: "",
         orderAD: "",
-        managerId:''
+        managerId: ""
       },
       filters1: {
         //超级管理员的当天数据
@@ -747,7 +778,7 @@ export default {
         orderField: "",
         orderAD: ""
       },
-        filters3: {
+      filters3: {
         //超级管理员查看学员列表
         // 排序
         MaxtimeValue: "",
@@ -763,7 +794,7 @@ export default {
       homeworkLIst: {
         pageNo: 1,
         pageSize: 10,
-        teacherId:""
+        teacherId: ""
       },
       allotList: {
         Allotgarde: "",
@@ -772,7 +803,7 @@ export default {
         pageSize: 10,
         homeworkId: ""
       },
-        allNoapprovalList:{
+      allNoapprovalList: {
         Allotgarde: "",
         Allotsubjct: "",
         pageNo: 1,
@@ -782,27 +813,44 @@ export default {
       AllotButton: ""
     };
   },
-  created(){
-    const managerId = this.$route.query.managerId
-    this.managerId = managerId
+  created() {
+    const managerId = this.$route.query.managerId;
+    this.managerId = managerId;
   },
-  watch:{
-        getTeacherIdStatus(val, oldVal){ //普通的watch监听
-         this.InfoWatch();
-        },
-           BeforetoTeacherAllotCode(val, oldVal){ //普通的watch监听
-          window.open(APPOR_BASE_URL + '?homeworkId=' + this.ApporhomeworkId + '&unionid=' + this.unionid + '&teacherId=' + this.homeworkLIst.teacherId + '&state=' + 1)
-        },
-           BeforetoTeacherstatues(val, oldVal){ //普通的watch监听
-         // 查看老师批改作业列表
+  watch: {
+    getTeacherIdStatus(val, oldVal) {
+      //普通的watch监听
+      this.InfoWatch();
+    },
+    BeforetoTeacherAllotCode(val, oldVal) {
+      //普通的watch监听
+      window.open(
+        APPOR_BASE_URL +
+          "?homeworkId=" +
+          this.ApporhomeworkId +
+          "&unionid=" +
+          this.unionid +
+          "&teacherId=" +
+          this.homeworkLIst.teacherId +
+          "&state=" +
+          1
+      );
+    },
+    BeforetoTeacherstatues(val, oldVal) {
+      //普通的watch监听
+      // 查看老师批改作业列表
       this.$store.dispatch("TeacherHomeworkList", {
         teacherId: this.homeworkLIst.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize
       });
-        },
     },
+      InfoTeacherstatues(val, oldVal) {
+      //普通的watch监听
+      this.pesiorFun();
+    },
+  },
   computed: {
     ...mapGetters([
       "getUser",
@@ -817,15 +865,17 @@ export default {
       "GetStudentDetail",
       "getTeacherIdStatus",
       "BeforetoTeacherAllotCode",
-      "BeforetoTeacherstatues"
+      "BeforetoTeacherstatues",
+      "InfoTeacherstatues"
+      
     ])
   },
   methods: {
     ...mapActions(["setUser"]),
-       // 去批改前分配老师
+    // 去批改前分配老师
     async ToAppovalOline(v) {
-      let ApporhomeworkId = v.homeworkId
-      this.ApporhomeworkId = ApporhomeworkId
+      let ApporhomeworkId = v.homeworkId;
+      this.ApporhomeworkId = ApporhomeworkId;
       this.$store.dispatch("BeforetoTeacherAllot", {
         teacherId: localStorage.getItem("userId"),
         homeworkId: v.homeworkId
@@ -857,7 +907,7 @@ export default {
     // },
     // 获取校区管理员监控数据
     async InfoWatch() {
-     this.isDown = false;
+      this.isDown = false;
       this.$store.dispatch("InfoWatch", {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
@@ -865,7 +915,7 @@ export default {
         maxCreateTime: "",
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
-        managerId:this.managerId || ''
+        managerId: this.managerId || ""
       });
     },
     // 获取校区管理员当天数据
@@ -874,11 +924,11 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime:"",
-          oneDay: this.filters1.MaxtimeValue,
+        maxCreateTime: "",
+        oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
-         managerId:this.managerId || ''
+        managerId: this.managerId || ""
       });
     },
     // 获取校区管理员当月数据
@@ -888,16 +938,16 @@ export default {
         subject: this.filters.gradesValue,
         teacherName: this.filters2.inputValue,
         maxCreateTime: "",
-           oneMonth: this.filters2.MaxtimeValue,
+        oneMonth: this.filters2.MaxtimeValue,
         pageNo: this.filters2.pageNo,
         pageSize: this.filters2.pageSize,
-         managerId:this.managerId || ''
+        managerId: this.managerId || ""
       });
     },
-    
+
     // 查看老师批改作业列表
     async TeacherHomework(v) {
-      this.homeworkLIst.teacherId =  v.teacherId
+      this.homeworkLIst.teacherId = v.teacherId;
       this.$store.dispatch("TeacherHomeworkList", {
         teacherId: v.teacherId,
         maxCreateTime: "",
@@ -905,7 +955,7 @@ export default {
         pageSize: this.homeworkLIst.pageSize
       });
     },
-       // 分页查看老师批改作业列表
+    // 分页查看老师批改作业列表
     async TeacherHomeworkfy() {
       this.$store.dispatch("TeacherHomeworkList", {
         teacherId: this.homeworkLIst.teacherId,
@@ -924,7 +974,7 @@ export default {
         pageSize: this.allotList.pageSize
       });
     },
-     // 可分配老师列表分页
+    // 可分配老师列表分页
     async TeacherAllotfy() {
       this.$store.dispatch("TeacherAllotList", {
         grade: this.allotList.Allotgarde,
@@ -950,8 +1000,8 @@ export default {
       });
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
-       this.NoAllotManagerModel = false
-       this.UnallotHomework()
+      this.NoAllotManagerModel = false;
+      this.UnallotHomework();
       this.isPigai = true;
     },
     // 分配老师
@@ -962,45 +1012,47 @@ export default {
       });
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
-      this.hiddenModel = false
+      this.hiddenModel = false;
     },
-     // 查看老师详情信息
+    // 查看老师详情信息
     async GetTeacherInfo(v) {
       this.$store.dispatch("GetTeacherDetail", {
-        teacherId: v.teacherId,
+        teacherId: v.teacherId
       });
-         var arr = this.GetTeacherDetail.grade.split(',');
-        this.arrPeriod = this.GetTeacherDetail.period.split(',') || [];
-        var arrList = [];
-        for (var i in arr) {
-          if (arr[i] == '一年级' || arr[i] == '二年级') {
-            arrList.push('1-2年级')
-          } else if (arr[i] == '三年级' || arr[i] == "四年级") {
-            arrList.push('3-4年级')
-          } else if (arr[i] == '五年级' || arr[i] == "六年级") {
-            arrList.push('5-6年级')
-          }
-        }
-        this.arrGrade = this.uniq(arrList) || [];
     },
-        // 查看学生详情信息
+   async pesiorFun(){
+       var arr = this.GetTeacherDetail.grade.split(",");
+      this.arrPeriod = this.GetTeacherDetail.period.split(",");
+      var arrList = [];
+      for (var i in arr) {
+        if (arr[i] == "一年级" || arr[i] == "二年级") {
+          arrList.push("1-2年级");
+        } else if (arr[i] == "三年级" || arr[i] == "四年级") {
+          arrList.push("3-4年级");
+        } else if (arr[i] == "五年级" || arr[i] == "六年级") {
+          arrList.push("5-6年级");
+        }
+      }
+      this.arrGrade = this.uniq(arrList) || [];
+   },
+    // 查看学生详情信息
     async GetStudentInfo(v) {
       this.$store.dispatch("GetStudentDetail", {
-        vipId: v.vipId,
+        vipId: v.vipId
       });
     },
     selectTitle(k) {
       this.modelindex = k;
       if (k === 0) {
-       this.filters.pageNo = 1
+        this.filters.pageNo = 1;
         this.InfoWatch();
       }
       if (k === 1) {
-        this.filters1.pageNo = 1
+        this.filters1.pageNo = 1;
         this.InfoWatchDay();
       }
       if (k === 2) {
-        this.filters2.pageNo = 1
+        this.filters2.pageNo = 1;
         this.InfoWatchMoth();
       }
     },
@@ -1017,39 +1069,36 @@ export default {
       } else if (str == 2) {
         _this.isPigai = true;
         this.UnallotHomework();
-      }
-      else if (str == 3) {
+      } else if (str == 3) {
         _this.ModelAppor = true;
-        this.GetTeacherInfo(v)
-      }
-        else if (str == 4) {
+        this.GetTeacherInfo(v);
+      } else if (str == 4) {
         _this.ModelStudet = true;
-        this.GetStudentInfo(v)
-      }
-       else if (str == 5) {
-           this.allNoapprovalList.Allotgarde = v.grade;
+        this.GetStudentInfo(v);
+      } else if (str == 5) {
+        this.allNoapprovalList.Allotgarde = v.grade;
         this.allNoapprovalList.Allotsubjct = v.subject;
-          this.allNoapprovalList.homeworkId = v.homeworkId;
+        this.allNoapprovalList.homeworkId = v.homeworkId;
         _this.NoAllotManagerModel = true;
         _this.isPigai = false;
-         this.NoapporvalTeacherAllot(v);
+        this.NoapporvalTeacherAllot(v);
         // this.GetAllotManagerInfo()
       }
     },
     // 未批改作业可分配老师列表
     async NoapporvalTeacherAllot(v) {
       this.$store.dispatch("TeacherAllotList", {
-        grade: v.grade || this.allNoapprovalList.Allotgarde, 
+        grade: v.grade || this.allNoapprovalList.Allotgarde,
         subject: v.subject || this.allNoapprovalList.Allotsubjct,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
         pageSize: this.allNoapprovalList.pageSize
       });
     },
-       // 未批改作业可分配老师分页列表
+    // 未批改作业可分配老师分页列表
     async NoapporvalTeacherAllotfy() {
       this.$store.dispatch("TeacherAllotList", {
-        grade: this.allNoapprovalList.Allotgarde, 
+        grade: this.allNoapprovalList.Allotgarde,
         subject: this.allNoapprovalList.Allotsubjct,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allNoapprovalList.pageNo,
@@ -1057,36 +1106,35 @@ export default {
       });
     },
     // 去分配
-    allocation(){
-      var noHomework = document.getElementById('noHomework');
-      this.InfoWatch()
-      if (this.monitorTeacherList.unCorrectCount == 0){
+    allocation() {
+      var noHomework = document.getElementById("noHomework");
+      this.InfoWatch();
+      if (this.monitorTeacherList.unCorrectCount == 0) {
         noHomework.style.display = "block";
-        setTimeout(function () {
+        setTimeout(function() {
           noHomework.style.display = "none";
         }, 1000);
       } else {
-        this.isShow(this.monitorTeacherList,2)
+        this.isShow(this.monitorTeacherList, 2);
       }
-
     },
     //年月日时间封装
-    dayFormatDate: function () {
+    dayFormatDate: function() {
       let date = new Date();
       let y = date.getFullYear();
       let MM = date.getMonth() + 1;
-      MM = MM < 10 ? ('0' + MM) : MM;
+      MM = MM < 10 ? "0" + MM : MM;
       let d = date.getDate();
-      d = d < 10 ? ('0' + d) : d;
-      return y + '-' + MM + '-' + d;
+      d = d < 10 ? "0" + d : d;
+      return y + "-" + MM + "-" + d;
     },
     //年月时间封装
-    monthFormatDate: function () {
+    monthFormatDate: function() {
       let date = new Date();
       let y = date.getFullYear();
       let MM = date.getMonth() + 1;
-      MM = MM < 10 ? ('0' + MM) : MM;
-      return y + '-' + MM;
+      MM = MM < 10 ? "0" + MM : MM;
+      return y + "-" + MM;
     },
     //关闭弹框
     allShowModel(str) {
@@ -1095,27 +1143,24 @@ export default {
         _this.hiddenModel = false;
       } else if (str == 2) {
         _this.isPigai = false;
-      }
-       else if (str == 3) {
+      } else if (str == 3) {
         _this.ModelAppor = false;
-      }
-        else if (str == 4) {
+      } else if (str == 4) {
         _this.ModelStudet = false;
-      }
-      else if (str == 5) {
+      } else if (str == 5) {
         _this.NoAllotManagerModel = false;
       }
     },
-      // 数组去重
-      uniq(array){
-        var temp = []; //一个新的临时数组
-        for (var i = 0; i < array.length; i++){
-          if (temp.indexOf(array[i]) == -1) {
-            temp.push(array[i]);
-          }
+    // 数组去重
+    uniq(array) {
+      var temp = []; //一个新的临时数组
+      for (var i = 0; i < array.length; i++) {
+        if (temp.indexOf(array[i]) == -1) {
+          temp.push(array[i]);
         }
-        return temp;
-      },
+      }
+      return temp;
+    },
     //  输入框按键方法
     keyCodeMethod(e) {
       if (e.keyCode === 13) return this.itemListReshow();
@@ -1156,19 +1201,19 @@ export default {
       this.filters.pageSize = val;
       this.InfoWatch();
     },
-      handleSizeChange1(val) {
+    handleSizeChange1(val) {
       this.filters1.pageSize = val;
       this.InfoWatchDay();
     },
-      handleSizeChange2(val) {
+    handleSizeChange2(val) {
       this.filters2.pageSize = val;
       this.InfoWatchMoth();
     },
-      handleSizeChange3(val) {
+    handleSizeChange3(val) {
       this.homeworkLIst.pageSize = val;
       this.TeacherHomeworkfy();
     },
-     handleSizeChange4(val) {
+    handleSizeChange4(val) {
       this.allotList.pageSize = val;
       this.TeacherAllotfy();
     },
@@ -1176,28 +1221,28 @@ export default {
       this.allNoapprovalList.pageSize = val;
       this.NoapporvalTeacherAllotfy();
     },
-      // 分页
+    // 分页
     pageChange(val) {
       this.filters.pageNo = val;
       this.InfoWatch();
-    },  // 分页
+    }, // 分页
     pageChange1(val) {
       this.filters1.pageNo = val;
       this.InfoWatchDay();
-    },  // 分页
+    }, // 分页
     pageChange2(val) {
       this.filters2.pageNo = val;
       this.InfoWatchMoth();
     },
-      pageChange3(val) {
+    pageChange3(val) {
       this.homeworkLIst.pageNo = val;
       this.TeacherHomeworkfy();
     },
-      pageChange4(val) {
+    pageChange4(val) {
       this.allotList.pageNo = val;
       this.TeacherAllotfy();
     },
-       pageChange6(val) {
+    pageChange6(val) {
       this.allNoapprovalList.pageNo = val;
       this.NoapporvalTeacherAllotfy();
     },
@@ -1206,7 +1251,7 @@ export default {
       this.filters.orderField = sort.prop;
       this.filters.orderAD = sort.order != null ? sort.order : "";
       this.itemListReshow();
-    },
+    }
     // 获取创建人列表
     // async getUserNameList() {
     //   let {
@@ -1233,9 +1278,9 @@ body {
   height: 100%;
   overflow: hidden;
 }
-ul{
+ul {
   text-align: center;
-  margin: 0 !important
+  margin: 0 !important;
 }
 .aside {
   background-color: #fff;
@@ -1285,22 +1330,22 @@ el-table {
 }
 .el-select {
   width: 100px;
-  margin: -10px!important;
+  margin: -10px !important;
 }
 .input-with-select .el-input-group__prepend {
   background-color: #fff;
 }
-.el-select-dropdown__list{
-  padding:15px 0!important;
+.el-select-dropdown__list {
+  padding: 15px 0 !important;
 }
-.input-with-new{
-  border:1px solid #cccccc;
-  border-radius:15px;
+.input-with-new {
+  border: 1px solid #cccccc;
+  border-radius: 15px;
   height: 30px;
-  line-height:30px;
-  padding:10px;
+  line-height: 30px;
+  padding: 10px;
   font-size: 12px;
-  color:#eeeeee;
+  color: #eeeeee;
   width: 180px;
 }
 .active {
@@ -1319,7 +1364,7 @@ el-table {
   cursor: pointer;
 }
 .table {
-  width: 94.5%!important;
+  width: 94.5% !important;
   border-top: 1px solid #e5e5e5;
   margin: 0 43px;
 }
@@ -1331,7 +1376,7 @@ el-table {
   justify-content: space-around;
 }
 .table-heads1 {
-  margin-left:15%;
+  margin-left: 15%;
   width: 60%;
   color: #3ab548;
   font-size: 14px;
@@ -1349,7 +1394,7 @@ el-table {
   width: 100%;
   color: #393939;
   text-align: center;
-   font-family:"PingFang-SC-Bold";
+  font-family: "PingFang-SC-Bold";
   font-size: 16px;
   font-weight: 700;
 }
@@ -1433,9 +1478,9 @@ el-table {
 .tr-active {
   color: #3ab548;
 }
- .BgcColor{
-     background-color: #F7FBFC;
-   }
+.BgcColor {
+  background-color: #f7fbfc;
+}
 .showModel {
   width: 100%;
   height: 100%;

src/pages/home/TeacherPay.vue

@@ -53,18 +53,18 @@
             <div class="modal-cancel" @click="updateIsShowCarouselPictureModal()">X</div>
             <div class="detailinfo">
               <div class="detailImg">
-                <img  :src="BASE_URL + errorDetailList[pictureIndex].pictureUrl"  alt="">
+                <img  :src="BASE_URL + errorDetailList.pictureUrl"  alt="">
               </div>
               <div class="detailword">
                 <div>
                   <h1 class="tipsesson">错误原因:</h1>
                   <span class="tipsessonWord">
-                       {{errorDetailList[pictureIndex].errorReason}}
+                       {{errorDetailList.errorReason}}
                       </span>
                 </div>
                 <div class="timeAndteacher">
-                  <h2 class="managertip">{{errorDetailList[pictureIndex].checker}}</h2>
-                  <div class="timeset">{{errorDetailList[pictureIndex].checkDate}}</div>
+                  <h2 class="managertip">{{errorDetailList.checker}}</h2>
+                  <div class="timeset">{{errorDetailList.checkDate}}</div>
                   <div class="timesetImg">
                     <img src="../../assets/img/pen.png" alt="">
                   </div>
@@ -72,23 +72,23 @@
               </div>
               <div  class="nextPrveBtn">
                 <!-- 上一页 -->
-                <div @click="Clickprvebtn" v-show='pictureIndex >0'  class="prvebtn"  style="height:50px;cursor:pointer;">
+                <!-- <div @click="Clickprvebtn" v-show='pictureIndex >0'  class="prvebtn"  style="height:50px;cursor:pointer;">
                   <img src="../../assets/img/prev_white.png" alt="">
                 </div>
                    <div v-show='pictureIndex == 0'  class="prvebtn"  style="height:50px">
                   <img src="../../assets/img/prev_gray.png" alt="">
-                </div>
+                </div> -->
                 <!-- 张数 -->
-                <div style="color:#ffffff; font-size:25px;margin-top:40px;">
+                <!-- <div style="color:#ffffff; font-size:25px;margin-top:40px;">
                   <span>{{pictureIndex + 1}}</span><span style="color:#bbbbbb;">/{{errorDetailList.length}}</span>
-                </div>
+                </div> -->
                 <!-- 下一页 -->
-                <div @click="ClickNextebtn" v-show='pictureIndex < errorDetailList.length - 1' class="Nextebtn"  style="height:50px;cursor:pointer;">
+                <!-- <div @click="ClickNextebtn" v-show='pictureIndex < errorDetailList.length - 1' class="Nextebtn"  style="height:50px;cursor:pointer;">
                   <img  src="../../assets/img/next_white.png" alt="">
                 </div>
                 <div v-show='pictureIndex == errorDetailList.length - 1'  class="Nextebtn" style="height:50px">
                   <img  src="../../assets/img/next_gray.png" alt="">
-                </div>
+                </div> -->
               </div>
             </div>
       </div>
@@ -126,7 +126,6 @@ export default {
   methods: {
     ...mapActions(["setUser"]),
        // 去批改前分配老师
-    // 获取校区管理员当天数据
     async GeterrorWarningLists() {
       this.$store.dispatch("GeterrorWarning", {
         pageNo: this.filters1.pageNo,
@@ -150,7 +149,7 @@ export default {
         this.pictureIndex = 0
         this.NoAllotManagerModel = true
           this.$store.dispatch("GeterrorDetail", {
-        homeworkId: str.homeworkId,
+        pictureId: str.pictureId,
         accessToken:this.accessToken
       });
       },

src/pages/super/SuperAdmin.vue

@@ -189,6 +189,8 @@
         }
       };
     },
+     created() {
+  },
     watch: {},
     computed: {
       ...mapGetters(["getUser","getManagerList","getManagerDetail"])

src/store/getters.js

@@ -30,5 +30,6 @@ const getters = {
   errorWarningList :state => state.user.errorWarningList,
   errorDetailList :state => state.user.errorDetailList || {},
   pictureIndex :state => state.user.pictureIndex,
+  InfoTeacherstatues :state => state.user.InfoTeacherstatues,
 }
 export default getters

src/store/modules/user.js

@@ -37,6 +37,7 @@ const user = {
     errorWarningList:[],
     errorDetailList:[],
     pictureIndex:0,
+    InfoTeacherstatues:""
   },
 
   mutations: {
@@ -112,6 +113,9 @@ const user = {
     SET_GET_SUCCESS_TEACHER:(state,BeforetoTeacherstatues) => {
       state.BeforetoTeacherstatues = BeforetoTeacherstatues
     },
+    SET_GET_SUCCESS_TEACHERINFO_STUS:(state,InfoTeacherstatues) => {
+      state.InfoTeacherstatues = InfoTeacherstatues
+    },
     SET_ERROR_WARING:(state,errorWarningList) => {
       state.errorWarningList = errorWarningList
     },
@@ -153,13 +157,13 @@ const user = {
                           }
                           if (roles == 2) {
                             Message.success('校区管理员角色登录成功')
-                            // router.push("/home");
-                            router.push({path: '/home', replace: true})
+                            router.push("/home");
+                            // router.push({path: '/home', replace: true})
                           }
                           if (roles == 3) {
                             Message.success('超级管理员角色登录成功')
-                            // router.push("/super");
-                            router.push({path: '/super', replace: true})
+                            router.push("/super");
+                            // router.push({path: '/super', replace: true})
                           }
                         } if (isBanned == 1) {
                           Message.error('您已被封号')
@@ -192,6 +196,7 @@ const user = {
                         const userId = res.data.userId
                         const isBanned = res.data.isBanned
                         const unionid = res.data.unionid
+                        localStorage.setItem("unionid",unionid)
                         localStorage.setItem("userId",userId)
                         if (isBanned == 0) {
                           if (roles == 0) {
@@ -203,14 +208,14 @@ const user = {
                           }
                           if (roles == 2) {
                             Message.success('校区管理员角色登录成功')
-                            // router.push("/home");
-                            router.push({path: '/home', replace: true})
+                            router.push("/home");
+                            // router.push({path: '/home', replace: true})
                             
                           }
                           if (roles == 3) {
                             Message.success('超级管理员角色登录成功')
-                            // router.push("/super");
-                            router.push({path: '/super', replace: true})
+                            router.push("/super");
+                            // router.push({path: '/super', replace: true})
                             
                           }
                         } if (isBanned == 1) {
@@ -345,9 +350,12 @@ const user = {
            GetTeacherDetail({ commit, state }, data) {
             return new Promise((resolve, reject) => {
               axios.post(GetTeacherDetail, data).then(response => {
-                const data = response.data || {}
-                commit('SET_GET_TEACHERDETAIL', data);
-                resolve(response)
+                const data = response || {}
+                if (data.code === '999'){
+                  commit('SET_GET_SUCCESS_TEACHERINFO_STUS',new Date());
+                  commit('SET_GET_TEACHERDETAIL', data.data);
+                  resolve(response)
+                }
               }).catch(error => {
                 reject(error)
               })
@@ -436,7 +444,8 @@ const user = {
         GeterrorDetail({ commit, state }, data) {
           return new Promise((resolve, reject) => {
             axios.post(errorDetail, data).then(response => {
-              const data = response.data.list || {}
+              const data = response.data.dto || {}
+              // debugger
               commit('SET_ERROR_DETAIL', data);
                commit('SET_ERROR_INDEX', 0);
               resolve(response)