解决版本冲突

src/api/index.js

@@ -24,6 +24,18 @@ const UnallotHomeworkList = urlFn('/api/kmt/correctSys/unallotHomeworkList')
 const GetTeacherDetail = urlFn('/api/kmt/correctSys/getTeacherDetail')
 //  查看学生详情
 const GetStudentDetail = urlFn('/api/kmt/correctSys/getStudentDetail')
+//查看超级管理员校区列表
+const SuperManagerList = urlFn('/api/kmt/correctSys/getManagerList')
+//查看校区管理员详情
+const GetManagerDetail = urlFn('/api/kmt/correctSys/getManagerDetail')
+//校区管理员降级
+const Downgrade = urlFn('/api/kmt/correctSys/downgrade')
+//查看申请批改老师列表
+const SuperApplyTeacherList = urlFn('/api/kmt/correctSys/applyTeacherList')
+//申请审批操作
+const ApplyOperate = urlFn('/api/kmt/correctSys/applyOperate')
+//老师薪酬列表
+const GetTeacherSalaryList = urlFn('/api/kmt/correctSys/getTeacherSalaryList')
 export {
     GET_TOKEN,
     GetInfo,
@@ -35,5 +47,11 @@ export {
     TeacherAllot,
     UnallotHomeworkList,
     GetTeacherDetail,
-    GetStudentDetail
-}
+    GetStudentDetail,
+    SuperManagerList,
+    GetManagerDetail,
+    Downgrade,
+    SuperApplyTeacherList,
+    ApplyOperate,
+    GetTeacherSalaryList
+}

src/components/MenuComponent.vue

@@ -2,7 +2,8 @@
   <el-col :span="24" class="">
       <el-col :span="2" :offset="2">
        <img class="logoImg" src="../assets/img/log.png"/>
-      </el-col>  
+      </el-col>
+
       <!-- v-show="roles.indexOf(item.id) >= 0" -->
       <el-col :span="2"  v-for="(item, index) of menuData" :key="item.id"
       @click.native="secondNavClick(item,index)" style="text-align: center">
@@ -10,12 +11,14 @@
 
       </el-col>
 
-      <el-col :span="2"  :offset="13">
-        <div class="">
+      <el-col :span="3"  :offset="12">
+        <div class="login">
           <img class="userstyle" src="../assets/img/user.jpg"/>
           <span>李老师</span>
           <i class="el-icon-caret-bottom"></i>
-          <img src="" alt="">
+        </div>
+        <div class="out">
+          <img src="../assets/img/out.png" alt="" class="out-img">
           <span>退出</span>
         </div>
       </el-col>
@@ -118,4 +121,19 @@ export default {
     color: #999999;
     font-size: 18px;
   }
+  .login{
+    color: #333333;
+    font-size: 14px;
+    display: inline-block;
+  }
+  .out{
+    margin-left: 20px;
+    font-size: 14px;
+    color: #666666;
+  }
+  .out-img{
+    width: 16px;
+    height: 18px;
+    display: inline-block;
+  }
 </style>

src/components/SuperComponent.vue

@@ -3,22 +3,24 @@
       <el-col :span="2" :offset="2">
        <img class="logoImg" src="../assets/img/log.png"/>
       </el-col>
-      <el-col :span="2" v-show="roles.indexOf(item.id) >= 0"  v-for="(item, index) of menuData" :key="item.id"
-      @click.native="secondNavClick(item,index)">
+    <!--v-show="roles.indexOf(item.id) >= 0"-->
+      <el-col :span="2"   v-for="(item, index) of menuData" :key="item.id"
+      @click.native="secondNavClick(item,index)" style="text-align: center">
         <span class="lineStyle" :class="{active:index == checkindex,menu_item:true}">{{item.name}}</span>
 
       </el-col>
 
-      <el-col :span="2"  :offset="13">
-        <div class="">
+      <el-col :span="3"  :offset="10">
+        <div class="login">
           <img class="userstyle" src="../assets/img/user.jpg"/>
           <span>李老师</span>
           <i class="el-icon-caret-bottom"></i>
-          <img src="" alt="">
+        </div>
+        <div class="out">
+          <img src="../assets/img/out.png" alt="" class="out-img">
           <span>退出</span>
         </div>
       </el-col>
-      <el-col :span="1"></el-col>
   </el-col>
 </template>
 
@@ -62,7 +64,7 @@ export default {
     //   this.menuData = JSON.parse(JSON.stringify(this.navsData));
     // },
     secondNavClick(val, index) {
-      this.$router.push("/home/" + val.href);
+      this.$router.push("/super/" + val.href);
       this.checkindex = index;
     }
   },
@@ -116,5 +118,21 @@ export default {
   .lineStyle{
     color: #999999;
     font-size: 18px;
+    text-align: center;
   }
+.login{
+  color: #333333;
+  font-size: 14px;
+  display: inline-block;
+}
+.out{
+  margin-left: 20px;
+  font-size: 14px;
+  color: #666666;
+  display: inline-block;
+}
+.out-img{
+  width: 16px;
+  height: 18px;
+}
 </style>

src/pages/Super.vue

@@ -187,32 +187,7 @@
   .main_conter{
     height: 1000px;
   }
-  .out{
-    margin-left:10px;
-    color:#333333;
-  }
-  .navlink{
-    float:left;
-    margin-right:24px;
-    color:#999999 ;
-    font-size: 9px;
-  }
-  .menu {
-    /* overflow-y: auto; */
-    position: relative;
-    z-index: 1;
-    background-color: #00253f;
-    box-shadow: 3px 0px 7px #cfcfcf;
-  }
-  .logoUser {
-    position: relative;
-    width: 100%;
-    color: #fff;
-    border-bottom: 1px solid #001625;
-  }
-  .logoImg {
-    padding: 0.2rem;
-  }
+
   .logoImg > img {
     display: inline-block;
     width: 1.8rem;

src/pages/home/SchoolManager.vue

@@ -492,6 +492,7 @@
   </div>
 </template>
 <script>
+<<<<<<< HEAD
 import { mapGetters, mapActions } from "vuex";
 export default {
   components: {},
@@ -510,6 +511,23 @@ export default {
       ModelStudet:false, //学生详情弹框
       isDown: false,
       options: [
+=======
+  import { mapGetters, mapActions } from "vuex";
+  export default {
+    components: { },
+    name: "actvResolveLabel",
+    props: {},
+    data() {
+      return {
+        // BASE_URL:'https://img.sharingschool.com',
+        BASE_URL:'https://xt.sharingschool.com/upload/',
+        isDownindex:0,
+        modelindex: 0,
+        hiddenModel:false,
+        isPigai:false,
+        isDown:false,
+            options: [
+>>>>>>> 9d24aa96a7db77f00d14035d905add3b93c0ac00
         {
           value: "0",
           label: "一年级"

src/pages/super/CheckTeacherAudit.vue

@@ -8,7 +8,7 @@
       <el-col :span="20" class="main" :offset="2">
 
         <el-table
-          :data="dataList"
+          :data="applyTeacherList.list"
           highlight-current-row
           size="medium"
           border
@@ -19,55 +19,60 @@
             header-align="center"
           >
             <template scope="scope">
-              <img :src="scope.row.img" alt="" class="table-img">
+              <img :src="BASE_URL+scope.row.imgUrl" alt="" class="table-img">
+              <span class="scope-name">{{scope.row.name}}}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="names"
+            prop="school"
             label="学校"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="number"
+            prop="subject"
             label="批改科目"
             header-align="center"
           ></el-table-column>
           <el-table-column
-            prop="time"
+            prop="grade"
             label="批改年级"
             header-align="center">
           </el-table-column>
           <el-table-column
-            prop="allTime"
+            prop=""
             label="可批改时间"
             header-align="center"
           >
             <template scope="scope">
-              <el-button type="info" round>周一</el-button>
+              <el-button type="info" round>{{scope.row.period}}</el-button>
             </template>
           </el-table-column>
 
           <el-table-column prop="status" label="" header-align="center" width="250">
             <template scope="scope">
-              <el-button type="danger" @click="isShow(2)">不通过</el-button>
-              <el-button type="primary" @click="isShow(1)">通过</el-button>
+              <el-button type="danger" @click="isShow(2,scope.row.id)">不通过</el-button>
+              <el-button type="primary" @click="isShow(1,scope.row.id)">通过</el-button>
             </template>
           </el-table-column>
 
         </el-table>
+        <!-- 分页显示 -->
+        <div class="page-block">
+          <el-pagination
+            background
+            class="all_pagination"
+            @size-change="handleSizeChange"
+            @current-change="pageChange"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            >
+          </el-pagination>
+        </div>
       </el-col>
-      <!-- 分页显示 -->
-      <!--<el-pagination-->
-      <!--background-->
-      <!--class="all_pagination"-->
-      <!--@size-change="handleSizeChange"-->
-      <!--@current-change="pageChange"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="10"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--:total="filters.count">-->
-      <!--</el-pagination>-->
+
+
     </el-row>
 
     <!--是否通过-->
@@ -75,12 +80,12 @@
     <div class='model' v-if="hiddenModel">
       <div class='model-text'>
         <div class="model-text-items">
-          <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(2)" class="model-text-items-close"></div>
+          <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(1)" class="model-text-items-close"></div>
           <div>是否要通过颜如玉老师的注册申请？</div>
         </div>
         <div class="model-btn">
-          <div class="model-btn-items main-gay">是</div>
-          <div class="model-btn-items model-grdeen">否</div>
+          <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(1)">否</div>
         </div>
       </div>
     </div>
@@ -93,8 +98,8 @@
           <div>是否要驳回颜如玉老师的注册申请？</div>
         </div>
         <div class="model-btn">
-          <div class="model-btn-items main-gay">是</div>
-          <div class="model-btn-items model-grdeen">否</div>
+          <div class="model-btn-items main-gay" @click="ApplyOperate()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(2)">否</div>
         </div>
       </div>
     </div>
@@ -108,7 +113,10 @@
     props: {},
     data() {
       return {
+        BASE_URL:'https://xt.sharingschool.com/upload/',
         hiddenModel:false,
+        applicantId:'',
+        operate:'',
         isPigai:false,
             options: [
         {
@@ -161,32 +169,13 @@
             text:'当月'
           },
         ],
-        dataList:[
-          {
-            img:'../../assets/img/user.jpg',
-            names:'阿三',
-            number:'3',
-            time:'14:22',
-            allTime:'14:22',
-            rate:'222',
-            status:'22'
-          },
-          {
-            img:'../../assets/img/user.jpg',
-            names:'阿三',
-            number:'3',
-            time:'14:22',
-            allTime:'14:22',
-            rate:'222',
-            status:'22'
-          }
-        ],
         filters: {
           actvNm: "",
           actvCrtUserId: "",
           actvType: "",
           actvSmallType: "",
           // 排序
+          MaxtimeValue:'',
           pageNo: 1,
           pageSize: 10,
           count: 0,
@@ -197,7 +186,7 @@
     },
     watch: {},
     computed: {
-      ...mapGetters(["getUser"])
+      ...mapGetters(["getUser","applyTeacherList"])
     },
     methods: {
       ...mapActions(["setUser"]),
@@ -205,7 +194,7 @@
         console.log(k);
         this.checkindex = k;
       },
-      isShow(str){
+      isShow(str,res){
         let _this = this;
         console.log(str)
         if (str == 1){
@@ -218,29 +207,51 @@
 
       },
       //关闭弹框
-      allShowModel(str) {
+      allShowModel(str,res) {
         let _this = this;
+        _this.operate = str;
+        _this.applicantId = res;
         if (str == 1){
           _this.hiddenModel = false;
         } else if (str == 2){
           _this.isPigai = false;
         }
       },
-      //  输入框按键方法
-      keyCodeMethod(e) {
-        if (e.keyCode === 13) return this.itemListReshow();
+      //查看申请老师列表
+      async SuperApplyTeacherList() {
+        this.$store.dispatch("SuperApplyTeacherList", {
+          maxCreateTime: this.formatDate(),
+          pageNo: this.filters.pageNo,
+          pageSize: this.filters.pageSize
+        });
       },
-      expandChange(row, expandRows) {
-        for (let item of expandRows) {
-          if (row === item) {
-            this.expandRowKeys = [row.nodId];
-          }
-        }
+      //申请审批操作
+      async ApplyOperate() {
+        this.$store.dispatch("ApplyOperate", {
+          applicantId: this.applicantId,
+          operate: this.operate,
+        });
+      },
+      //时间封装
+      formatDate: function () {
+        let date = new Date();
+        let y = date.getFullYear();
+        let MM = date.getMonth() + 1;
+        MM = MM < 10 ? ('0' + MM) : MM;
+        let d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        let h = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        let m = date.getMinutes();
+        m = m < 10 ? ('0' + m) : m;
+        let s = date.getSeconds();
+        s = s < 10 ? ('0' + s) : s;
+        return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
       },
       // 分页
       pageChange(val) {
         this.filters.pageNo = val;
-        this.itemListReshow();
+        this.SuperApplyTeacherList();
       },
       changeDateSlot(dateSlot) {
         if (dateSlot) {
@@ -268,8 +279,9 @@
         }
       },
       handleSizeChange(val) {
+        console.log(val)
         this.filters.pageSize = val;
-        this.itemListReshow();
+        this.SuperApplyTeacherList();
       },
       // 排序
       sortChange(sort) {
@@ -285,20 +297,11 @@
         this.filtersActvType = [];
         this.createDateSlot = null;
       },
-      // 获取创建人列表
-      // async getUserNameList() {
-      //   let {
-      //     userNameList = []
-      //   } = await this.$dao.actv.marketActDao.getUserNameList();
-      //   this.userNameList = userNameList || [];
-      //   let { list = [] } = await this.$dao.bsnsActvTypeAllList();
-      //   this.actvTypeList = list || [];
-      // }
+
     },
     mounted() {
-      // this.getsetDictByType2();
-      // this.getUserNameList();
-      // this.itemListReshow();
+      this.SuperApplyTeacherList();
+      // console.log(applyTeacherList)
     }
   };
 </script>
@@ -313,48 +316,24 @@
     border: 1px solid #E1E1E1;
     min-height: 980px;
   }
-  .table-aside{
-    color: #666666;
-    font-size: 18px;
-    text-align: center;
-    line-height: 60px;
-  }
+
   el-table{
     color: #999999;
     font-size: 18px;
   }
+  .scope-name{
+    margin-left: 13px;
+  }
   .main-items{
     color: #393939;
     text-align: center;
     line-height: 80px;
   }
-  .main-header-item{
-    font-size: 16px;
-    color: #7E7E7E;
-  }
-  .main-header-link{
-    color: #52CC60;
-    font-size: 18px;
-    margin-left: 10px;
-    text-decoration:underline
-  }
-  .el-select{
-    width: 100px;
-    margin: 0 5px;
-  }
+
   .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
-  .active{
-    background-color: #52CC60;
-    color: #fff;
-  }
-  .el-input__inner{
-    height: 32px;
-  }
-  .cell{
-    font-size: 18px !important;
-  }
+
   .table-img{
     width:36px;
     height:36px;
@@ -386,62 +365,11 @@
     text-align: center;
   }
 
-  .model-items-first{
-    padding: 0 34px;
-    display: flex;
-    justify-content: space-between;
-  }
-  .model-items-first-img{
-    width: 68px;
-    height: 68px;
-    border-radius: 8px;
-    position: relative;
-    bottom: 20px;
-  }
-  .model-items-first-left{
-    display: inline-block;
-    color: #393939;
-    font-size: 24px;
-    margin-left: 14px;
-    text-align: left;
-  }
-  .model-items-first-left-down{
-    color: #7E7E7E;
-    font-size: 18px;
-  }
   .model-text{
     background:rgba(255,255,255,1);
     border-radius:10px;
   }
-  .model-items-other{
-    height: 60px;
-    line-height: 60px;
-    color: #393939;
-    font-size: 20px;
-    text-align: left;
-    padding: 0 34px;
-  }
-  .model-active{
-    background-color: #F6F7FB;
-  }
-  .model-active-last{
-    border-radius:0 0 30px 30px;
-    background-color: #F6F7FB;
-  }
-  .model-text-head{
-    padding: 40px 50px;
-    display: flex;
-    color: #393939;
-    font-size: 24px;
-    justify-content: space-between;
-  }
-  .model-manager{
-    display: flex;
-    justify-content: space-between;
-    margin: 30px;
-    color: #393939;
-    font-size: 24px;
-  }
+
   .model-btn{
     display: flex;
     justify-content: space-around;
@@ -475,4 +403,10 @@
     text-align: center;
     padding: 40px 0 50px 0;
   }
+  .page-block{
+    text-align: center;
+  }
+  /*.all_pagination{*/
+    /*text-align: center !important;*/
+  /*}*/
 </style>

src/pages/super/CheckTeacherPay.vue

@@ -7,20 +7,24 @@
       <!--数据监控-->
       <el-col :span="20" class="main" :offset="2">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="3"><div class="main-header-item" >
-            <i class="el-icon-d-arrow-left"></i>
-              <span>2018-12</span>
-            <i class="el-icon-d-arrow-right"></i>
+          <el-col :span="3" :offset="1"><div class="main-header-item" >
+            <div class="block" >
+              <el-date-picker
+                v-model="selMonth"
+                type="month"
+                placeholder="选择月" @change="allclick()">
+              </el-date-picker>
+            </div>
           </div></el-col>
-          <el-col :span="4" :offset="17">
+          <el-col :span="4" :offset="16">
             <div class="main-header-item">
               <i class="el-icon-printer"></i>
-              <span>导出表表格</span>
+              <span @click="excel()">导出表格</span>
             </div>
           </el-col>
         </el-row>
         <el-table
-          :data="dataList"
+          :data="getTeacherSalaryList.list"
           highlight-current-row
           size="medium"
           border
@@ -31,47 +35,49 @@
             header-align="center"
           >
             <template scope="scope">
-              <img :src="scope.row.img" alt="" class="table-img">
+              <img :src="BASE_URL+scope.row.imgUrl" alt="" class="table-img">
+              <span class="scope-name">{{scope.row.name}}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="names"
+            prop="lowGradeCount"
             label="1～2年级0.6元/份"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="number"
+            prop="middleGradeCount"
             label="3～4年级0.8元/份"
             header-align="center"
           ></el-table-column>
           <el-table-column
-            prop="time"
+            prop="highGradeCount"
             label="5～6年级1.2元/份"
             header-align="center">
           </el-table-column>
           <el-table-column
-            prop="allTime"
+            prop="total"
             label="总计"
             header-align="center"
-            width="250"
+            width="450"
           >
           </el-table-column>
-
-
         </el-table>
+        <!-- 分页显示 -->
+        <div class="page-block">
+          <el-pagination
+            background
+            class="all_pagination"
+            @size-change="handleSizeChange"
+            @current-change="pageChange"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+          >
+          </el-pagination>
+        </div>
       </el-col>
-      <!-- 分页显示 -->
-      <!--<el-pagination-->
-      <!--background-->
-      <!--class="all_pagination"-->
-      <!--@size-change="handleSizeChange"-->
-      <!--@current-change="pageChange"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="10"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--:total="filters.count">-->
-      <!--</el-pagination>-->
+
     </el-row>
 
 
@@ -81,7 +87,7 @@
       <div class='model-text'>
         <div class="model-text-items">
           <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(2)" class="model-text-items-close"></div>
-          <div>是否要驳回颜如玉老师的注册申请？</div>
+          <div>是否导出表格？</div>
         </div>
         <div class="model-btn">
           <div class="model-btn-items main-gay">是</div>
@@ -99,6 +105,8 @@
     props: {},
     data() {
       return {
+        BASE_URL:'https://xt.sharingschool.com/upload/',
+        selMonth:'',
         hiddenModel:false,
         isPigai:false,
         ItemList: [
@@ -112,32 +120,17 @@
             text:'当月'
           },
         ],
-        dataList:[
-          {
-            img:'../../assets/img/user.jpg',
-            names:'阿三',
-            number:'3',
-            time:'14:22',
-            allTime:'14:22',
-            rate:'222',
-            status:'22'
-          },
-          {
-            img:'../../assets/img/user.jpg',
-            names:'阿三',
-            number:'3',
-            time:'14:22',
-            allTime:'14:22',
-            rate:'222',
-            status:'22'
-          }
-        ],
+        getTeacherSalaryList:{
+          list:[]
+        },
         filters: {
           actvNm: "",
           actvCrtUserId: "",
           actvType: "",
           actvSmallType: "",
           // 排序
+          MaxtimeValue:'',
+          oneMonth:'',
           pageNo: 1,
           pageSize: 10,
           count: 0,
@@ -148,14 +141,57 @@
     },
     watch: {},
     computed: {
-      ...mapGetters(["getUser"])
+      ...mapGetters(["getUser","getTeacherSalaryList"])
     },
     methods: {
       ...mapActions(["setUser"]),
-      selectTitle(k) {
-        console.log(k);
-        this.checkindex = k;
+      //表格导出
+      excel(){
+        try {
+          //var curTbl = document.getElementById(tableId);
+          //var lenRow = curTbl.rows.length;
+          var curTbl = $('.el-table')[0];
+          var lenRow = curTbl.rows.length;
+          //创建AX对象excel
+          var oXL = new ActiveXObject("Excel.Application");
+          //获取workbook对象
+          var oWB = oXL.Workbooks.Add();
+          var oSheet = oWB.ActiveSheet;
+
+          //取得表格行数
+          for (var i = 0; i < lenRow; i++) {
+            var lenCol = curTbl.rows(i).cells.length;
+            //取得每行的列数
+            for (var j = 0; j < lenCol; j++)
+            {
+              oSheet.Cells(i + 1, j + 1).value = curTbl.rows(i).cells(j).innerText;
+
+            }
+          }
+          oXL.Visible = true; //设置excel可见属性
+          //oXL.UserControl = true;
+          //oXL=null
+        } catch (e) {
+          if ((!+'\v1')) { //ie浏览器
+            alert("无法启动Excel，请确保电脑中已经安装了Excel!")
+          } else {
+            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
+            }
+            var uri = 'data:text/csv;charset=utf-8,' + encodeURIComponent(str);
+            var downloadLink = document.createElement("a");
+            downloadLink.href = uri;
+            downloadLink.download = "export.csv";
+
+            document.body.appendChild(downloadLink);
+            downloadLink.click();
+            document.body.removeChild(downloadLink);
+          }
+        }
       },
+      //弹框
       isShow(str){
         let _this = this;
         console.log(str)
@@ -177,21 +213,45 @@
           _this.isPigai = false;
         }
       },
-      //  输入框按键方法
-      keyCodeMethod(e) {
-        if (e.keyCode === 13) return this.itemListReshow();
+      //时间封装
+      formatDate: function () {
+        let date = new Date();
+        let y = date.getFullYear();
+        let MM = date.getMonth() + 1;
+        MM = MM < 10 ? ('0' + MM) : MM;
+        let d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        let h = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        let m = date.getMinutes();
+        m = m < 10 ? ('0' + m) : m;
+        let s = date.getSeconds();
+        s = s < 10 ? ('0' + s) : s;
+        return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
       },
-      expandChange(row, expandRows) {
-        for (let item of expandRows) {
-          if (row === item) {
-            this.expandRowKeys = [row.nodId];
-          }
-        }
+      // 老师薪酬列表
+      async GetTeacherSalaryList() {
+        this.$store.dispatch("GetTeacherSalaryList", {
+          pageNo: this.filters.pageNo,
+          pageSize: this.filters.pageSize,
+          oneMonth:this.filters.oneMonth,
+          maxCreateTime: this.formatDate()
+        });
+      },
+      //选择月
+      allclick(){
+        var year = this.selMonth.getFullYear();
+        var month = this.selMonth.getMonth() + 1;
+        month = (month < 10 ? "0" + month : month);
+        var mydate = (year.toString() + '-' + month.toString());
+        this.filters.oneMonth = mydate;
+        this.GetTeacherSalaryList()
       },
+
       // 分页
       pageChange(val) {
         this.filters.pageNo = val;
-        this.itemListReshow();
+        this.GetTeacherSalaryList();
       },
       changeDateSlot(dateSlot) {
         if (dateSlot) {
@@ -220,7 +280,7 @@
       },
       handleSizeChange(val) {
         this.filters.pageSize = val;
-        this.itemListReshow();
+        this.GetTeacherSalaryList();
       },
       // 排序
       sortChange(sort) {
@@ -236,20 +296,10 @@
         this.filtersActvType = [];
         this.createDateSlot = null;
       },
-      // 获取创建人列表
-      // async getUserNameList() {
-      //   let {
-      //     userNameList = []
-      //   } = await this.$dao.actv.marketActDao.getUserNameList();
-      //   this.userNameList = userNameList || [];
-      //   let { list = [] } = await this.$dao.bsnsActvTypeAllList();
-      //   this.actvTypeList = list || [];
-      // }
+
     },
     mounted() {
-      // this.getsetDictByType2();
-      // this.getUserNameList();
-      // this.itemListReshow();
+     this.GetTeacherSalaryList()
     }
   };
 </script>
@@ -264,12 +314,7 @@
     border: 1px solid #E1E1E1;
     min-height: 980px;
   }
-  .table-aside{
-    color: #666666;
-    font-size: 18px;
-    text-align: center;
-    line-height: 60px;
-  }
+
   el-table{
     color: #999999;
     font-size: 18px;
@@ -283,29 +328,11 @@
     font-size: 16px;
     color: #7E7E7E;
   }
-  .main-header-link{
-    color: #52CC60;
-    font-size: 18px;
-    margin-left: 10px;
-    text-decoration:underline
-  }
-  .el-select{
-    width: 100px;
-    margin: 0 5px;
-  }
+
   .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
-  .active{
-    background-color: #52CC60;
-    color: #fff;
-  }
-  .el-input__inner{
-    height: 32px;
-  }
-  .cell{
-    font-size: 18px !important;
-  }
+
   .table-img{
     width:36px;
     height:36px;
@@ -336,63 +363,15 @@
     border-radius:30px;
     text-align: center;
   }
-
-  .model-items-first{
-    padding: 0 34px;
-    display: flex;
-    justify-content: space-between;
-  }
-  .model-items-first-img{
-    width: 68px;
-    height: 68px;
-    border-radius: 8px;
-    position: relative;
-    bottom: 20px;
-  }
-  .model-items-first-left{
-    display: inline-block;
-    color: #393939;
-    font-size: 24px;
-    margin-left: 14px;
-    text-align: left;
-  }
-  .model-items-first-left-down{
-    color: #7E7E7E;
-    font-size: 18px;
+  .scope-name{
+    margin-left: 13px;
   }
+
   .model-text{
     background:rgba(255,255,255,1);
     border-radius:10px;
   }
-  .model-items-other{
-    height: 60px;
-    line-height: 60px;
-    color: #393939;
-    font-size: 20px;
-    text-align: left;
-    padding: 0 34px;
-  }
-  .model-active{
-    background-color: #F6F7FB;
-  }
-  .model-active-last{
-    border-radius:0 0 30px 30px;
-    background-color: #F6F7FB;
-  }
-  .model-text-head{
-    padding: 40px 50px;
-    display: flex;
-    color: #393939;
-    font-size: 24px;
-    justify-content: space-between;
-  }
-  .model-manager{
-    display: flex;
-    justify-content: space-between;
-    margin: 30px;
-    color: #393939;
-    font-size: 24px;
-  }
+
   .model-btn{
     display: flex;
     justify-content: space-around;

src/pages/super/SuperAdmin.vue

@@ -7,13 +7,13 @@
       <!--数据监控-->
       <el-col :span="20" class="main" :offset="2">
         <el-row :gutter="20" class="main-header">
-          <el-col :span="3"><div class="main-header-item" >注册老师数：18人</div></el-col>
-          <el-col :span="3"><div class="main-header-item">活跃老师数：16人</div></el-col>
-          <el-col :span="4"><div class="main-header-item">注册用户数：1128人</div></el-col>
-          <el-col :span="4"><div class="main-header-item">活跃用户数：1008人</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="dataList"
+          :data="getManagerList.list"
           highlight-current-row
           size="medium"
           border
@@ -24,37 +24,38 @@
             header-align="center"
           >
             <template scope="scope">
-              <img :src="scope.row.img" alt="" class="table-img">
+              <img :src="BASE_URL +scope.row.imgUrl" alt="" class="table-img">
+              <span class="scope-name">{{scope.row.name}}</span>
             </template>
           </el-table-column>
           <el-table-column
-            prop="names"
+            prop="groupCount"
             label="小组人数"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="number"
+            prop="attendanceRate"
             label="老师出勤率"
             header-align="center"
           ></el-table-column>
           <el-table-column
-            prop="time"
+            prop="homeworkCount"
             label="作业批改总份数"
             header-align="center">
           </el-table-column>
           <el-table-column
-            prop="allTime"
+            prop="homeworkPicCount"
             label="作业批改总张数"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop="rate"
+            prop="avgTime"
             label="批改平均用时"
             header-align="center"></el-table-column>
           <el-table-column
-            prop="status"
+            prop="avgMark"
             label="家长平均评分"
             header-align="center"></el-table-column>
           <el-table-column
@@ -63,24 +64,27 @@
             header-align="center"></el-table-column>
           <el-table-column prop="status" label="" header-align="center" width="250">
             <template scope="scope">
-              <el-button type="success" plain @click="isShow(1)">小组详情</el-button>
-              <el-button type="success" >管理员详情</el-button>
+              <el-button type="success" plain >小组详情</el-button>
+              <el-button type="success" @click="isShow(1,scope.row.managerId)">管理员详情</el-button>
             </template>
           </el-table-column>
 
         </el-table>
+        <!-- 分页显示 -->
+        <div class="page-block">
+          <el-pagination
+            background
+            class="all_pagination"
+            @size-change="handleSizeChange"
+            @current-change="pageChange"
+            :page-sizes="[10, 20, 30, 40]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            >
+          </el-pagination>
+        </div>
       </el-col>
-      <!-- 分页显示 -->
-      <!--<el-pagination-->
-      <!--background-->
-      <!--class="all_pagination"-->
-      <!--@size-change="handleSizeChange"-->
-      <!--@current-change="pageChange"-->
-      <!--:page-sizes="[10, 20, 30, 40]"-->
-      <!--:page-size="10"-->
-      <!--layout="total, sizes, prev, pager, next, jumper"-->
-      <!--:total="filters.count">-->
-      <!--</el-pagination>-->
+
     </el-row>
 
     <!--可分配老师-->
@@ -94,21 +98,21 @@
         <div class="model-items">
           <div class="model-items-first">
             <div>
-              <img src="../../assets/img/user.jpg" alt="" class="model-items-first-img">
+              <img :src="BASE_URL+getManagerDetail.imgUrl" alt="" class="model-items-first-img">
               <div class="model-items-first-left">
-                <div>程歌（在线）</div>
-                <div class="model-items-first-left-down">南方科技大学</div>
+                <div>{{getManagerDetail.name}}（{{getManagerDetail.status}}）</div>
+                <div class="model-items-first-left-down">{{getManagerDetail.school}}</div>
               </div>
             </div>
             <div>
-              <el-button type="danger" plain round @click="isShow(2)"><i class="el-icon-bottom"></i><span>降级</span></el-button>
+              <el-button type="danger" plain round @click="isShow(2,getManagerDetail.name)"><i class="el-icon-bottom"></i><span>降级</span></el-button>
             </div>
           </div>
-          <div class="model-items-other model-active">批改科目 : 语文、英语</div>
-          <div class="model-items-other">批改年级 : 1～2年级、3～4年级</div>
-          <div class="model-items-other model-active">可批改时间：<el-button type="info" round>周一</el-button></div>
-          <div class="model-items-other">手机号 : 18832340987</div>
-          <div class="model-items-other model-active-last">上次登录时间 : 2019.05.14 18:02</div>
+          <div class="model-items-other model-active">批改科目 : {{getManagerDetail.subject}}</div>
+          <div class="model-items-other">批改年级 : <span v-for="(v, k) of arrGrade" class="scope-name">{{v}}</span></div>
+          <div class="model-items-other model-active">可批改时间：<el-button type="info" round v-for="(v, k) of arrPeriod">{{v}}</el-button></div>
+          <div class="model-items-other">手机号 : {{getManagerDetail.phone}}</div>
+          <div class="model-items-other model-active-last">上次登录时间 : {{getManagerDetail.lastOnlineTime}}</div>
         </div>
 
       </div>
@@ -119,11 +123,11 @@
       <div class='model-text'>
         <div class="model-text-items">
           <div><img src="../../assets/img/del@2x.png" alt="" @click="allShowModel(2)" class="model-text-items-close"></div>
-          <div>是否要将程歌老师降级为普通批改老师？</div>
+          <div>是否要将{{superName}}老师降级为普通批改老师？</div>
         </div>
         <div class="model-btn">
-          <div class="model-btn-items main-gay">是</div>
-          <div class="model-btn-items model-grdeen">否</div>
+          <div class="model-btn-items main-gay" @click="Downgrade()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(2)">否</div>
         </div>
       </div>
     </div>
@@ -137,8 +141,14 @@
     props: {},
     data() {
       return {
+        BASE_URL:'https://xt.sharingschool.com/upload/',
         hiddenModel:false,
         isPigai:false,
+        managerId:'',
+        superName:'',
+        count:0,
+        arrPeriod:[],
+        arrGrade:[],
         ItemList: [
           {
             text:'数据监控'
@@ -150,32 +160,14 @@
             text:'当月'
           },
         ],
-        dataList:[
-          {
-            img:'../../assets/img/user.jpg',
-            names:'阿三',
-            number:'3',
-            time:'14:22',
-            allTime:'14:22',
-            rate:'222',
-            status:'22'
-          },
-          {
-            img:'../../assets/img/user.jpg',
-            names:'阿三',
-            number:'3',
-            time:'14:22',
-            allTime:'14:22',
-            rate:'222',
-            status:'22'
-          }
-        ],
+
         filters: {
           actvNm: "",
           actvCrtUserId: "",
           actvType: "",
           actvSmallType: "",
           // 排序
+          MaxtimeValue:"",
           pageNo: 1,
           pageSize: 10,
           count: 0,
@@ -186,23 +178,23 @@
     },
     watch: {},
     computed: {
-      ...mapGetters(["getUser"])
+      ...mapGetters(["getUser","getManagerList","getManagerDetail"])
     },
     methods: {
       ...mapActions(["setUser"]),
-      selectTitle(k) {
-        console.log(k);
-        this.checkindex = k;
-      },
-      isShow(str){
+
+      isShow(str,res){
         let _this = this;
-        console.log(str)
+        console.log(str,res)
         if (str == 1){
           _this.hiddenModel = true;
           _this.isPigai = false;
+          _this.managerId = res;
+          _this.GetManagerDetail(res)
         } else if (str == 2){
           _this.isPigai = true;
           _this.hiddenModel = false;
+          _this.superName = res
         }
 
       },
@@ -215,21 +207,60 @@
           _this.isPigai = false;
         }
       },
-      //  输入框按键方法
-      keyCodeMethod(e) {
-        if (e.keyCode === 13) return this.itemListReshow();
+      //时间封装
+      formatDate: function () {
+        let date = new Date();
+        let y = date.getFullYear();
+        let MM = date.getMonth() + 1;
+        MM = MM < 10 ? ('0' + MM) : MM;
+        let d = date.getDate();
+        d = d < 10 ? ('0' + d) : d;
+        let h = date.getHours();
+        h = h < 10 ? ('0' + h) : h;
+        let m = date.getMinutes();
+        m = m < 10 ? ('0' + m) : m;
+        let s = date.getSeconds();
+        s = s < 10 ? ('0' + s) : s;
+        return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
       },
-      expandChange(row, expandRows) {
-        for (let item of expandRows) {
-          if (row === item) {
-            this.expandRowKeys = [row.nodId];
+      // 获取超级管理员数据
+      async SuperManagerList() {
+        this.$store.dispatch("SuperManagerList", {
+          maxCreateTime: this.formatDate(),
+          pageNo: this.filters.pageNo,
+          pageSize: this.filters.pageSize
+        });
+      },
+      // 查看校区管理员详情
+      async GetManagerDetail(str) {
+        this.$store.dispatch("GetManagerDetail", {
+          managerId: str
+        });
+        var arr = this.getManagerDetail.grade.split(',');
+        this.arrPeriod = this.getManagerDetail.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 Downgrade() {
+        this.$store.dispatch("Downgrade", {
+          managerId: this.managerId
+        });
+        this.allShowModel(2)
       },
       // 分页
       pageChange(val) {
         this.filters.pageNo = val;
-        this.itemListReshow();
+        this.SuperManagerList();
       },
       changeDateSlot(dateSlot) {
         if (dateSlot) {
@@ -258,7 +289,7 @@
       },
       handleSizeChange(val) {
         this.filters.pageSize = val;
-        this.itemListReshow();
+        this.SuperManagerList();
       },
       // 排序
       sortChange(sort) {
@@ -274,20 +305,21 @@
         this.filtersActvType = [];
         this.createDateSlot = null;
       },
-      // 获取创建人列表
-      // async getUserNameList() {
-      //   let {
-      //     userNameList = []
-      //   } = await this.$dao.actv.marketActDao.getUserNameList();
-      //   this.userNameList = userNameList || [];
-      //   let { list = [] } = await this.$dao.bsnsActvTypeAllList();
-      //   this.actvTypeList = list || [];
-      // }
+      // 数组去重
+      uniq(array){
+        var temp = []; //一个新的临时数组
+        for (var i = 0; i < array.length; i++){
+          if (temp.indexOf(array[i]) == -1) {
+            temp.push(array[i]);
+          }
+        }
+        return temp;
+      }
     },
     mounted() {
-      // this.getsetDictByType2();
-      // this.getUserNameList();
-      // this.itemListReshow();
+      this.SuperManagerList()
+      this.count = this.getManagerList.pages;
+
     }
   };
 </script>
@@ -302,12 +334,7 @@
     border: 1px solid #E1E1E1;
     min-height: 980px;
   }
-  .table-aside{
-    color: #666666;
-    font-size: 18px;
-    text-align: center;
-    line-height: 60px;
-  }
+
   el-table{
     color: #999999;
     font-size: 18px;
@@ -321,29 +348,11 @@
     font-size: 16px;
     color: #7E7E7E;
   }
-  .main-header-link{
-    color: #52CC60;
-    font-size: 18px;
-    margin-left: 10px;
-    text-decoration:underline
-  }
-  .el-select{
-    width: 100px;
-    margin: 0 5px;
-  }
+
   .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
-  .active{
-    background-color: #52CC60;
-    color: #fff;
-  }
-  .el-input__inner{
-    height: 32px;
-  }
-  .cell{
-    font-size: 18px !important;
-  }
+
   .table-img{
     width:36px;
     height:36px;
@@ -409,6 +418,7 @@
     font-size: 20px;
     text-align: left;
     padding: 0 34px;
+
   }
   .model-active{
     background-color: #F6F7FB;
@@ -417,13 +427,7 @@
     border-radius:0 0 30px 30px;
     background-color: #F6F7FB;
   }
-  .model-text-head{
-    padding: 40px 50px;
-    display: flex;
-    color: #393939;
-    font-size: 24px;
-    justify-content: space-between;
-  }
+
   .model-manager{
     display: flex;
     justify-content: space-between;
@@ -464,4 +468,7 @@
     text-align: center;
     padding: 40px 0 50px 0;
   }
+  .scope-name{
+    margin-left: 13px;
+  }
 </style>

src/store/getters.js

@@ -7,6 +7,7 @@ const getters = {
   addRouters: state => state.permission.addRouters,
   roles: state => state.user.roles,
   monitorTeacherList: state => state.user.monitorTeacherList,
+<<<<<<< HEAD
   TeacherHomeworkList: state => state.user.TeacherHomeworkList,
   TeacherAllotList: state => state.user.TeacherAllotList,
   TeacherAllotstatus: state => state.user.TeacherAllotstatus,
@@ -15,5 +16,13 @@ const getters = {
   UnallotHomeworkInfo: state => state.user.UnallotHomeworkList,
   GetTeacherDetail: state => state.user.GetTeacherDetail,
   GetStudentDetail: state => state.user.GetStudentDetail,
+=======
+  getManagerList: state => state.user.getManagerList,
+  getManagerDetail: state => state.user.getManagerDetail,
+  downgrade: state => state.user.downgrade,
+  applyTeacherList: state => state.user.applyTeacherList,
+  applyOperate: state => state.user.applyOperate,
+  getTeacherSalaryList: state => state.user.getTeacherSalaryList,
+>>>>>>> 9d24aa96a7db77f00d14035d905add3b93c0ac00
 }
 export default getters

src/store/modules/user.js

@@ -1,5 +1,9 @@
 import { LOGIN,GET_TOKEN,GetInfo,InfoWatch,InfoWatchDay,
-  InfoWatchMoth,TeacherHomeworkList,TeacherAllotList,TeacherAllot,UnallotHomeworkList,GetTeacherDetail,GetStudentDetail } from '@/api'
+  InfoWatchMoth,TeacherHomeworkList,TeacherAllotList,
+  TeacherAllot,UnallotHomeworkList,GetTeacherDetail,
+  GetStudentDetail,GetManagerDetail,Downgrade,
+  SuperApplyTeacherList,ApplyOperate,GetTeacherSalaryList
+  } from '@/api'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import axios from '@/axios'
 import { Message } from 'element-ui'
@@ -17,7 +21,11 @@ const user = {
     TeacherAllotstatus:false,
     UnallotHomeworkList:[],
     GetTeacherDetail:[],
-    GetStudentDetail:[]
+    GetStudentDetail:[],
+    getManagerList:[],
+    getManagerDetail:{},
+    applyTeacherList:[],
+    getTeacherSalaryList:[]
   },
 
   mutations: {
@@ -59,7 +67,25 @@ const user = {
     },
     SET_GET_STUDENTDETAIL: (state, GetStudentDetail) => {
       state.GetStudentDetail = GetStudentDetail
-    }
+    },
+    SET_SUPER_MANAGERLIST:(state, getManagerList) => {
+      state.getManagerList = getManagerList
+    },
+    SET_MANAGER_DETAIL:(state, getManagerDetail) => {
+      state.getManagerDetail = getManagerDetail
+    },
+    SET_DOWNGRADE:(state, downgrade) => {
+      state.downgrade = downgrade
+    },
+    SET_APPLY_TEACHER_LIST:(state, applyTeacherList) => {
+      state.applyTeacherList = applyTeacherList
+    },
+    SET_APPLY_OPERATE:(state,applyOperate) => {
+      state.applyOperate = applyOperate
+    },
+    SET_TEACHER_SALARY_LIST:(state,getTeacherSalaryList) => {
+      state.getTeacherSalaryList = getTeacherSalaryList
+    },
   },
 
   actions: {
@@ -142,7 +168,7 @@ const user = {
       })
     },
      // 查看老师批改作业列表
-     TeacherHomeworkList({ commit, state }, data) {
+    TeacherHomeworkList({ commit, state }, data) {
       return new Promise((resolve, reject) => {
         axios.post(TeacherHomeworkList, data).then(response => {
           const data = response.data || {}
@@ -216,6 +242,83 @@ const user = {
           })
         },
     // 登出
+    // 查看超级管理员校区列表
+    SuperManagerList({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        axios.post(SuperManagerList, data).then(response => {
+          const data = response.data
+          commit('SET_SUPER_MANAGERLIST', data);
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 查看校区管理员详情
+    GetManagerDetail({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        axios.post(GetManagerDetail, data).then(response => {
+          const data = response.data
+          commit('SET_MANAGER_DETAIL', data);
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 校区管理员降级
+    Downgrade({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        axios.post(Downgrade, data).then(response => {
+          const data = response.data
+          commit('SET_DOWNGRADE', data);
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    //查看申请批改老师列表
+    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)
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    //申请审批操作
+    ApplyOperate({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        axios.post(ApplyOperate, data).then(response => {
+          const data = response.data
+          commit('SET_APPLY_OPERATE', data);
+          // debugger
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    //老师薪酬列表
+    GetTeacherSalaryList({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        axios.post(GetTeacherSalaryList, data).then(response => {
+          const data = response.data
+          commit('SET_TEACHER_SALARY_LIST', data);
+          // debugger
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
+    // 登出getTeacherSalaryList
     // LogOut({ commit, state }) {
     //   return new Promise((resolve, reject) => {
     //     logout(state.token).then(() => {