修复测试反馈

src/components/SuperComponent.vue

@@ -4,13 +4,13 @@
        <img class="logoImg" src="../assets/img/log.png"/>
       </el-col>
     <!--v-show="roles.indexOf(item.id) >= 0"-->
-      <el-col :span="2"   v-for="(item, index) of menuData" :key="item.id"
+      <el-col :span="3"   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="3" :offset="6">
+      <el-col :span="4" class="aside-right">
       <div class="login">   
         <img  class="userstyle"  :src="BASE_URL + avatar" alt="">
         <!-- <img class="userstyle" src="../assets/img/user.jpg"> -->
@@ -22,7 +22,6 @@
         <span @click="Loginout">退出</span>
       </div>
     </el-col>
-    <el-col :span="1"></el-col>
   </el-col>
 </template>
 
@@ -51,11 +50,11 @@ export default {
     name: "批改老师薪酬表",
     href: "CheckTeacherPay",
   },
-   {
-    id: "4",
-    name: "作业回收站",
-    href: "HomeWorkRecover",
-  },
+          {
+            id: "4",
+            name: "作业回收站",
+            href: "HomeworkRecycle",
+          },
  ],
       checkindex: 0
     };
@@ -162,4 +161,8 @@ export default {
   width: 16px;
   height: 18px;
 }
+  .aside-right{
+    float: right;
+    margin-right: 0%;
+  }
 </style>

src/pages/super/CheckTeacherAudit.vue

@@ -9,7 +9,7 @@
 
         <el-table
           :data="list"
-          highlight-current-row
+          :header-cell-class-name="tableheaderClassName"
           size="medium"
           border
           stripe
@@ -68,12 +68,12 @@
 
         </el-table>
         <!-- 分页显示 -->
-        <div class="page-block" v-if="parseInt(applyTeacherList.pages) > 0">
+        <div class="page-block" v-if="parseInt(applyTeacherList.pages) > 10">
           <el-pagination
             background
             @size-change="handleSizeChange"
             @current-change="pageChange"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10]"
             layout="total, sizes, prev, pager, next, jumper"
             :total= parseInt(applyTeacherList.pages)
           ></el-pagination>
@@ -225,6 +225,10 @@
           _this.isPigai = false;
         }
       },
+      // 表格表头设置
+      tableheaderClassName({ row, rowIndex }) {
+        return "table-head-th";
+      },
       //查看申请老师列表
       async SuperApplyTeacherList() {
         this.$store.dispatch("SuperApplyTeacherList", {
@@ -469,6 +473,12 @@
     margin-left: 18px;
     text-align: left;
   }
+  .el-table .table-head-th{
+    background-color:#F6F7FB;
+    font-size: 16px !important;
+    color: #393939;
+
+  }
   /*.all_pagination{*/
     /*text-align: center !important;*/
   /*}*/

src/pages/super/CheckTeacherPay.vue

@@ -25,7 +25,7 @@
         </el-row>
         <el-table
           :data="getTeacherSalaryList.list"
-          highlight-current-row
+          :header-cell-class-name="tableheaderClassName"
           size="medium"
           border
           stripe
@@ -65,12 +65,12 @@
           </el-table-column>
         </el-table>
         <!-- 分页显示 -->
-        <div class="page-block" v-if="parseInt(getTeacherSalaryList.pages) > 0">
+        <div class="page-block" v-if="parseInt(getTeacherSalaryList.pages) > 10">
           <el-pagination
             background
             @size-change="handleSizeChange"
             @current-change="pageChange"
-            :page-sizes="[10, 20, 30, 40]"
+            :page-sizes="[10]"
             layout="total, sizes, prev, pager, next, jumper"
             :total= parseInt(getTeacherSalaryList.pages)
           ></el-pagination>
@@ -141,6 +141,10 @@
     },
     methods: {
       ...mapActions(["setUser"]),
+      // 表格头部样式
+      tableheaderClassName({ row, rowIndex }) {
+        return "table-head-th";
+      },
       //表格导出
       excel(){
         try {
@@ -401,6 +405,12 @@
     text-align: center;
     padding: 40px 0 50px 0;
   }
+  .el-table .table-head-th{
+    background-color:#F6F7FB;
+    font-size: 16px !important;
+    color: #393939;
+
+  }
   .page-block{
     text-align: center !important;
     margin-top: 15px;

src/pages/super/HomeworkRecycle.vue

@@ -0,0 +1,354 @@
+<!-- 活动解析 -->
+<template>
+  <div>
+    <!-- table 表格 -->
+    <el-row :gutter="20" class="main-items" >
+
+      <!--数据监控-->
+      <el-col :span="20" class="main" :offset="2">
+
+        <el-table
+          :data="list"
+          :header-cell-class-name="tableheaderClassName"
+          size="medium"
+          stripe
+        >
+          <el-table-column
+            label="上传时间"
+            prop=""
+            header-align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="科目"
+            header-align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="学生"
+            header-align="center"
+          ></el-table-column>
+          <el-table-column
+            prop=""
+            label="批改状况"
+            header-align="center">
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label="是否有补拍"
+            header-align="center"
+          >
+          </el-table-column>
+          <el-table-column
+            prop=""
+            label=""
+            header-align="center"
+            width="450"
+          >
+            <template scope="">
+                <span class="allocation">去分配</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <!-- 分页显示 -->
+        <!--<div class="page-block" v-if="parseInt(getTeacherSalaryList.pages) > 0">-->
+          <!--<el-pagination-->
+            <!--background-->
+            <!--@size-change="handleSizeChange"-->
+            <!--@current-change="pageChange"-->
+            <!--:page-sizes="[10, 20, 30, 40]"-->
+            <!--layout="total, sizes, prev, pager, next, jumper"-->
+            <!--:total= parseInt(getTeacherSalaryList.pages)-->
+          <!--&gt;</el-pagination>-->
+        <!--</div>-->
+      </el-col>
+
+    </el-row>
+
+
+    <!--弹框-->
+    <div class='showModel' @click="allShowModel(2)" v-if="isPigai"></div>
+    <div class='model' v-if="isPigai">
+      <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 class="model-btn">
+          <div class="model-btn-items main-gay">是</div>
+          <div class="model-btn-items model-grdeen">否</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+  import { mapGetters, mapActions } from "vuex";
+  export default {
+    components: { },
+    name: "actvResolveLabel",
+    props: {},
+    data() {
+      return {
+        BASE_URL:'https://xt.sharingschool.com/upload/',
+        selMonth:'',
+        hiddenModel:false,
+        isPigai:false,
+        list:[],
+        filters: {
+          actvNm: "",
+          actvCrtUserId: "",
+          actvType: "",
+          actvSmallType: "",
+          // 排序
+          MaxtimeValue:'',
+          oneMonth:'',
+          pageNo: 1,
+          pageSize: 10,
+          count: 0,
+          orderField: "",
+          orderAD: ""
+        }
+      };
+    },
+    watch: {},
+    computed: {
+      ...mapGetters(["getUser"])
+    },
+    methods: {
+      ...mapActions(["setUser"]),
+      // 表格头部样式
+      tableheaderClassName({ row, rowIndex }) {
+        return "table-head-th";
+      },
+      //弹框
+      isShow(str){
+        let _this = this;
+        console.log(str)
+        if (str == 1){
+          _this.hiddenModel = true;
+          _this.isPigai = false;
+        } else if (str == 2){
+          _this.isPigai = true;
+          _this.hiddenModel = false;
+        }
+
+      },
+      //关闭弹框
+      allShowModel(str) {
+        let _this = this;
+        if (str == 1){
+          _this.hiddenModel = false;
+        } else if (str == 2){
+          _this.isPigai = false;
+        }
+      },
+      //时间封装
+      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;
+      },
+      // 老师薪酬列表
+      // 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.GetTeacherSalaryList();
+      },
+      changeDateSlot(dateSlot) {
+        if (dateSlot) {
+          this.filters.startDate = dateSlot[0];
+          this.filters.endDate = dateSlot[1];
+        } else {
+          this.filters.startDate = null;
+          this.filters.endDate = null;
+        }
+      },
+      actvTypeChange(typeList) {
+        switch (typeList.length) {
+          case 1:
+            this.filters.actvType = typeList[0];
+            this.filters.actvSmallType = null;
+            break;
+          case 2:
+            this.filters.actvType = null;
+            this.filters.actvSmallType = typeList[1];
+            break;
+          default:
+            this.filters.actvType = null;
+            this.filters.actvSmallType = null;
+            break;
+        }
+      },
+      handleSizeChange(val) {
+        this.filters.pageSize = val;
+        this.GetTeacherSalaryList();
+      },
+      // 排序
+      sortChange(sort) {
+        this.filters.orderField = sort.prop;
+        this.filters.orderAD = sort.order != null ? sort.order : "";
+        this.itemListReshow();
+      },
+      clearSearch() {
+        this.filters.actvNm = null;
+        this.filters.actvCrtUserId = null;
+        this.filters.actvType = null;
+        this.filters.actvSmallType = null;
+        this.filtersActvType = [];
+        this.createDateSlot = null;
+      },
+
+    },
+    mounted() {
+    }
+  };
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+
+  .main{
+    background-color: #fff;
+    margin-top: 16px;
+    padding: 0 !important;
+    border: 1px solid #E1E1E1;
+    min-height: 980px;
+  }
+
+  el-table{
+    color: #999999;
+    font-size: 18px;
+  }
+  .main-items{
+    color: #393939;
+    text-align: center;
+    line-height: 80px;
+  }
+  .main-header-item{
+    font-size: 16px;
+    color: #7E7E7E;
+  }
+
+  .input-with-select .el-input-group__prepend {
+    background-color: #fff;
+  }
+
+  .table-img{
+    width:36px;
+    height:36px;
+    border-radius:6px;
+  }
+  .showModel{
+    width: 100%;
+    height: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    background: #000000;
+    opacity: 0.2;
+    overflow: hidden;
+    z-index: 1000;
+    color: #fff;
+
+  }
+  .model{
+    z-index: 1001;
+    width:40%;
+    height:auto;
+    position: fixed;
+    top: 30%;
+    left: 30%;
+    margin:auto;
+    background: #fff;
+    border-radius:10px;
+    text-align: center;
+  }
+  .scope-name{
+    margin-left: 13px;
+  }
+
+  .model-text{
+    background:rgba(255,255,255,1);
+    border-radius:10px;
+  }
+
+  .model-btn{
+    display: flex;
+    justify-content: space-around;
+    margin-bottom: 44px;
+  }
+  .model-btn-items{
+    width:154px;
+    height:50px;
+    line-height: 50px;
+    text-align: center;
+    font-size: 18px;
+    border-radius:4px;
+  }
+  .main-gay{
+    background:rgba(246,247,251,1);
+    color: #7E7E7E;
+  }
+  .model-grdeen{
+    background-color: #52CC60;
+    color: #fff;
+  }
+  .model-text-items-close{
+    position: absolute;
+    top: 10px;
+    right: 15px;
+  }
+  .model-text-items{
+    position: relative;
+    color: #000000;
+    font-size: 24px;
+    text-align: center;
+    padding: 40px 0 50px 0;
+  }
+  .page-block{
+    text-align: center !important;
+    margin-top: 15px;
+  }
+  .el-table .table-head-th{
+    background-color:#F6F7FB;
+    font-size: 16px !important;
+    color: #393939;
+
+  }
+  .allocation{
+    color: #52CC60;
+    font-size: 20px;
+    text-decoration: underline;
+  }
+</style>

src/pages/super/SchoolManager.vue

@@ -475,6 +475,9 @@
         </div>
         <div>
           <!-- UnallotHomeworkInfo -->
+            <div class="tr-setNo"  v-if="UnallotHomeworkInfo.list.length == 0">
+            暂无数据!
+          </div>
           <div class="tr-set" v-for="(v, k) of UnallotHomeworkInfo.list" :key="k">
             <div class="tr-secon">{{k+1}}</div>
             <div class="tr-secon" style="width:50px;">

src/pages/super/SuperAdmin.vue

@@ -14,10 +14,10 @@
         </el-row>
         <el-table
           :data="getManagerList.list"
-          highlight-current-row
+          :header-cell-class-name="tableheaderClassName"
+          :cell-style="cellStyle"
           size="medium"
           border
-          stripe
         >
           <el-table-column
             label="小组管理员"
@@ -66,8 +66,9 @@
             label="是否在线"
             header-align="center">
             <template scope="scope">
-                <span v-if="scope.$index==0">自己</span>
-                <span v-if="scope.$index>0">{{scope.row.status}}</span>
+                <span v-if="scope.$index==0&&parseInt(getManagerList.pageNo)==1">自己</span>
+                <span v-if="scope.$index>0&&parseInt(getManagerList.pageNo)==1">{{scope.row.status}}</span>
+                <span v-if="parseInt(getManagerList.pageNo)>1">{{scope.row.status}}</span>
             </template>
           </el-table-column>
           <el-table-column prop="status" label="" header-align="center" width="250">
@@ -79,7 +80,7 @@
 
         </el-table>
         <!-- 分页显示 -->
-        <div class="page-block" v-if="parseInt(getManagerList.pages) > 0">
+        <div class="page-block" v-if="parseInt(getManagerList.pages) > 10">
             <el-pagination
               background
               @size-change="handleSizeChange"
@@ -272,6 +273,7 @@ k
         this.$store.dispatch("Downgrade", {
           managerId: this.managerId
         });
+        this.SuperManagerList();
         this.allShowModel(2)
       },
       //小组详情
@@ -283,6 +285,18 @@ k
           }
         })
       },
+      // 表格头部样式
+      tableheaderClassName({ row, rowIndex }) {
+        return "table-head-th";
+      },
+      cellStyle:function (row, column, rowIndex, columnIndex) {
+          console.log(row)
+        if (row.column.label === "小组管理员") {
+          return 'font-size:30px'
+        } else {
+          return ''
+        }
+      },
       // 分页
       pageChange(val) {
         this.filters.pageNo = val;
@@ -495,6 +509,8 @@ k
   }
   .scope-name{
     margin-left: 13px;
+    color: #393939;
+    font-size: 16px;
   }
   .page-block{
     text-align: center !important;
@@ -504,4 +520,13 @@ k
     margin-left: 18px;
     text-align: left;
   }
+  .noBorderBottom{
+    border-bottom: none;
+  }
+  .el-table .table-head-th{
+    background-color:#F6F7FB;
+    font-size: 16px !important;
+    color: #393939;
+
+  }
 </style>

src/router/index.js

@@ -16,7 +16,7 @@ import CheckTeacherAudit from "@/pages/Super/CheckTeacherAudit";
 import SuperSchoolManager from "@/pages/Super/SchoolManager";
 import CheckTeacherPay from "@/pages/Super/CheckTeacherPay";
 import SuperAdmin from "@/pages/Super/SuperAdmin";
-import HomeWorkRecover from "@/pages/Super/HomeWorkRecover";
+import HomeworkRecycle from "@/pages/Super/HomeworkRecycle";
 // 在线批改老师
 import Onlineteacher from "@/pages/OnlineTeacher/onlineteacher";
 import Redirect_uri from "@/pages/aikmt/Redirect_uri"; //微信登陆路由重定向页面
@@ -81,12 +81,12 @@ export const constantRouterMap =
           component: SuperSchoolManager,
           meta: { title: '校区管理员', roles: ['3'] }
         },
-        {
-          path: "HomeWorkRecover",
-          name: "HomeWorkRecover",
-          component: HomeWorkRecover,
-          meta: { title: '作业回收站', roles: ['3'] }
-        },
+         {
+           path: "HomeworkRecycle",
+           name: "HomeworkRecycle",
+           component: HomeworkRecycle,
+           meta: { title: '作业回收站', roles: ['3'] }
+         },
        ]
      },
     //  校区管理员角色路由