Browse Source

6.14页面样式修改

name 6 năm trước cách đây
mục cha
commit
8a8ef856fd

+ 7 - 1
src/api/index.js

@@ -46,6 +46,10 @@ const GetAllotManagerList = urlFn('/api/kmt/correctSys/getAllotManagerList')
 const AllotTeacherToManager = urlFn('/api/kmt/correctSys/allotTeacherToManager')
 // 作业回收站列表
 const HomeworkRecoveryList = urlFn('/api/kmt/correctSys/homeworkRecoveryList')
+// 报错警告
+const errorWarning = urlFn('/api/kmt/correctSys/errorWarning')
+// 报错详情
+const errorDetail = urlFn('/api/kmt/correctSys/errorDetail')
 export {
     GET_TOKEN,
     GET_UUIONID_TOKEN,
@@ -68,5 +72,7 @@ export {
     DealCorrectTeacher,
     GetAllotManagerList,
     AllotTeacherToManager,
-    HomeworkRecoveryList
+    HomeworkRecoveryList,
+    errorWarning,
+    errorDetail
 }

BIN
src/assets/img/next_gray.png


BIN
src/assets/img/next_white.png


BIN
src/assets/img/pen.png


BIN
src/assets/img/prev_gray.png


BIN
src/assets/img/prev_white.png


+ 14 - 5
src/components/MenuComponent.vue

@@ -15,7 +15,7 @@
       <span class="lineStyle" :class="{navactive:index == checkindex,menu_item:true}">{{item.name}}</span>
     </el-col>
 
-    <el-col :span="4" :offset="10">
+    <el-col :span="4" :offset="9">
       <div class="login">   
         <img  class="userstyle"  :src="BASE_URL + avatar" alt="">
         <!-- <img class="userstyle" src="../assets/img/user.jpg"> -->
@@ -45,7 +45,7 @@ export default {
         // BASE_URL:'https://img.sharingschool.com', //正式环境图片地址
       menuData: [
         {
-          id: "2",
+          id: "1",
           name: "校区群管理员",
           href: "SchoolManager"
         },
@@ -60,7 +60,7 @@ export default {
           href: "TeacherPay"
         },
       ],
-      checkindex: 0
+      checkindex: ""
     };
   },
   watch: {
@@ -75,8 +75,16 @@ export default {
     //   this.menuData = JSON.parse(JSON.stringify(this.navsData));
     // },
     secondNavClick(val, index) {
-      this.$router.push("/home/" + val.href);
-      this.checkindex = index;
+        sessionStorage.setItem('tabIndex',index);
+      this.checkindex = sessionStorage.getItem('tabIndex');
+      console.log(sessionStorage.getItem('tabIndex'))
+      if (sessionStorage.getItem('tabIndex') == 0){
+        this.$router.push("/home/" + 'SchoolManager');
+      } else if (sessionStorage.getItem('tabIndex') == 1){
+        this.$router.push("/home/" + 'TeacherApporval');
+      } else if (sessionStorage.getItem('tabIndex') == 2){
+        this.$router.push("/home/" + 'TeacherPay');
+      }
     },
     //  账号管理、退出登录
     Loginout() {
@@ -101,6 +109,7 @@ export default {
     ...mapGetters(["name", "avatar", "roles"])
   },
   mounted() {
+      this.checkindex = sessionStorage.getItem('tabIndex');
     // this.initNav();
   }
 };

+ 17 - 12
src/pages/home/SchoolManager.vue

@@ -84,7 +84,7 @@
               </div>
               <div class="tr" v-for="(v, k) of monitorTeacherList.list" :key="k">
                 <!-- 在线 -->
-                <div v-if="v.status == '1'" class="tr-first">
+                <div v-if="v.status == '1'" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <i
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
@@ -101,7 +101,7 @@
                   <div>在线</div>
                 </div>
                 <!-- 离线 -->
-                <div v-if="v.status == '2'" style="color:#BEBEBE" class="tr-first">
+                <div v-if="v.status == '2'" style="color:#BEBEBE" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <i
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
@@ -117,7 +117,7 @@
                   <div>离线</div>
                 </div>
                 <!-- 封号 -->
-                <div v-if="v.status == '3'" style="color:#FF6767" class="tr-first">
+                <div v-if="v.status == '3'" style="color:#FF6767" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <i
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
@@ -244,7 +244,7 @@
                 <div>出勤</div>
               </div>
               <div class="tr" v-for="(v, k) of DayTeacherList.list" :key="k">
-                <div class="tr-first">
+                <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
                     <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
@@ -255,7 +255,7 @@
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkCount}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
-                  <div>{{v.avgTime}}</div>
+                  <div style="width:240px;">{{v.avgTime}}</div>
                   <div>{{v.attendance}}</div>
                      <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
                    <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div> -->
@@ -340,7 +340,7 @@
                 <div>出勤率</div>
               </div>
               <div class="tr" v-for="(v, k) of MothTeacherList.list" :key="k">
-                <div class="tr-first">
+                <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
                     <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
@@ -353,7 +353,7 @@
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
                   <div>{{v.satisfactionDegree}}</div>
-                  <div>{{v.avgTime}}</div>
+                  <div style="width:240px;">{{v.avgTime}}</div>
                   <div>{{v.attendance}}</div>
                 </div>
               </div>
@@ -838,7 +838,7 @@ export default {
     },
     // 点击下拉
     dropDown(v, k) {
-      this.isDown = true;
+      this.isDown = !this.isDown;
       //  console.log(!this.isDown)
       this.isDownindex = k;
       // if (this.isDown = true){
@@ -867,7 +867,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters.inputValue,
-        maxCreateTime: this.filters.MaxtimeValue,
+        maxCreateTime: "",
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId:this.managerId || ''
@@ -879,7 +879,8 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime: this.filters1.MaxtimeValue,
+        maxCreateTime:"",
+          oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
          managerId:this.managerId || ''
@@ -891,7 +892,8 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters2.inputValue,
-        maxCreateTime: this.filters2.MaxtimeValue,
+        maxCreateTime: "",
+           oneMonth: this.filters2.MaxtimeValue,
         pageNo: this.filters2.pageNo,
         pageSize: this.filters2.pageSize,
          managerId:this.managerId || ''
@@ -902,7 +904,7 @@ export default {
       this.homeworkLIst.teacherId =  v.teacherId
       this.$store.dispatch("TeacherHomeworkList", {
         teacherId: v.teacherId,
-        maxCreateTime: this.filters.MaxtimeValue,
+        maxCreateTime: "",
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize
       });
@@ -1426,6 +1428,9 @@ el-table {
 .tr-active {
   color: #3ab548;
 }
+ .BgcColor{
+     background-color: #F7FBFC;
+   }
 .showModel {
   width: 100%;
   height: 100%;

+ 1 - 1
src/pages/home/TeacherApporval.vue

@@ -19,7 +19,7 @@
     computed: {},
     methods: {
       toAppovalIng(){
-            window.open('https://kmt.sharingschool.com/aijia/kmt/index.html?unionid=' + this.unionid + '&state=' + 1)
+            window.open('http://120.77.207.0:8081/kmt/index.html?unionid=' + this.unionid + '&state=' + 1)
       }
     },
     mounted() {}

+ 247 - 42
src/pages/home/TeacherPay.vue

@@ -4,41 +4,33 @@
     <!-- table 表格 -->
     <el-row :gutter="20"  class="main-items">
       <!--数据监控-->
+       <!-- <el-col class="aside" :span="1" :offset="1" style="padding: 0 !important;">
+        <div></div>
+      </el-col> -->
       <!--当天-->
-      <el-col :span="20"  :offset="2" class="main">
-        <el-row :gutter="20" class="main-header">
+      <el-col :span="20"  class="main">
+        <el-row :gutter="20"  class="main-header">
           <el-col :span="5">
-         <div class="main-header-item">今日报错总次数:<span style="color:red;">{{DayTeacherList.wrongCount}}次</span></div> 
+         <div class="main-header-item">报错总次数:<span style="color:red;">{{errorWarningList.allErrorCount}}次</span></div> 
           </el-col>
         </el-row>
         <el-row :gutter="20" class="main-header">
           <el-col :span="24">
             <div class="table">
               <div class="table-head">
-                <div>头像</div>
-                <div>姓名</div>
-                <div>被报错</div>
+                <div>时间</div>
+                <div>学生</div>
                 <div>科目</div>
-                <div>批改总份数</div>
-                <div>批改总张数</div>
-                <div>平均批改时间</div>
-                <div>出勤</div>
+                 <div style="margin-left:40px;">查看报错详情</div>
               </div>
-              <div class="tr" v-for="(v, k) of DayTeacherList.list" :key="k">
-                <div class="tr-first">
-                  <div>
-                    <img :src="BASE_URL + v.imgUrl" alt class="table-img">
-                  </div>
-                  <div>{{v.name}}</div>
-                  <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
-                   <div style="color:red;" v-if="v.wrongCount > 0">{{v.wrongCount}}次</div>
-                  <div class="tr-active">{{v.subject}}</div>
-                  <div>{{v.homeworkCount}}</div>
-                  <div>{{v.homeworkPicCount}}/张</div>
-                  <div>{{v.avgTime}}</div>
-                  <div>{{v.attendance}}</div>
-                     <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
-                   <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div> -->
+              <div class="tr" v-for="(v, k) of errorWarningList.list" :key="k">
+                <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
+                  <div>{{v.date}}</div>
+                  <div>{{v.studentName}}</div>
+                  <div>{{v.subject}}</div>
+                   <div class="tr-seconds">
+                      <span @click="groupDetail(v)" style="cursor: pointer;" class="tr-second-check">查看详情</span>
+                    </div>
                 </div>
               </div>
             </div>
@@ -49,18 +41,57 @@
               @current-change="pageChange1"
               :page-sizes="[10]"
               layout="total, sizes, prev, pager, next, jumper"
-              :total="parseInt(DayTeacherList.pages)"
+              :total="parseInt(errorWarningList.pages)"
               :hide-on-single-page="true"
             ></el-pagination>
-            <!-- <div style="float:right;margin-left:15px;">
-            <el-button @click="myVisible = false" size="small">取 消</el-button>
-            <el-button type="primary" size="small" @click="submit">确定</el-button>
-            </div>-->
             <div style="clear:both;"></div>
           </el-col>
         </el-row>
       </el-col>
     </el-row>
+      <div class="showModel"  v-if="NoAllotManagerModel">
+            <div class="modal-cancel" @click="updateIsShowCarouselPictureModal()">X</div>
+            <div class="detailinfo">
+              <div class="detailImg">
+                <img  :src="BASE_URL + errorDetailList[pictureIndex].pictureUrl"  alt="">
+              </div>
+              <div class="detailword">
+                <div>
+                  <h1 class="tipsesson">错误原因:</h1>
+                  <span class="tipsessonWord">
+                       {{errorDetailList[pictureIndex].errorReason}}
+                      </span>
+                </div>
+                <div class="timeAndteacher">
+                  <h2 class="managertip">{{errorDetailList[pictureIndex].checker}}</h2>
+                  <div class="timeset">{{errorDetailList[pictureIndex].checkDate}}</div>
+                  <div class="timesetImg">
+                    <img src="../../assets/img/pen.png" alt="">
+                  </div>
+                </div>
+              </div>
+              <div  class="nextPrveBtn">
+                <!-- 上一页 -->
+                <div @click="Clickprvebtn" v-show='pictureIndex >0'  class="prvebtn"  style="height:50px;cursor:pointer;">
+                  <img src="../../assets/img/prev_white.png" alt="">
+                </div>
+                   <div v-show='pictureIndex == 0'  class="prvebtn"  style="height:50px">
+                  <img src="../../assets/img/prev_gray.png" alt="">
+                </div>
+                <!-- 张数 -->
+                <div style="color:#ffffff; font-size:25px;margin-top:40px;">
+                  <span>{{pictureIndex + 1}}</span><span style="color:#bbbbbb;">/{{errorDetailList.length}}</span>
+                </div>
+                <!-- 下一页 -->
+                <div @click="ClickNextebtn" v-show='pictureIndex < errorDetailList.length - 1' class="Nextebtn"  style="height:50px;cursor:pointer;">
+                  <img  src="../../assets/img/next_white.png" alt="">
+                </div>
+                <div v-show='pictureIndex == errorDetailList.length - 1'  class="Nextebtn" style="height:50px">
+                  <img  src="../../assets/img/next_gray.png" alt="">
+                </div>
+              </div>
+            </div>
+      </div>
   </div>
 </template>
 <script>
@@ -72,9 +103,16 @@ export default {
   props: {},
   data() {
     return {
+
         // BASE_URL:'https://img.sharingschool.com', //正式环境图片地址
       BASE_URL:'https://xtimg.sharingschool.com/',
-      // BASE_URL: BASE_URL,
+       accessToken:localStorage.getItem("accessToken"), 
+       NoAllotManagerModel:false,//token
+       filters1: {
+        pageNo: 1,
+        pageSize: 10,
+      },
+      pictureIndex:0
     };
   },
   created(){
@@ -83,33 +121,197 @@ export default {
     },
   computed: {
     ...mapGetters([
-      "DayTeacherList",
+      "errorWarningList",
+      "errorDetailList",
     ])
   },
   methods: {
     ...mapActions(["setUser"]),
        // 去批改前分配老师
     // 获取校区管理员当天数据
-    async InfoWatchDay() {
-      this.$store.dispatch("InfoWatchDay", {
-        grade: this.filters.OptionsValue,
-        subject: this.filters.gradesValue,
-        teacherName: this.filters1.inputValue,
-        maxCreateTime: this.filters1.MaxtimeValue,
+    async GeterrorWarningLists() {
+      this.$store.dispatch("GeterrorWarning", {
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
-         managerId:this.managerId || ''
+        accessToken: this.accessToken
       });
     },
+       handleSizeChange1(val) {
+      this.filters1.pageSize = val;
+      this.GeterrorWarningLists();
+    },
+      pageChange1(val) {
+      this.filters1.pageNo = val;
+      this.GeterrorWarningLists();
+    },
+    updateIsShowCarouselPictureModal(){
+        this.NoAllotManagerModel = false
+    },
+      //报错详情
+      groupDetail(str){
+        this.pictureIndex = 0
+        this.NoAllotManagerModel = true
+          this.$store.dispatch("GeterrorDetail", {
+        homeworkId: str.homeworkId,
+        accessToken:this.accessToken
+      });
+      },
+      // 下一页
+       ClickNextebtn(){
+        this.pictureIndex++
+        console.log( this.pictureIndex)
+        // if (this.pictureIndex >= errorDetailList.list.length){
+        //     return
+        // }
+      },
+       // 上一页
+       Clickprvebtn(){
+        this.pictureIndex--
+          console.log( this.pictureIndex)
+        // if (this.pictureIndex <= errorDetailList.list.length){
+        //     return
+        // }
+      }
   },
   mounted() {
-    this.InfoWatchDay();
+     console.log( this.pictureIndex)
+    this.GeterrorWarningLists();
   }
 };
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->
-<style>
+<style scoped>
+.showModel {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000000e7;
+  opacity: 1!important;
+  overflow: hidden!important;
+  color: #fff;
+}
+  .modal-cancel {
+      position: absolute;
+      top: 20px;
+      right: 40px;
+      width: 50px;
+      height: 50px;
+      text-align: center;
+      line-height: 50px;
+      background: #eee;
+      border-radius: 100px;
+      font-size: 16;
+      color:#000000;
+      cursor: pointer;
+    }
+    .detailinfo{
+      position: absolute;
+      left:50%;
+      margin-left:-490px;
+      top: 20px;
+      width: 980px;
+      height: 800px;
+      /* background: #eee; */
+      text-align: center;
+      line-height: 50px;
+      border-radius: 100px;
+      font-size: 16;
+      color:#000000;
+     padding:50px!important;
+    }
+    .detailImg{
+        background: #000000;
+      position: absolute;
+      left:0;
+      top: 20px;
+      width: 450px;
+      height: 550px;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 15px;
+      font-size: 16;
+      color:rgb(0, 0, 0);
+      opacity: 1!important;
+      /* cursor: pointer; */
+    }
+    .detailword{
+        background: #eee;
+      position: absolute;
+      right:0;
+      top: 20px;
+      width: 450px;
+      height: 550px;
+      text-align: center;
+      line-height: 50px;
+      border-radius: 15px;
+      font-size: 16;
+      color:#000000;
+       opacity: 1!important;
+      /* cursor: pointer; */
+    }
+   .detailImg img{
+      width: 450px;
+      height: 550px;
+       border-radius: 15px;
+   }
+   .tipsesson{
+     font-size: 18px; 
+     font-weight: 700;
+       position: absolute;
+      left:10px;
+      top: 20px;
+   }
+   .tipsessonWord{
+     width: 100%;
+     height: 400px;
+      font-size: 14px; 
+     position: absolute;
+      left:10px;
+      top: 50px;
+      padding:0 20px;
+      line-height:20px;
+      text-align:left;
+   }
+   .BgcColor{
+     background-color: #F7FBFC;
+   }
+   .managertip{
+      font-size: 20px; 
+     font-weight: 700;
+   }
+   .timeAndteacher{
+      height: 200px;
+      position: absolute;
+      right:50px;
+      bottom: 50px;
+   }
+   .nextPrveBtn{
+     width: 400px;
+        left:50%;
+      margin-left:-200px;
+      height: 200px;
+      position: absolute;
+      bottom: 50px;
+   }
+   .timeset{
+     color:#5de26c;
+     font-size: 16px;
+   }
+   .Nextebtn{
+     height: 100px;
+      position: absolute;
+      right:50px;
+      bottom: 50px;
+   }
+   .prvebtn{
+     height: 100px;
+       position: absolute;
+      left:50px;
+      bottom: 50px;
+   }
 html,
 body {
   height: 100%;
@@ -120,7 +322,7 @@ ul{
   margin: 0 !important
 }
 .aside {
-  background-color: #fff;
+  /* background-color: #fbfbfb; */
   margin-top: 16px;
   padding: 0;
   min-height: 880px;
@@ -129,6 +331,7 @@ ul{
   background-color: #fff;
   margin: 16px;
   padding: 0 !important;
+  margin-left:180px;
   min-height: 980px;
 }
 .table-aside {
@@ -202,6 +405,7 @@ el-table {
   margin: 0 43px;
 }
 .table-head {
+   margin-right:6%;
   color: #999999;
   font-size: 18px;
   text-align: center;
@@ -230,6 +434,7 @@ el-table {
   text-align: center;
 }
 .tr-first {
+  margin-right:2%;
   display: flex;
   justify-content: space-around;
 }

+ 2 - 2
src/pages/super/CheckTeacherAudit.vue

@@ -48,7 +48,7 @@
             header-align="center">
               <template slot-scope="scope">
                 <div >
-                    <div v-for="(v, k) of scope.row.gradeList" :key=k v-if="v">{{v}}</div>
+                    <div v-for="(v, k) of scope.row.gradeList" :key=k v-show="v">{{v}}</div>
                 </div>
               </template>
           </el-table-column>
@@ -60,7 +60,7 @@
           >
             <template slot-scope="scope">
                   <div>
-                    <el-button type="info" round v-for="(v, k) of scope.row.periodList" :key=k v-if="v">{{v}}</el-button>
+                    <el-button type="info" round v-for="(v, k) of scope.row.periodList" :key=k v-show="v">{{v}}</el-button>
                 </div>
             </template>
           </el-table-column>

+ 1 - 1
src/pages/super/HomeworkRecycle.vue

@@ -54,7 +54,7 @@
             header-align="center"
             width="450"
           >
-            <template slot-scope="scope">
+            <template slot-scope="">
                 <span class="allocation">去分配</span>
             </template>
           </el-table-column>

+ 17 - 18
src/pages/super/SchoolManager.vue

@@ -84,7 +84,7 @@
               </div>
               <div class="tr" v-for="(v, k) of monitorTeacherList.list" :key="k">
                 <!-- 在线 -->
-                <div v-if="v.status == '1'" class="tr-first">
+                <div v-if="v.status == '1'" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <i
                       :class="[isDown&&isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
@@ -101,7 +101,7 @@
                   <div>在线</div>
                 </div>
                 <!-- 离线 -->
-                <div v-if="v.status == '2'" style="color:#BEBEBE" class="tr-first">
+                <div v-if="v.status == '2'" style="color:#BEBEBE" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <i
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
@@ -117,7 +117,7 @@
                   <div>离线</div>
                 </div>
                 <!-- 封号 -->
-                <div v-if="v.status == '3'" style="color:#FF6767" class="tr-first">
+                <div v-if="v.status == '3'" style="color:#FF6767" class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <i
                       :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
@@ -212,7 +212,7 @@
               <el-date-picker
                 @change="InfoWatchDay"
                 v-model="filters1.MaxtimeValue"
-                value-format="yyyy-MM-dd"
+                 value-format="yyyy-MM-dd"
                 type="date"
                 placeholder="filters1.MaxtimeValue"
               ></el-date-picker>
@@ -233,7 +233,7 @@
                 <div>出勤</div>
               </div>
               <div class="tr" v-for="(v, k) of DayTeacherList.list" :key="k">
-                <div class="tr-first">
+                <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
                     <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
@@ -244,7 +244,7 @@
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkCount}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
-                  <div>{{v.avgTime}}</div>
+                  <div  style="width:240px;">{{v.avgTime}}</div>
                    <div>{{v.attendance}}</div>
                     <!-- <div v-if="v.attendance == 正常">{{v.attendance}}</div>
                    <div style="color:#52cc60;" v-if="v.attendance == 未出勤">{{v.attendance}}</div> -->
@@ -334,7 +334,7 @@
                 <div>出勤率</div>
               </div>
               <div class="tr" v-for="(v, k) of MothTeacherList.list" :key="k">
-                <div class="tr-first">
+                <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
                     <img src="../../assets/img/user.jpg" alt="" v-if="!v.imgUrl" class="table-img">
@@ -347,7 +347,7 @@
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
                   <div>{{v.satisfactionDegree}}</div>
-                  <div>{{v.avgTime}}</div>
+                  <div  style="width:240px;">{{v.avgTime}}</div>
                   <div>{{v.attendance}}</div>
                 </div>
               </div>
@@ -910,13 +910,7 @@ export default {
     ...mapActions(["setUser"]),
     // 点击下拉
     dropDown(v, k) {
-      // this.teachList.list = (res => {
-      //   for (let i in this.teachList) {
-      //     this.teachList[i].isShow = false;
-      //   }
-      // this.teachList[k].isShow = !this.teachList[k].isShow;
-      // console.log(this.teachList[k].isShow)
-      this.isDown = true;
+      this.isDown = !this.isDown;
       this.isDownindex = k;
       this.TeacherHomework(v);
     },
@@ -941,7 +935,7 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters.inputValue,
-        maxCreateTime: this.filters.MaxtimeValue,
+        maxCreateTime: "",
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId: this.managerId || ""
@@ -974,7 +968,8 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters1.inputValue,
-        maxCreateTime: this.filters1.MaxtimeValue,
+        maxCreateTime: "",
+        oneDay: this.filters1.MaxtimeValue,
         pageNo: this.filters1.pageNo,
         pageSize: this.filters1.pageSize,
         managerId: this.managerId || ""
@@ -986,7 +981,8 @@ export default {
         grade: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
         teacherName: this.filters2.inputValue,
-        maxCreateTime: this.filters2.MaxtimeValue,
+        maxCreateTime: "",
+        oneMonth: this.filters2.MaxtimeValue,
         pageNo: this.filters2.pageNo,
         pageSize: this.filters2.pageSize,
         managerId: this.managerId || ""
@@ -1447,6 +1443,9 @@ el-table {
   color: #999999;
   font-size: 18px;
 }
+ .BgcColor{
+     background-color: #F7FBFC;
+   }
 .buttonAppoval{
   display:inline-block;
 }

+ 2 - 1
src/router/index.js

@@ -11,6 +11,7 @@ import Error404 from "@/pages/Error404";
 import SchoolManager from "@/pages/home/SchoolManager";
 import TeacherApporval from "@/pages/home/TeacherApporval";
 import TeacherPay from "@/pages/home/TeacherPay";
+
 // 超级管理员
 import CheckTeacherAudit from "@/pages/Super/CheckTeacherAudit";
 import SuperSchoolManager from "@/pages/Super/SchoolManager";
@@ -117,7 +118,7 @@ export const constantRouterMap =
            path: "TeacherPay",
            name: "TeacherPay",
            component: TeacherPay,
-           meta: { title: '教师薪酬管理', roles: ['2'] }
+           meta: { title: '报错详情', roles: ['2'] }
          },
        ]
      },

+ 3 - 0
src/store/getters.js

@@ -27,5 +27,8 @@ const getters = {
   BeforetoTeacherAllotCode: state => state.user.BeforetoTeacherAllotCode,
   SuperBeforetoTeacherAllotCode :state => state.user.SuperBeforetoTeacherAllotCode,
   BeforetoTeacherstatues :state => state.user.BeforetoTeacherstatues,
+  errorWarningList :state => state.user.errorWarningList,
+  errorDetailList :state => state.user.errorDetailList || {},
+  pictureIndex :state => state.user.pictureIndex,
 }
 export default getters

+ 42 - 3
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,HomeworkRecoveryList
+  GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,errorWarning,errorDetail
   } from '@/api'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import axios from '@/axios'
@@ -32,7 +32,10 @@ const user = {
     getAllotManagerList:"",
     homeworkRecoveryList:[],
     BeforetoTeacherAllotCode:"",
-    BeforetoTeacherstatues:""
+    BeforetoTeacherstatues:"",
+    errorWarningList:[],
+    errorDetailList:[],
+    pictureIndex:0,
   },
 
   mutations: {
@@ -105,6 +108,17 @@ const user = {
     SET_GET_SUCCESS_TEACHER:(state,BeforetoTeacherstatues) => {
       state.BeforetoTeacherstatues = BeforetoTeacherstatues
     },
+    SET_ERROR_WARING:(state,errorWarningList) => {
+      state.errorWarningList = errorWarningList
+    },
+    SET_ERROR_DETAIL:(state,errorDetailList) => {
+      console.log(errorDetailList)
+      state.errorDetailList = errorDetailList
+    },
+    SET_ERROR_INDEX:(state,pictureIndex) => {
+      console.log(pictureIndex)
+      state.pictureIndex = pictureIndex
+    },
   },
 
   actions: {
@@ -364,7 +378,7 @@ const user = {
                   const data = response || {}
                   if (data.code === '999'){
                     commit('SET_GET_SUCCESS_CODE',new Date());
-                    Message.success('分配成功')
+                    // Message.success('分配成功')
                   }
                 }).catch(error => {
                   reject(error)
@@ -396,6 +410,31 @@ const user = {
         })
       })
     },
+      // 报错警告
+      GeterrorWarning({ commit, state }, data) {
+        return new Promise((resolve, reject) => {
+          axios.post(errorWarning, data).then(response => {
+            const data = response.data || {}
+            commit('SET_ERROR_WARING', data);
+            resolve(response)
+          }).catch(error => {
+            reject(error)
+          })
+        })
+      },
+        // 报错详情
+        GeterrorDetail({ commit, state }, data) {
+          return new Promise((resolve, reject) => {
+            axios.post(errorDetail, data).then(response => {
+              const data = response.data.list || {}
+              commit('SET_ERROR_DETAIL', data);
+               commit('SET_ERROR_INDEX', 0);
+              resolve(response)
+            }).catch(error => {
+              reject(error)
+            })
+          })
+        },
     // 处理在线批改老师(解封)
     OpenIdTeacher({ commit, state }, data) {
       return new Promise((resolve, reject) => {