增加超级管理员登陆

src/pages/home/SchoolManager.vue

@@ -406,7 +406,7 @@
 
     <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
-    <div class="model" v-if="hiddenModel">
+    <div class="model" style="width:40%" v-if="hiddenModel">
       <div class="model-text">
         <div class="model-text-head">
           <div>可分配老师</div>
@@ -450,7 +450,7 @@
     </div>
     <!--所有未批改作业-->
     <div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
-    <div class="model" v-if="isPigai">
+    <div class="model" style="width:50%" v-if="isPigai">
       <div class="model-text">
         <div class="model-text-head">
           <div>所有未批改作业</div>
@@ -487,7 +487,7 @@
     </div>
     <!-- 老师详情弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="ModelAppor"></div>
-    <div class="model" v-if="ModelAppor">
+    <div class="model" style="width:40%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
           <div>批改老师</div>
@@ -509,7 +509,7 @@
             </div>
           </div>
           <div class="model-items-other model-active">批改科目 : {{GetTeacherDetail.subject}}</div>
-          <div class="model-items-other">批改年级 : {{GetTeacherDetail.grade}}</div>
+          <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>
@@ -524,7 +524,7 @@
     </div>
       <!-- 学生详情弹框 -->
     <div class="showModel" @click="allShowModel(4)" v-if="ModelStudet"></div>
-    <div class="model" style="width:40%;" v-if="ModelStudet">
+    <div class="model"  style="width:20%;" v-if="ModelStudet">
       <div class="model-text">
         <div class="model-manager">
           <div>学生详情</div>
@@ -558,11 +558,13 @@ export default {
   props: {},
   data() {
     return {
+      managerId:"",// 超级管理员登陆ID
       // BASE_URL:'https://img.sharingschool.com',
       BASE_URL: "https://xt.sharingschool.com/upload/",
       isDownindex: "",
       modelindex: 0,
       values: [],
+      arrGrade:[],
       hiddenModel: false, //分配老师弹框
       isPigai: false,//未批改作业弹框
       ModelAppor:false,//批改老师详情信息弹框
@@ -686,6 +688,10 @@ export default {
       AllotButton: ""
     };
   },
+  created(){
+    const managerId = this.$route.query.managerId
+    this.managerId = managerId
+  },
   watch: {},
   computed: {
     ...mapGetters([
@@ -732,7 +738,8 @@ export default {
         teacherName: this.filters.inputValue,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.filters.pageNo,
-        pageSize: this.filters.pageSize
+        pageSize: this.filters.pageSize,
+        managerId:this.managerId || ''
       });
     },
     // 获取校区管理员当天数据
@@ -743,7 +750,8 @@ export default {
         teacherName: this.filters1.inputValue,
         maxCreateTime: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
-        pageSize: this.filters1.pageSize
+        pageSize: this.filters1.pageSize,
+         managerId:this.managerId || ''
       });
     },
     // 获取校区管理员当月数据
@@ -754,7 +762,8 @@ export default {
         teacherName: this.filters2.inputValue,
         maxCreateTime: this.filters2.MaxtimeValue,
         pageNo: this.filters2.pageNo,
-        pageSize: this.filters2.pageSize
+        pageSize: this.filters2.pageSize,
+         managerId:this.managerId || ''
       });
     },
     // 查看老师批改作业列表
@@ -818,6 +827,19 @@ export default {
       this.$store.dispatch("GetTeacherDetail", {
         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 GetStudentInfo(v) {
@@ -874,6 +896,16 @@ export default {
         _this.ModelStudet = false;
       }
     },
+      // 数组去重
+      uniq(array){
+        var temp = []; //一个新的临时数组
+        for (var i = 0; i < array.length; i++){
+          if (temp.indexOf(array[i]) == -1) {
+            temp.push(array[i]);
+          }
+        }
+        return temp;
+      },
     //  输入框按键方法
     keyCodeMethod(e) {
       if (e.keyCode === 13) return this.itemListReshow();

src/store/modules/user.js

@@ -102,10 +102,10 @@ const user = {
                     Message.success('登录成功')
                    dispatch('GetInfo').then(res => { // 拉取用户信息
                         const roles = res.data.role 
-                        if (roles == 1) {
+                        if (roles == 2) {
                           router.push("/home");
                         }
-                        if (roles == 2) {
+                        if (roles == 1) {
                           router.push("/super");
                         }
                       }).catch(() => {
@@ -130,10 +130,10 @@ const user = {
                     Message.success('登录成功')
                    dispatch('GetInfo').then(res => { // 拉取用户信息
                         const roles = res.data.role 
-                        if (roles == 1) {
+                        if (roles == 2) {
                           router.push("/home");
                         }
-                        if (roles == 2) {
+                        if (roles == 1) {
                           router.push("/super");
                         }
                       }).catch(() => {