6.14页面样式修改

src/components/SuperComponent.vue

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

src/pages/home/SchoolManager.vue

@@ -676,7 +676,7 @@ export default {
         {
           value: "3",
           label: "全部",
-          str:''
+          // str:''
         }
       ],
       grades: [
@@ -693,12 +693,12 @@ export default {
         {
           value: "2",
           label: "英语",
-          str:"数学"
+          str:"英语"
         },
         {
           value: "3",
           label: "全部",
-          str:""
+          // str:""
         }
       ],
       ItemList: [

src/pages/super/CheckTeacherAudit.vue

@@ -245,7 +245,7 @@
           pageNo: this.filters.pageNo,
           pageSize: this.filters.pageSize
         });
-        // console.log(this.applyTeacherList)
+        console.log(this.applyTeacherList.list)
         this.applyTeacherList.list = (res => {
           const d = []
           for (let i in res) {
@@ -262,17 +262,21 @@
           return d
         })(this.applyTeacherList.list)
         this.list = this.applyTeacherList.list;
-        console.log(this.list)
+        // console.log(this.list)
       },
       //申请审批操作
       async ApplyOperate() {
+        var _that = this;
         this.$store.dispatch("ApplyOperate", {
           applicantId: this.applicantId,
           operate: this.operate,
           reason:this.filters.textareaDesc
         });
         this.allShowModel(this.operate);
-        this.SuperApplyTeacherList()
+        setTimeout(function () {
+          _that.SuperApplyTeacherList()
+          window.location.reload();
+        }, 1000);
       },
       //时间封装
       formatDate: function () {

src/pages/super/CheckTeacherPay.vue

@@ -12,7 +12,9 @@
               <el-date-picker
                 v-model="selMonth"
                 type="month"
-                placeholder="选择月" @change="allclick()">
+                placeholder="选择月"
+                value-format="yyyy-MM"
+                @change="GetTeacherSalaryList()">
               </el-date-picker>
             </div>
           </div></el-col>
@@ -242,20 +244,10 @@
         this.$store.dispatch("GetTeacherSalaryList", {
           pageNo: this.filters.pageNo,
           pageSize: this.filters.pageSize,
-          oneMonth:this.filters.oneMonth,
+          oneMonth:this.selMonth,
           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;

src/pages/super/SchoolManager.vue

@@ -33,7 +33,7 @@
                 v-model="filters.OptionsValue"
                 @change="InfoWatch"
                 slot="prepend"
-                placeholder="全部"
+                placeholder="选年级"
                 maxlength="20"
               >
                 <el-option
@@ -47,7 +47,7 @@
                 v-model="filters.gradesValue"
                 @change="InfoWatch"
                 slot="prepend"
-                placeholder="全部"
+                placeholder="选科目"
                 maxlength="20"
               >
                 <el-option
@@ -87,7 +87,7 @@
                 <div v-if="v.status == '1'" class="tr-first">
                   <div>
                     <i
-                      :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
+                      :class="[isDown&&isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
                       @click="dropDown(v,k)"
                     ></i>
                     <img :src="BASE_URL + v.imgUrl" alt class="table-img" v-if="v.imgUrl" @click="isShow(v,3)">
@@ -135,7 +135,7 @@
                   <div class="tr-setNo" v-if="isDownindex === k && isDown && TeacherHomeworkList.list.length == 0">
                     暂无数据!
                 </div>
-                <!--&& isDown-->
+                <!--&& isDownindex === k && isDown-->
                 <div v-if="isDownindex === k && isDown">
                   <div class="tr-second" v-for="(v, k) of TeacherHomeworkList.list" :key="k">
                     <div class="tr-seconds" style="width:16px;">{{k+1}}</div>
@@ -749,6 +749,7 @@ export default {
       NoAllotManagerModel:false, //所有未批改可分配老师列表弹框
       ModelStudet: false, //学生详情弹框
       isDown: false,
+      teachList:[],
       options: [
         {
           value: "0",
@@ -768,7 +769,7 @@ export default {
         {
           value: "3",
           label: "全部",
-          str:''
+          // str:'全部'
         }
       ],
       grades: [
@@ -785,12 +786,12 @@ export default {
         {
           value: "2",
           label: "英语",
-          str:"数学"
+          str:"英语"
         },
         {
           value: "3",
           label: "全部",
-          str:""
+          // str:""
         }
       ],
       ItemList: [
@@ -909,6 +910,12 @@ 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.isDownindex = k;
       this.TeacherHomework(v);
@@ -939,6 +946,27 @@ export default {
         pageSize: this.filters.pageSize,
         managerId: this.managerId || ""
       });
+      // this.monitorTeacherList.list = (res => {
+      //   const d = [];
+      //   for (let i in res) {
+      //     d.push( {
+      //       isShow:false,
+      //       bannedTime:res[i].bannedTime,
+      //       imgUrl:res[i].imgUrl,
+      //       maxWaitTime:res[i].maxWaitTime,
+      //       name:res[i].name,
+      //       role:res[i].role,
+      //       status:res[i].status,
+      //       respSpeed:res[i].respSpeed,
+      //       teacherId:res[i].teacherId,
+      //       totalCorrectTime:res[i].totalCorrectTime,
+      //       waitCount:res[i].waitCount,
+      //     })
+      //   }
+      //   return d
+      // })(this.monitorTeacherList.list)
+      // this.teachList = this.monitorTeacherList.list;
+      // console.log(this.teachList)
     },
     // 获取校区管理员当天数据
     async InfoWatchDay() {

src/pages/super/SuperAdmin.vue

@@ -121,8 +121,8 @@
             </div>
           </div>
           <div class="model-items-other model-active" >批改科目 : {{getManagerDetail.subject}}</div>
-          <div class="model-items-other">批改年级 :<span v-for="(v, k) of arrGrade" :key=k class="grade-name" v-show="k>=0">{{v}}</span></div>
-          <div class="model-items-other model-active"><span>可批改时间：</span> <el-button type="info" round v-for="(v, k) of arrPeriod" :key=k v-show="k>=0">{{v}}</el-button></div>
+          <div class="model-items-other">批改年级 :<span v-for="(v, k) of arrGrade" :key=k class="grade-name" v-show="v">{{v}}</span></div>
+          <div class="model-items-other model-active"><span>可批改时间：</span> <el-button type="info" round v-for="(v, k) of arrPeriod" :key=k v-show="v">{{v}}</el-button></div>
           <div class="model-items-other">手机号 : {{getManagerDetail.phone}}</div>
           <div class="model-items-other model-active-last">上次登录时间 : {{getManagerDetail.lastOnlineTime}}</div>
         </div>
@@ -271,7 +271,7 @@
             arrList.push('5-6年级')
           }
         }
-        console.log(arrList,this.arrPeriod)
+        console.log(this.arrPeriod)
         this.arrGrade = this.uniq(arrList);
       },
       //校区管理员降级