创建分支提交最新代码

src/components/SeacherHomewrokStatus.vue

@@ -83,7 +83,7 @@
       </el-table-column>
       <el-table-column prop="status" label header-align="left" width="200">
         <template slot-scope="scope">
-          <div class="UpTeacherIDiNfo" @click="isShow(1,scope.row)">
+          <div v-if="scope.row.status !==3 " class="UpTeacherIDiNfo" @click="isShow(1,scope.row)">
             <span>分配</span>
           </div>
         </template>
@@ -473,20 +473,15 @@ export default {
   created() {},
   watch: {
     BeforetoTeacherstatues(val, oldVal) {
-      //普通的watch监听
-      // 查看老师批改作业列表
-      //   this.$store.dispatch("TeacherHomeworkList", {
-      //     teacherId: this.homeworkLIst.teacherId,
-      //     maxCreateTime: this.filters.MaxtimeValue,
-      //     pageNo: this.homeworkLIst.pageNo,
-      //     pageSize: this.homeworkLIst.pageSize
-      //   });
      this.UnallotHomework();
     },
         InfoTeacherstatues(val, oldVal) {
-      //普通的watch监听
       this.pesiorFun();
     },
+      ApporingTeacherstatues(val, oldVal) {
+         this.hiddenModel = false;
+     this.UnallotHomework();
+    },
   },
   computed: {
     ...mapGetters([
@@ -496,6 +491,7 @@ export default {
       "getAllotManagerList",
       "StudentHomeworkNoFeedbackList",
        "InfoTeacherstatues",
+       "ApporingTeacherstatues"
     ])
   },
   methods: {

src/pages/home/SchoolManager.vue

@@ -437,11 +437,11 @@
           <el-col :span="24">
             <div
               class="table"
-              v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length ==0"
+              v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length ==0 ||  DayTeacherList.list.length >0 && DayTeacherList.status == 0"
             >暂无数据！</div>
             <div
               class="table"
-              v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length >0"
+              v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length >0 && DayTeacherList.status == 1"
             >
               <div class="table-head">
                 <div>头像</div>
@@ -477,7 +477,7 @@
               </div>
             </div>
             <!-- 数据监控当天分页匹配知识点老师 -->
-            <div v-if="this.DayActiveindex == true">
+            <div v-if="this.DayActiveindex == true && DayTeacherList.status == 1">
               <el-pagination
                 background
                 @size-change="handleSizeDayChange1"
@@ -489,7 +489,7 @@
                 :hide-on-single-page="true"
               ></el-pagination>
             </div>
-            <div v-if="this.DayActiveindex == false">
+            <div v-if="this.DayActiveindex == false && DayTeacherList.status == 1">
               <el-pagination
                 background
                 @size-change="handleSizeChange1"
@@ -1423,7 +1423,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime: "",
+          maxCreateTime: this.dayFormatDate(),
         oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
@@ -1613,7 +1613,7 @@ export default {
     DayhandApor() {
       this.DayActiveindex = false;
       this.filters1.pageNo = 1;
-      this.filters1.MaxtimeValue = "";
+       this.filters1.MaxtimeValue = this.dayFormatDate();
       this.filters1.inputValue = "";
       //  this.showApporAways = false;
       this.InfoWatchDay();
@@ -1622,7 +1622,7 @@ export default {
     DayAutoApor() {
       this.DayActiveindex = true;
       // this.showApporAways = true;
-      this.filters1.MaxtimeValue = "";
+     this.filters1.MaxtimeValue = this.dayFormatDate();
       this.filters1.inputValue = "";
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
@@ -1633,7 +1633,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime: "",
+          maxCreateTime: this.dayFormatDate(),
         oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
@@ -1641,10 +1641,11 @@ export default {
       });
     },
     InfoWatchDayDatas() {
+
       if (this.DayActiveindex == false) {
         this.InfoWatchDay();
       }
-      if (this.Activeindex == true) {
+      if (this.DayActiveindex == true) {
         this.InfoKonwTeacherDayApprvalList();
       }
     },
@@ -1870,6 +1871,22 @@ export default {
     SearchValueAllot() {
       this.SearchNoapporvalTeacherAllot();
     },
+           //时间封装
+    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;
+    },
     //年月日时间封装
     dayFormatDate: function() {
       let date = new Date();

src/pages/super/HomeWorkPictrue.vue

@@ -21,7 +21,7 @@
           </el-col>
           <el-col :span="20" class :offset="2">
               <!-- {{StudentHomeworkDetail}} -->
-            <div class="beginPictrue">
+            <div class="beginPictrue" v-if="StudentHomeworkDetail.originPicList !== undefined && StudentHomeworkDetail.originPicList.length >0">
               <div class="studentName">原图</div>
               <ul>
                 <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomeworkDetail.originPicList" :key="k">
@@ -44,7 +44,7 @@
             </div>
           </el-col>
           <el-col :span="20" class :offset="2">
-            <div class="beginPictrue">
+            <div class="beginPictrue" v-if="StudentHomeworkDetail.correctPicList !== undefined && StudentHomeworkDetail.correctPicList.length >0">
               <div class="studentName">批改图片</div>
               <ul>
                 <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomeworkDetail.correctPicList" :key="k">
@@ -221,12 +221,12 @@ export default {
 }
 .modelspec {
   z-index: 10000;
-  width: 70%;
-  height: 600px;
+  width: 50%;
+  /* height: 100%; */
   height: auto;
   position: fixed;
   top: 10%;
-  left: 15%;
+  left: 25%;
   bottom: 10%;
   margin: auto;
   border-radius: 10px;

src/pages/super/SchoolManager.vue

@@ -427,11 +427,11 @@
           <el-col :span="24">
             <div
               class="table"
-              v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length ==0"
+                v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length ==0 ||  DayTeacherList.list.length >0 && DayTeacherList.status == 0"
             >暂无数据！</div>
             <div
               class="table"
-              v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length >0"
+               v-if="DayTeacherList.list !== undefined && DayTeacherList.list.length >0 && DayTeacherList.status == 1"
             >
               <div class="table-head">
                 <div>头像</div>
@@ -467,7 +467,7 @@
               </div>
             </div>
             <!-- 数据监控当天分页匹配知识点老师 -->
-            <div v-if="this.DayActiveindex == true">
+            <div v-if="this.DayActiveindex == true && DayTeacherList.status == 1">
               <el-pagination
                 background
                 @size-change="handleSizeDayChange1"
@@ -480,7 +480,7 @@
               ></el-pagination>
             </div>
             <!-- 分页显示 -->
-            <div v-if="this.DayActiveindex == false">
+            <div v-if="this.DayActiveindex == false && DayTeacherList.status == 1">
               <el-pagination
                 background
                 @size-change="handleSizeChange1"
@@ -1499,7 +1499,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime: "",
+           maxCreateTime: this.dayFormatDate(),
         oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
@@ -1994,7 +1994,7 @@ export default {
     DayhandApor() {
       this.DayActiveindex = false;
       this.filters1.pageNo = 1;
-      this.filters1.MaxtimeValue = "";
+      this.filters1.MaxtimeValue = this.dayFormatDate();
       this.filters1.inputValue = "";
       //  this.showApporAways = false;
       this.InfoWatchDay();
@@ -2003,7 +2003,7 @@ export default {
     DayAutoApor() {
       this.DayActiveindex = true;
       // this.showApporAways = true;
-      this.filters1.MaxtimeValue = "";
+     this.filters1.MaxtimeValue = this.dayFormatDate();
       this.filters1.inputValue = "";
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
@@ -2014,7 +2014,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime: "",
+           maxCreateTime: this.dayFormatDate(),
         oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
@@ -2175,6 +2175,22 @@ export default {
       this.filters.orderAD = sort.order != null ? sort.order : "";
       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;
+    },
     //年月日时间封装
     dayFormatDate: function() {
       let date = new Date();

src/store/modules/user.js

@@ -528,6 +528,7 @@ const user = {
             if (response.code === '000'){
               Message.error(response.msg)
                 commit('SET_APPORING_STATUS',new Date());
+              
               resolve(response)
             }
             if (response.code === "") {