6.4；17：24页面样式修改

src/components/MenuComponent.vue

@@ -100,7 +100,7 @@ export default {
       })
         .then(() => {
           localStorage.removeItem("accessToken");
-          debugger
+          // debugger
           this.$store.dispatch("LogOut").then(() => {
             location.reload(); // 为了重新实例化vue-router对象 避免bug
           });

src/pages/home/SchoolManager.vue

@@ -503,7 +503,7 @@
     </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>
@@ -515,7 +515,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>
@@ -528,12 +528,12 @@
           <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>
+            <el-button type="info" round v-for="(v, k) of arrPeriod" :key=k v-if="v">{{v}}</el-button>
           </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>
@@ -551,7 +551,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>
@@ -853,7 +854,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] == '二年级') {

src/pages/super/SchoolManager.vue

@@ -514,7 +514,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>
@@ -522,7 +522,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
@@ -562,12 +562,12 @@
           </div>
           <div class="model-items-other model-active">
             可批改时间：
-            <el-button type="info" round>{{GetTeacherDetail.period}}</el-button>
+            <el-button type="info" round v-for="(v, k) of arrPeriod" :key="k" v-if="v">{{v}}</el-button>
           </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>
@@ -589,6 +589,7 @@
           <div class="model-items-first">
             <div>
                <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>
@@ -645,12 +646,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>
@@ -666,8 +670,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>
@@ -1016,7 +1020,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] == "二年级") {
@@ -1444,14 +1449,14 @@ el-table {
 }
 .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 {
@@ -1526,20 +1531,23 @@ el-table {
   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{
@@ -1595,4 +1603,10 @@ el-table {
   width: 226px;
   height: 203px;
 }
+  .allocation-items{
+    width: 45%;
+    display: inline-block;
+    margin-right: 20px;
+    margin-bottom:30px;
+  }
 </style>

src/store/modules/permission.js

@@ -6,7 +6,7 @@ import { asyncRouterMap, constantRouterMap } from '@/router'
  * @param route
  */
 function hasPermission(roles, route) {
-  debugger
+  // debugger
   if (route.meta && route.meta.roles) {
     return roles.some(role => route.meta.roles.indexOf(role) >= 0)
   } else {