6.20-15：45页面样式修改

src/components/SuperComponent.vue

@@ -1,8 +1,8 @@
 <template>
   <el-col :span="24" class="">
-      <el-col :span="2" :offset="2">
+      <div class="logo-header">
        <img class="logoImg" src="../assets/img/log.png"/>
-      </el-col>
+      </div>
     <!--v-show="roles.indexOf(item.id) >= 0"-->
       <el-col :span="3"   v-for="(item, index) of menuData" :key="item.id"
       @click.native="secondNavClick(item,index)" style="text-align: center">
@@ -125,7 +125,7 @@ export default {
 /*}*/
 .menu_item {
   cursor: pointer;
-  color:#999999; 
+  color:#999999;
   font-size: 9px;
   font-family: serif;
   box-sizing:border-box;
@@ -145,6 +145,11 @@ export default {
 .menu_item+.menu_item {
   border-left: 1px solid #ffffff;
 }
+.logo-header{
+  display: inline-block;
+  float: left;
+  margin-left: 8.3%;
+}
 .logoImg{
   width:136px;
   height:52px;
@@ -168,7 +173,7 @@ export default {
   display: inline-block;
 }
 .out{
-  margin-left: 40px;
+  margin-left: 2%;
   font-size: 14px;
   color: #666666;
   display: inline-block;

src/pages/super/CheckTeacherAudit.vue

@@ -243,10 +243,19 @@
 
       };
     },
-    watch: {},
+    watch: {
+      InfoTeacherstatues(val, oldVal) {
+        //普通的watch监听
+        this.pesiorFun();
+      },
+      GetTeacherstatues(val, oldVal) {
+        //普通的watch监听
+        this.SuperApplyTeacherList()
+      }
+    },
     //
     computed: {
-      ...mapGetters(["getUser","applyTeacherList"])
+      ...mapGetters(["getUser","applyTeacherList","InfoTeacherstatues","GetTeacherstatues"])
     },
     methods: {
       ...mapActions(["setUser"]),
@@ -287,7 +296,10 @@
           pageNo: this.filters.pageNo,
           pageSize: this.filters.pageSize
         });
-        console.log(this.applyTeacherList.list)
+
+      },
+      async pesiorFun(){
+        console.log(this.applyTeacherList)
         this.applyTeacherList.list = (res => {
           const d = []
           for (let i in res) {
@@ -305,7 +317,7 @@
           }
           return d
         })(this.applyTeacherList.list)
-        this.list = this.applyTeacherList.list;
+        this.list = this.applyTeacherList.list || [];
         console.log(this.list)
       },
       //申请审批操作
@@ -317,10 +329,10 @@
           reason:this.filters.textareaDesc
         });
         this.allShowModel(this.operate);
-        setTimeout(function () {
-          // _that.SuperApplyTeacherList()
-          window.location.reload();
-        }, 1000);
+        // setTimeout(function () {
+        //   // _that.SuperApplyTeacherList()
+        //   window.location.reload();
+        // }, 1000);
       },
       //时间封装
       formatDate: function () {

src/pages/super/SuperAdmin.vue

@@ -7,10 +7,18 @@
       <!--数据监控-->
       <el-col :span="20" class="main" :offset="2">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="3"><div class="main-header-item" >注册老师数：{{getManagerList.registerTeacherCount}}人</div></el-col>
-          <el-col :span="3"><div class="main-header-item">活跃老师数：{{getManagerList.activeTeacherCount}}人</div></el-col>
-          <el-col :span="4"><div class="main-header-item">注册用户数：{{getManagerList.registerUserCount}}人</div></el-col>
-          <el-col :span="4"><div class="main-header-item">活跃用户数：{{getManagerList.activeUserCount}}人</div></el-col>
+          <!--<el-col :span="3">-->
+            <div class="main-header-item" >注册老师数：{{getManagerList.registerTeacherCount}}人</div>
+          <!--</el-col>-->
+          <!--<el-col :span="3">-->
+            <div class="main-header-item">活跃老师数：{{getManagerList.activeTeacherCount}}人</div>
+          <!--</el-col>-->
+          <!--<el-col :span="4">-->
+            <div class="main-header-item">注册用户数：{{getManagerList.registerUserCount}}人</div>
+          <!--</el-col>-->
+          <!--<el-col :span="4">-->
+            <div class="main-header-item">活跃用户数：{{getManagerList.activeUserCount}}人</div>
+          <!--</el-col>-->
         </el-row>
         <el-table
           :data="getManagerList.list"
@@ -191,9 +199,14 @@
     },
      created() {
   },
-    watch: {},
+    watch: {
+      InfoTeacherstatues(val, oldVal) {
+        //普通的watch监听
+        this.teacherDetailFun();
+      },
+    },
     computed: {
-      ...mapGetters(["getUser","getManagerList","getManagerDetail"])
+      ...mapGetters(["getUser","getManagerList","getManagerDetail","InfoTeacherstatues"])
     },
     methods: {
       ...mapActions(["setUser"]),
@@ -252,6 +265,8 @@
         this.$store.dispatch("GetManagerDetail", {
           managerId: str
         });
+      },
+      async teacherDetailFun(){
         console.log(this.getManagerDetail)
         var arr = this.getManagerDetail.grade.split(",");
         this.arrPeriod = this.getManagerDetail.period.split(",");
@@ -266,7 +281,7 @@
             arrList.push("5-6年级");
           }
         }
-        this.arrGrade = this.uniq(arrList);
+        this.arrGrade = this.uniq(arrList) || [];
       },
       //校区管理员降级
       async Downgrade() {
@@ -381,12 +396,17 @@
   }
   .main-items{
     color: #393939;
-    text-align: center;
+    /*text-align: center;*/
     line-height: 80px;
   }
   .main-header-item{
     font-size: 16px;
     color: #7E7E7E;
+    text-overflow: ellipsis;
+    /*vertical-align: middle;*/
+    text-align: center;
+    display: inline-block;
+    width: 20%;
   }
 
   .input-with-select .el-input-group__prepend {
@@ -509,7 +529,7 @@
     padding: 40px 0 50px 0;
   }
   .scope-name{
-    margin-left: 13px;
+    margin-left: 5%;
     color: #393939;
     font-size: 13px;
   }
@@ -523,7 +543,7 @@
     margin-top: 15px;
   }
   .scope-list{
-    margin-left: 18px;
+    margin-left: 5%;
     text-align: left;
   }
   .noBorderBottom{

src/store/getters.js

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

src/store/modules/user.js

@@ -37,7 +37,8 @@ const user = {
     errorWarningList:[],
     errorDetailList:[],
     pictureIndex:0,
-    InfoTeacherstatues:""
+    InfoTeacherstatues:"",
+    GetTeacherstatues:"",
   },
 
   mutations: {
@@ -116,6 +117,9 @@ const user = {
     SET_GET_SUCCESS_TEACHERINFO_STUS:(state,InfoTeacherstatues) => {
       state.InfoTeacherstatues = InfoTeacherstatues
     },
+    SET_GET_SUCCESS_MANAGER_DETAIL:(state,GetTeacherstatues) => {
+      state.GetTeacherstatues = GetTeacherstatues
+    },
     SET_ERROR_WARING:(state,errorWarningList) => {
       state.errorWarningList = errorWarningList
     },
@@ -421,6 +425,8 @@ const user = {
       return new Promise((resolve, reject) => {
         axios.post(GetManagerDetail, data).then(response => {
           const data = response.data || {}
+          // commit('SET_GET_SUCCESS_MANAGER_DETAIL',new Date());
+          commit('SET_GET_SUCCESS_TEACHERINFO_STUS',new Date());
           commit('SET_MANAGER_DETAIL', data);
           resolve(response)
         }).catch(error => {
@@ -524,10 +530,17 @@ const user = {
     SuperApplyTeacherList({ commit, state }, data) {
       return new Promise((resolve, reject) => {
         axios.post(SuperApplyTeacherList, data).then(response => {
-          const data = response.data || { }
-          commit('SET_APPLY_TEACHER_LIST', data);
-          // debugger
-          // console.log(data)
+          const data = response || {}
+          if (data.code === "999"){
+            commit('SET_APPLY_TEACHER_LIST', data.data);
+            commit('SET_GET_SUCCESS_TEACHERINFO_STUS',new Date());
+          }
+          else {
+            Message.error("出错了")
+          }
+          // const data = response.data || { }
+          // commit('SET_APPLY_TEACHER_LIST', data);
+
           resolve(response)
         }).catch(error => {
           reject(error)
@@ -543,6 +556,7 @@ const user = {
           // debugger
           const data = response || {}
           if (data.code === "999"){
+            commit('SET_GET_SUCCESS_MANAGER_DETAIL',new Date());
             commit('SET_CLOSE_OR_OPENID', new Date());
             Message.success(data.msg)
           }