最新代码

src/api/index.js

@@ -44,6 +44,8 @@ const DealCorrectTeacher = urlFn('/api/kmt/correctSys/dealCorrectTeacher')
 const GetAllotManagerList = urlFn('/api/kmt/correctSys/getAllotManagerList')
 // 分配老师到管理员名下
 const AllotTeacherToManager = urlFn('/api/kmt/correctSys/allotTeacherToManager')
+// 作业回收站列表
+const HomeworkRecoveryList = urlFn('/api/kmt/correctSys/homeworkRecoveryList')
 export {
     GET_TOKEN,
     GET_UUIONID_TOKEN,
@@ -65,5 +67,6 @@ export {
     GetTeacherSalaryList,
     DealCorrectTeacher,
     GetAllotManagerList,
-    AllotTeacherToManager
+    AllotTeacherToManager,
+    HomeworkRecoveryList
 }

src/components/SuperComponent.vue

@@ -52,11 +52,11 @@ export default {
     name: "批改老师薪酬表",
     href: "CheckTeacherPay",
   },
-          {
-            id: "4",
-            name: "作业回收站",
-            href: "HomeworkRecycle",
-          },
+          // {
+          //   id: "4",
+          //   name: "作业回收站",
+          //   href: "HomeworkRecycle",
+          // },
  ],
       checkindex: 0
     };

src/pages/home/SchoolManager.vue

@@ -192,7 +192,7 @@
           <el-col :span="5">
             <div class="main-header-item">今日报错总次数:{{DayTeacherList.wrongCount}}人</div>
           </el-col>
-          <el-col :span="10" :offset="5">
+          <el-col :span="10" :offset="4">
             <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
               <el-select
                 v-model="filters1.OptionsValue"
@@ -290,7 +290,7 @@
           <el-col :span="5">
             <div class="main-header-item">当月报错总次数：{{MothTeacherList.wrongCount}}人</div>
           </el-col>
-          <el-col :span="10" :offset="5">
+          <el-col :span="10" :offset="4">
             <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
               <el-select
                 v-model="filters2.OptionsValue"
@@ -419,8 +419,13 @@
         </div>
           <!-- <div class="tr-setNo"  v-if="TeacherAllotList.list.length == 0">
             暂无数据!
+<<<<<<< HEAD
           </div> -->
         <div class="model-itemss" style="margin:10px;" v-for="(v, k) in TeacherAllotList.list" :key="k">
+=======
+          </div>
+        <div class="allocation-items" v-for="(v, k) in TeacherAllotList.list" :key="k" >
+>>>>>>> 6a3419620148f4e66aa22d4c8ad3e9a27fb03927
           <div class="model-items-left">
             <div class="model-items-left-top">
               <div>
@@ -1495,8 +1500,8 @@ padding:30px;
     width: 226px;
     height: 203px;
   }
-    .allocation-items{
-    width: 40%;
+  .allocation-items{
+    width: 45%;
     display: inline-block;
     margin-right: 20px;
     margin-bottom:30px;

src/pages/super/HomeworkRecycle.vue

@@ -4,11 +4,11 @@
     <!-- table 表格 -->
     <el-row :gutter="20" class="main-items" >
 
-      <!--数据监控-->
+      <!--数据监控homeworkRecoveryList.list-->
       <el-col :span="20" class="main" :offset="2">
 
         <el-table
-          :data="list"
+          :data="homeworkRecoveryList"
           :header-cell-class-name="tableheaderClassName"
           :header-cell-style="{
           'color': '#999999',
@@ -19,23 +19,23 @@
         >
           <el-table-column
             label="上传时间"
-            prop=""
+            prop="createTime"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop=""
+            prop="subject"
             label="科目"
             header-align="center"
           >
           </el-table-column>
           <el-table-column
-            prop=""
+            prop="studentName"
             label="学生"
             header-align="center"
           ></el-table-column>
           <el-table-column
-            prop=""
+            prop="status"
             label="批改状况"
             header-align="center">
           </el-table-column>
@@ -44,6 +44,9 @@
             label="是否有补拍"
             header-align="center"
           >
+            <template slot-scope="ownReplenish">
+              <span class="allocation">{{scope.row.ownReplenish==1?'有':'无'}}</span>
+            </template>
           </el-table-column>
           <el-table-column
             prop=""
@@ -57,14 +60,14 @@
           </el-table-column>
         </el-table>
         <!-- 分页显示 -->
-        <!--<div class="page-block" v-if="parseInt(getTeacherSalaryList.pages) > 0">-->
+        <!--<div class="page-block" v-if="parseInt(homeworkRecoveryList.pages) > 0">-->
           <!--<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)-->
+            <!--:total= parseInt(homeworkRecoveryList.pages)-->
           <!--&gt;</el-pagination>-->
         <!--</div>-->
       </el-col>
@@ -119,7 +122,7 @@
     },
     watch: {},
     computed: {
-      ...mapGetters(["getUser"])
+      ...mapGetters(["getUser",'homeworkRecoveryList'])
     },
     methods: {
       ...mapActions(["setUser"]),
@@ -165,23 +168,13 @@
         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()
+      //作业回收站列表
+      async HomeworkRecoveryList() {
+        this.$store.dispatch("HomeworkRecoveryList", {
+          pageNo: this.filters.pageNo,
+          pageSize: this.filters.pageSize,
+          maxCreateTime: this.formatDate()
+        });
       },
 
       // 分页
@@ -235,6 +228,7 @@
 
     },
     mounted() {
+      // this.HomeworkRecoveryList()
     }
   };
 </script>

src/pages/super/SchoolManager.vue

@@ -198,7 +198,7 @@
           <el-col :span="5">
             <div class="main-header-item">今日报错总次数:{{DayTeacherList.wrongCount}}人</div>
           </el-col>
-          <el-col :span="10" :offset="5">
+          <el-col :span="10" :offset="4">
             <el-input placeholder="请输入老师名字" v-model="filters1.inputValue" class="input-with-select">
               <el-select
                 v-model="filters1.OptionsValue"
@@ -297,7 +297,7 @@
           <el-col :span="5">
             <div class="main-header-item">当月报错总次数：{{MothTeacherList.wrongCount}}人</div>
           </el-col>
-          <el-col :span="10" :offset="5">
+          <el-col :span="10" :offset="4">
             <el-input placeholder="请输入老师名字" v-model="filters2.inputValue" class="input-with-select">
               <el-select
                 v-model="filters2.OptionsValue"

src/store/getters.js

@@ -23,8 +23,8 @@ const getters = {
   getTeacherSalaryList: state => state.user.getTeacherSalaryList  || {},
   getTeacherIdStatus: state => state.user.getTeacherIdStatus,
   getAllotManagerList: state => state.user.getAllotManagerList  || {},
+  homeworkRecoveryList: state => state.user.homeworkRecoveryList,
   BeforetoTeacherAllotCode: state => state.user.BeforetoTeacherAllotCode,
   SuperBeforetoTeacherAllotCode :state => state.user.SuperBeforetoTeacherAllotCode,
-  
 }
 export default getters

src/store/modules/user.js

@@ -3,7 +3,7 @@ import { GET_UUIONID_TOKEN,GET_TOKEN,GetInfo,InfoWatch,InfoWatchDay,
   TeacherAllot,UnallotHomeworkList,GetTeacherDetail,
   GetStudentDetail,GetManagerDetail,Downgrade,SuperManagerList,
   SuperApplyTeacherList,ApplyOperate,GetTeacherSalaryList,DealCorrectTeacher,
-  GetAllotManagerList,AllotTeacherToManager
+  GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList
   } from '@/api'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import axios from '@/axios'
@@ -30,6 +30,7 @@ const user = {
     getTeacherSalaryList:[],
     getTeacherIdStatus:"",
     getAllotManagerList:"",
+    homeworkRecoveryList:[],
     BeforetoTeacherAllotCode:""
   },
 
@@ -491,6 +492,19 @@ const user = {
         })
       })
     },
+    //作业回收站列表
+    HomeworkRecoveryList({ commit, state }, data) {
+      return new Promise((resolve, reject) => {
+        axios.post(HomeworkRecoveryList, data).then(response => {
+          const data = response.data || { }
+          commit('SET_HOMEWORK_RECOVERY_LIST', data);
+          // debugger
+          resolve(response)
+        }).catch(error => {
+          reject(error)
+        })
+      })
+    },
     // 登出getTeacherSalaryList
     LogOut({ commit, state }) {
       // debugger