创建分支提交最新代码

src/ImgConfig/index.js

@@ -4,13 +4,13 @@ if (process.env.NODE_ENV === 'development') {
     IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
     APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
 } else {
-    // IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
-    IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
+    IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+    // IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
 
-    APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
-    // APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
+    // APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
+    APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
     // APPOR_BASE_URL = 'https://aikmt.sharingschool.com/kmt/index.html#/'; //oss正式环境作业批改地址地址;
-    // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //实习环境作业批改地址
+    // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //Oss实习环境作业批改地址
 }
 export {
     IMG_BASE_URL,

src/api/scheduling.js

@@ -26,6 +26,10 @@ const TeacherListForChecker = urlFn('/api/kmt/correctSys/teacherListForChecker')
 //校区群管理员列表（质检员角色查看）查看老师批改完的作业列表
 const TeacherHomeworkListForChecker = urlFn('/api/kmt/correctSys/teacherHomeworkListForChecker')
 const FindArrangeTemplateIntervalList = urlFn('/api/kmt/arrange/findArrangeTemplateIntervalList')
+// 查看所有学生作业列表（不包含已批改）
+const StudentHomeworkNoFeedbackList = urlFn('/api/kmt/correctSys/studentHomeworkNoFeedbackList')
+//查看作业详情
+const StudentHomeworkDetail = urlFn('/api/kmt/correctSys/studentHomeworkDetail')
 //
 export {
     FindCalendarList,
@@ -40,6 +44,8 @@ export {
     GetManagerListForChecker,
     TeacherListForChecker,
     TeacherHomeworkListForChecker,
-    FindArrangeTemplateIntervalList
+    FindArrangeTemplateIntervalList,
+    StudentHomeworkNoFeedbackList,
+    StudentHomeworkDetail
 
 }

src/components/HomeworkTotalList.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <div :id="myChart" class="myChartDiv" style=" width: 80%; height: 600px;"></div>
-    <!-- <div id="myChart" class="myChart" style="width:960px;height:500px;margin:0 auto;"></div> -->
   </div>
 </template>
 <script>
@@ -119,15 +118,6 @@ export default {
           name: "（张）",
           // scale: true,
           min: 0,
-          // interval: maxValue / 5,
-          // max: 500,
-          // max: function(value) {
-
-          //     if (value >= 1 && value < 50) {
-          //       value = 50
-          //     }
-          //    return value;
-          // },
           minInterval: 1,
           splitNumber: 5,
           boundaryGap: [0.2, 0.2],

src/components/MenuComponent.vue

@@ -1,7 +1,7 @@
 <template>
   <el-col :span="24" class>
     <el-col :span="2" :offset="2">
-      <img class="logoImg" src="../assets/img/log.png">
+      <img class="logoImg" src="../assets/img/log.png" />
     </el-col>
 
     <!-- v-show="roles.indexOf(item.id) >= 0" -->
@@ -16,24 +16,31 @@
     </el-col>
 
     <el-col :span="4" :offset="10">
-      <div class="loginMock">   
-        <img  class="userstyle"  :src="BASE_URL + avatar" alt="">
+      <div class="loginMock">
+        <img class="userstyle" :src="BASE_URL + avatar" alt />
         <!-- <img class="userstyle" src="../assets/img/user.jpg"> -->
         <span>{{name}}</span>
         <i class="el-icon-caret-bottom"></i>
       </div>
       <div class="out">
-        <img src="../assets/img/out.png" alt class="out-img">
+        <img src="../assets/img/out.png" alt class="out-img" />
         <span @click="LoginoutBtn">退出</span>
       </div>
     </el-col>
     <el-col :span="1"></el-col>
-        <!--是否通过-->
-    <div class='showModel' @click="allShowModel()" v-if="hiddenModel"></div>
-    <div class='model' v-if="hiddenModel">
-      <div class='model-text'>
+    <!--是否通过-->
+    <div class="showModel" @click="allShowModel()" v-if="hiddenModel"></div>
+    <div class="model" v-if="hiddenModel">
+      <div class="model-text">
         <div class="model-text-items">
-          <div><img src="../assets/img/del@2x.png" alt="" @click="allShowModel()" class="model-text-items-close"></div>
+          <div>
+            <img
+              src="../assets/img/del@2x.png"
+              alt
+              @click="allShowModel()"
+              class="model-text-items-close"
+            />
+          </div>
           <div>{{name}}老师您确定退出吗？</div>
         </div>
         <div class="model-btn">
@@ -47,7 +54,7 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { IMG_BASE_URL } from '@/ImgConfig'
+import { IMG_BASE_URL } from "@/config";
 export default {
   name: "navMenu",
   // props: {
@@ -55,13 +62,13 @@ export default {
   // },
   data() {
     return {
-      accessToken:localStorage.getItem("accessToken"), //token
-      BASE_URL:IMG_BASE_URL,
-      hiddenModel:false,
+      accessToken: localStorage.getItem("accessToken"), //token
+      BASE_URL: IMG_BASE_URL,
+      hiddenModel: false,
       menuData: [
         {
           id: "1",
-          name: "校区群管理员",
+          name: "学习管理员",
           href: "SchoolManager"
         },
         {
@@ -73,7 +80,7 @@ export default {
           id: "3",
           name: "报错警告",
           href: "TeacherPay"
-        },
+        }
       ],
       checkindex: 0
     };
@@ -89,36 +96,36 @@ export default {
     // initNav() {
     //   this.menuData = JSON.parse(JSON.stringify(this.navsData));
     // },
-    LoginoutBtn(){
-       this.hiddenModel = true;
+    LoginoutBtn() {
+      this.hiddenModel = true;
     },
-    allShowModel(){
+    allShowModel() {
       this.hiddenModel = false;
-       this.$message("已取消操作!");
+      this.$message("已取消操作!");
     },
-    ApplyOperate(){
-        this.$store.dispatch("LogOut", {
-             accessToken: this.accessToken
+    ApplyOperate() {
+      this.$store.dispatch("LogOut", {
+        accessToken: this.accessToken
       });
     },
     secondNavClick(val, 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');
+      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");
       }
-    },
+    }
   },
   computed: {
     ...mapGetters(["name", "avatar", "roles"])
   },
   mounted() {
-      this.checkindex = sessionStorage.getItem('tabIndex');
+    this.checkindex = sessionStorage.getItem("tabIndex");
     // this.initNav();
   }
 };
@@ -143,11 +150,14 @@ export default {
   color: #52cc60;
   border-bottom: 2px solid #52cc60;
 }
-.el-input__inner, .el-checkbox__inner, .el-textarea__inner, .el-button {
-    font-size: 0.3125rem;
-    text-align: center;
-    line-height: 0!important;
-    padding: 12px 20px!important;
+.el-input__inner,
+.el-checkbox__inner,
+.el-textarea__inner,
+.el-button {
+  font-size: 0.3125rem;
+  text-align: center;
+  line-height: 0 !important;
+  padding: 12px 20px !important;
 }
 .navactive {
   color: #52cc60 !important;
@@ -164,8 +174,8 @@ export default {
   margin-left: 125px;
 }
 .userstyle {
-   width:50px;
-  height:50px;
+  width: 50px;
+  height: 50px;
   border-radius: 25px;
 }
 .lineStyle {
@@ -189,71 +199,70 @@ export default {
   height: 18px;
   display: inline-block;
 }
- .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;
-  }
+.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;
+}
 
-  .model-text{
-    background:rgba(255,255,255,1);
-    border-radius:10px;
-  }
+.model-text {
+  background: rgba(255, 255, 255, 1);
+  border-radius: 10px;
+}
 
-  .model-btn{
-    display: flex;
-    justify-content: space-around;
-    margin-bottom: 44px;
-    cursor: pointer;
-  }
-  .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{
-     cursor: pointer;
-    position: absolute;
-    top: 10px;
-    right: -5px;
-  }
-  .model-text-items{
-    position: relative;
-    color: #000000;
-    font-size: 24px;
-    text-align: center;
-    padding: 40px 0 50px 0;
-    margin: 0 33px;
-  }
+.model-btn {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 44px;
+  cursor: pointer;
+}
+.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 {
+  cursor: pointer;
+  position: absolute;
+  top: 10px;
+  right: -5px;
+}
+.model-text-items {
+  position: relative;
+  color: #000000;
+  font-size: 24px;
+  text-align: center;
+  padding: 40px 0 50px 0;
+  margin: 0 33px;
+}
 </style>

src/components/NextMonthList.vue

@@ -4,11 +4,8 @@
     <el-col :span="18" class="main">
       <el-row :gutter="20" class="main-header">
         <el-col :span="24">
-             <el-col :span="1" class="month" :offset="2">
-            <span
-              @click="shoeNextOrlastMOntlist(1)"
-              class="IconLeftclass el-icon-arrow-left"
-            ></span>
+          <el-col :span="1" class="month" :offset="2">
+            <span @click="shoeNextOrlastMOntlist(1)" class="IconLeftclass el-icon-arrow-left"></span>
           </el-col>
           <el-col :span="8">
             <div class="selectBox">
@@ -54,8 +51,8 @@
               </div>
             </div>
           </el-col>
-          <el-col :span="6"> 
-              <h1 class="tiplog">{{currentDateStr}}实时排班情况</h1>
+          <el-col :span="6">
+            <h1 class="tiplog">{{currentDateStr}}实时排班情况</h1>
           </el-col>
         </el-col>
         <el-col :span="24">
@@ -63,18 +60,21 @@
             <div class="tablebox1">
               <div class="date">
                 <div class="calendar-week">
-                  <div class="week-item" v-for="item of weekList" :key="item">  
+                  <div class="week-item" v-for="item of weekList" :key="item">
                     <span :class="[item == '六' || item == '日'?'grayRed':'']">{{item}}</span>
-                    </div>
+                  </div>
                 </div>
-                <div class="calendar-inner"  v-if="NextMonthFindCalendarList.list && NextMonthFindCalendarList.list.length>0">
+                <div
+                  class="calendar-inner"
+                  v-if="NextMonthFindCalendarList.list && NextMonthFindCalendarList.list.length>0"
+                >
                   <div
                     class="calendar-item"
                     v-for="(item, index) of calendarList"
                     :key="index"
                     :class="[item.disable ? 'disabled' : '']"
                   >
-                    <el-popover placement="bottom" width="500" trigger="click" >
+                    <el-popover placement="bottom" width="500" trigger="click">
                       <!-- {{calendarList.dateList.intervalList}} -->
                       <div class="month-day">{{month}}月{{today}}日</div>
                       <el-table
@@ -132,8 +132,8 @@
                           </template>
                         </el-table-column>
                       </el-table>
-                      
-                        <!-- v-if='item.dateList && item.dateList.intervalList' -->
+
+                      <!-- v-if='item.dateList && item.dateList.intervalList' -->
                       <div
                         slot="reference"
                         @click="classSet(index,item.date,item.month,item.dateList.intervalList)"
@@ -141,18 +141,24 @@
                       >
                         <!-- {{FindCalendarList}} -->
                         <div class="date-day">{{ item.date }}</div>
-                         <div class="people" v-if="item.dateList.isOpen ==0">
-                               <div class="people-items">
-                            <div style="color:#999999" class="people-items-text"> 不开放</div>
+                        <div class="people" v-if="item.dateList.isOpen ==0">
+                          <div class="people-items">
+                            <div style="color:#999999" class="people-items-text">不开放</div>
                           </div>
                         </div>
                         <div class="people" v-if="item.dateList.isOpen ==1">
                           <div class="people-items">
-                            <div class="people-items-num" v-if='item.dateList && item.dateList.miniNum'>{{item.dateList.miniNum}}</div>
+                            <div
+                              class="people-items-num"
+                              v-if="item.dateList && item.dateList.miniNum"
+                            >{{item.dateList.miniNum}}</div>
                             <div class="people-items-text">最少</div>
                           </div>
                           <div class="people-items">
-                            <div class="people-items-num" v-if='item.dateList && item.dateList.maxNum'>{{item.dateList.maxNum}}</div>
+                            <div
+                              class="people-items-num"
+                              v-if="item.dateList && item.dateList.maxNum"
+                            >{{item.dateList.maxNum}}</div>
                             <div class="people-items-text">饱和</div>
                           </div>
                           <div class="people-items">
@@ -173,7 +179,7 @@
         </el-col>
       </el-row>
     </el-col>
-      <!-- 添加移除老师弹框 -->
+    <!-- 添加移除老师弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="isApporTeacher"></div>
     <div class="model" style="width:40%; top:10%;" v-if="isApporTeacher">
       <div class="model-text">
@@ -197,7 +203,7 @@
                 class="DaySeachIcon el-icon-search"
               ></span>
             </div>
-            <div class="">
+            <div class>
               <span class="tr-slogn">最少:{{FindHaveTeacherList.arrangeDetail.miniNum}}</span>
               <span class="tr-slogn">已选:{{FindHaveTeacherList.arrangeDetail.haveNum}}</span>
               <span class="tr-slogn">饱和:{{FindHaveTeacherList.arrangeDetail.maxNum}}</span>
@@ -215,14 +221,28 @@
             <div class="tr-secon1">在岗率</div>
             <div class="tr-secon1" style="width:25%">当月已选时段</div>
           </div>
-          <div v-if="FindHaveTeacherList.arrangeDetail.isAdd ==1" class="abbTeachers" @click="showAddTeacherModel">
+          <div
+            v-if="FindHaveTeacherList.arrangeDetail.isAdd ==1"
+            class="abbTeachers"
+            @click="showAddTeacherModel"
+          >
             <span class="addLogicon">+</span> 添加老师
           </div>
-            <div v-if="FindHaveTeacherList.arrangeDetail.isAdd ==0" style="color:#7297FF" class="abbTeachers">
-            当前时段暂时不可添加老师！
-          </div>
-          <div class="scrollBox"  v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length >0">
-            <div class="tr-set" :class="{BgcColor:index%2 !== 1}" v-for="(item, index) of FindHaveTeacherList.list" :key="index">
+          <div
+            v-if="FindHaveTeacherList.arrangeDetail.isAdd ==0"
+            style="color:#7297FF"
+            class="abbTeachers"
+          >当前时段暂时不可添加老师！</div>
+          <div
+            class="scrollBox"
+            v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length >0"
+          >
+            <div
+              class="tr-set"
+              :class="{BgcColor:index%2 !== 1}"
+              v-for="(item, index) of FindHaveTeacherList.list"
+              :key="index"
+            >
               <div class="tr-secon">
                 <img :src="BASE_URL + item.photo" alt class="table-img" v-if="item.photo" />
                 <img src="../assets/img/attt.png" alt v-if="item.photo ==''" class="table-img" />
@@ -233,18 +253,15 @@
               <div class="tr-secon tr-sw100">{{item.dutyRatio}}%</div>
               <div class="tr-secon tr-sw100" style="color:#7297FF">{{item.haveCount }}</div>
               <div v-if="item.isEdit==1" class="Buttonhole" @click="detailTeacherTeam(item)">移除</div>
-                <div v-if="item.isEdit==0" class="NoButtonhole"></div>
+              <div v-if="item.isEdit==0" class="NoButtonhole"></div>
             </div>
           </div>
-            <div class="scrollBox" v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length <=0">
-            <div class="tr-set">
-              暂无可移除老师！
-            </div>
+          <div
+            class="scrollBox"
+            v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length <=0"
+          >
+            <div class="tr-set">暂无可移除老师！</div>
           </div>
-          <!-- <div class="btsnius">
-            <div class="yesBtn">确定</div>
-            <div class="closeBtn">取消</div>
-          </div>-->
         </div>
       </div>
     </div>
@@ -289,10 +306,8 @@
                 class="DaySeachIcon el-icon-search"
               ></span>
             </div>
-             <div class="tiplogslogn">
-              <span
-                class="tr-slogn1"
-              >最少:{{FindNoHaveTeacherList.arrangeDetail.miniNum}}</span>
+            <div class="tiplogslogn">
+              <span class="tr-slogn1">最少:{{FindNoHaveTeacherList.arrangeDetail.miniNum}}</span>
               <span class="tr-slogn1">饱和:{{FindNoHaveTeacherList.arrangeDetail.maxNum}}</span>
               <span class="tr-slogn1">已选:{{FindNoHaveTeacherList.arrangeDetail.haveNum}}</span>
             </div>
@@ -307,10 +322,15 @@
             <div class="tr-secon1">科目</div>
             <div class="tr-secon1">出勤率</div>
             <div class="tr-secon1">在岗率</div>
-            <div class="tr-secon1"  style="width:25%">当月已选时段</div>
+            <div class="tr-secon1" style="width:25%">当月已选时段</div>
           </div>
           <div class="scrollBox">
-            <div class="tr-set" :class="{BgcColor:index%2 !== 1}" v-for="(item, index) of FindNoHaveTeacherList.list" :key="index">
+            <div
+              class="tr-set"
+              :class="{BgcColor:index%2 !== 1}"
+              v-for="(item, index) of FindNoHaveTeacherList.list"
+              :key="index"
+            >
               <div class="tr-secon">
                 <img :src="BASE_URL + item.photo" alt class="table-img" v-if="item.photo" />
                 <img src="../assets/img/attt.png" alt v-if="item.photo ==''" class="table-img" />
@@ -348,7 +368,7 @@
 <script>
 import { mapGetters, mapActions } from "vuex";
 import { Message } from "element-ui";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL } from "@/config";
 export default {
   name: "model",
   components: {},
@@ -368,10 +388,10 @@ export default {
       gardeListDown: false,
       selecttitlepag: "批改老师",
       selecttitleage: "语文",
-      DetailteacherName:'',
+      DetailteacherName: "",
       inputValue: "",
-      gridData:[],
-         isPigai: false,
+      gridData: [],
+      isPigai: false,
       detetaiTeacherid: [],
       isApporTeacher: false, //移除添加老师
       hiddenModel: false, //移除弹框
@@ -416,37 +436,37 @@ export default {
           str: "英语"
         }
       ],
-          HaveTeacherList: {
+      HaveTeacherList: {
         Teacherid: "",
         teacherName: ""
       },
       NoHaveTeacherList: {
         teacherName: ""
-      },
+      }
     };
   },
   watch: {
-        NextMonthlistSTUS(val, oldVal) {
+    NextMonthlistSTUS(val, oldVal) {
       // debugger
       //排班列表请求成功的watch监听回调
-     this.Datainit();
-     this.nextMonth()
+      this.Datainit();
+      this.nextMonth();
     },
-       DeleteArrangeByTeacher(val, oldVal) {
+    DeleteArrangeByTeacher(val, oldVal) {
       // debugger
-      
+
       this.GetFindCalendarListInfo();
     },
     AddArrangeByTeacherStatus(val, oldVal) {
       // debugger
-     
+
       this.GetFindCalendarListInfo();
     },
-     NextOrNewMonthStatus(val, oldVal) {
+    NextOrNewMonthStatus(val, oldVal) {
       // debugger
-      
-     this.GetFindCalendarListInfo()
-    },
+
+      this.GetFindCalendarListInfo();
+    }
   },
   computed: {
     ...mapGetters([
@@ -454,34 +474,34 @@ export default {
       "FindCalendarList",
       "NextMonthlistSTUS",
       "NextMonthFindCalendarList",
-       "FindHaveTeacherList",
-         "FindNoHaveTeacherList",
+      "FindHaveTeacherList",
+      "FindNoHaveTeacherList"
     ]),
-       // 显示当前时间
+    // 显示当前时间
     currentDateStr() {
       let { year, month } = this.current;
       return `${this.pad(month + 1)}月`;
-    },
+    }
   },
-    created() {
-        this.GetFindCalendarListInfo();
+  created() {
+    this.GetFindCalendarListInfo();
   },
   methods: {
-        // 切换下月当月排班表
+    // 切换下月当月排班表
     shoeNextOrlastMOntlist(str) {
       if (str == 1) {
-          this.$store.dispatch("NextOrNewMonthAction", {
-          NextOrNewMonthStatus:false ,
-      });
+        this.$store.dispatch("NextOrNewMonthAction", {
+          NextOrNewMonthStatus: false
+        });
       }
     },
-      //弹框
+    //弹框
     isShow(str, id, timeFnd, DaytimeFn) {
       let _this = this;
       if (str == 1) {
         if ((timeFnd < -4 && DaytimeFn <= 0) || DaytimeFn < 0) {
           _this.isApporTeacher = true;
-          this.HaveTeacherList.teacherName = ''
+          this.HaveTeacherList.teacherName = "";
           this.HaveTeacherList.Teacherid = id;
           this.GetFindHaveTeacherListInfo();
         } else {
@@ -489,7 +509,7 @@ export default {
         }
       }
     },
-      //关闭弹框
+    //关闭弹框
     allShowModel(str) {
       let _this = this;
       if (str == 1) {
@@ -500,14 +520,14 @@ export default {
       } else if (str == 3) {
         _this.isApporTeacher = false;
       } else if (str == 4) {
-          this.teacherIds = []
+        this.teacherIds = [];
         _this.AddTeacherModel = false;
         _this.isApporTeacher = true;
       } else if (str == 5) {
         _this.NoAllotManagerModel = false;
       }
     },
-       // 选中时段老师列表
+    // 选中时段老师列表
     async GetFindHaveTeacherListInfo() {
       this.$store.dispatch("GetFindHaveTeacherList", {
         id: this.HaveTeacherList.Teacherid,
@@ -530,10 +550,6 @@ export default {
       var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
       var seconds = Math.round(leave3 / 1000);
       return hours;
-      // return dayDiff
-      // console.log(" 相差" + dayDiff + "天" + hours + "小时 " + minutes + "分钟" + seconds + " 秒")
-      // console.log(dateDiff + "时间差的毫秒数",dayDiff + "计算出相差天数",leave1 + "计算天数后剩余的毫秒数"
-      //     ,hours + "计算出小时数",minutes + "计算相差分钟数",seconds + "计算相差秒数");
     },
     DaytimeFn(d1) {
       //di作为一个变量传进来
@@ -586,14 +602,14 @@ export default {
     },
     // 获取校区管理员排班表
     async GetFindCalendarListInfo() {
-        // this.gridData = []
+      // this.gridData = []
       this.$store.dispatch("GetNextmonthFindCalendarList", {
         type: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
-         month: this.Nowyear + '-' + this.Nextmonth
+        month: this.Nowyear + "-" + this.Nextmonth
       });
     },
-      // 添加老师勾选数组
+    // 添加老师勾选数组
     async DetetaiOrAddeacherTeam(item, type) {
       if (type == 1) {
         const index = this.teacherIds.indexOf(item.teacherId);
@@ -622,8 +638,8 @@ export default {
     // 时段添加老师
     async GetAddArrangeByTeacherStatus() {
       // debugger
-        this.teacherIds = []
-      this.AddTeacherModel = false
+      this.teacherIds = [];
+      this.AddTeacherModel = false;
       this.$store.dispatch("GetAddArrangeByTeacher", {
         id: this.HaveTeacherList.Teacherid,
         teacherIds: this.teacherIds
@@ -631,14 +647,14 @@ export default {
     },
     // 时段移除老师
     detailTeacherTeam(item) {
-      this.DetailteacherName =  item.teacherName;
+      this.DetailteacherName = item.teacherName;
       this.isApporTeacher = false;
       this.hiddenModel = true;
       this.detetaiTeacherid = item.teacherId;
     },
     // 移除老师
     DetetaiApplyOperate() {
-       this.hiddenModel = false;
+      this.hiddenModel = false;
       this.$store.dispatch("GetDeleteArrangeByTeacher", {
         id: this.HaveTeacherList.Teacherid,
         teacherId: this.detetaiTeacherid
@@ -647,10 +663,10 @@ export default {
     showAddTeacherModel() {
       this.isApporTeacher = false;
       this.AddTeacherModel = true;
-      this.NoHaveTeacherList.teacherName = ''
+      this.NoHaveTeacherList.teacherName = "";
       this.GetFindNoHaveTeacherListInfo();
     },
-       SearchFindHaveTeacher() {
+    SearchFindHaveTeacher() {
       this.GetFindHaveTeacherListInfo();
     },
     // 日期处理
@@ -703,7 +719,7 @@ export default {
       }
       this.calendarList[k].status = !this.calendarList[k].status;
       this.gridData = intervalList;
-      console.log( this.gridData)
+      console.log(this.gridData);
     },
     // 设置或初始化 current
     setCurrent(d = new Date()) {
@@ -769,7 +785,7 @@ export default {
           date: date,
           disable: curMonth !== month,
           status: false,
-           pastDay: date < today && curMonth == month,
+          pastDay: date < today && curMonth == month,
           value: this.stringify(year, curMonth, date)
         });
         // 排班设置
@@ -788,7 +804,9 @@ export default {
         if (!list[i].disable) {
           const dateValue = list[i].value;
           for (let t = 0; t < that.NextMonthFindCalendarList.list.length; t++) {
-            if (dateValue == that.NextMonthFindCalendarList.list[t].arrangeDate) {
+            if (
+              dateValue == that.NextMonthFindCalendarList.list[t].arrangeDate
+            ) {
               list[i].dateList = that.NextMonthFindCalendarList.list[t];
             }
           }
@@ -796,25 +814,12 @@ export default {
           list[i].dateList = {};
         }
       }
-      //    for (let i = 0; i < setList.length; i++) {
-      //   if (!setList[i].disable) {
-      //     const dateValue = setList[i].value;
-      //     for (let t = 0; t < that.DutyTemplateListInfo.dayList.length; t++) {
-      //       if (dateValue == that.DutyTemplateListInfo.dayList[t].day) {
-      //         setList[i].dateList = that.DutyTemplateListInfo.dayList[t];
-      //       }
-      //     }
-      //   } else {
-      //     setList[i].dateList = {};
-      //   }
-      // }
       this.calendarList = list;
       this.setCalendarList = setList;
     }
   },
 
-  mounted() {
-  }
+  mounted() {}
 };
 </script>
 
@@ -1023,7 +1028,7 @@ table.bgtable tbody tr td.gray {
   border-radius: 10px;
 }
 .model-text-head {
-  padding:0!important;
+  padding: 0 !important;
   display: flex;
   color: #393939;
   font-size: 24px;
@@ -1060,7 +1065,7 @@ table.bgtable tbody tr td.gray {
   font-size: 12px;
   text-align: center;
   word-wrap: break-word;
-   width: 20%;
+  width: 20%;
   line-height: 50px;
 }
 .tr-secon {
@@ -1075,13 +1080,13 @@ table.bgtable tbody tr td.gray {
   text-align: center;
 }
 .tr-sw200 {
- width: 13%;
+  width: 13%;
   text-align: center;
-  white-space:nowrap;
-overflow:hidden;
-text-overflow:ellipsis;
-padding:10px;
-line-height:25px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 10px;
+  line-height: 25px;
 }
 .width120 {
   width: 200px;
@@ -1105,7 +1110,7 @@ line-height:25px;
   font-size: 25px;
   font-weight: 700;
   margin: 0 auto;
-  line-height:50px;
+  line-height: 50px;
 }
 .Buttonhole {
   cursor: pointer;
@@ -1117,8 +1122,8 @@ line-height:25px;
   background-color: #7297ff;
   color: #fff;
 }
-.NoButtonhole{
- cursor: pointer;
+.NoButtonhole {
+  cursor: pointer;
   margin-top: 10px;
   width: 80px;
   height: 30px;
@@ -1147,7 +1152,7 @@ line-height:25px;
 .Dayteach-Allot1 {
   display: inline-block;
   width: 30%;
-  float:left;
+  float: left;
   position: relative;
   height: 30px;
   top: 5px;
@@ -1160,27 +1165,27 @@ line-height:25px;
   color: #7297ff;
   /* margin-top: 10px; */
 }
-.tiplogslogn{
+.tiplogslogn {
   display: inline-block;
-  float:right;
-  margin-top:0px;
+  float: right;
+  margin-top: 0px;
   height: 30px;
-  margin-right:20px;
+  margin-right: 20px;
 }
 .tr-slogn {
   display: inline-block;
-  margin-right:30px;
+  margin-right: 30px;
   font-size: 12px;
   text-align: left;
-  float:left;
+  float: left;
   font-weight: 700;
 }
 .tr-slogn1 {
   display: inline-block;
-  margin-right:10px;
+  margin-right: 10px;
   font-size: 12px;
   text-align: left;
-  float:left;
+  float: left;
   font-weight: 700;
 }
 .Daylog {
@@ -1213,7 +1218,7 @@ line-height:25px;
   box-shadow: none;
 }
 .Dayinput-with-Allot1 {
-  margin-top:20px;
+  margin-top: 20px;
   border: #b6b6b6;
   border-radius: 20px;
   height: 30px;
@@ -1374,11 +1379,11 @@ line-height:25px;
 }
 .calendar-item.disabled {
   /* color: rgba(0, 0, 0, 0.3); */
-  color:#ffff;
+  color: #ffff;
 }
-.psatchecked{
-    color: rgba(0, 0, 0, 0.3);
-      opacity: 0.5;
+.psatchecked {
+  color: rgba(0, 0, 0, 0.3);
+  opacity: 0.5;
 }
 .checked {
   background: #f6f7fb;
@@ -1414,15 +1419,15 @@ line-height:25px;
 }
 .IconLeftclass {
   display: inline-block;
-  margin-top:20px;
+  margin-top: 20px;
   height: 40px;
-  line-height:40px;
+  line-height: 40px;
   font-size: 35px;
   cursor: pointer;
   font-weight: 700;
 }
-.nextLIstColor{
-    color:#7297FF;
-    font-weight: 700;
+.nextLIstColor {
+  color: #7297ff;
+  font-weight: 700;
 }
 </style>

src/components/QualityMenu.vue

@@ -64,7 +64,7 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL } from "@/config";
 export default {
   name: "navMenu",
   // props: {

src/components/SeacherHomewrokStatus.vue

@@ -12,6 +12,8 @@
           @click="AutoApor()"
           :class="{Apporvalactive:Activeindex == true,ApporStyles:true}"
         >匹配知识点老师</div>
+        <!-- <span class="bank-active" @click="isShow(2)">查看</span>
+        <span class="bank-active" @click="groupPicture()">作业原图</span> -->
       </el-col>
       <el-col :span="14" :offset="0">
         <div class="teach-block">
@@ -22,22 +24,16 @@
               v-model="filters.inputValue"
               class="miniorinput-with-Allot"
             />
-            <span
-              v-if="this.Activeindex == false"
+            <span   
               @click="UnallotHomework()"
               class="miinorSeachIcon el-icon-search"
             ></span>
-            <span
-              v-if="this.Activeindex == true"
-              @click="unmatchHomework()"
-              class="miinorSeachIcon el-icon-search"
-            ></span>
           </div>
         </div>
       </el-col>
     </el-row>
     <el-table
-      :data="UnallotHomeworkInfo.list"
+      :data="StudentHomeworkNoFeedbackList.list"
       :header-cell-class-name="tableheaderClassName"
       :header-cell-style="{
           'background-color': '#F6F7FB',
@@ -47,22 +43,48 @@
       size="medium"
       border
     >
-      <el-table-column label="学生" header-align="center">
+      <el-table-column label="学生姓名" header-align="center">
         <template slot-scope="scope">
           <div class="scope-list">
-            <img :src="BASE_URL+scope.row.imgUrl" alt class="table-img" v-if="scope.row.imgUrl" />
-            <img src="../assets/img/user.jpg" alt v-if="!scope.row.imgUrl" class="table-img" />
+            <!-- <img :src="BASE_URL+scope.row.imgUrl" alt class="table-img" v-if="scope.row.imgUrl" />
+            <img src="../assets/img/user.jpg" alt v-if="!scope.row.imgUrl" class="table-img" />-->
             <span class="scope-name">{{scope.row.name}}</span>
           </div>
         </template>
       </el-table-column>
-      <el-table-column prop="spendTime" label="等待时长" header-align="center"></el-table-column>
       <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
-      <el-table-column prop="teacherName" label="未批改老师" header-align="center"></el-table-column>
+      <el-table-column prop="picNums" label="张数" header-align="center"></el-table-column>
+      <el-table-column prop="status" label="状态" header-align="center" v-if="Activeindex == false">
+        <template slot-scope="scope">
+          <span v-if="scope.row.status ==1 " >未分配</span>
+          <span v-if="scope.row.status ==2 " >已分配未批改</span>
+          <span v-if="scope.row.status ==3 " >批改中</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态" header-align="center" v-if="Activeindex == true">
+         <template slot-scope="scope">
+          <span v-if="scope.row.status ==1 " >未分配</span>
+          <span v-if="scope.row.status ==2 " >已分配未匹配</span>
+          <span v-if="scope.row.status ==3 " >匹配中</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="waitTime" label="等待时长" header-align="center"></el-table-column>
+      <el-table-column prop label="批改老师" header-align="center" width="200">
+        <template slot-scope="scope">
+          <span class="bank-active" >{{scope.row.teacherName}}</span>
+          <!-- @click="isShow(3,scope.row)" -->
+        </template>
+      </el-table-column>
+      <el-table-column prop="statusTime" label="状态时间" header-align="center"></el-table-column>
+      <el-table-column prop label="作业图片" header-align="center" width="200">
+        <template slot-scope="scope">
+          <span style="color:#67c23a" class="bank-active" @click="GetStudentHomeworkDetail(scope.row)">查看</span>
+        </template>
+      </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)">
-            <span>去分配</span>
+            <span>分配</span>
           </div>
         </template>
       </el-table-column>
@@ -74,10 +96,10 @@
       @current-change="pageChange"
       :page-sizes="[10, 20, 30, 40]"
       layout="total, sizes, prev, pager, next, jumper"
-      :total="parseInt(UnallotHomeworkInfo.pages)"
+      :total="parseInt(StudentHomeworkNoFeedbackList.pages)"
     ></el-pagination>
-      <!--可分配老师-->
-      <!--可分配老师-->
+    <!--可分配老师-->
+    <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
     <div class="model" style="width:50%; top:5%;" v-if="hiddenModel">
       <div class="model-text">
@@ -150,11 +172,264 @@
         ></el-pagination>
       </div>
     </div>
+    <!-- 老师详情弹框 -->
+    <div class="showModel" @click="allShowModel(2)" v-if="ModelAppor"></div>
+    <div class="model" style="width:40%;left: 32.5%" v-if="ModelAppor">
+      <div class="model-text">
+        <div class="model-manager">
+          <div v-if="this.Activeindex == false">批改老师</div>
+          <div v-if="this.Activeindex == true">匹配知识点老师</div>
+          <div v-if="this.teacherRoles ==11">(学习管理员)</div>
+          <div>
+            <img src="../assets/img/del@2x.png" alt @click="allShowModel(2)" />
+          </div>
+        </div>
+        <div class="model-items">
+          <div class="model-items-first">
+            <div>
+              <img
+                :src="BASE_URL + GetTeacherDetail.imgUrl"
+                v-if="GetTeacherDetail.imgUrl"
+                alt
+                class="model-items-first-img"
+              />
+              <img
+                src="../assets/img/attt.png"
+                v-if="!GetTeacherDetail.imgUrl"
+                alt
+                class="model-items-first-img"
+              />
+              <div class="model-items-first-left" style="display:inline-block">
+                <!-- <div class="Onlinename">李小花</div>
+                <div class="Online">（在线）</div>
+                <div class="model-items-first-left-down">南方科技大学</div>-->
+                <div class="Onlinename">{{GetTeacherDetail.name}}</div>
+                <div v-if="GetTeacherDetail.status ===1" class="Online">（在线）</div>
+                <div v-if="GetTeacherDetail.status ===0" class="Online">（离线）</div>
+                <div class="model-items-first-left-down">{{GetTeacherDetail.school}}</div>
+              </div>
+              <div
+                class="closeAnOpenId"
+                style="display:inline-block"
+                v-if="this.TeacherIdStatus ==1 || 2 && this.TeacherIdStatus !==3"
+              >
+                <div class="closeTeacherID" @click="isShow(GetTeacherDetail,6)">
+                  <span class="el-icon-close">封号</span>
+                </div>
+                <div
+                  v-if="this.Activeindex == false && this.teacherRoles ==8"
+                  class="UpTeacherID"
+                  @click="isShow(GetTeacherDetail,5)"
+                >
+                  <span class="el-icon-upload2">升级</span>
+                </div>
+              </div>
+              <div style="display:inline-block" v-if="this.TeacherIdStatus ==3">
+                <div class="UpTeacherID" @click="isShow(GetTeacherDetail,7)">
+                  <span class="el-icon-unlock">解封</span>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == false"
+          >批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div
+            class="model-items-other model-active"
+            v-if="this.Activeindex == true"
+          >批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div class="model-items-other model-active" v-if="this.Activeindex == false">
+            批改年级 :
+            <span v-for="(v, k) of arrGrade" :key="k">{{v}},</span>
+          </div>
+          <!-- <div class="model-items-other model-active">
+            可批改时间：
+            <div class="buttonAppoval">
+              <div class="TeacherApporTime" v-for="(v, k) of arrPeriod" v-show="v" :key="k">
+                <span>{{v}}</span>
+              </div>
+            </div>
+          </div>-->
+          <div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
+          <div class="model-items-other model-active">上次登录时间 : {{GetTeacherDetail.lastOnlineTime}}</div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == false"
+          >批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == true"
+          >匹配正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+          <div class="model-items-other model-active">
+            被报错总次数 :
+            <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
+          </div>
+          <div
+            class="model-items-other model-active"
+            v-if="this.Activeindex == false"
+          >家长满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
+          <div style="display:inline-block">
+            <div
+              v-if="this.TeacherIdStatus ==1  && this.teacherRoles ==8"
+              class="OutOnlineTeacherID"
+              @click="isShow(GetTeacherDetail,11)"
+            >
+              <span class="el-icon-close">强制下线</span>
+            </div>
+            <div
+              class="UpTeacherID"
+              style="width:120px;margin-top:30px;"
+              @click="isShow(GetTeacherDetail,8)"
+            >
+              <span class="el-icon-user-solid">重新分配组</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- 升级校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(5)" v-if="rePush"></div>
+    <div class="modelspec" v-if="rePush">
+      <div class="model-text">
+        <div class="model-text-items">
+          <div>
+            <img
+              src="../assets/img/del@2x.png"
+              alt
+              @click="allShowModel(5)"
+              class="model-text-items-close"
+            />
+          </div>
+          <div>是否要将{{TeacherName}}老师升级为学习管理员？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="RepushTeacherAcess()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(5)">否</div>
+        </div>
+      </div>
+    </div>
+    <!-- 强制下线校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(10)" v-if="outOnline"></div>
+    <div class="modelspec" v-if="outOnline">
+      <div class="model-text">
+        <div class="model-text-items">
+          <div>
+            <img
+              src="../assets/img/del@2x.png"
+              alt
+              @click="allShowModel(10)"
+              class="model-text-items-close"
+            />
+          </div>
+          <div>是否要将{{TeacherName}}老师强制下线？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="OutLineTeacherAcess()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(10)">否</div>
+        </div>
+      </div>
+    </div>
+    <!-- 封号校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(6)" v-if="closeID"></div>
+    <div class="modelspec" v-if="closeID">
+      <div class="model-text">
+        <div class="model-text-items">
+          <div>
+            <img
+              src="../assets/img/del@2x.png"
+              alt
+              @click="allShowModel(6)"
+              class="model-text-items-close"
+            />
+          </div>
+          <div>是否要对{{TeacherName}}老师进行封号？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="CloseTeacherId()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(6)">否</div>
+        </div>
+      </div>
+    </div>
+    <!-- 解封校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(7)" v-if="OpenID"></div>
+    <div class="modelspec" v-if="OpenID">
+      <div class="model-text">
+        <div class="model-text-items">
+          <div>
+            <img
+              src="../assets/img/del@2x.png"
+              alt
+              @click="allShowModel(7)"
+              class="model-text-items-close"
+            />
+          </div>
+          <div>是否要对{{TeacherName}}老师进行解封？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="OPenTeacherId()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(7)">否</div>
+        </div>
+      </div>
+    </div>
+    <!--可分配小组管理员列表弹框-->
+    <div class="showModel" @click="allShowModel(8)" v-if="AllotManagerModel"></div>
+    <div class="model" style="width:45%;top:5%;" v-if="AllotManagerModel">
+      <div class="model-text">
+        <div class="model-manager">
+          <div>可分配小组</div>
+          <div>
+            <img src="../assets/img/del@2x.png" alt @click="allShowModel(8)" />
+          </div>
+        </div>
+        <div class="allocation-items" v-for="(v, k) in getAllotManagerList.list" :key="k">
+          <div class="model-items-left">
+            <div class="model-items-left-top">
+              <div>
+                <img
+                  :src="BASE_URL + v.imgUrl"
+                  v-if="v.imgUrl"
+                  alt
+                  class="model-items-left-top-img"
+                />
+                <img
+                  src="../assets/img/attt.png"
+                  v-if="!v.imgUrl"
+                  alt
+                  class="model-items-left-top-img"
+                />
+                <div style="display: inline-block;text-align: left;">
+                  <div class="teach-style-name">{{v.name}}</div>
+                  <div class="model-items-left-top-number">老师数量：{{v.teacherCount}}</div>
+                </div>
+              </div>
+              <div>
+                <el-button v-show="v.type && v.type === 1" disabled type="info">已分配</el-button>
+                <el-button
+                  v-show="!v.type || v.type !== 1"
+                  @click="GOAllotTeacherToManager(v,k)"
+                  type="success"
+                >分配</el-button>
+              </div>
+            </div>
+          </div>
+        </div>
+        <el-pagination
+          background
+          @size-change="handleSizeChange5"
+          @current-change="pageChange5"
+          :page-sizes="[10]"
+          layout="total, prev, pager, next"
+          :total="parseInt(getAllotManagerList.pages)"
+          :hide-on-single-page="true"
+        ></el-pagination>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL } from "@/config";
 export default {
   components: {},
   name: "actvResolveLabel",
@@ -163,10 +438,19 @@ export default {
     return {
       BASE_URL: IMG_BASE_URL,
       hiddenModel: false,
-      inputValueAllot:"",
+      OpenID: false, //解封校区管理员弹框
+      closeID: false, //封号校区管理员弹框
+      rePush: false, //升级校区管理员弹框
+      ModelAppor: false, //批改老师详情信息弹框
+      AllotManagerModel: false, //可分配小组管理员列表弹框
+      outOnline: false, //强制下线校区管理员弹框
+      TeacherIdStatus: "",
+      teacherRoles: "",
+      arrGrade: [],
+      inputValueAllot: "",
       Activeindex: "",
-      TeacherType:8,
-      managerId:'',
+      TeacherType: 8,
+      managerId: "",
       filters: {
         inputValue: "",
         pageNo: 1,
@@ -177,39 +461,41 @@ export default {
         pageSize: 10,
         teacherId: ""
       },
-      allotList:{
+      allotList: {
         pageNo: 1,
         pageSize: 10,
-        homeworkId:'',
-          Allotgarde:'',
-        Allotsubjct:'',
+        homeworkId: "",
+        Allotgarde: "",
+        Allotsubjct: ""
       }
     };
   },
   created() {},
   watch: {
-          BeforetoTeacherstatues(val, oldVal) {
+    BeforetoTeacherstatues(val, oldVal) {
       //普通的watch监听
       // 查看老师批改作业列表
-    //   this.$store.dispatch("TeacherHomeworkList", {
-    //     teacherId: this.homeworkLIst.teacherId,
-    //     maxCreateTime: this.filters.MaxtimeValue,
-    //     pageNo: this.homeworkLIst.pageNo,
-    //     pageSize: this.homeworkLIst.pageSize
-    //   });
-        if (this.Activeindex == false){
-            this.UnallotHomework();
-      }
-       if (this.Activeindex == true){
-          this.unmatchHomework()
-      }
+      //   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();
     },
   },
   computed: {
     ...mapGetters([
-        "BeforetoTeacherstatues",
-      "UnallotHomeworkInfo",
-      "TeacherAllotList"
+      "BeforetoTeacherstatues",
+      "TeacherAllotList",
+      "GetTeacherDetail",
+      "getAllotManagerList",
+      "StudentHomeworkNoFeedbackList",
+       "InfoTeacherstatues",
     ])
   },
   methods: {
@@ -217,59 +503,165 @@ export default {
     isShow(str, res) {
       let _this = this;
       if (str == 1) {
-          _this.hiddenModel = true
+        _this.hiddenModel = true;
         _this.SearchTeacherAllot(res);
+      } else if (str == 2) {
+        _this.ModelAppor = true;
+        this.GetTeacherInfo();
+      } else if (str == 2) {
+        _this.isPigai = true;
+        this.homeworkLIst.pageNo = 1;
+        this.UnallotHomework();
+      } else if (str == 3) {
+        this.TeacherIds = res.teacherId;
+        _this.ModelAppor = true;
+        this.GetTeacherInfo();
+      } else if (str == 4) {
+        _this.ModelStudet = true;
+        this.GetStudentInfo();
+      } else if (str == 5) {
+        _this.rePush = true;
+        _this.ModelAppor = false;
+      } else if (str == 6) {
+        _this.closeID = true;
+        _this.ModelAppor = false;
+      } else if (str == 7) {
+        _this.OpenID = true;
+        _this.ModelAppor = false;
+      } else if (str == 8) {
+        _this.AllotManagerModel = true;
+        _this.ModelAppor = false;
+        this.GetAllotManagerInfo();
+      } else if (str == 9) {
+        // this.allNoapprovalList.Allotgarde = v.grade;
+        // this.allNoapprovalList.Allotsubjct = v.subject;
+        // this.allNoapprovalList.homeworkId = v.homeworkId;
+        // this.allNoapprovalList.teacherId = v.teacherId;
+        _this.NoAllotManagerModel = true;
+        _this.isPigai = false;
+        this.AllinputValueAllot = "";
+        this.NoapporvalTeacherAllot();
+        // this.GetAllotManagerInfo()
+      } else if (str == 10) {
+        _this.isPigai = true;
+        this.homeworkLIst.pageNo = 1;
+        this.unmatchHomework();
+      } else if (str == 11) {
+        _this.outOnline = true;
+        _this.ModelAppor = false;
       }
     },
     //关闭弹框
-      allShowModel(str) {
-        let _this = this;
-        if (str == 1){
-          _this.hiddenModel = false;
+    allShowModel(str) {
+      let _this = this;
+      if (str == 1) {
+        _this.hiddenModel = false;
+      } else if (str == 2) {
+        _this.ModelAppor = false;
+      }
+    },
+      async pesiorFun() {
+      var arr = this.GetTeacherDetail.grade.split(",");
+      this.arrPeriod = this.GetTeacherDetail.period.split(",");
+      var arrList = [];
+      for (var i in arr) {
+        if (arr[i] == "一年级" || arr[i] == "二年级") {
+          arrList.push("1-2年级");
+        } else if (arr[i] == "三年级" || arr[i] == "四年级") {
+          arrList.push("3-4年级");
+        } else if (arr[i] == "五年级" || arr[i] == "六年级") {
+          arrList.push("5-6年级");
         }
-      },
+      }
+      this.arrGrade = this.uniq(arrList) || [];
+    },
+    // 查看学生作业原图详情
+    GetStudentHomeworkDetail(v) {
+      // debugger
+      this.$store.dispatch("GetStudentHomeworkDetail", {
+        teacherId: v.teacherId,
+        homeworkId:v.homeworkId,
+         type: this.TeacherType
+      });
+        this.$router.push({
+        path: "/Super/HomeWorkPictrue"
+      });
+    },
+    // 查看老师详情信息
+    async GetTeacherInfo() {
+      this.$store.dispatch("GetTeacherDetail", {
+        teacherId:this.TeacherIds
+      });
+    },
+    // 封号
+    async CloseTeacherId() {
+      this.closeID = false;
+      this.$store.dispatch("CloseIdTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 2,
+        type: this.TeacherIdType
+      });
+    },
+    //强制下线
+    async OutLineTeacherAcess() {
+      this.outOnline = false;
+      this.$store.dispatch("RepushTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 4,
+        type: this.TeacherIdType
+      });
+    },
+    // 升级
+    async RepushTeacherAcess() {
+      this.rePush = false;
+      this.$store.dispatch("RepushTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 1,
+        type: this.TeacherIdType
+      });
+    },
+    // 解封
+    async OPenTeacherId() {
+      this.OpenID = false;
+      this.$store.dispatch("OpenIdTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 3,
+        type: this.TeacherIdType
+      });
+    },
     // 手动批改
     handApor() {
       this.Activeindex = false;
-      this.TeacherType = 8
-      this.filters.inputValue = ''
-      this.UnallotHomework()
+      this.TeacherType = 8;
+      this.filters.inputValue = "";
+      this.UnallotHomework();
     },
     // 匹配知识点老师
     AutoApor() {
       this.Activeindex = true;
-         this.TeacherType = 13
-          this.filters.inputValue = ''
-         this.unmatchHomework()
+      this.TeacherType = 13;
+      this.filters.inputValue = "";
+      this.UnallotHomework();
     },
-    // 未批改作业列表列表
+    // 未匹配/未批改作业列表列表
     async UnallotHomework() {
-      this.$store.dispatch("UnallotHomeworkList", {
+      this.$store.dispatch("GetStudentHomeworkNoFeedbackList", {
         maxCreateTime: this.formatDate(),
-        pageNo: this.homeworkLIst.pageNo,
-        pageSize: this.homeworkLIst.pageSize,
+        pageNo: this.filters.pageNo,
+        pageSize: this.filters.pageSize,
         managerId: this.managerId,
-        value: this.filters.inputValue
-      });
-    },
-     // 未匹配作业列表列表
-    async unmatchHomework() {
-      this.$store.dispatch("UnmatchHomeworkList", {
-         maxCreateTime: this.formatDate(),
-        pageNo: this.homeworkLIst.pageNo,
-        pageSize: this.homeworkLIst.pageSize,
-        managerId: this.managerId,
-        value: this.filters.inputValue
+        value: this.filters.inputValue,
+        type: this.TeacherType
       });
     },
-        // 搜索可分配老师列表
+    // 搜索可分配老师列表
     async SearchvalueTeacherAllot() {
       this.$store.dispatch("TeacherAllotList", {
         grade: this.allotList.Allotgarde,
         subject: this.allotList.Allotsubjct,
         homeworkId: this.allotList.homeworkId,
         originTeacherId: this.homeworkLIst.teacherId,
-       maxCreateTime: this.formatDate(),
+        maxCreateTime: this.formatDate(),
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
         name: this.inputValueAllot,
@@ -278,10 +670,10 @@ export default {
     },
     // 可分配老师列表
     async SearchTeacherAllot(v) {
-    this.homeworkLIst.teacherId = v.teacherId;
-    this.allotList.homeworkId = v.homeworkId;
-    this.allotList.Allotgarde = v.grade;
-    this.allotList.Allotsubjct = v.subject;
+      this.homeworkLIst.teacherId = v.teacherId;
+      this.allotList.homeworkId = v.homeworkId;
+      this.allotList.Allotgarde = v.grade;
+      this.allotList.Allotsubjct = v.subject;
       this.$store.dispatch("TeacherAllotList", {
         grade: v.grade,
         subject: v.subject,
@@ -294,7 +686,7 @@ export default {
         type: this.TeacherType
       });
     },
-      // 分配老师
+    // 分配老师
     async GOtoTeacherAllot(v, k) {
       this.$store.dispatch("toTeacherAllot", {
         teacherId: v.teacherId,
@@ -337,30 +729,20 @@ export default {
     // 分页
     pageChange(val) {
       this.filters.pageNo = val;
-      if (this.Activeindex == false){
-            this.UnallotHomework();
-      }
-       if (this.Activeindex == true){
-          this.unmatchHomework()
-      }
+      this.UnallotHomework();
     },
     handleSizeChange(val) {
       this.filters.pageSize = val;
-      if (this.Activeindex == false){
-            this.UnallotHomework();
-      }
-       if (this.Activeindex == true){
-          this.unmatchHomework()
-      }
+      this.UnallotHomework();
     },
-       handleSizeChange4(val) {
+    handleSizeChange4(val) {
       this.allotList.pageSize = val;
       this.SearchvalueTeacherAllot();
     },
-     pageChange4(val) {
+    pageChange4(val) {
       this.allotList.pageNo = val;
       this.SearchvalueTeacherAllot();
-    },
+    }
   },
   mounted() {
     this.UnallotHomework();
@@ -495,6 +877,11 @@ el-table {
   cursor: pointer;
   border: 1px solid;
 }
+.model-items-first {
+  padding: 0 34px;
+  display: flex;
+  justify-content: space-between;
+}
 .closeTeacherID:hover {
   color: #fff;
   background-color: #f56c6c;
@@ -540,7 +927,7 @@ el-table {
   border-color: #67c23a;
 }
 .el-pagination {
-    margin-top:30px;
+  margin-top: 30px;
   white-space: nowrap;
   padding: 2px 5px;
   color: #303133;
@@ -584,6 +971,9 @@ el-table {
   cursor: pointer;
   margin: 0 5px;
 }
+.bank-active {
+  cursor: pointer;
+}
 .TeacherApporTime:hover {
   color: #fff;
   background-color: #909399;
@@ -620,7 +1010,7 @@ el-table {
   border-radius: 10px;
 }
 .model-text-head {
-    padding:0!important;
+  padding: 0 !important;
   display: flex;
   color: #393939;
   font-size: 24px;
@@ -642,7 +1032,7 @@ el-table {
 }
 .model-itemss {
   padding: 10px 0;
-  float:left;
+  float: left;
   /*display: flex;*/
   /*justify-content: space-between;*/
   /*display: inline-block;*/
@@ -665,12 +1055,11 @@ el-table {
   margin-left: 10px;
   height: 50px;
 }
-.btnClass{
-    height: 50px;
-    margin:20px;
+.btnClass {
+  height: 50px;
+  margin: 20px;
 }
 .teach-Allot {
- 
   width: 350px;
   position: relative;
 }
@@ -682,8 +1071,15 @@ el-table {
   top: 35%;
   cursor: pointer;
 }
+.model-items-first-img {
+  width: 68px;
+  height: 68px;
+  border-radius: 8px;
+  position: relative;
+  bottom: 20px;
+}
 .input-with-Allot {
-    margin-top:20px;
+  margin-top: 20px;
   border: #b6b6b6;
   border-radius: 15px;
   height: 30px;
@@ -698,4 +1094,36 @@ el-table {
   outline: none !important;
   box-shadow: none;
 }
+.model-manager {
+  display: flex;
+  justify-content: space-between;
+  margin: 30px;
+  color: #393939;
+  font-size: 24px;
+}
+.Onlinename {
+  display: inline-block;
+}
+.model-items-first-left-down {
+  color: #7e7e7e;
+  font-size: 18px;
+}
+.closeAnOpenId {
+  width: 250px;
+}
+.model-items-other {
+  height: 60px;
+  line-height: 60px;
+  color: #393939;
+  font-size: 20px;
+  text-align: left;
+  padding: 0 34px;
+}
+.model-active {
+  background-color: #f6f7fb;
+}
+.model-active-last {
+  border-radius: 0 0 30px 30px;
+  background-color: #f6f7fb;
+}
 </style>

src/components/SuperComponent.vue

@@ -64,7 +64,7 @@
 
 <script>
 import { mapGetters } from "vuex";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL } from "@/config";
 export default {
   name: "navMenu",
   // props: {
@@ -78,7 +78,7 @@ export default {
       menuData: [
         {
           id: "1",
-          name: "校区管理员",
+          name: "学习管理员",
           href: "SuperAdmin"
         },
         {

src/components/SuperworkListSeting.vue

@@ -8,7 +8,11 @@
         <el-row :gutter="20">
           <el-col :span="18" class="month" :offset="2">
             <span>{{currentDateStr }}排班设置</span>
-             <div class="model-btn-items model-grdeen" style="float:right" @click="saveOpenCloseDAys()">保存</div>
+            <div
+              class="model-btn-items model-grdeen"
+              style="float:right"
+              @click="saveOpenCloseDAys()"
+            >保存</div>
           </el-col>
         </el-row>
         <el-row :gutter="24">
@@ -57,8 +61,8 @@
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
-import { IMG_BASE_URL } from "@/ImgConfig";
-import { Message } from 'element-ui'
+import { IMG_BASE_URL } from "@/config";
+import { Message } from "element-ui";
 export default {
   components: {},
   name: "actvResolveLabel",
@@ -71,14 +75,14 @@ export default {
       shareDate: new Date(), // 享元模式，用来做优化的
       month: "",
       today: "",
-      SettingDays: [],
+      SettingDays: []
     };
   },
   watch: {
-       SaveSysTeacherDutyStatus(val, oldVal) {
+    SaveSysTeacherDutyStatus(val, oldVal) {
       //保存排班设置成功的watch监听回调
-      this.GetDutyTemplateListInfo()
-    },
+      this.GetDutyTemplateListInfo();
+    }
   },
   // ,'homeworkRecoveryList'
   computed: {
@@ -105,30 +109,29 @@ export default {
         days: this.SettingDays
       });
     },
-    async UnOrWaitOpen(item, type,Setindex) {
+    async UnOrWaitOpen(item, type, Setindex) {
       if (type == 1) {
         const index = this.SettingDays.indexOf(item.value);
         if (index > -1) {
           this.SettingDays.splice(index, 1);
         }
-        item.dateList.isOpen = 1 
-      this.$set(this.setCalendarList.dateList, Setindex, item);
+        item.dateList.isOpen = 1;
+        this.$set(this.setCalendarList.dateList, Setindex, item);
       }
       if (type == 2) {
         const index = this.SettingDays.indexOf(item.value);
         if (index == -1) {
           this.SettingDays.push(item.value);
         }
-        item.dateList.isOpen = 0 
-      this.$set(this.setCalendarList.dateList, Setindex, item);
+        item.dateList.isOpen = 0;
+        this.$set(this.setCalendarList.dateList, Setindex, item);
       }
     },
-      // 排班设置返回接口
+    // 排班设置返回接口
     async GetDutyTemplateListInfo() {
-      this.$store.dispatch("GetDutyTemplateList", {
-      });
+      this.$store.dispatch("GetDutyTemplateList", {});
     },
-    
+
     // 日期处理
     init() {
       // 初始化当前时间
@@ -248,7 +251,7 @@ export default {
         begin += oneDayMS;
       }
       var that = this;
-         for (let i = 0; i < setList.length; i++) {
+      for (let i = 0; i < setList.length; i++) {
         if (!setList[i].disable) {
           const dateValue = setList[i].value;
           for (let t = 0; t < that.DutyTemplateListInfo.dayList.length; t++) {
@@ -282,7 +285,7 @@ export default {
       this.setCalendarList[k].status = !this.setCalendarList[k].status;
     }
   },
-  mounted() {  
+  mounted() {
     this.init();
     this.GetDutyTemplateListInfo();
     // console.log(DutyTemplateListInfo)

src/components/TeamWorkLists.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
-    <!--数据监控-->
-    <el-col :span="18" class="main"  v-if="NextOrNewMonthStatus.NextOrNewMonthStatus == false">
+    <el-col :span="18" class="main" v-if="NextOrNewMonthStatus.NextOrNewMonthStatus == false">
       <el-row :gutter="20" class="main-header">
         <el-col :span="24">
           <el-col :span="10">
@@ -48,22 +47,19 @@
               </div>
             </div>
           </el-col>
-          <el-col  :span="4"  :offset="0">
-               <h1 class="tiplog">{{this.Nowmonth}}月排班情况</h1>
+          <el-col :span="4" :offset="0">
+            <h1 class="tiplog">{{this.Nowmonth}}月排班情况</h1>
           </el-col>
-            <el-col :span="10" class="month" :offset="0">
-            <div v-if="FindCalendarList.isNextMonth ==1"
+          <el-col :span="10" class="month" :offset="0">
+            <div
+              v-if="FindCalendarList.isNextMonth ==1"
               @click="shoeNextOrlastMOntlist(1)"
               class="NextMonthList"
             >
               查看下月排班情况
               <span class="el-icon-arrow-right"></span>
             </div>
-             <div v-if="FindCalendarList.isNextMonth ==0"
-              class="NextMonthListMax"
-            >
-              25号至月底前一天可查看老师下月排班
-            </div>
+            <div v-if="FindCalendarList.isNextMonth ==0" class="NextMonthListMax">25号至月底前一天可查看老师下月排班</div>
           </el-col>
         </el-col>
         <el-col :span="24">
@@ -71,11 +67,14 @@
             <div class="tablebox1">
               <div class="date">
                 <div class="calendar-week">
-                  <div class="week-item" v-for="item of weekList" :key="item">  
+                  <div class="week-item" v-for="item of weekList" :key="item">
                     <span :class="[item == '六' || item == '日'?'grayRed':'']">{{item}}</span>
-                    </div>
+                  </div>
                 </div>
-                <div class="calendar-inner"  v-if="FindCalendarList.list && FindCalendarList.list.length>0">
+                <div
+                  class="calendar-inner"
+                  v-if="FindCalendarList.list && FindCalendarList.list.length>0"
+                >
                   <div
                     class="calendar-item"
                     v-for="(item, index) of calendarList"
@@ -141,7 +140,6 @@
                       </el-table>
                       <!-- v-if='item.dateList && item.dateList.intervalList' -->
                       <div
-                        
                         slot="reference"
                         @click="classSet(index,item.date,item.month,item.dateList.intervalList)"
                         :class="[item.pastDay ? 'psatchecked' : '']"
@@ -149,18 +147,24 @@
                       >
                         <!-- {{FindCalendarList}} -->
                         <div class="date-day">{{ item.date }}</div>
-                           <div class="people" v-if="item.dateList.isOpen ==0">
-                               <div class="people-items">
-                            <div style="color:#999999" class="people-items-text"> 不开放</div>
+                        <div class="people" v-if="item.dateList.isOpen ==0">
+                          <div class="people-items">
+                            <div style="color:#999999" class="people-items-text">不开放</div>
                           </div>
                         </div>
                         <div class="people" v-if="item.dateList.isOpen ==1">
                           <div class="people-items">
-                            <div class="people-items-num" v-if='item.dateList && item.dateList.miniNum'>{{item.dateList.miniNum}}</div>
+                            <div
+                              class="people-items-num"
+                              v-if="item.dateList && item.dateList.miniNum"
+                            >{{item.dateList.miniNum}}</div>
                             <div class="people-items-text">最少</div>
                           </div>
                           <div class="people-items">
-                            <div class="people-items-num" v-if='item.dateList && item.dateList.maxNum'>{{item.dateList.maxNum}}</div>
+                            <div
+                              class="people-items-num"
+                              v-if="item.dateList && item.dateList.maxNum"
+                            >{{item.dateList.maxNum}}</div>
                             <div class="people-items-text">饱和</div>
                           </div>
                           <div class="people-items">
@@ -181,8 +185,8 @@
         </el-col>
       </el-row>
     </el-col>
-         <!-- 下个月排班实施动态 -->
-      <NextMonthList   v-if="NextOrNewMonthStatus.NextOrNewMonthStatus == true"></NextMonthList>
+    <!-- 下个月排班实施动态 -->
+    <NextMonthList v-if="NextOrNewMonthStatus.NextOrNewMonthStatus == true"></NextMonthList>
     <!-- 添加移除老师弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="isApporTeacher"></div>
     <div class="model" style="width:40%; top:10%;" v-if="isApporTeacher">
@@ -207,7 +211,7 @@
                 class="DaySeachIcon el-icon-search"
               ></span>
             </div>
-            <div class="">
+            <div class>
               <span class="tr-slogn">最少:{{FindHaveTeacherList.arrangeDetail.miniNum}}</span>
               <span class="tr-slogn">已选:{{FindHaveTeacherList.arrangeDetail.haveNum}}</span>
               <span class="tr-slogn">饱和:{{FindHaveTeacherList.arrangeDetail.maxNum}}</span>
@@ -228,8 +232,16 @@
           <div class="abbTeachers" @click="showAddTeacherModel">
             <span class="addLogicon">+</span> 添加老师
           </div>
-          <div class="scrollBox" v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length >0">
-            <div class="tr-set" :class="{BgcColor:index%2 !== 1}" v-for="(item, index) of FindHaveTeacherList.list" :key="index">
+          <div
+            class="scrollBox"
+            v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length >0"
+          >
+            <div
+              class="tr-set"
+              :class="{BgcColor:index%2 !== 1}"
+              v-for="(item, index) of FindHaveTeacherList.list"
+              :key="index"
+            >
               <div class="tr-secon">
                 <img :src="BASE_URL + item.photo" alt class="table-img" v-if="item.photo" />
                 <img src="../assets/img/attt.png" alt v-if="item.photo ==''" class="table-img" />
@@ -240,18 +252,15 @@
               <div class="tr-secon tr-sw100">{{item.dutyRatio}}%</div>
               <div class="tr-secon tr-sw100" style="color:#7297FF">{{item.haveCount }}</div>
               <div v-if="item.isEdit==1" class="Buttonhole" @click="detailTeacherTeam(item)">移除</div>
-                <div v-if="item.isEdit==0" class="NoButtonhole"></div>
+              <div v-if="item.isEdit==0" class="NoButtonhole"></div>
             </div>
           </div>
-           <div class="scrollBox" v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length <=0">
-            <div class="tr-set">
-              暂无可移除老师！
-            </div>
+          <div
+            class="scrollBox"
+            v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length <=0"
+          >
+            <div class="tr-set">暂无可移除老师！</div>
           </div>
-          <!-- <div class="btsnius">
-            <div class="yesBtn">确定</div>
-            <div class="closeBtn">取消</div>
-          </div>-->
         </div>
       </div>
     </div>
@@ -296,10 +305,8 @@
                 class="DaySeachIcon el-icon-search"
               ></span>
             </div>
-             <div class="tiplogslogn">
-              <span
-                class="tr-slogn1"
-              >最少:{{FindNoHaveTeacherList.arrangeDetail.miniNum}}</span>
+            <div class="tiplogslogn">
+              <span class="tr-slogn1">最少:{{FindNoHaveTeacherList.arrangeDetail.miniNum}}</span>
               <span class="tr-slogn1">饱和:{{FindNoHaveTeacherList.arrangeDetail.maxNum}}</span>
               <span class="tr-slogn1">已选:{{FindNoHaveTeacherList.arrangeDetail.haveNum}}</span>
             </div>
@@ -314,10 +321,18 @@
             <div class="tr-secon1">科目</div>
             <div class="tr-secon1">出勤率</div>
             <div class="tr-secon1">在岗率</div>
-            <div class="tr-secon1"  style="width:25%">当月已选时段</div>
+            <div class="tr-secon1" style="width:25%">当月已选时段</div>
           </div>
-          <div class="scrollBox" v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length >0">
-            <div class="tr-set" :class="{BgcColor:index%2 !== 1}" v-for="(item, index) of FindNoHaveTeacherList.list" :key="index">
+          <div
+            class="scrollBox"
+            v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length >0"
+          >
+            <div
+              class="tr-set"
+              :class="{BgcColor:index%2 !== 1}"
+              v-for="(item, index) of FindNoHaveTeacherList.list"
+              :key="index"
+            >
               <div class="tr-secon">
                 <img :src="BASE_URL + item.photo" alt class="table-img" v-if="item.photo" />
                 <img src="../assets/img/attt.png" alt v-if="item.photo ==''" class="table-img" />
@@ -343,8 +358,11 @@
               </div>
             </div>
           </div>
-             <div class="scrollBox" v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length <=0">
-              <span>暂无可添加老师！</span>
+          <div
+            class="scrollBox"
+            v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length <=0"
+          >
+            <span>暂无可添加老师！</span>
           </div>
           <div class="btsnius">
             <div @click="GetAddArrangeByTeacherStatus()" class="yesBtn">确定</div>
@@ -358,11 +376,11 @@
 <script>
 import { mapGetters, mapActions } from "vuex";
 import { Message } from "element-ui";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL } from "@/config";
 import NextMonthList from "./NextMonthList.vue";
 export default {
   name: "model",
-  components: {NextMonthList},
+  components: { NextMonthList },
   props: {},
   data() {
     return {
@@ -381,8 +399,8 @@ export default {
       selecttitlepag: "批改老师",
       selecttitleage: "语文",
       teacherIds: [],
-      gridData:[],
-      DetailteacherName:'',
+      gridData: [],
+      DetailteacherName: "",
       inputValue: "",
       isSelected: false,
       isPigai: false,
@@ -446,19 +464,19 @@ export default {
     },
     DeleteArrangeByTeacher(val, oldVal) {
       // debugger
-      
+
       this.GetFindCalendarListInfo();
     },
     AddArrangeByTeacherStatus(val, oldVal) {
       // debugger
-     
+
       this.GetFindCalendarListInfo();
     },
-     NextOrNewMonthStatus(val, oldVal) {
+    NextOrNewMonthStatus(val, oldVal) {
       // debugger
-      
-     this.GetFindCalendarListInfo()
-    },
+
+      this.GetFindCalendarListInfo();
+    }
   },
   computed: {
     ...mapGetters([
@@ -469,7 +487,7 @@ export default {
       "FindNoHaveTeacherList",
       "DutyTemplateListSTUS",
       "AddArrangeByTeacherStatus",
-        "NextOrNewMonthStatus"
+      "NextOrNewMonthStatus"
     ])
   },
   methods: {
@@ -484,7 +502,7 @@ export default {
       } else if (str == 3) {
         _this.isApporTeacher = false;
       } else if (str == 4) {
-          this.teacherIds = []
+        this.teacherIds = [];
         _this.AddTeacherModel = false;
         _this.isApporTeacher = true;
       } else if (str == 5) {
@@ -507,10 +525,6 @@ export default {
       var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
       var seconds = Math.round(leave3 / 1000);
       return hours;
-      // return dayDiff
-      // console.log(" 相差" + dayDiff + "天" + hours + "小时 " + minutes + "分钟" + seconds + " 秒")
-      // console.log(dateDiff + "时间差的毫秒数",dayDiff + "计算出相差天数",leave1 + "计算天数后剩余的毫秒数"
-      //     ,hours + "计算出小时数",minutes + "计算相差分钟数",seconds + "计算相差秒数");
     },
     DaytimeFn(d1) {
       //di作为一个变量传进来
@@ -548,7 +562,7 @@ export default {
       if (str == 1) {
         if ((timeFnd < -4 && DaytimeFn <= 0) || DaytimeFn < 0) {
           _this.isApporTeacher = true;
-          this.HaveTeacherList.teacherName = ''
+          this.HaveTeacherList.teacherName = "";
           this.HaveTeacherList.Teacherid = id;
           this.GetFindHaveTeacherListInfo();
         } else {
@@ -604,14 +618,14 @@ export default {
         if (index == -1) {
           this.teacherIds.push(item.teacherId);
         }
-        console.log(this.teacherIds)
+        console.log(this.teacherIds);
         //   item.dateList.isOpen = 0
         // this.$set(this.setCalendarList.dateList, Setindex, item);
       }
     },
     // 获取校区管理员排班表
     async GetFindCalendarListInfo() {
-        // this.gridData = []
+      // this.gridData = []
       this.$store.dispatch("GetFindCalendarList", {
         type: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
@@ -635,7 +649,7 @@ export default {
     // 时段添加老师
     async GetAddArrangeByTeacherStatus() {
       // debugger
-      this.AddTeacherModel = false
+      this.AddTeacherModel = false;
       this.$store.dispatch("GetAddArrangeByTeacher", {
         id: this.HaveTeacherList.Teacherid,
         teacherIds: this.teacherIds
@@ -643,14 +657,14 @@ export default {
     },
     // 时段移除老师
     detailTeacherTeam(item) {
-      this.DetailteacherName =  item.teacherName;
+      this.DetailteacherName = item.teacherName;
       this.isApporTeacher = false;
       this.hiddenModel = true;
       this.detetaiTeacherid = item.teacherId;
     },
     // 移除老师
     DetetaiApplyOperate() {
-       this.hiddenModel = false;
+      this.hiddenModel = false;
       this.$store.dispatch("GetDeleteArrangeByTeacher", {
         id: this.HaveTeacherList.Teacherid,
         teacherId: this.detetaiTeacherid
@@ -659,10 +673,11 @@ export default {
     showAddTeacherModel() {
       this.isApporTeacher = false;
       this.AddTeacherModel = true;
-      this.NoHaveTeacherList.teacherName = ''
+      this.teacherIds = [];
+      this.NoHaveTeacherList.teacherName = "";
       this.GetFindNoHaveTeacherListInfo();
     },
-       SearchFindHaveTeacher() {
+    SearchFindHaveTeacher() {
       this.GetFindHaveTeacherListInfo();
     },
     // 日期处理
@@ -671,12 +686,12 @@ export default {
       this.setCurrent();
       this.calendarCreator();
     },
-      // 切换下月当月排班表
+    // 切换下月当月排班表
     shoeNextOrlastMOntlist(str) {
       if (str == 1) {
-          this.$store.dispatch("NextOrNewMonthAction", {
-          NextOrNewMonthStatus:true ,
-      });
+        this.$store.dispatch("NextOrNewMonthAction", {
+          NextOrNewMonthStatus: true
+        });
       }
     },
     // 判断当前月有多少天
@@ -790,7 +805,7 @@ export default {
           date: date,
           disable: curMonth !== month,
           status: false,
-           pastDay: date < today && curMonth == month,
+          pastDay: date < today && curMonth == month,
           value: this.stringify(year, curMonth, date)
         });
         // 排班设置
@@ -817,32 +832,17 @@ export default {
           list[i].dateList = {};
         }
       }
-      //    for (let i = 0; i < setList.length; i++) {
-      //   if (!setList[i].disable) {
-      //     const dateValue = setList[i].value;
-      //     for (let t = 0; t < that.DutyTemplateListInfo.dayList.length; t++) {
-      //       if (dateValue == that.DutyTemplateListInfo.dayList[t].day) {
-      //         setList[i].dateList = that.DutyTemplateListInfo.dayList[t];
-      //       }
-      //     }
-      //   } else {
-      //     setList[i].dateList = {};
-      //   }
-      // }
       this.calendarList = list;
       this.setCalendarList = setList;
-      console.log(1111111111111111111111111111111111111111)
-      console.log(this.calendarList)
-       console.log(22222222222222222222222222222222222222222222)
     }
   },
   created() {
-   this.GetFindCalendarListInfo();
+    this.GetFindCalendarListInfo();
   },
   mounted() {
-     this.$store.dispatch("NextOrNewMonthAction", {
-          NextOrNewMonthStatus:false ,
-      });
+    this.$store.dispatch("NextOrNewMonthAction", {
+      NextOrNewMonthStatus: false
+    });
   }
 };
 </script>
@@ -1052,7 +1052,7 @@ table.bgtable tbody tr td.gray {
   border-radius: 10px;
 }
 .model-text-head {
-  padding:0!important;
+  padding: 0 !important;
   display: flex;
   color: #393939;
   font-size: 24px;
@@ -1089,7 +1089,7 @@ table.bgtable tbody tr td.gray {
   font-size: 12px;
   text-align: center;
   word-wrap: break-word;
-   width: 20%;
+  width: 20%;
   line-height: 50px;
 }
 .tr-secon {
@@ -1104,13 +1104,13 @@ table.bgtable tbody tr td.gray {
   text-align: center;
 }
 .tr-sw200 {
- width: 13%;
+  width: 13%;
   text-align: center;
-  white-space:nowrap;
-overflow:hidden;
-text-overflow:ellipsis;
-padding:10px;
-line-height:25px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  padding: 10px;
+  line-height: 25px;
 }
 .width120 {
   width: 200px;
@@ -1146,8 +1146,8 @@ line-height:25px;
   background-color: #7297ff;
   color: #fff;
 }
-.NoButtonhole{
- cursor: pointer;
+.NoButtonhole {
+  cursor: pointer;
   margin-top: 10px;
   width: 80px;
   height: 30px;
@@ -1176,7 +1176,7 @@ line-height:25px;
 .Dayteach-Allot1 {
   display: inline-block;
   width: 30%;
-  float:left;
+  float: left;
   position: relative;
   height: 30px;
   top: 5px;
@@ -1189,27 +1189,27 @@ line-height:25px;
   color: #7297ff;
   /* margin-top: 10px; */
 }
-.tiplogslogn{
+.tiplogslogn {
   display: inline-block;
-  float:right;
-  margin-top:0px;
+  float: right;
+  margin-top: 0px;
   height: 30px;
-  margin-right:20px;
+  margin-right: 20px;
 }
 .tr-slogn {
   display: inline-block;
-  margin-right:30px;
+  margin-right: 30px;
   font-size: 12px;
   text-align: left;
-  float:left;
+  float: left;
   font-weight: 700;
 }
 .tr-slogn1 {
   display: inline-block;
-  margin-right:10px;
+  margin-right: 10px;
   font-size: 12px;
   text-align: left;
-  float:left;
+  float: left;
   font-weight: 700;
 }
 .Daylog {
@@ -1242,7 +1242,7 @@ line-height:25px;
   box-shadow: none;
 }
 .Dayinput-with-Allot1 {
-  margin-top:20px;
+  margin-top: 20px;
   border: #b6b6b6;
   border-radius: 20px;
   height: 30px;
@@ -1403,11 +1403,11 @@ line-height:25px;
 }
 .calendar-item.disabled {
   /* color: rgba(0, 0, 0, 0.3); */
-  color:#ffff;
+  color: #ffff;
 }
-.psatchecked{
-    color: rgba(0, 0, 0, 0.3);
-      opacity: 0.5;
+.psatchecked {
+  color: rgba(0, 0, 0, 0.3);
+  opacity: 0.5;
 }
 .checked {
   background: #f6f7fb;
@@ -1442,7 +1442,7 @@ line-height:25px;
   font-weight: normal;
 }
 .NextMonthList {
-  float:right;
+  float: right;
   cursor: pointer;
   margin-top: 20px;
   width: 250px;
@@ -1453,11 +1453,11 @@ line-height:25px;
   color: #7297ff;
   font-size: 12px;
 }
-.NextMonthListMax{
-  float:right;
+.NextMonthListMax {
+  float: right;
   cursor: pointer;
   margin-top: 20px;
-  width: 400px;
+  width: 300px;
   height: 40px;
   border-radius: 20px;
   line-height: 40px;

src/components/TeamworkScheduling.vue

@@ -2,9 +2,6 @@
 <template>
   <div>
     <!-- table 表格 -->
-    <!-- <el-row :gutter="18"  class="main-items"> -->
-
-    <!--当天-->
     <el-col :span="18" class="main">
       <el-row :gutter="20" class="main-header">
         <el-col :span="8" :offset="0">
@@ -23,35 +20,30 @@
             <span>{{FindTeamTeacherList.dutyRatio}}%</span>
           </div>
         </el-col>
-             <el-col :span="4"  :offset="0">
-            <div
-              @click="SelectgroupDetail()"
-              class="NextMonthList"
-            >
-              {{showSelectCodeWord}}
-            </div>
-          </el-col>
+        <el-col :span="4" :offset="0">
+          <div @click="SelectgroupDetail()" class="NextMonthList">{{showSelectCodeWord}}</div>
+        </el-col>
         <el-col :span="6">
-            <div class="teach-block">
-                    <div class="Dayteach-Allot">
-                      <input
-                        type="text"
-                        placeholder="请输入老师名字"
-                        v-model="filters1.inputValue"
-                        class="Dayinput-with-Allot"
-                      />
-                      <span
-                        v-if="this.Activeindex == false"
-                        @click="SearchGetFindTeamTeacherListInfo()"
-                        class="DaySeachIcon el-icon-search"
-                      ></span>
-                      <span
-                        v-if="this.Activeindex == true"
-                        @click="SearchGetFindTeamTeacherListInfo()"
-                        class="DaySeachIcon el-icon-search"
-                      ></span>
-                    </div>
-                  </div>
+          <div class="teach-block">
+            <div class="Dayteach-Allot">
+              <input
+                type="text"
+                placeholder="请输入老师名字"
+                v-model="filters1.inputValue"
+                class="Dayinput-with-Allot"
+              />
+              <span
+                v-if="this.Activeindex == false"
+                @click="SearchGetFindTeamTeacherListInfo()"
+                class="DaySeachIcon el-icon-search"
+              ></span>
+              <span
+                v-if="this.Activeindex == true"
+                @click="SearchGetFindTeamTeacherListInfo()"
+                class="DaySeachIcon el-icon-search"
+              ></span>
+            </div>
+          </div>
         </el-col>
         <el-col :span="24">
           <div class="table">
@@ -116,10 +108,13 @@
                   <div class="date">
                     <div class="calendar-week">
                       <div class="week-item" v-for="item of daynamearr" :key="item">
-                     <span :class="[item == '六' || item == '日'?'grayRed':'']">{{item}}</span>
+                        <span :class="[item == '六' || item == '日'?'grayRed':'']">{{item}}</span>
                       </div>
                     </div>
-                    <div class="calendar-inner" v-if="TeacherThisMonthDutyList.dayList && TeacherThisMonthDutyList.dayList.length>0">
+                    <div
+                      class="calendar-inner"
+                      v-if="TeacherThisMonthDutyList.dayList && TeacherThisMonthDutyList.dayList.length>0"
+                    >
                       <div
                         v-for="(item, index) of calendarList"
                         :class="[item.pastDay ? 'psatchecked' : 'calendar-item']"
@@ -128,35 +123,37 @@
                         <div slot="reference" class="day-setting">
                           <div class="date-day">{{ item.date }}</div>
                           <div class="people" v-if="item.dateList && item.dateList.timeVoList">
-                            <div class="people-items"  v-show="item.dateList.isOpen ==1">
+                            <div class="people-items" v-show="item.dateList.isOpen ==1">
                               <div
                                 :class="[item.pastDay ? 'Past-items-text' : 'people-items-text']"
                                 v-for="(v, k) of item.dateList.timeVoList"
                                 :key="k"
-                              >           
-                                    <span v-if="v.timeState ==1">{{v.startInterval}}-{{v.endInterval}}</span>
-                                  <span
-                                    class="selectIng"
-                                    v-if="v.timeState ==2 && !item.pastDay"
-                                  >{{v.startInterval}}-{{v.endInterval}}</span>
-                                  <span
-                                    class="MuchselectIng"
-                                    v-if="v.timeState ==2 && item.pastDay"
-                                  >{{v.startInterval}}-{{v.endInterval}}</span>
-                                  <span
-                                    class="LostselectIng"
-                                    v-if="v.timeState ==4"
-                                  >{{v.startInterval}}-{{v.endInterval}}</span>
-                                  <span
-                                    class="MuchselectIng"
-                                    v-if="v.timeState ==3"
-                                  >{{v.startInterval}}-{{v.endInterval}}</span>
+                              >
+                                <span v-if="v.timeState ==1">{{v.startInterval}}-{{v.endInterval}}</span>
+                                <span
+                                  class="selectIng"
+                                  v-if="v.timeState ==2 && !item.pastDay"
+                                >{{v.startInterval}}-{{v.endInterval}}</span>
+                                <span
+                                  class="MuchselectIng"
+                                  v-if="v.timeState ==2 && item.pastDay"
+                                >{{v.startInterval}}-{{v.endInterval}}</span>
+                                <span
+                                  class="LostselectIng"
+                                  v-if="v.timeState ==4"
+                                >{{v.startInterval}}-{{v.endInterval}}</span>
+                                <span
+                                  class="MuchselectIng"
+                                  v-if="v.timeState ==3"
+                                >{{v.startInterval}}-{{v.endInterval}}</span>
                               </div>
                             </div>
-                               <div class="people-items" style="color:#999999;backgroung-color:#F9F9F9"  v-show="item.dateList.isOpen ==0">
-                              <div>           
-                                不开放
-                              </div>
+                            <div
+                              class="people-items"
+                              style="color:#999999;backgroung-color:#F9F9F9"
+                              v-show="item.dateList.isOpen ==0"
+                            >
+                              <div>不开放</div>
                             </div>
                           </div>
                         </div>
@@ -171,10 +168,14 @@
       </div>
     </div>
     <!-- 筛选排班时段 -->
-     <div class="showModel" v-if="SelectTeacherworkListModel">
+    <div class="showModel" v-if="SelectTeacherworkListModel">
       <div class="modal-cancel" @click="updateIsShowSelectWorkListModal()">X</div>
       <div class="detailinfo">
-         <div class="Selcetmodel-btn-items model-grdeen" style="float:right" @click="saveOpenCloseDAys()">确定</div>
+        <div
+          class="Selcetmodel-btn-items model-grdeen"
+          style="float:right"
+          @click="saveOpenCloseDAys()"
+        >确定</div>
         <el-col :span="24">
           <!-- <h1 class="tiplog">{{TeacherThisMonthDutyList.month}}月排班情况</h1> -->
           <div class="canlender" id="canlender">
@@ -185,11 +186,13 @@
                   <div class="date">
                     <div class="calendar-week">
                       <div class="week-item" v-for="item of daynamearr" :key="item">
-                     <span :class="[item == '六' || item == '日'?'grayRed':'']">{{item}}</span>
+                        <span :class="[item == '六' || item == '日'?'grayRed':'']">{{item}}</span>
                       </div>
                     </div>
-                    <!-- {{FindArrangeTemplateIntervalList}} -->
-                    <div class="calendar-inner" v-if="FindArrangeTemplateIntervalList.list && FindArrangeTemplateIntervalList.list.length>0">
+                    <div
+                      class="calendar-inner"
+                      v-if="FindArrangeTemplateIntervalList.list && FindArrangeTemplateIntervalList.list.length>0"
+                    >
                       <div
                         v-for="(item, index) of setCalendarList"
                         :class="[item.pastDay ? 'psatchecked' : 'calendar-item']"
@@ -198,20 +201,36 @@
                         <div slot="reference" class="day-setting">
                           <div class="date-day">{{ item.date }}</div>
                           <div class="people" v-if="item.dateList && item.dateList.intervalList">
-                            <div class="people-items"  v-show="item.dateList.isOpen ==1">
+                            <div class="people-items" v-show="item.dateList.isOpen ==1">
                               <div
                                 :class="[item.pastDay ? 'Past-items-text' : 'people-items-text']"
                                 v-for="(v, k) of item.dateList.intervalList"
                                 :key="k"
-                              >           
-                                    <a  v-if="item.pastDay" href="javaScript:;" class="selectIngHovernomal"> <span >{{v.startInterval}}-{{v.endInterval}}</span></a>
-                                     <a  v-if="!item.pastDay"     :class="[v.id == SelectSearchId  ? 'selectIngTimeCode' : '']" href="javaScript:;" @click="SelectActiveindex(v)" class="selectIngHover"> <span >{{v.startInterval}}-{{v.endInterval}}</span></a>
+                              >
+                                <a
+                                  v-if="item.pastDay"
+                                  href="javaScript:;"
+                                  class="selectIngHovernomal"
+                                >
+                                  <span>{{v.startInterval}}-{{v.endInterval}}</span>
+                                </a>
+                                <a
+                                  v-if="!item.pastDay"
+                                  :class="[v.id == SelectSearchId  ? 'selectIngTimeCode' : '']"
+                                  href="javaScript:;"
+                                  @click="SelectActiveindex(v)"
+                                  class="selectIngHover"
+                                >
+                                  <span>{{v.startInterval}}-{{v.endInterval}}</span>
+                                </a>
                               </div>
                             </div>
-                               <div class="people-items" style="color:#999999;backgroung-color:#F9F9F9"  v-show="item.dateList.isOpen ==0">
-                              <div>           
-                                不开放
-                              </div>
+                            <div
+                              class="people-items"
+                              style="color:#999999;backgroung-color:#F9F9F9"
+                              v-show="item.dateList.isOpen ==0"
+                            >
+                              <div>不开放</div>
                             </div>
                           </div>
                         </div>
@@ -229,7 +248,7 @@
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL } from "@/config";
 export default {
   components: {},
   name: "actvResolveLabel",
@@ -244,12 +263,12 @@ export default {
       D: new Date().getDate() + " ",
       // month: new Date().getMonth() + 1,
       NewDay: "",
-      SelectSearchId:"",
-      showSelectCodeWord:"筛选时段",
+      SelectSearchId: "",
+      showSelectCodeWord: "筛选时段",
       BASE_URL: IMG_BASE_URL,
       accessToken: localStorage.getItem("accessToken"),
       NoAllotManagerModel: false, //token
-      SelectTeacherworkListModel:false,
+      SelectTeacherworkListModel: false,
       Activeindex: false,
       TEACHERTYPE: 8,
       current: {}, // 当前时间
@@ -261,7 +280,7 @@ export default {
       filters1: {
         pageNo: 1,
         pageSize: 10,
-        inputValue:""
+        inputValue: ""
       },
       pictureIndex: 0
     };
@@ -296,9 +315,9 @@ export default {
     handApor() {
       this.Activeindex = false;
       this.filters1.pageNo = 1;
-       this.filters1.inputValue = "";
-        this.showSelectCodeWord = '筛选时段';
-          this.SelectSearchId = '';
+      this.filters1.inputValue = "";
+      this.showSelectCodeWord = "筛选时段";
+      this.SelectSearchId = "";
       this.TEACHERTYPE = 8;
       this.GetFindTeamTeacherListInfo();
     },
@@ -306,21 +325,20 @@ export default {
     AutoApor() {
       this.Activeindex = true;
       this.filters1.pageNo = 1;
-       this.filters1.inputValue = "";
-      this.showSelectCodeWord = '筛选时段';
-       this.SelectSearchId = '';
+      this.filters1.inputValue = "";
+      this.showSelectCodeWord = "筛选时段";
+      this.SelectSearchId = "";
       this.TEACHERTYPE = 13;
       this.GetFindTeamTeacherListInfo();
     },
-   // 查询当月日历时间列表
+    // 查询当月日历时间列表
     async GetFindArrangeTemplateIntervalListInfo() {
-      this.$store.dispatch("GetFindArrangeTemplateIntervalList", {
-      });
+      this.$store.dispatch("GetFindArrangeTemplateIntervalList", {});
     },
-    SearchGetFindTeamTeacherListInfo(){
-      this.SelectSearchId = ''
-       this.showSelectCodeWord = '筛选时段';
-      this.GetFindTeamTeacherListInfo()
+    SearchGetFindTeamTeacherListInfo() {
+      this.SelectSearchId = "";
+      this.showSelectCodeWord = "筛选时段";
+      this.GetFindTeamTeacherListInfo();
     },
     // 组内排班老师列表
     async GetFindTeamTeacherListInfo() {
@@ -344,7 +362,7 @@ export default {
     updateIsShowCarouselPictureModal() {
       this.NoAllotManagerModel = false;
     },
-      updateIsShowSelectWorkListModal() {
+    updateIsShowSelectWorkListModal() {
       this.SelectTeacherworkListModel = false;
     },
     //老师排班详情
@@ -356,21 +374,22 @@ export default {
       });
       //  this.init();
     },
-      //筛选时段
+    //筛选时段
     SelectgroupDetail() {
       // this.pictureIndex = 0;
       this.SelectTeacherworkListModel = true;
-     this.GetFindArrangeTemplateIntervalListInfo()
+      this.GetFindArrangeTemplateIntervalListInfo();
     },
-    SelectActiveindex(v){
-      this.SelectSearchId = v.id
-      this.showSelectCodeWord = v.arrangeDate + '-' + v.startInterval + '-' + v.endInterval
+    SelectActiveindex(v) {
+      this.SelectSearchId = v.id;
+      this.showSelectCodeWord =
+        v.arrangeDate + "-" + v.startInterval + "-" + v.endInterval;
     },
     //确定提交所选中时段
-    saveOpenCloseDAys(){
-       this.SelectTeacherworkListModel = false;
-        this.filters1.inputValue = ''
-        this.GetFindTeamTeacherListInfo()
+    saveOpenCloseDAys() {
+      this.SelectTeacherworkListModel = false;
+      this.filters1.inputValue = "";
+      this.GetFindTeamTeacherListInfo();
     },
     // 日期处理
     init() {
@@ -487,50 +506,64 @@ export default {
           date: date,
           status: false,
           disable: curMonth !== month,
-            pastDay: date < today && curMonth == month,
+          pastDay: date < today && curMonth == month,
           value: this.stringify(year, curMonth, date)
         });
         begin += oneDayMS;
       }
       var that = this;
       // debugger
-         if (that.TeacherThisMonthDutyList.dayList && that.TeacherThisMonthDutyList.dayList.length > 0) {
-      for (let i = 0; i < list.length; i++) {
-        if (!list[i].disable) {
-          const dateValue = list[i].date;
-          // debugger
-          for (let t = 0; t < that.TeacherThisMonthDutyList.dayList.length; t++)
-           {
-            if (dateValue == that.TeacherThisMonthDutyList.dayList[t].day) {
-              list[i].dateList = that.TeacherThisMonthDutyList.dayList[t];
+      if (
+        that.TeacherThisMonthDutyList.dayList &&
+        that.TeacherThisMonthDutyList.dayList.length > 0
+      ) {
+        for (let i = 0; i < list.length; i++) {
+          if (!list[i].disable) {
+            const dateValue = list[i].date;
+            // debugger
+            for (
+              let t = 0;
+              t < that.TeacherThisMonthDutyList.dayList.length;
+              t++
+            ) {
+              if (dateValue == that.TeacherThisMonthDutyList.dayList[t].day) {
+                list[i].dateList = that.TeacherThisMonthDutyList.dayList[t];
+              }
             }
+          } else {
+            list[i].dateList = {
+              timeVoList: []
+            };
           }
-        } else {
-          list[i].dateList = {
-            timeVoList: []
-          };
         }
       }
-         }
-           if (that.FindArrangeTemplateIntervalList.list && that.FindArrangeTemplateIntervalList.list.length > 0) {
-         for (let i = 0; i < setList.length; i++) {
-        if (!setList[i].disable) {
-          const dateValue = setList[i].value;
-          for (let t = 0; t < that.FindArrangeTemplateIntervalList.list.length; t++) {
-            if (dateValue == that.FindArrangeTemplateIntervalList.list[t].arrangeDate) {
-              setList[i].dateList = that.FindArrangeTemplateIntervalList.list[t];
+      if (
+        that.FindArrangeTemplateIntervalList.list &&
+        that.FindArrangeTemplateIntervalList.list.length > 0
+      ) {
+        for (let i = 0; i < setList.length; i++) {
+          if (!setList[i].disable) {
+            const dateValue = setList[i].value;
+            for (
+              let t = 0;
+              t < that.FindArrangeTemplateIntervalList.list.length;
+              t++
+            ) {
+              if (
+                dateValue ==
+                that.FindArrangeTemplateIntervalList.list[t].arrangeDate
+              ) {
+                setList[i].dateList =
+                  that.FindArrangeTemplateIntervalList.list[t];
+              }
             }
+          } else {
+            setList[i].dateList = {};
           }
-        } else {
-          setList[i].dateList = {};
         }
       }
-           }
       this.calendarList = list;
       this.setCalendarList = setList;
-      console.log("000000000000000000000000000000000");
-      console.log(this.setCalendarList);
-      console.log("000000000000000000000000000000000");
     }
   },
   mounted() {
@@ -1097,8 +1130,8 @@ el-table {
   text-align: center;
   font-size: 18px;
   border-radius: 50px;
-  z-index:99999999999!important;
-  cursor: pointer!important;
+  z-index: 99999999999 !important;
+  cursor: pointer !important;
 }
 .model-grdeen {
   background-color: #52cc60;
@@ -1257,15 +1290,15 @@ table.bgtable tbody tr td.gray {
   border-radius: 10px;
   margin: 10px;
 }
-.selectIngHover{
-  color:#999999;
-   text-decoration:none;
+.selectIngHover {
+  color: #999999;
+  text-decoration: none;
 }
-.selectIngHovernomal{
-   color:#999999;
-   text-decoration:none;
+.selectIngHovernomal {
+  color: #999999;
+  text-decoration: none;
 }
-.selectIngHover :hover{
+.selectIngHover :hover {
   display: block;
   background-color: #7297ff;
   color: #fff;
@@ -1275,9 +1308,8 @@ table.bgtable tbody tr td.gray {
   font-size: 12px;
   border-radius: 10px;
   margin: 10px;
-  
 }
-.selectIngTimeCode{
+.selectIngTimeCode {
   display: block;
   background-color: #7297ff;
   color: #fff;
@@ -1308,7 +1340,7 @@ table.bgtable tbody tr td.gray {
   border-radius: 10px;
   margin: 10px;
 }
-.Dayinput-with-Allot{
+.Dayinput-with-Allot {
   border: #b6b6b6;
   border-radius: 20px;
   height: 40px;
@@ -1338,14 +1370,14 @@ table.bgtable tbody tr td.gray {
   cursor: pointer;
 }
 .NextMonthList {
-  float:right;
+  float: right;
   cursor: pointer;
   margin-top: 20px;
   width: 250px;
   height: 40px;
   border-radius: 20px;
   line-height: 40px;
-  background-color: #7297FF;
+  background-color: #7297ff;
   color: #fff;
   font-size: 12px;
 }

src/config/index.js

@@ -1,14 +1,62 @@
 let BASE_URL = ''
+let APP_ID = ''
+let RESET_URL = ''
+let TYPE = ''
+let IMG_BASE_URL = ''
+let APPOR_BASE_URL = ''
 if (process.env.NODE_ENV === 'development') {
     BASE_URL = 'https://xt.sharingschool.com/sz'
+    APP_ID = "wx3d4605f43beda11a"//测试环境AppId
+    RESET_URL = "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境微信重定向页面
+     TYPE = 0
+     IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
+     APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
 } else {
-    BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
-    // BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址 OSS正式环境地址
-    // BASE_URL = 'https://sx.sharingschool.com/sz'  //实习环境地址
+// 1.测试环境配置
+             BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
+             APP_ID = "wx3d4605f43beda11a"//测试环境AppId
+             RESET_URL = "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境微信重定向页面
+             TYPE = 0
+             IMG_BASE_URL = 'https://xtimg.sharingschool.com/' //测试环境图片地址
+             APPOR_BASE_URL = 'https://xtkmt.sharingschool.com/kmt/index.html#/' //测试环境作业批改地址
+
+//  -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ // 2.正式环境配置(Kmt)
+    //       BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址 
+    //       APP_ID = "wxd18ca9555a939281"//正式环境
+    //       RESET_URL = "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境微信重定向页面
+    //       TYPE = 0
+    //       IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+    //       APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html#/'; //正式环境作业批改地址地址;
+
+// -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ // 3.OSS正式环境(aiKmt)
+            // BASE_URL = 'https://t.sharingschool.com/sz'; // OSS正式环境地址
+            // APP_ID =  "wx5a83afb22813e986"//OSS正式环境
+            // RESET_URL = "https://aikmt.sharingschool.com/manager/index.html#/" //OSS正式环境
+            // TYPE = 1
+            // IMG_BASE_URL = 'https://img.sharingschool.com'; //正式环境图片地址;
+            // APPOR_BASE_URL = 'https://aikmt.sharingschool.com/kmt/index.html#/'; //oss正式环境作业批改地址地址;
+
+// -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+// 4.OSS实训环境配置(Sxkmt)
+        //  BASE_URL = 'https://sx.sharingschool.com/sz'  //OSS实训环境地址
+        //  APP_ID = "wx7fe760dc3c45794d" //OSS实训环境
+        // RESET_URL = "https://sxkmt.sharingschool.com/manager/index.html#/" //OSS实训环境
+        // TYPE = 0
+        // IMG_BASE_URL = 'https://xtimg.sharingschool.com' //实习，测试环境图片地址;
+        // APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html#/' //Oss实习环境作业批改地址
+
 }
 const TIME_OUT = 10000
 
 export {
     BASE_URL,
     TIME_OUT,
+    APP_ID,
+    RESET_URL,
+    TYPE,  
+    IMG_BASE_URL,
+    APPOR_BASE_URL
+
 } 

src/pages/Login.vue

@@ -26,9 +26,16 @@
               @click="loginStyle(2)"
               src="../assets/img/ercode (1).png"
             />
-            <div class="passWordLogin" style="min-width: 400px;min-height:400px" v-show="PasswordOrcode">
-  
-              <div class="loginInput" style="min-width: 400px;min-height:400px" v-show="PasswordOrcode">
+            <div
+              class="passWordLogin"
+              style="min-width: 400px;min-height:400px"
+              v-show="PasswordOrcode"
+            >
+              <div
+                class="loginInput"
+                style="min-width: 400px;min-height:400px"
+                v-show="PasswordOrcode"
+              >
                 <el-form :model="loginForm" ref="ruleForms" :rules="rules" label-position="left">
                   <el-form-item label="手机号" prop="phoneNumber" class="InputHeight">
                     <el-input v-model="loginForm.phoneNumber" class="inputstyle" autocomplete="off"></el-input>
@@ -37,15 +44,25 @@
                   <el-form-item label="验证码" prop="Ercode" class="InputHeight">
                     <el-input v-model="loginForm.Ercode" class="inputstyle2" autocomplete="off"></el-input>
 
-                    <div class="linnheight"></div><div v-if="!Unclicktime" @click="GetVerficationCodeFun('ruleForms')" class="SendErcode">发送验证码</div>
+                    <div class="linnheight"></div>
+                    <div
+                      v-if="!Unclicktime"
+                      @click="GetVerficationCodeFun('ruleForms')"
+                      class="SendErcode"
+                    >发送验证码</div>
                     <div v-if="Unclicktime" class="SendErcode">{{TimeClock}}</div>
                     <div class="bottomLine"></div>
                   </el-form-item>
                   <el-form-item>
                     <!-- <div class="SubmitBtn"  @click="submitForm('ruleForms')">
                       登陆
-                    </div> -->
-                    <el-button class="SubmitBtn" type="primary" size="medium" @click="submitForm('ruleForms')">登陆</el-button>
+                    </div>-->
+                    <el-button
+                      class="SubmitBtn"
+                      type="primary"
+                      size="medium"
+                      @click="submitForm('ruleForms')"
+                    >登陆</el-button>
                   </el-form-item>
                 </el-form>
               </div>
@@ -58,8 +75,8 @@
 </template>
 
 <script>
-// import { isvalidPhone } from "../js/rules";
-import { Message } from 'element-ui'
+import { APP_ID, RESET_URL, TYPE } from "@/config";
+import { Message } from "element-ui";
 export default {
   name: "login",
   data() {
@@ -75,7 +92,7 @@ export default {
     return {
       TimeClock: "",
       Unclicktime: false,
-      time:0,
+      time: 0,
       loginForm: {
         phoneNumber: "",
         Ercode: ""
@@ -97,7 +114,6 @@ export default {
   watch: {
     $route(to, from) {
       //监听路由是否变化
-      console.log(999);
       location.reload();
     }
   },
@@ -109,13 +125,12 @@ export default {
     submitForm(ruleForms) {
       this.$refs[ruleForms].validate(valid => {
         if (valid) {
-         this.$store.dispatch("PhoneCodeLogin", {
-        phone: this.loginForm.phoneNumber,
-        vcode: this.loginForm.Ercode,
-        accessToken:""
-      });
+          this.$store.dispatch("PhoneCodeLogin", {
+            phone: this.loginForm.phoneNumber,
+            vcode: this.loginForm.Ercode,
+            accessToken: ""
+          });
         } else {
-          console.log("error submit!!");
           return false;
         }
       });
@@ -123,14 +138,7 @@ export default {
     resetForm(ruleForms) {
       this.$refs[ruleForms].resetFields();
     },
-    WxLoginCtl() {
-      // this.$router.push({
-      //   path: "/aikmt/Redirect_uri",
-      //   query: {
-      //     unionid: "oPHg8wXraekgH5YKVHvD3H7Ujynw"
-      //   }
-      // });
-    },
+    WxLoginCtl() {},
     isvalidPhone(str) {
       const reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
       return reg.test(str);
@@ -148,7 +156,6 @@ export default {
     timer() {
       if (this.time > 0) {
         this.time--;
-        //                 console.log(this.time);
         this.Unclicktime = true;
         this.TimeClock = this.time + "s后重新获取";
         setTimeout(this.timer, 1000);
@@ -159,18 +166,16 @@ export default {
       }
     },
     async GetVerficationCodeFun(ruleForms) {
-     
-        if (this.isvalidPhone(this.loginForm.phoneNumber)) {
-           //倒计时函数
-       this.time = 60;
-       this.timer();
-      this.$store.dispatch("GetVerficationCode", {
-        phone: this.loginForm.phoneNumber
-      });
-        } else {
-            Message.error('请输入正确电话格式！')
-        }
-      
+      if (this.isvalidPhone(this.loginForm.phoneNumber)) {
+        //倒计时函数
+        this.time = 60;
+        this.timer();
+        this.$store.dispatch("GetVerficationCode", {
+          phone: this.loginForm.phoneNumber
+        });
+      } else {
+        Message.error("请输入正确电话格式！");
+      }
     },
     async getTKByUnionid() {
       if (window.location.href.indexOf("unionid") >= 0) {
@@ -180,29 +185,22 @@ export default {
         let WxCode = unionid;
         this.WxCode = WxCode;
         localStorage.setItem("unionid", this.WxCode);
-        console.log("获取unionid" + this.WxCode);
         this.$store.dispatch("UnionidLogin", {
           unionid: this.WxCode
         });
       }
       if (window.location.href.indexOf("code") >= 0) {
         // 如果url中包含code,则保存到store中
-        console.log(window.location.href);
         let code = window.location.href.split("#/?")[1];
-        console.log("code开始打印");
-        console.log(code);
         code = code.substring(5, code.indexOf("&"));
         let WxCode = code;
         this.WxCode = WxCode;
-        console.log("获取Code" + this.WxCode);
         this.$store.dispatch("GET_TOKEN", {
           code: this.WxCode,
-          type: 0
-          // type:1,  //aikmt
+          type: TYPE
         });
         // 清除重定向url中参数ocde,
         window.history.replaceState({}, "", `${location.pathname}`);
-        console.log(location.pathname);
       }
       return;
     },
@@ -210,17 +208,9 @@ export default {
       var obj = new WxLogin({
         self_redirect: false,
         id: "login_container",
-        // appid: "wxd18ca9555a939281", //正式环境
-        // appid: "wx5a83afb22813e986", //OSS正式环境
-        // appid: "wx7fe760dc3c45794d", //实训环境
-        appid: "wx3d4605f43beda11a", //测试环境
+        appid: APP_ID,
         scope: "snsapi_login",
-        redirect_uri: encodeURIComponent(
-          // "https://kmt.sharingschool.com/aijia/manager/index.html#/" //正式环境
-          // "https://aikmt.sharingschool.com/manager/index.html#/" //OSS正式环境
-          // "https://sxkmt.sharingschool.com/manager/index.html#/" //实训环境
-          "https://xtkmt.sharingschool.com/manager/index.html#/" //测试环境
-        ),
+        redirect_uri: encodeURIComponent(RESET_URL),
         state: "",
         style: "width: 250px;height: 500px",
         href: ""
@@ -253,15 +243,12 @@ export default {
   height: 366px;
   box-shadow: 0 0 20px #cccccc;
   border-radius: 5px;
-
 }
 
-
-
 .typeWord {
   display: inline-block;
   margin-left: 30px;
-  font-size 20px;
+  font-size: 20px;
 }
 
 .bottomLine {
@@ -270,50 +257,57 @@ export default {
   background-color: #cccccc;
   margin: 0 auto;
 }
-.SubmitBtn{
-  width 200px;
-  height 40px;
-  font-size 16px;
-  line-height:10px;
+
+.SubmitBtn {
+  width: 200px;
+  height: 40px;
+  font-size: 16px;
+  line-height: 10px;
 }
+
 .SendErcode {
   display: inline-block;
   font-size: 10px;
-  color:#00B7FF;
+  color: #00B7FF;
   cursor: pointer;
 }
 
 .inputstyle {
   width: 250px;
 }
-.linnheight{
-  width 2px;
-  height 20px;
+
+.linnheight {
+  width: 2px;
+  height: 20px;
   background-color: #cccccc;
-   display: inline-block;
-   margin-right:10px;
-    
+  display: inline-block;
+  margin-right: 10px;
 }
+
 .inputstyle2 {
   width: 150px;
 }
-.InputHeight{
-   width: 90%;
-  height:100px;
-  margin:0 auto;
-  font-size: 30px
+
+.InputHeight {
+  width: 90%;
+  height: 100px;
+  margin: 0 auto;
+  font-size: 30px;
 }
- /deep/ .el-input__inner {
+
+/deep/ .el-input__inner {
   border-style: none !important;
-  outline: none!important;;
+  outline: none !important;
   background-color: transparent;
-  border: 0!important;;
+  border: 0 !important;
 }
- /deep/ .el-form-item__label {
-   font-size 16px;
-   font-weight 700
-   color:#393939
+
+/deep/ .el-form-item__label {
+  font-size: 16px;
+  font-weight: 700;
+  color: #393939;
 }
+
 .loginCodeOrword {
   position: relative;
 }

src/pages/Qualityinspector/GetCheckHomeWork.vue

@@ -2,23 +2,15 @@
 <template>
   <div>
     <!-- table 表格 -->
-    <el-row :gutter="20" class="main-items" >
+    <el-row :gutter="20" class="main-items">
       <!--数据监控-->
       <el-col :span="20" class="main" :offset="2">
         <el-row :gutter="24" class="main-header">
-          <!--<el-col :span="3">-->
-            <div class="main-header-item" >	批改老师注册数:{{GetManagerListForChecker.correctTeacher}}人</div>
-             <div class="main-header-item" >	匹配老师注册数:{{GetManagerListForChecker.matchTeacher}}人</div>
-          <!--</el-col>-->
-          <!--<el-col :span="3">-->
-            <div class="main-header-item">活跃老师数：{{GetManagerListForChecker.activeTeacherCount}}人</div>
-          <!--</el-col>-->
-          <!--<el-col :span="4">-->
-            <div class="main-header-item">注册用户数：{{GetManagerListForChecker.registerUserCount}}人</div>
-          <!--</el-col>-->
-          <!--<el-col :span="4">-->
-            <div class="main-header-item">活跃用户数：{{GetManagerListForChecker.activeUserCount}}人</div>
-          <!--</el-col>-->
+          <div class="main-header-item">批改老师注册数:{{GetManagerListForChecker.correctTeacher}}人</div>
+          <div class="main-header-item">匹配老师注册数:{{GetManagerListForChecker.matchTeacher}}人</div>
+          <div class="main-header-item">活跃老师数：{{GetManagerListForChecker.activeTeacherCount}}人</div>
+          <div class="main-header-item">注册用户数：{{GetManagerListForChecker.registerUserCount}}人</div>
+          <div class="main-header-item">活跃用户数：{{GetManagerListForChecker.activeUserCount}}人</div>
         </el-row>
         <el-table
           :data="GetManagerListForChecker.list"
@@ -31,134 +23,103 @@
           size="medium"
           border
         >
-          <el-table-column
-            label="校区管理员"
-            header-align="center"
-            width="200"
-          >
+          <el-table-column label="校区管理员" header-align="center" width="200">
             <template slot-scope="scope">
               <div class="scope-list">
-                <img :src='BASE_URL+scope.row.imgUrl' alt="" class="table-img" v-if="scope.row.imgUrl">
-                <img src="../../assets/img/user.jpg" alt="" v-if="!scope.row.imgUrl" class="table-img">
+                <img :src="BASE_URL+scope.row.imgUrl" alt class="table-img" v-if="scope.row.imgUrl" />
+                <img src="../../assets/img/user.jpg" alt v-if="!scope.row.imgUrl" class="table-img" />
                 <span class="scope-name">{{scope.row.name}}</span>
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            prop="groupCount"
-            label="小组人数"
-            header-align="center"
-          >
-          </el-table-column>
-             <el-table-column
-            prop="subject"
-            label="科目"
-            header-align="center">
-                </el-table-column>
-          <el-table-column
-            prop="feedbackCount"
-            label="近七日批改+匹配总张数"
-            header-align="center"
-          >
-          </el-table-column>
-          <el-table-column
-            prop="checkCount"
-            label="近七日已质检张数"
-            header-align="center"></el-table-column>
-          <el-table-column
-            prop="checkRate"
-            label="近七日作业质检率"
-            header-align="center"></el-table-column>
-          <el-table-column
-            prop="checkRightRate"
-            label="近七日质检正确率"
-            header-align="center"
-          ></el-table-column>
-          <el-table-column prop="status" label="" header-align="center" width="350">
+          <el-table-column prop="groupCount" label="小组人数" header-align="center"></el-table-column>
+          <el-table-column prop="subject" label="科目" header-align="center"></el-table-column>
+          <el-table-column prop="feedbackCount" label="近七日批改+匹配总张数" header-align="center"></el-table-column>
+          <el-table-column prop="checkCount" label="近七日已质检张数" header-align="center"></el-table-column>
+          <el-table-column prop="checkRate" label="近七日作业质检率" header-align="center"></el-table-column>
+          <el-table-column prop="checkRightRate" label="近七日质检正确率" header-align="center"></el-table-column>
+          <el-table-column prop="status" label header-align="center" width="350">
             <template slot-scope="scope">
-                 <div class="UpTeacherTeam"  @click="groupDetail(scope.row.managerId)">
-                  <span>小组详情</span>
-                </div>
+              <div class="UpTeacherTeam" @click="groupDetail(scope.row.managerId)">
+                <span>小组详情</span>
+              </div>
             </template>
           </el-table-column>
-
         </el-table>
         <!-- 分页显示 -->
-    
-            <el-pagination
-              background
-              @size-change="handleSizeChange"
-              @current-change="pageChange"
-              :page-sizes="[10, 20, 30, 40]"
-              layout="total, sizes, prev, pager, next, jumper"
-              :total= parseInt(GetManagerListForChecker.pages)
-               :hide-on-single-page="true"
-            ></el-pagination>
-      
+
+        <el-pagination
+          background
+          @size-change="handleSizeChange"
+          @current-change="pageChange"
+          :page-sizes="[10, 20, 30, 40]"
+          layout="total, sizes, prev, pager, next, jumper"
+          :total="parseInt(GetManagerListForChecker.pages)"
+          :hide-on-single-page="true"
+        ></el-pagination>
       </el-col>
     </el-row>
   </div>
 </template>
 <script>
-  import { mapGetters, mapActions } from "vuex";
-  import { IMG_BASE_URL } from '@/ImgConfig'
-  import SeacherHomewrokStatus from "@/components/SeacherHomewrokStatus";
-  export default {
-    components: {SeacherHomewrokStatus},
-    name: "actvResolveLabel",
-    props: {},
-    data() {
-      return {
-        BASE_URL:IMG_BASE_URL,
-        hiddenModel:false,
-        isPigai:false,
-        managerId:'',
-        superName:'',
-        count:0,
-        arrPeriod:[],
-        arrGrade:[],
-        gardeListDownage:false,
-        selecttitleage:'选择科目',
-        closeID:false,
-        OpenID:false,
-        TeacherIdstatus:'',
-        modelindex:"",
-        Activeindex:false,
-        filters: {
-           inputValue: "",
-          actvNm: "",
-          actvCrtUserId: "",
-          actvType: "",
-          actvSmallType: "",
-          // 排序
-          MaxtimeValue:"",
-          pageNo: 1,
-          pageSize: 10,
-          count: 0,
-          orderField: "",
-          orderAD: "",
-          gradesValue:''
-        }
-      };
-    },
-     created() {
+import { mapGetters, mapActions } from "vuex";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+import SeacherHomewrokStatus from "@/components/SeacherHomewrokStatus";
+export default {
+  components: { SeacherHomewrokStatus },
+  name: "actvResolveLabel",
+  props: {},
+  data() {
+    return {
+      BASE_URL: IMG_BASE_URL,
+      hiddenModel: false,
+      isPigai: false,
+      managerId: "",
+      superName: "",
+      count: 0,
+      arrPeriod: [],
+      arrGrade: [],
+      gardeListDownage: false,
+      selecttitleage: "选择科目",
+      closeID: false,
+      OpenID: false,
+      TeacherIdstatus: "",
+      modelindex: "",
+      Activeindex: false,
+      filters: {
+        inputValue: "",
+        actvNm: "",
+        actvCrtUserId: "",
+        actvType: "",
+        actvSmallType: "",
+        // 排序
+        MaxtimeValue: "",
+        pageNo: 1,
+        pageSize: 10,
+        count: 0,
+        orderField: "",
+        orderAD: "",
+        gradesValue: ""
+      }
+    };
   },
-    watch: {
-      InfoTeacherstatues(val, oldVal) {
-        //普通的watch监听
-        this.teacherDetailFun();
-      },
-      downgrade(val, oldVal) {
-        this.SuperManagerList();
-      },
-    },
-    computed: {
-      ...mapGetters(["GetManagerListForChecker"])
+  created() {},
+  watch: {
+    InfoTeacherstatues(val, oldVal) {
+      //普通的watch监听
+      this.teacherDetailFun();
     },
-    methods: {
-      ...mapActions(["setUser"]),
+    downgrade(val, oldVal) {
+      this.SuperManagerList();
+    }
+  },
+  computed: {
+    ...mapGetters(["GetManagerListForChecker"])
+  },
+  methods: {
+    ...mapActions(["setUser"]),
 
-        // 手动批改
+    // 手动批改
     handApor() {
       this.Activeindex = false;
     },
@@ -166,11 +127,11 @@
     AutoApor() {
       this.Activeindex = true;
     },
-      selectTipage(item) {
+    selectTipage(item) {
       this.filters.gradesValue = item.str;
       this.selecttitleage = item.label;
       this.gardeListDownage = false;
-      this.SuperManagerList()
+      this.SuperManagerList();
     },
     selectStyle1() {
       this.gardeListDownage = true;
@@ -178,136 +139,133 @@
     outStyle1() {
       this.gardeListDownage = false;
     },
-        selectTitle(k) {
+    selectTitle(k) {
       this.modelindex = k;
     },
-      //时间封装
-      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 SuperManagerList() {
-        this.$store.dispatch("GetManagerListForCheckerInfo", {
-          maxCreateTime: this.formatDate(),
-          pageNo: this.filters.pageNo,
-          pageSize: this.filters.pageSize,
-        });
-
-      },
-      // 查看校区管理员详情
-      async GetManagerDetail(str) {
-        this.$store.dispatch("GetManagerDetail", {
-          managerId: str
-        });
-      },
-      async teacherDetailFun(){
-        console.log(this.getManagerDetail)
-        var arr = this.getManagerDetail.grade.split(",");
-        this.arrPeriod = this.getManagerDetail.period.split(",");
-        console.log(this.arrPeriod)
-        var arrList = [];
-        for (var i in arr) {
-          if (arr[i] == "一年级" || arr[i] == "二年级") {
-            arrList.push("1-2年级");
-          } else if (arr[i] == "三年级" || arr[i] == "四年级") {
-            arrList.push("3-4年级");
-          } else if (arr[i] == "五年级" || arr[i] == "六年级") {
-            arrList.push("5-6年级");
-          }
-        }
-        this.arrGrade = this.uniq(arrList) || [];
-      },
-      //小组详情
-      groupDetail(str){
-        this.$router.push({
-          path: "/Qualityinspector/checkListInfo",
-          query: {
-            managerId: str
-          }
-        })
-      },
-      // 表格头部样式
-      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 ''
+    //时间封装
+    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 SuperManagerList() {
+      this.$store.dispatch("GetManagerListForCheckerInfo", {
+        maxCreateTime: this.formatDate(),
+        pageNo: this.filters.pageNo,
+        pageSize: this.filters.pageSize
+      });
+    },
+    // 查看校区管理员详情
+    async GetManagerDetail(str) {
+      this.$store.dispatch("GetManagerDetail", {
+        managerId: str
+      });
+    },
+    async teacherDetailFun() {
+      console.log(this.getManagerDetail);
+      var arr = this.getManagerDetail.grade.split(",");
+      this.arrPeriod = this.getManagerDetail.period.split(",");
+      console.log(this.arrPeriod);
+      var arrList = [];
+      for (var i in arr) {
+        if (arr[i] == "一年级" || arr[i] == "二年级") {
+          arrList.push("1-2年级");
+        } else if (arr[i] == "三年级" || arr[i] == "四年级") {
+          arrList.push("3-4年级");
+        } else if (arr[i] == "五年级" || arr[i] == "六年级") {
+          arrList.push("5-6年级");
         }
-      },
-      // 分页
-      pageChange(val) {
-        this.filters.pageNo = val;
-        this.SuperManagerList();
-      },
-      handleSizeChange(val) {
-        this.filters.pageSize = val;
-        this.SuperManagerList();
-      },
-      // 数组去重
-      uniq(array){
-        var temp = []; //一个新的临时数组
-        for (var i = 0; i < array.length; i++){
-          if (temp.indexOf(array[i]) == -1) {
-            temp.push(array[i]);
-          }
+      }
+      this.arrGrade = this.uniq(arrList) || [];
+    },
+    //小组详情
+    groupDetail(str) {
+      this.$router.push({
+        path: "/Qualityinspector/checkListInfo",
+        query: {
+          managerId: str
         }
-        return temp;
+      });
+    },
+    // 表格头部样式
+    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 "";
       }
     },
-    mounted() {
-      sessionStorage.setItem('tabIndex',0)
-      this.SuperManagerList()
-
+    // 分页
+    pageChange(val) {
+      this.filters.pageNo = val;
+      this.SuperManagerList();
+    },
+    handleSizeChange(val) {
+      this.filters.pageSize = val;
+      this.SuperManagerList();
+    },
+    // 数组去重
+    uniq(array) {
+      var temp = []; //一个新的临时数组
+      for (var i = 0; i < array.length; i++) {
+        if (temp.indexOf(array[i]) == -1) {
+          temp.push(array[i]);
+        }
+      }
+      return temp;
     }
-  };
+  },
+  mounted() {
+    sessionStorage.setItem("tabIndex", 0);
+    this.SuperManagerList();
+  }
+};
 </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;
-  }
-  .aside {
+.main {
+  background-color: #fff;
+  margin-top: 16px;
+  padding: 0 !important;
+  border: 1px solid #e1e1e1;
+  min-height: 980px;
+}
+el-table {
+  color: #999999;
+  font-size: 18px;
+}
+.aside {
   background-color: #fff;
   margin-top: 16px;
   margin-right: 16px;
   padding: 0;
   min-height: 880px;
 }
-  .main-items{
-    color: #393939;
-    /*text-align: center;*/
-    line-height: 80px;
-  }
-  .main-header {
-    position:relative;
-  }
-  .modelspec {
+.main-items {
+  color: #393939;
+  /*text-align: center;*/
+  line-height: 80px;
+}
+.main-header {
+  position: relative;
+}
+.modelspec {
   z-index: 10000;
   width: 35.5%;
   height: auto;
@@ -319,48 +277,47 @@
   border-radius: 10px;
   text-align: center;
 }
-  .main-header-item{
-    float:left;
-    font-size: 16px;
-    color: #7E7E7E;
-    margin-left:30px;
-    text-overflow: ellipsis;
-    /*vertical-align: middle;*/
-    text-align: center;
-    display: inline-block;
-    /* width: 15%; */
-  }
+.main-header-item {
+  float: left;
+  font-size: 16px;
+  color: #7e7e7e;
+  margin-left: 30px;
+  text-overflow: ellipsis;
+  /*vertical-align: middle;*/
+  text-align: center;
+  display: inline-block;
+  /* width: 15%; */
+}
 
-  .input-with-select .el-input-group__prepend {
-    background-color: #fff;
-  }
+.input-with-select .el-input-group__prepend {
+  background-color: #fff;
+}
 .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color:#52cc60!important;
-    color: #fff;
+  background-color: #52cc60 !important;
+  color: #fff;
 }
-  .table-img{
-    width:36px;
-    height:36px;
-    border-radius:6px;
-  }
-  .active {
+.table-img {
+  width: 36px;
+  height: 36px;
+  border-radius: 6px;
+}
+.active {
   background-color: #52cc60;
-  color: #fff!important;
-}
-  .showModel{
-    width: 100%;
-    height: 100%;
-    position: fixed;
-    top: 0;
-    left: 0;
-    background: #000000;
-    opacity: 0.2;
-    overflow: hidden;
-    z-index: 1000;
-    color: #fff;
-
-  }
-  .ApporStyles {
+  color: #fff !important;
+}
+.showModel {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+.ApporStyles {
   display: inline-block;
   width: 200px;
   height: 40px;
@@ -370,129 +327,128 @@
   font-size: 16px;
   color: #7c819d;
   cursor: pointer;
-  text-align:center;
+  text-align: center;
 }
 .Apporvalactive {
-  background-color: #52cc60!important;
-  color: #fff!important;
-}
-  .model{
-    z-index: 1001;
-    width:40%;
-    height:auto;
-    position: fixed;
-    top: 30%;
-    left: 30%;
-    margin:auto;
-    background: #fff;
-    border-radius:10px;
-    text-align: center;
-  }
-
-  .model-items-first{
-    padding: 0 34px;
-    display: flex;
-    justify-content: space-between;
-  }
-  .model-items-first-img{
-    width: 68px;
-    height: 68px;
-    border-radius: 8px;
-    position: relative;
-    bottom: 20px;
-  }
-  .model-items-first-left{
-    display: inline-block;
-    color: #393939;
-    font-size: 24px;
-    margin-left: 14px;
-    text-align: left;
-  }
-  .model-items-first-left-down{
-    color: #7E7E7E;
-    font-size: 18px;
-  }
-  .model-text{
-    background:rgba(255,255,255,1);
-    border-radius:10px;
-  }
-  .model-items-other{
-    height: 60px;
-    line-height: 60px;
-    color: #393939;
-    font-size: 20px;
-    text-align: left;
-    padding: 0 34px;
+  background-color: #52cc60 !important;
+  color: #fff !important;
+}
+.model {
+  z-index: 1001;
+  width: 40%;
+  height: auto;
+  position: fixed;
+  top: 30%;
+  left: 30%;
+  margin: auto;
+  background: #fff;
+  border-radius: 10px;
+  text-align: center;
+}
 
-  }
-  .model-active{
-    background-color: #F6F7FB;
-  }
-  .model-active-last{
-    border-radius:0 0 10px 10px;
-    background-color: #F6F7FB;
-  }
+.model-items-first {
+  padding: 0 34px;
+  display: flex;
+  justify-content: space-between;
+}
+.model-items-first-img {
+  width: 68px;
+  height: 68px;
+  border-radius: 8px;
+  position: relative;
+  bottom: 20px;
+}
+.model-items-first-left {
+  display: inline-block;
+  color: #393939;
+  font-size: 24px;
+  margin-left: 14px;
+  text-align: left;
+}
+.model-items-first-left-down {
+  color: #7e7e7e;
+  font-size: 18px;
+}
+.model-text {
+  background: rgba(255, 255, 255, 1);
+  border-radius: 10px;
+}
+.model-items-other {
+  height: 60px;
+  line-height: 60px;
+  color: #393939;
+  font-size: 20px;
+  text-align: left;
+  padding: 0 34px;
+}
+.model-active {
+  background-color: #f6f7fb;
+}
+.model-active-last {
+  border-radius: 0 0 10px 10px;
+  background-color: #f6f7fb;
+}
 
-  .model-manager{
-    display: flex;
-    justify-content: space-between;
-    margin: 30px;
-    color: #393939;
-    font-size: 24px;
-  }
-  .model-btn{
-    display: flex;
-    justify-content: space-around;
-    margin-bottom: 44px;
-  }
-  .model-btn-items{
-    cursor: pointer;
-    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;
-  }
-  .scope-name{
-    margin-left: 5%;
-    color: #393939;
-    font-size: 13px;
-  }
-  .grade-name{
-    color: #393939;
-    font-size: 16px;
-    margin:0 10px;
-  }
-  .page-block{
-    text-align: center !important;
-    margin-top: 15px;
-  }
-  .scope-list{
-    margin-left: 5%;
-    text-align: left;
-  }
-  .miniorinput-with-Allot {
+.model-manager {
+  display: flex;
+  justify-content: space-between;
+  margin: 30px;
+  color: #393939;
+  font-size: 24px;
+}
+.model-btn {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 44px;
+}
+.model-btn-items {
+  cursor: pointer;
+  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;
+}
+.scope-name {
+  margin-left: 5%;
+  color: #393939;
+  font-size: 13px;
+}
+.grade-name {
+  color: #393939;
+  font-size: 16px;
+  margin: 0 10px;
+}
+.page-block {
+  text-align: center !important;
+  margin-top: 15px;
+}
+.scope-list {
+  margin-left: 5%;
+  text-align: left;
+}
+.miniorinput-with-Allot {
   border: #b6b6b6;
   border-radius: 5px;
   height: 40px;
@@ -522,17 +478,17 @@
   margin-top: 12px;
   cursor: pointer;
 }
-  .noBorderBottom{
-    border-bottom: none;
-  }
-  .el-table .table-head-th{
-    background-color:#F6F7FB;
-    font-size: 16px !important;
-    color: #393939;
-  }
-  .closeTeacherID {
-    margin-right:50px;
-   display: inline-block;
+.noBorderBottom {
+  border-bottom: none;
+}
+.el-table .table-head-th {
+  background-color: #f6f7fb;
+  font-size: 16px !important;
+  color: #393939;
+}
+.closeTeacherID {
+  margin-right: 50px;
+  display: inline-block;
   height: 40px;
   width: 100px;
   color: #f56c6c;
@@ -554,14 +510,14 @@
   height: 40px;
   width: 120px;
   color: #fff;
-    background-color: #67c23a;
+  background-color: #67c23a;
   border-color: #c2e7b0;
   font-size: 14px;
   line-height: 40px;
   cursor: pointer;
   border: 1px solid;
-  text-align:center;
-  margin:0 auto;
+  text-align: center;
+  margin: 0 auto;
 }
 .UpTeacherTeam:hover {
   color: #fff;
@@ -587,7 +543,7 @@
   border-color: #67c23a;
 }
 .UpTeacherIDiNfo {
-    float:left!important;
+  float: left !important;
   display: inline-block;
   height: 40px;
   width: 150px;
@@ -599,10 +555,10 @@
   line-height: 40px;
   cursor: pointer;
   border: 1px solid;
-  text-align:center;
+  text-align: center;
 }
 .UpTeacherIDiNfo:hover {
- color: #67c23a;
+  color: #67c23a;
   background: #f0f9eb;
   border-color: #c2e7b0;
 }
@@ -636,9 +592,9 @@
   cursor: pointer;
 }
 .selectBox {
-   position: absolute;;
-  right:50px;
-  top:15px;
+  position: absolute;
+  right: 50px;
+  top: 15px;
 }
 .Ageclass {
   /* display: inline-block; */

src/pages/Qualityinspector/checkListInfo.vue

@@ -67,8 +67,8 @@
                   v-model="filters.inputValue"
                   class="miniorinput-with-Allot"
                 />
-                  <span @click="InfoWatch()" class="miinorSeachIcon el-icon-search"></span>
-                     <!-- <span v-if="this.Activeindex == true" @click="InfoKonwTeacherWatchList()" class="miinorSeachIcon el-icon-search"></span> -->
+                <span @click="InfoWatch()" class="miinorSeachIcon el-icon-search"></span>
+                <!-- <span v-if="this.Activeindex == true" @click="InfoKonwTeacherWatchList()" class="miinorSeachIcon el-icon-search"></span> -->
               </div>
             </div>
           </el-col>
@@ -147,7 +147,7 @@
                     />
                   </div>
                   <div>{{v.name}}</div>
-                 <div>{{v.feedbackCount}}张</div>
+                  <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>离线</div>
                 </div>
@@ -174,7 +174,7 @@
                     />
                   </div>
                   <div>{{v.name}}</div>
-                 <div>{{v.feedbackCount}}张</div>
+                  <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>已封号</div>
                 </div>
@@ -184,10 +184,13 @@
                 >暂无数据!</div>
                 <!--&& isDownindex === k && isDown-->
                 <div v-if="isDownindex === k && isDown">
-                  <div class="tr-second" v-for="(v, k) of TeacherHomeworkListForChecker.list" :key="k">
+                  <div
+                    class="tr-second"
+                    v-for="(v, k) of TeacherHomeworkListForChecker.list"
+                    :key="k"
+                  >
                     <div class="tr-seconds" style="width:6%;">{{k+1}}</div>
                     <div class="tr-seconds tr-w120" style="width:14%;">
-                  
                       <span>{{v.name}}</span>
                     </div>
                     <div class="tr-seconds widthSu" style="width: 10%">{{v.subject}}</div>
@@ -196,34 +199,33 @@
                       <span>已质检</span>
                       (
                       <span>{{v.checkCount}}/{{v.feedbackCount}}</span>)
-                    </div>              
-                  
-                    <div
-                      class="ApporTeacher"
-                      style="width: 25%"
-                    >
-                      <el-button type="warning"    @click="CheackHomeworkStatus(v)">
-                        <span
-                          href
-                          style="text-decoration:none;color:#ffffff;"
-                        >去质检</span>
+                    </div>
+
+                    <div class="ApporTeacher" style="width: 25%">
+                      <el-button type="warning" @click="CheackHomeworkStatus(v)">
+                        <span href style="text-decoration:none;color:#ffffff;">去质检</span>
                       </el-button>
-                      <span v-if="v.wrongCount > 0" style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
-                         <span  v-if="v.wrongCount == 0" style="color:#fbfbfb;font-size:12px;">报错{{v.wrongCount}}</span>
+                      <span
+                        v-if="v.wrongCount > 0"
+                        style="color:red;font-size:12px;"
+                      >报错{{v.wrongCount}}</span>
+                      <span
+                        v-if="v.wrongCount == 0"
+                        style="color:#fbfbfb;font-size:12px;"
+                      >报错{{v.wrongCount}}</span>
                     </div>
                   </div>
                   <!-- 分页显示 -->
-               
-                    <el-pagination
-                      background
-                        @size-change="WatchHomrworkleSizeChange"
-                        @current-change="WatchHomeWorkpageChange"
-                      :page-sizes="[10, 20]"
-                      layout="total, prev, pager, next"
-                      :total="parseInt(TeacherHomeworkListForChecker.pages)"
-                      :hide-on-single-page="true"
-                    ></el-pagination>
-                 
+
+                  <el-pagination
+                    background
+                    @size-change="WatchHomrworkleSizeChange"
+                    @current-change="WatchHomeWorkpageChange"
+                    :page-sizes="[10, 20]"
+                    layout="total, prev, pager, next"
+                    :total="parseInt(TeacherHomeworkListForChecker.pages)"
+                    :hide-on-single-page="true"
+                  ></el-pagination>
                 </div>
               </div>
             </div>
@@ -232,12 +234,11 @@
             <div v-if="this.Activeindex == false">
               <el-pagination
                 background
-              @size-change="WatchApporvalhandleSizeChange"
-              @current-change="WatchApporvalpageChange"
+                @size-change="WatchApporvalhandleSizeChange"
+                @current-change="WatchApporvalpageChange"
                 :page-sizes="[10, 20, 30, 40]"
                 layout="total, prev, pager, next"
                 :total="parseInt(TeacherListForChecker.pages)"
-             
                 :current-page.sync="currentPage"
               ></el-pagination>
               <div style="clear:both;"></div>
@@ -246,8 +247,8 @@
             <div v-if="this.Activeindex == true">
               <el-pagination
                 background
-              @size-change="WatchApporvalhandleSizeChange"
-              @current-change="WatchApporvalpageChange"
+                @size-change="WatchApporvalhandleSizeChange"
+                @current-change="WatchApporvalpageChange"
                 :page-sizes="[10, 20, 30, 40]"
                 layout="total, prev, pager, next"
                 :total="parseInt(TeacherListForChecker.pages)"
@@ -263,15 +264,15 @@
         </el-row>
       </el-col>
     </el-row>
-  
+
     <!-- 老师详情弹框 -->
     <div class="showModel" @click="allShowModel(1)" v-if="ModelAppor"></div>
     <div class="model" style="width:40%;left: 32.5%" v-if="ModelAppor">
       <div class="model-text">
         <div class="model-manager">
           <div v-if="this.Activeindex == false">批改老师</div>
-           <div v-if="this.Activeindex == true">匹配知识点老师</div>
-           <div v-if="this.teacherRoles ==11">(校区管理员)</div>
+          <div v-if="this.Activeindex == true">匹配知识点老师</div>
+          <div v-if="this.teacherRoles ==11">(校区管理员)</div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(1)" />
           </div>
@@ -302,23 +303,36 @@
               </div>
             </div>
           </div>
-          <div class="model-items-other" v-if="this.Activeindex == false">批改科目 : {{GetTeacherDetail.subject}}</div>
-            <div class="model-items-other model-active" v-if="this.Activeindex == true">批改科目 : {{GetTeacherDetail.subject}}</div>
-          <div class="model-items-other  model-active" v-if="this.Activeindex == false">
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == false"
+          >批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div
+            class="model-items-other model-active"
+            v-if="this.Activeindex == true"
+          >批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div class="model-items-other model-active" v-if="this.Activeindex == false">
             批改年级 :
             <span v-for="(v, k) of arrGrade" :key="k">{{v}},</span>
           </div>
           <div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
           <div class="model-items-other model-active">上次登录时间 : {{GetTeacherDetail.lastOnlineTime}}</div>
-          <div class="model-items-other" v-if="this.Activeindex == false">批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
-           <div class="model-items-other" v-if="this.Activeindex == true">匹配正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == false"
+          >批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == true"
+          >匹配正确率 : {{GetTeacherDetail.accuracyRate}}</div>
           <div class="model-items-other model-active">
             被报错总次数 :
             <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
           </div>
           <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div>
           <div
-            class="model-items-other model-active" v-if="this.Activeindex == false"
+            class="model-items-other model-active"
+            v-if="this.Activeindex == false"
           >家长满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
         </div>
       </div>
@@ -347,13 +361,13 @@ export default {
       TeacherName: "", //封号，升级，解封
       arrGrade: [],
       Activeindex: false,
-      ModelAppor: false, //批改老师详情信息弹框  
+      ModelAppor: false, //批改老师详情信息弹框
       isDown: false,
       gardeListDown: false,
       gardeListDownage: false,
       selecttitlepag: "选年级",
       selecttitleage: "选时间",
-      teacherRoles:"",
+      teacherRoles: "",
       TeacherType: 8,
       TeacherCheackStyle: 2,
       TeacherIdType: 8,
@@ -377,7 +391,7 @@ export default {
           value: "2",
           label: "5~6年级",
           str: "五年级,六年级"
-        },
+        }
       ],
       grades: [
         {
@@ -415,11 +429,11 @@ export default {
           label: "前六天",
           str: "7"
         },
-           {
+        {
           value: "0",
           label: "全部",
           str: "0"
-        },
+        }
       ],
       filters: {
         //超级管理员的当天数据
@@ -432,14 +446,14 @@ export default {
         pageSize: 10,
         count: 100,
         managerId: "",
-        teachertype:8
+        teachertype: 8
       },
       homeworkLIst: {
         pageNo: 1,
         pageSize: 10,
         teacherId: ""
       },
-      CurrthomeworkIdStatus: "",
+      CurrthomeworkIdStatus: ""
     };
   },
   created() {
@@ -475,8 +489,8 @@ export default {
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId: this.managerId || "",
-       type: this.TeacherIdType,
-        selectTime:this.filters.gradesValue,
+        type: this.TeacherIdType,
+        selectTime: this.filters.gradesValue
       });
     },
     //  // 查看老师批改作业列表
@@ -487,20 +501,20 @@ export default {
         maxCreateTime: "",
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize,
-         selectTime:this.filters.gradesValue,
+        selectTime: this.filters.gradesValue
       });
     },
-       //  // 查看老师批改作业列表
+    //  // 查看老师批改作业列表
     async TeacherHomeworkFenye() {
       this.$store.dispatch("GetTeacherHomeworkListForChecker", {
-        teacherId:this.homeworkLIst.teacherId,
+        teacherId: this.homeworkLIst.teacherId,
         maxCreateTime: "",
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize,
-         selectTime:this.filters.gradesValue,
+        selectTime: this.filters.gradesValue
       });
     },
-     WatchApporvalhandleSizeChange(val) {
+    WatchApporvalhandleSizeChange(val) {
       this.filters.pageSize = val;
       this.InfoWatch();
     },
@@ -509,7 +523,7 @@ export default {
       this.filters.pageNo = val;
       this.InfoWatch();
     }, // 分页
-      WatchHomrworkleSizeChange(val) {
+    WatchHomrworkleSizeChange(val) {
       this.homeworkLIst.pageSize = val;
       this.TeacherHomeworkFenye();
     },
@@ -527,7 +541,7 @@ export default {
         originTeacherId: this.homeworkLIst.teacherId
       });
     },
- 
+
     // 查看老师详情信息
     async GetTeacherInfo(v) {
       this.$store.dispatch("GetTeacherDetail", {
@@ -553,7 +567,7 @@ export default {
       let _this = this;
       // scroll= (window).scrollTop();
       // $ ( ‘html’ ).css({ ‘overflow’ : ’hidden’ , ’position’: ’fixed’, ’top’: ’- ‘+scroll+’px’})
-     if (str == 3) {
+      if (str == 3) {
         this.TeacherIdStatus = v.status;
         this.TeacherIds = v.teacherId;
         this.TeacherName = v.name;
@@ -565,7 +579,7 @@ export default {
     //关闭弹框
     allShowModel(str) {
       let _this = this;
-      if  (str == 1) {
+      if (str == 1) {
         _this.ModelAppor = false;
       }
     },
@@ -585,32 +599,32 @@ export default {
     },
     // 手动批改
     handApor() {
-       this.isDown = false;
+      this.isDown = false;
       this.TeacherType = 8;
       this.TeacherCheackStyle = 2;
       this.TeacherIdType = 8;
       this.Activeindex = false;
       this.filters.pageNo = 1;
-      this.filters.OptionsValue = '';
-      this.filters.gradesValue = '';
-      this.filters.inputValue = '';
-         this.selecttitlepag = '选年级';
-            this.selecttitleage = '选时间';
+      this.filters.OptionsValue = "";
+      this.filters.gradesValue = "";
+      this.filters.inputValue = "";
+      this.selecttitlepag = "选年级";
+      this.selecttitleage = "选时间";
       //  this.showApporAways = false;
       this.InfoWatch();
     },
     // 匹配知识点老师
     AutoApor() {
-        this.isDown = false;
+      this.isDown = false;
       this.TeacherType = 13;
       this.TeacherIdType = 13;
       this.TeacherCheackStyle = 4;
       this.Activeindex = true;
-       this.filters.OptionsValue = '';
-         this.filters.gradesValue = '';
-        this.filters.inputValue = '';
-        this.selecttitlepag = '选年级';
-        this.selecttitleage = '选时间';
+      this.filters.OptionsValue = "";
+      this.filters.gradesValue = "";
+      this.filters.inputValue = "";
+      this.selecttitlepag = "选年级";
+      this.selecttitleage = "选时间";
       // this.showApporAways = true;
       this.filters.pageNo = 1;
       this.InfoWatch();
@@ -623,10 +637,11 @@ export default {
     },
     selectTip(item) {
       this.filters.OptionsValue = item.str;
-      if (this.Activeindex == false){
-          this.InfoWatch();
+      this.isDown = false;
+      if (this.Activeindex == false) {
+        this.InfoWatch();
       }
-       if (this.Activeindex == true){
+      if (this.Activeindex == true) {
         this.InfoWatch();
       }
       this.selecttitlepag = item.label;
@@ -634,11 +649,12 @@ export default {
     },
     selectTipage(item) {
       this.filters.gradesValue = item.str;
-     if (this.Activeindex == false){
-          this.InfoWatch();
+      this.isDown = false;
+      if (this.Activeindex == false) {
+        this.InfoWatch();
       }
-       if (this.Activeindex == true){
-           this.InfoWatch();
+      if (this.Activeindex == true) {
+        this.InfoWatch();
       }
       this.selecttitleage = item.label;
       this.gardeListDownage = false;
@@ -665,9 +681,9 @@ export default {
   watch: {
     getTeacherIdStatus(val, oldVal) {
       //普通的watch监听
-        this.InfoWatch();
+      this.InfoWatch();
     },
-     InfoTeacherstatues(val, oldVal) {
+    InfoTeacherstatues(val, oldVal) {
       //普通的watch监听
       this.pesiorFun();
     },
@@ -1094,7 +1110,7 @@ ul {
   font-size: 24px;
 }
 .model-items-left-top {
-   float:left;
+  float: left;
   display: flex;
   justify-content: space-between;
 }
@@ -1205,7 +1221,7 @@ ul {
   display: inline-block;
   margin-right: 20px;
   margin-bottom: 30px;
-   /* float:left; */
+  /* float:left; */
 }
 .closeTeacherID {
   display: inline-block;
@@ -1220,8 +1236,8 @@ ul {
   cursor: pointer;
   border: 1px solid;
 }
-.OutOnlineTeacherID{
-    display: inline-block;
+.OutOnlineTeacherID {
+  display: inline-block;
   height: 40px;
   width: 140px;
   color: #fff;
@@ -1427,8 +1443,8 @@ ul {
   cursor: pointer;
 }
 .Apporvalactive {
-  background-color: #52cc60!important;
-  color: #fff!important;
+  background-color: #52cc60 !important;
+  color: #fff !important;
 }
 .main-header-numNew {
   display: flex;

src/pages/home/SchoolManager.vue

@@ -27,7 +27,7 @@
               >匹配知识点老师</div>
             </el-col>
             <el-col :span="14" :offset="2">
-                <div class="selectBox">
+              <div class="selectBox">
                 <div
                   class="Ageclass"
                   @click="choiceclass()"
@@ -447,7 +447,7 @@
                 <div>头像</div>
                 <div>姓名</div>
                 <div>被报错</div>
-                <div>纠正次数</div>
+                <!-- <div>纠正次数</div> -->
                 <div>科目</div>
                 <div v-if="this.DayActiveindex == false">批改有效总张数</div>
                 <div v-if="this.DayActiveindex == true">匹配总张数</div>
@@ -465,7 +465,7 @@
                   <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.correctNums}}次</div>
+                  <!-- <div class="tr-active">{{v.correctNums}}次</div> -->
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
@@ -546,22 +546,20 @@
                       ></span>
                     </div>
                   </div>
-                <div class="betown-block">
-              <el-date-picker
-                @change="FindSubjectChartsInfo"
-                v-model="Timevalue"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd"
-                align="right"
-               :picker-options="pickerOptions0"
-              ></el-date-picker>
-            </div>
-
+                  <div class="betown-block">
+                    <el-date-picker
+                      @change="FindSubjectChartsInfo"
+                      v-model="Timevalue"
+                      type="daterange"
+                      range-separator="至"
+                      start-placeholder="开始日期"
+                      end-placeholder="结束日期"
+                      value-format="yyyy-MM-dd"
+                      align="right"
+                      :picker-options="pickerOptions0"
+                    ></el-date-picker>
+                  </div>
                 </div>
-
               </div>
             </el-col>
           </el-col>
@@ -617,7 +615,7 @@
                 <div>头像</div>
                 <div>姓名</div>
                 <div>被报错</div>
-                <div>纠正次数</div>
+                <!-- <div>纠正次数</div> -->
                 <div>科目</div>
                 <div v-if="this.MonthActiveindex == false">批改有效总张数</div>
                 <div v-if="this.MonthActiveindex == true">匹配总张数</div>
@@ -635,7 +633,7 @@
                   <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.correctNums}}次</div>
+                  <!-- <div class="tr-active">{{v.correctNums}}次</div> -->
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
@@ -920,7 +918,7 @@
         <div class="model-manager">
           <div v-if="this.Activeindex == false">批改老师</div>
           <div v-if="this.Activeindex == true">匹配知识点老师</div>
-          <div v-if="this.teacherRoles ==11">(校区管理员)</div>
+          <div v-if="this.teacherRoles ==11">(学习管理员)</div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(3)" />
           </div>
@@ -960,14 +958,6 @@
             批改年级 :
             <span v-for="(v, k) of arrGrade" :key="k">{{v}},</span>
           </div>
-          <!-- <div class="model-items-other model-active">
-            可批改时间:
-            <div class="buttonAppoval">
-              <div class="TeacherApporTime" v-for="(v, k) of arrPeriod" v-show="v" :key="k">
-                <span>{{v}}</span>
-              </div>
-            </div>
-          </div>-->
           <div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
           <div class="model-items-other model-active">上次登录时间 : {{GetTeacherDetail.lastOnlineTime}}</div>
           <div
@@ -982,9 +972,9 @@
             被报错总次数 :
             <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
           </div>
-          <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div>
+          <!-- <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div> -->
           <div
-            class="model-items-other model-active"
+            class="model-items-other"
             v-if="this.Activeindex == false"
           >家长满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
         </div>
@@ -1025,7 +1015,8 @@
   </div>
 </template>
 <script>
-import { IMG_BASE_URL, APPOR_BASE_URL } from "@/ImgConfig";
+// import { IMG_BASE_URL, APPOR_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 import { mapGetters, mapActions } from "vuex";
 import TeamworkScheduling from "@/components/TeamworkScheduling";
 import TeamWorkLists from "@/components/TeamWorkLists";
@@ -1061,20 +1052,20 @@ export default {
       isDown: false,
       gardeListDown: false,
       gardeListDownage: false,
-      TimeCodeListDown:false,
+      TimeCodeListDown: false,
       Activeindex: false,
       DayActiveindex: false,
       MonthActiveindex: false,
       selecttitlepag: "选年级",
       selecttitleage: "选科目",
-      selectTimeCodeValuepag:"选时间",
+      selectTimeCodeValuepag: "选时间",
       TeacherType: 8,
       TeacherCheackStyle: 2,
       TeacherApporvalStyle: 1,
       teacherRoles: "",
-      Timevalue:"",
-      startTime:"",
-      endTime:"",
+      Timevalue: "",
+      startTime: "",
+      endTime: "",
       pickerOptions0: {
         disabledDate(time) {
           return time.getTime() > Date.now() - 8.64e6;
@@ -1120,12 +1111,12 @@ export default {
         },
         {
           value: "3",
-          label: "全部"
-          // str:""
+          label: "全部",
+          str: ""
         }
       ],
-        selectTime: [
-      {
+      selectTime: [
+        {
           value: "1",
           label: "今天",
           str: "1"
@@ -1160,11 +1151,11 @@ export default {
           label: "前六天",
           str: "7"
         },
-           {
+        {
           value: "0",
           label: "全部",
           str: "0"
-        },
+        }
       ],
       ItemList: [
         {
@@ -1196,7 +1187,7 @@ export default {
         orderField: "",
         orderAD: "",
         managerId: "",
-        TimeCodeValue:0
+        TimeCodeValue: 0
       },
       filters1: {
         //超级管理员的当天数据
@@ -1306,7 +1297,7 @@ export default {
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
       if (this.Activeindex == false) {
         this.InfoWatch();
@@ -1396,21 +1387,7 @@ export default {
       // }
       this.TeacherHomework(v);
     },
-    // // 分页
-    // pageChange(val) {
-    //   this.filters.pageNo = val;
-    //   this.itemListReshow();
-    // },
-    // changeDateSlot(dateSlot) {
-    //   if (dateSlot) {
-    //     this.filters.startDate = dateSlot[0];
-    //     this.filters.endDate = dateSlot[1];
-    //   } else {
-    //     this.filters.startDate = null;
-    //     this.filters.endDate = null;
-    //   }
-    // },
-     // 数据列表
+    // 数据列表
     async FindSubjectChartsInfo() {
       let arr = this.Timevalue;
       if (this.Timevalue.length > 0) {
@@ -1419,11 +1396,11 @@ export default {
           this.endTime = arr[1];
         }
       }
-       if (this.MonthActiveindex == false)  {
-        this.InfoWatchMoth()
+      if (this.MonthActiveindex == false) {
+        this.InfoWatchMoth();
       }
       if (this.MonthActiveindex == true) {
-        this.InfoKonwTeacherMonthApprvalList()
+        this.InfoKonwTeacherMonthApprvalList();
       }
     },
     // 获取校区管理员监控数据
@@ -1437,7 +1414,7 @@ export default {
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId: this.managerId || "",
-        timeType:this.filters.TimeCodeValue
+        timeType: this.filters.TimeCodeValue
       });
     },
     // 获取校区管理员当天数据
@@ -1477,7 +1454,7 @@ export default {
         maxCreateTime: "",
         pageNo: 1,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
     },
     // 去分配前刷新老师批改作业列表
@@ -1487,7 +1464,7 @@ export default {
         maxCreateTime: "",
         pageNo: 1,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
     },
     // 分页查看老师批改作业列表
@@ -1497,7 +1474,7 @@ export default {
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        timeType: this.filters.TimeCodeValue
       });
     },
     // 可分配老师列表
@@ -1629,7 +1606,7 @@ export default {
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId: this.managerId || "",
-          selectTime:this.filters.TimeCodeValue
+        timeType: this.filters.TimeCodeValue
       });
     },
     // 当天数据手动批改
@@ -1677,7 +1654,7 @@ export default {
       this.filters2.pageNo = 1;
       this.filters2.MaxtimeValue = "";
       this.filters2.inputValue = "";
-      this.Timevalue = ''
+      this.Timevalue = "";
       //  this.showApporAways = false;
       this.InfoWatchMoth();
     },
@@ -1688,7 +1665,7 @@ export default {
       this.filters2.MaxtimeValue = "";
       this.filters2.inputValue = "";
       this.filters2.pageNo = 1;
-      this.Timevalue = ''
+      this.Timevalue = "";
       this.InfoKonwTeacherMonthApprvalList();
     },
     // 当月数据匹配知识点老师
@@ -1702,7 +1679,7 @@ export default {
         pageNo: this.filters2.pageNo,
         pageSize: this.filters2.pageSize,
         managerId: this.managerId || "",
-             startTime: this.startTime,
+        startTime: this.startTime,
         endTime: this.endTime
       });
     },
@@ -2056,14 +2033,15 @@ export default {
     outStyle() {
       this.gardeListDown = false;
     },
-      selectStyle2() {
+    selectStyle2() {
       this.TimeCodeListDown = true;
     },
     outStyle2() {
       this.TimeCodeListDown = false;
     },
-     timeselectTip(item) {
+    timeselectTip(item) {
       this.filters.TimeCodeValue = item.str;
+      this.isDown = false;
       if (this.Activeindex == false) {
         this.InfoWatch();
       }
@@ -2075,6 +2053,7 @@ export default {
     },
     selectTip(item) {
       this.filters.OptionsValue = item.str;
+      this.isDown = false;
       if (this.Activeindex == false) {
         this.InfoWatch();
       }
@@ -2086,6 +2065,7 @@ export default {
     },
     selectTipage(item) {
       this.filters.gradesValue = item.str;
+      this.isDown = false;
       if (this.Activeindex == false) {
         this.InfoWatch();
       }
@@ -2113,9 +2093,6 @@ export default {
   },
   mounted() {
     this.InfoWatch();
-    // this.getsetDictByType2();
-    // this.getUserNameList();
-    // this.itemListReshow();
   }
 };
 </script>
@@ -2167,7 +2144,7 @@ ul {
   display: inline-block;
 }
 .betown-block {
-  float:right;
+  float: right;
 }
 el-table {
   color: #999999;
@@ -2637,7 +2614,7 @@ el-table {
   top: 15%;
   cursor: pointer;
 }
-.Dayinput-with-Allot{
+.Dayinput-with-Allot {
   border: #b6b6b6;
   border-radius: 20px;
   height: 40px;
@@ -2757,10 +2734,13 @@ el-table {
   background-color: #52cc60;
   color: #fff;
 }
-.el-date-editor--daterange.el-input, .el-date-editor--daterange.el-input__inner, .el-date-editor--timerange.el-input, .el-date-editor--timerange.el-input__inner {
-    width: 300px!important;
+.el-date-editor--daterange.el-input,
+.el-date-editor--daterange.el-input__inner,
+.el-date-editor--timerange.el-input,
+.el-date-editor--timerange.el-input__inner {
+  width: 300px !important;
 }
 .el-date-editor .el-range-separator {
-    padding: 5px 20px 0px 10px!important;
+  padding: 5px 20px 0px 10px !important;
 }
 </style>

src/pages/home/TeacherApporval.vue

@@ -1,32 +1,31 @@
 <template>
-  <div> 
-  </div>
+  <div></div>
 </template>
 <script>
-import { IMG_BASE_URL,APPOR_BASE_URL } from '@/ImgConfig'
-  export default {
-    name: "model",
-    components: {},
-    props: {},
-    data() {
-      return {
-        APPOR_BASE_URL:APPOR_BASE_URL,
-      unionid:localStorage.getItem("unionid"),
-      };
-    },
-    created() {
-    this.toAppovalIng()
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+export default {
+  name: "model",
+  components: {},
+  props: {},
+  data() {
+    return {
+      APPOR_BASE_URL: APPOR_BASE_URL,
+      unionid: localStorage.getItem("unionid")
+    };
   },
-    watch: {},
-    computed: {},
-    methods: {
-      toAppovalIng(){
-            window.open(APPOR_BASE_URL + '?unionid=' + this.unionid + '&state=' + 1)
-              console.log(APPOR_BASE_URL + '?unionid=' + this.unionid + '&state=' + 1)
-      }
-    },
-    mounted() {}
-  };
+  created() {
+    this.toAppovalIng();
+  },
+  watch: {},
+  computed: {},
+  methods: {
+    toAppovalIng() {
+      window.open(APPOR_BASE_URL + "?unionid=" + this.unionid + "&state=" + 1);
+      console.log(APPOR_BASE_URL + "?unionid=" + this.unionid + "&state=" + 1);
+    }
+  },
+  mounted() {}
+};
 </script>
 
 <!-- Add "scoped" attribute to limit CSS to this component only -->

src/pages/home/TeacherPay.vue

@@ -2,16 +2,14 @@
 <template>
   <div>
     <!-- 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"  class="main">
-        <el-row :gutter="20"  class="main-header">
+    <el-row :gutter="20" class="main-items">
+      <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;">{{errorWarningList.allErrorCount}}次</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">
@@ -21,16 +19,20 @@
                 <div>时间</div>
                 <div>学生</div>
                 <div>科目</div>
-                 <div style="margin-left:40px;">查看报错详情</div>
+                <div style="margin-left:40px;">查看报错详情</div>
               </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 class="tr-seconds">
+                    <span
+                      @click="groupDetail(v)"
+                      style="cursor: pointer;"
+                      class="tr-second-check"
+                    >查看详情</span>
+                  </div>
                 </div>
               </div>
             </div>
@@ -40,7 +42,7 @@
               @size-change="handleSizeChange1"
               @current-change="pageChange1"
               :page-sizes="[10]"
-             layout="total, prev, pager, next"
+              layout="total, prev, pager, next"
               :total="parseInt(errorWarningList.pages)"
               :hide-on-single-page="true"
             ></el-pagination>
@@ -49,83 +51,76 @@
         </el-row>
       </el-col>
     </el-row>
-      <div class="showModel" @click="updateIsShowCarouselPictureModal()" v-if="NoAllotManagerModel">
-            <div class="modal-cancel" @click="updateIsShowCarouselPictureModal()">X</div>
-            <div class="detailinfo">
-              <div class="detailImg">
-                <img  :src="BASE_URL + errorDetailList[0].pictureUrl"  alt="">
-              </div>
-              <div class="detailword">
-                <div>
-                  <h1 class="tipsesson">错误原因:</h1>
-                  <span class="tipsessonWord">
-                       {{errorDetailList[0].errorReason}}
-                      </span>
-                </div>
-                <div class="timeAndteacher">
-                  <h2 class="managertip">{{errorDetailList[0].checker}}</h2>
-                  <div class="timeset">{{errorDetailList[0].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;">
+    <div class="showModel" @click="updateIsShowCarouselPictureModal()" v-if="NoAllotManagerModel">
+      <div class="modal-cancel" @click="updateIsShowCarouselPictureModal()">X</div>
+      <div class="detailinfo">
+        <div class="detailImg">
+          <img :src="BASE_URL + errorDetailList[0].pictureUrl" alt />
+        </div>
+        <div class="detailword">
+          <div>
+            <h1 class="tipsesson">错误原因:</h1>
+            <span class="tipsessonWord">{{errorDetailList[0].errorReason}}</span>
+          </div>
+          <div class="timeAndteacher">
+            <h2 class="managertip">{{errorDetailList[0].checker}}</h2>
+            <div class="timeset">{{errorDetailList[0].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;">
+          </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;">
+          </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>
       </div>
+    </div>
   </div>
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
-import { IMG_BASE_URL } from '@/ImgConfig'
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 export default {
   components: {},
   name: "actvResolveLabel",
   props: {},
   data() {
     return {
-         BASE_URL:IMG_BASE_URL,
-       accessToken:localStorage.getItem("accessToken"), 
-       NoAllotManagerModel:false,//token
-       filters1: {
+      BASE_URL: IMG_BASE_URL,
+      accessToken: localStorage.getItem("accessToken"),
+      NoAllotManagerModel: false, //token
+      filters1: {
         pageNo: 1,
-        pageSize: 10,
+        pageSize: 10
       },
-      pictureIndex:0
+      pictureIndex: 0
     };
   },
-  created(){
-  },
-  watch:{
-    },
+  created() {},
+  watch: {},
   computed: {
-    ...mapGetters([
-      "errorWarningList",
-      "errorDetailList",
-    ])
+    ...mapGetters(["errorWarningList", "errorDetailList"])
   },
   methods: {
     ...mapActions(["setUser"]),
-       // 去批改前分配老师
+    // 去批改前分配老师
     async GeterrorWarningLists() {
       this.$store.dispatch("GeterrorWarning", {
         pageNo: this.filters1.pageNo,
@@ -133,45 +128,45 @@ export default {
         accessToken: this.accessToken
       });
     },
-       handleSizeChange1(val) {
+    handleSizeChange1(val) {
       this.filters1.pageSize = val;
       this.GeterrorWarningLists();
     },
-      pageChange1(val) {
+    pageChange1(val) {
       this.filters1.pageNo = val;
       this.GeterrorWarningLists();
     },
-    updateIsShowCarouselPictureModal(){
-        this.NoAllotManagerModel = false
+    updateIsShowCarouselPictureModal() {
+      this.NoAllotManagerModel = false;
     },
-      //报错详情
-      groupDetail(str){
-        this.pictureIndex = 0
-        this.NoAllotManagerModel = true
-          this.$store.dispatch("GeterrorDetail", {
+    //报错详情
+    groupDetail(str) {
+      this.pictureIndex = 0;
+      this.NoAllotManagerModel = true;
+      this.$store.dispatch("GeterrorDetail", {
         pictureId: str.pictureId,
-        accessToken:this.accessToken
+        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
-        // }
-      }
+    },
+    // 下一页
+    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() {
-     console.log( this.pictureIndex)
+    console.log(this.pictureIndex);
     this.GeterrorWarningLists();
   }
 };
@@ -185,144 +180,144 @@ export default {
   position: fixed;
   top: 0;
   left: 0;
- background-color : rgba(5, 5, 5, 0.5);
-  opacity: 1!important;
-  overflow: hidden!important;
+  background-color: rgba(5, 5, 5, 0.5);
+  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-color : rgba(66, 56, 56, 0.5);
-      border-radius: 100px;
-      font-size: 16;
-      color:#eee;
-      cursor: pointer;
-    }
-    .detailinfo{
-      position: absolute;
-      left:50%;
-      margin-left:-650px;
-      top: 10%;
-      width: 1300px;
-      height: 1000px;
-      /* background: #eee; */
-      text-align: center;
-      line-height: 50px;
-      border-radius: 100px;
-      font-size: 16;
-      z-index:9999;
-          opacity: 1!important;
-      color:#000000;
-     padding:50px!important;
-    }
-    .detailImg{
-        background: #000000;
-      position: absolute;
-      left:0;
-      top: 20px;
-      width: 600px;
-      height: 700px;
-      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: 600px;
-      height: 700px;
-      text-align: center;
-      line-height: 50px;
-      border-radius: 15px;
-      font-size: 16;
-      color:#000000;
-       opacity: 1!important;
-      /* cursor: pointer; */
-    }
-   .detailImg img{
-      width: 600px;
-      height: 700px;
-       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;
-   }
-   .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color:#52cc60!important;
-    color: #fff;
+.modal-cancel {
+  position: absolute;
+  top: 20px;
+  right: 40px;
+  width: 50px;
+  height: 50px;
+  text-align: center;
+  line-height: 50px;
+  background-color: rgba(66, 56, 56, 0.5);
+  border-radius: 100px;
+  font-size: 16;
+  color: #eee;
+  cursor: pointer;
+}
+.detailinfo {
+  position: absolute;
+  left: 50%;
+  margin-left: -650px;
+  top: 10%;
+  width: 1300px;
+  height: 1000px;
+  /* background: #eee; */
+  text-align: center;
+  line-height: 50px;
+  border-radius: 100px;
+  font-size: 16;
+  z-index: 9999;
+  opacity: 1 !important;
+  color: #000000;
+  padding: 50px !important;
+}
+.detailImg {
+  background: #000000;
+  position: absolute;
+  left: 0;
+  top: 20px;
+  width: 600px;
+  height: 700px;
+  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: 600px;
+  height: 700px;
+  text-align: center;
+  line-height: 50px;
+  border-radius: 15px;
+  font-size: 16;
+  color: #000000;
+  opacity: 1 !important;
+  /* cursor: pointer; */
+}
+.detailImg img {
+  width: 600px;
+  height: 700px;
+  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;
+}
+.el-pagination.is-background .el-pager li:not(.disabled).active {
+  background-color: #52cc60 !important;
+  color: #fff;
 }
 html,
 body {
   height: 100%;
   overflow: hidden;
 }
-ul{
+ul {
   text-align: center;
-  margin: 0 !important
+  margin: 0 !important;
 }
 .aside {
   /* background-color: #fbfbfb; */
@@ -334,7 +329,7 @@ ul{
   background-color: #fff;
   margin: 16px;
   padding: 0 !important;
-  margin-left:180px;
+  margin-left: 180px;
   min-height: 980px;
 }
 .table-aside {
@@ -377,14 +372,14 @@ el-table {
 .input-with-select .el-input-group__prepend {
   background-color: #fff;
 }
-.input-with-new{
-  border:1px solid #cccccc;
-  border-radius:15px;
+.input-with-new {
+  border: 1px solid #cccccc;
+  border-radius: 15px;
   height: 30px;
-  line-height:30px;
-  padding:10px;
+  line-height: 30px;
+  padding: 10px;
   font-size: 12px;
-  color:#eeeeee;
+  color: #eeeeee;
   width: 180px;
 }
 .active {
@@ -408,7 +403,7 @@ el-table {
   margin: 0 43px;
 }
 .table-head {
-   margin-right:6%;
+  margin-right: 6%;
   color: #999999;
   font-size: 18px;
   text-align: center;
@@ -416,7 +411,7 @@ el-table {
   justify-content: space-around;
 }
 .table-heads {
-  margin-left:15%;
+  margin-left: 15%;
   width: 60%;
   color: #3ab548;
   font-size: 14px;
@@ -435,11 +430,11 @@ el-table {
   color: #393939;
   text-align: center;
   /* font-weight: 700; */
-   font-family:"PingFang-SC-Bold";
+  font-family: "PingFang-SC-Bold";
   font-size: 16px;
 }
 .tr-first {
-  margin-right:2%;
+  margin-right: 2%;
   display: flex;
   justify-content: space-around;
 }

src/pages/super/CheckTeacherPay.vue

@@ -255,7 +255,7 @@
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 export default {
   components: {},
   name: "actvResolveLabel",

src/pages/super/ComposeType.vue

@@ -14,7 +14,11 @@
       </el-col>
       <!--排班表-->
       <!-- {{NextOrNewMonthStatus.NextOrNewMonthStatus}} -->
-      <el-col  :span="17" class="main" v-if="modelindex == 0 && NextOrNewMonthStatus.NextOrNewMonthStatus == false">
+      <el-col
+        :span="17"
+        class="main"
+        v-if="modelindex == 0 && NextOrNewMonthStatus.NextOrNewMonthStatus == false"
+      >
         <el-row :gutter="20">
           <!-- {{NextOrNewMonthStatus}} -->
           <el-col :span="8" :offset="2">
@@ -66,18 +70,19 @@
             <!-- {{DutyTemplateListSTUS}} -->
           </el-col>
           <el-col :span="8" class="month">
-            <div v-if="FindCalendarList.isNextMonth ==1"
+            <div
+              v-if="FindCalendarList.isNextMonth ==1"
               @click="shoeNextOrlastMOntlist(1)"
               class="NextMonthList"
             >
               查看下月排班情况
               <span class="el-icon-arrow-right"></span>
             </div>
-             <div v-if="FindCalendarList.isNextMonth ==0"
+            <div
+              v-if="FindCalendarList.isNextMonth ==0"
               class="NextMonthList"
-            >
-              25号至月底前一天可查看老师下月排班
-            </div>
+              style="width:300px;"
+            >25号至月底前一天可查看老师下月排班</div>
           </el-col>
         </el-row>
         <el-row :gutter="24">
@@ -160,11 +165,11 @@
                     >
                       <!-- {{FindCalendarList}} -->
                       <div class="date-day">{{ item.date }}</div>
-                        <div class="people" v-if="item.dateList.isOpen ==0">
-                               <div class="people-items">
-                            <div style="color:#999999" class="people-items-text"> 不开放</div>
-                          </div>
+                      <div class="people" v-if="item.dateList.isOpen ==0">
+                        <div class="people-items">
+                          <div style="color:#999999" class="people-items-text">不开放</div>
                         </div>
+                      </div>
                       <div class="people" v-if="item.dateList.isOpen ==1">
                         <div class="people-items">
                           <div class="people-items-num">{{item.dateList.miniNum}}</div>
@@ -255,7 +260,7 @@
         </el-row>
       </el-col>
       <!-- 下个月排班实施动态 -->
-      <NextMonthList   v-if="modelindex == 0 && NextOrNewMonthStatus.NextOrNewMonthStatus == true"></NextMonthList>
+      <NextMonthList v-if="modelindex == 0 && NextOrNewMonthStatus.NextOrNewMonthStatus == true"></NextMonthList>
     </el-row>
     <!-- 添加移除老师弹框 -->
     <div class="showModel" @click="allShowModel(3)" v-if="isApporTeacher"></div>
@@ -302,7 +307,10 @@
           <div class="abbTeachers" @click="showAddTeacherModel">
             <span class="addLogicon">+</span> 添加老师
           </div>
-          <div class="scrollBox" v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length >0">
+          <div
+            class="scrollBox"
+            v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length >0"
+          >
             <div
               class="tr-set"
               :class="{BgcColor:index%2 !== 1}"
@@ -322,15 +330,12 @@
               <div v-if="item.isEdit==0" class="NoButtonhole"></div>
             </div>
           </div>
-            <div class="scrollBox" v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length <=0">
-            <div class="tr-set">
-              暂无可移除老师！
-            </div>
+          <div
+            class="scrollBox"
+            v-if="FindHaveTeacherList.list && FindHaveTeacherList.list.length <=0"
+          >
+            <div class="tr-set">暂无可移除老师！</div>
           </div>
-          <!-- <div class="btsnius">
-            <div class="yesBtn">确定</div>
-            <div class="closeBtn">取消</div>
-          </div>-->
         </div>
       </div>
     </div>
@@ -368,7 +373,10 @@
             <div class="tr-secon1">在岗率</div>
             <div class="tr-secon1" style="width:30%;">当月已选时段</div>
           </div>
-          <div class="scrollBox" v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length >0">
+          <div
+            class="scrollBox"
+            v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length >0"
+          >
             <div
               class="tr-setMargin"
               :class="{BgcColor:index%2 !== 1}"
@@ -400,8 +408,11 @@
               </div>
             </div>
           </div>
-           <div class="scrollBox" v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length <=0">
-              <span>暂无可添加老师！</span>
+          <div
+            class="scrollBox"
+            v-if="FindNoHaveTeacherList.list && FindNoHaveTeacherList.list.length <=0"
+          >
+            <span>暂无可添加老师！</span>
           </div>
           <div class="btsnius">
             <div @click="GetAddArrangeByTeacherStatus()" class="yesBtn">确定</div>
@@ -436,7 +447,7 @@
 <script>
 import { mapGetters, mapActions } from "vuex";
 import NextMonthList from "@/components/NextMonthList.vue";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 import { Message } from "element-ui";
 export default {
   components: { NextMonthList },
@@ -584,8 +595,8 @@ export default {
     NextOrNewMonthStatus(val, oldVal) {
       // debugger
       //排班列表请求成功的watch监听回调
-     this.GetFindCalendarListInfo()
-    },
+      this.GetFindCalendarListInfo();
+    }
   },
   // ,'homeworkRecoveryList'
   computed: {
@@ -617,9 +628,9 @@ export default {
     // 切换下月当月排班表
     shoeNextOrlastMOntlist(str) {
       if (str == 1) {
-          this.$store.dispatch("NextOrNewMonthAction", {
-          NextOrNewMonthStatus:true ,
-      });
+        this.$store.dispatch("NextOrNewMonthAction", {
+          NextOrNewMonthStatus: true
+        });
       }
     },
     //弹框
@@ -711,9 +722,6 @@ export default {
       var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
       var seconds = Math.round(leave3 / 1000);
       return hours;
-      // console.log(" 相差" + dayDiff + "天" + hours + "小时 " + minutes + "分钟" + seconds + " 秒")
-      // console.log(dateDiff + "时间差的毫秒数",dayDiff + "计算出相差天数",leave1 + "计算天数后剩余的毫秒数"
-      //     ,hours + "计算出小时数",minutes + "计算相差分钟数",seconds + "计算相差秒数");
     },
     DaytimeFn(d1) {
       //di作为一个变量传进来
@@ -738,7 +746,7 @@ export default {
       this.$store.dispatch("GetFindCalendarList", {
         type: this.filters.OptionsValue,
         subject: this.filters.gradesValue,
-        month:""
+        month: ""
       });
     },
     // 选中时段老师列表
@@ -1047,13 +1055,10 @@ export default {
 
       this.calendarList = list;
       this.setCalendarList = setList;
-        console.log(1111111111111111111111111111111111111111)
-      console.log(this.calendarList)
-       console.log(22222222222222222222222222222222222222222222)
     },
     // 排班点击
     classSet(k, d, m, intervalList) {
-      console.log(k, d, m);
+      // console.log(k, d, m);
       this.month = m + 1;
       this.today = d;
       for (var i in this.calendarList) {
@@ -1074,8 +1079,8 @@ export default {
     // debugger
     sessionStorage.setItem("tabIndex", 5);
     this.$store.dispatch("NextOrNewMonthAction", {
-          NextOrNewMonthStatus:false ,
-      });
+      NextOrNewMonthStatus: false
+    });
   }
 };
 </script>
@@ -1705,7 +1710,7 @@ line-height:25px; */
   cursor: pointer;
 }
 .model-btn-items-save {
-  margin-top:30px;
+  margin-top: 30px;
   width: 120px;
   height: 40px;
   line-height: 40px;
@@ -1732,7 +1737,7 @@ line-height:25px; */
   top: 0;
 }
 .NextMonthList {
-  float:right;
+  float: right;
   cursor: pointer;
   margin-top: 20px;
   width: 250px;

src/pages/super/HomeWorkPictrue.vue

@@ -0,0 +1,241 @@
+<!-- 活动解析 -->
+<template>
+  <div>
+    <!-- table 表格 -->
+    <el-row :gutter="20" class="main-items">
+      <el-col :span="20" class="main" :offset="2">
+        <el-row>
+          <el-col :span="20" class :offset="2">
+            <div class="studentInfo">
+              <span class="studentName">{{StudentHomeworkDetail.name}}同学/{{StudentHomeworkDetail.subject}}作业</span>
+              <span v-if="StudentHomeworkDetail.status ==1" style="color:#52cc60;">/未分配</span>
+               <span v-if="StudentHomeworkDetail.status ==2" style="color:#52cc60;">/已分配未批改</span>
+             <span v-if="StudentHomeworkDetail.status ==2" style="color:#52cc60;">/批改中</span>
+              <br />
+              <span class="timeInfo">{{StudentHomeworkDetail.statusTime}}开始匹配</span>
+            </div>
+          
+          </el-col>
+          <el-col :span="20" class :offset="2">
+            <div class="topLine"></div>
+          </el-col>
+          <el-col :span="20" class :offset="2">
+              <!-- {{StudentHomeworkDetail}} -->
+            <div class="beginPictrue">
+              <div class="studentName">原图</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomeworkDetail.originPicList" :key="k">
+                    <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />
+                </li>
+              </ul>
+            </div>
+          </el-col>
+          <el-col :span="20" class :offset="2">
+            <div class="beginPictrue">
+              <div class="studentName">批改图片</div>
+              <ul>
+                <li class="picLists" @click="pictrueAddView(v)" v-for="(v, k) of StudentHomeworkDetail.correctPicList" :key="k">
+                   <img :src="BASE_URL + v.url" alt class="table-img pictrueStyle" v-if="v.url"  />
+                    <img src="../../assets/img/attt.png" alt v-if="v.url ==''"  class="table-img pictrueStyle"/>
+                  <div v-if="v.type ==21" class="TeacherWords">已分配给其他老师</div>
+                   <div v-if="v.type ==20"  class="TeacherWords">作文有评语</div>
+                  <!-- 模糊 -->
+                  <img v-if="v.type ==1" class="logoPic" src="../../assets/img/Mohu (1).png" />
+                  <!-- 不全 -->
+                  <img v-if="v.type ==3" class="logoPic" src="../../assets/img/Reless (3).png" />
+                  <!-- 登记 -->
+                  <img  v-if="v.type ==22" class="logoPic" src="../../assets/img/sigin (3).png" />
+                  <!-- 补拍 -->
+                  <img v-if="v.type ==2" class="logoPic" src="../../assets/img/ReCamrea (1).png" />
+                  <!-- 不批改 -->
+                  <img v-if="v.type ==10" class="logoPic" src="../../assets/img/NoReset (1).png" />-->
+                </li>
+              </ul>
+            </div>
+          </el-col>
+            <el-col :span="20" class :offset="2">
+            <div style="margin-top:200px; text-align:center;">
+              <el-button @click="routerback()" type="success" round>返回</el-button>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+    <!-- 升级校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(1)" v-if="PictruePush"></div>
+    <div class="modelspec" v-if="PictruePush">
+      <div class="detaillogo">
+        <img src="../../assets/img/del@2x.png" alt @click="allShowModel(1)" />
+      </div>
+      <img class="LargepictrueStyle" :src="BASE_URL + this.PrewPictrue " />
+    </div>
+  </div>
+</template>
+<script>
+import { mapGetters, mapActions } from "vuex";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
+export default {
+  components: {},
+  name: "",
+  props: {},
+  data() {
+    return {
+      BASE_URL: IMG_BASE_URL,
+      PictruePush: false,
+      PrewPictrue:""
+    };
+  },
+  created() {},
+  methods: {
+    pictrueAddView(v) {
+        this.PrewPictrue = v.url
+      this.PictruePush = true;
+    },
+        // 回退
+    routerback() {
+      this.$router.back(-1);
+    },
+    //关闭弹框
+    allShowModel(str) {
+      let _this = this;
+      if (str == 1) {
+        _this.PictruePush = false;
+      }
+    }
+  },
+  watch: {},
+  mounted() {},
+  computed: {
+    ...mapGetters(["StudentHomeworkDetail"])
+  }
+};
+</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;
+}
+
+.topLine {
+  width: 100%;
+  background-color: rgba(207, 204, 204, 0.815);
+  height: 1px;
+}
+.picLists {
+  position: relative;
+}
+.TeacherWords {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  width: 100%;
+  height: 30px;
+  background: #000000;
+  text-align: center;
+  line-height: 30px;
+  opacity: 0.6;
+  color: #ffff;
+  font-size: 8px;
+}
+.logoPic {
+  position: absolute;
+  top: 0;
+  right: 0;
+}
+.userstyle {
+  width: 50px;
+  height: 50px;
+  border-radius: 25px;
+}
+.studentInfo {
+  display: inline-block;
+  float: left;
+  /* height: 70px; */
+  margin-top: 30px;
+  text-align: left;
+}
+.loginMock {
+  color: #333333;
+  font-size: 14px;
+  display: inline-block;
+  float: right;
+  margin-top: 30px;
+}
+.timeInfo {
+  color: #999999;
+  font-size: 14px;
+}
+.studentName {
+  font-size: 18px;
+  color: black;
+  width: 120px;
+  text-align: left;
+}
+.pictrueStyle {
+  width: 120px;
+  height: 120px;
+  border-radius: 5px;
+}
+.beginPictrue ul li {
+  float: left;
+  margin: 15px 20px 15px 0px;
+  cursor: pointer;
+}
+.showModel {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  background: #000000;
+  opacity: 0.2;
+  overflow: hidden;
+  z-index: 1000;
+  color: #fff;
+}
+.modelspec {
+  margin: 0 auto;
+}
+.LargepictrueStyle {
+  width: 100%;
+  height: 100%;
+  border-radius: 5px;
+}
+.modelspec {
+  z-index: 10000;
+  width: 70%;
+  height: 600px;
+  height: auto;
+  position: fixed;
+  top: 10%;
+  left: 15%;
+  bottom: 10%;
+  margin: auto;
+  border-radius: 10px;
+  text-align: center;
+}
+.detaillogo {
+  position: fixed;
+  top: 5%;
+  right: 13%;
+  cursor: pointer;
+}
+</style>

src/pages/super/HomeworkRecycle.vue

@@ -140,7 +140,7 @@
 </template>
 <script>
   import { mapGetters, mapActions } from "vuex";
-  import { IMG_BASE_URL } from '@/ImgConfig'
+ import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
   export default {
     components: { },
     name: "actvResolveLabel",

src/pages/super/HomeworkTotally.vue

@@ -50,7 +50,7 @@
 <script>
 import { mapGetters, mapActions } from "vuex";
 import HomeworkTotalList from "@/components/HomeworkTotalList";
-import { IMG_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 export default {
   components: {
     HomeworkTotalList

src/pages/super/SchoolManager.vue

@@ -26,27 +26,27 @@
             >匹配知识点老师</div>
           </el-col>
           <el-col :span="14" :offset="1">
-                 <div class="selectBox">
-                <div
-                  class="Ageclass"
-                  @click="choiceclass()"
-                  @mouseover="selectStyle2()"
-                  @mouseout="outStyle2()"
-                >
-                  <span class="age-tip">{{selectTimeCodeValuepag}}</span>
-                  <span :class="[TimeCodeListDown ?'el-icon-caret-top':'el-icon-caret-bottom']"></span>
-                </div>
-                <div
-                  class="class-download"
-                  v-show="TimeCodeListDown"
-                  @mouseover="selectStyle2()"
-                  @mouseout="outStyle2()"
-                >
-                  <ul v-for="(item, k) in selectTime" :key="k">
-                    <li @click="timeselectTip(item)">{{item.label}}</li>
-                  </ul>
-                </div>
+            <div class="selectBox">
+              <div
+                class="Ageclass"
+                @click="choiceclass()"
+                @mouseover="selectStyle2()"
+                @mouseout="outStyle2()"
+              >
+                <span class="age-tip">{{selectTimeCodeValuepag}}</span>
+                <span :class="[TimeCodeListDown ?'el-icon-caret-top':'el-icon-caret-bottom']"></span>
+              </div>
+              <div
+                class="class-download"
+                v-show="TimeCodeListDown"
+                @mouseover="selectStyle2()"
+                @mouseout="outStyle2()"
+              >
+                <ul v-for="(item, k) in selectTime" :key="k">
+                  <li @click="timeselectTip(item)">{{item.label}}</li>
+                </ul>
               </div>
+            </div>
             <div class="selectBox">
               <div
                 class="Ageclass"
@@ -97,8 +97,16 @@
                   v-model="filters.inputValue"
                   class="miniorinput-with-Allot"
                 />
-                  <span v-if="this.Activeindex == false" @click="InfoWatch()" class="miinorSeachIcon el-icon-search"></span>
-                     <span v-if="this.Activeindex == true" @click="InfoKonwTeacherWatchList()" class="miinorSeachIcon el-icon-search"></span>
+                <span
+                  v-if="this.Activeindex == false"
+                  @click="InfoWatch()"
+                  class="miinorSeachIcon el-icon-search"
+                ></span>
+                <span
+                  v-if="this.Activeindex == true"
+                  @click="InfoKonwTeacherWatchList()"
+                  class="miinorSeachIcon el-icon-search"
+                ></span>
               </div>
             </div>
           </el-col>
@@ -285,25 +293,25 @@
                     >
                       <span>{{v.checkCount}}</span>
                       <span style="color:#bbbbbb;">/{{v.picTotal}}</span>
-                      <el-button type="info"    @click="CheackHomeworkStatus(v)">
-                        <span
-                          href
-                          style="text-decoration:none;color:#ffffff;"
-                        >已检查</span>
+                      <el-button type="info" @click="CheackHomeworkStatus(v)">
+                        <span href style="text-decoration:none;color:#ffffff;">已检查</span>
                       </el-button>
-                      <span v-if="v.wrongCount > 0" style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
-                         <span  v-if="v.wrongCount == 0" style="color:#fbfbfb;font-size:12px;">报错{{v.wrongCount}}</span>
+                      <span
+                        v-if="v.wrongCount > 0"
+                        style="color:red;font-size:12px;"
+                      >报错{{v.wrongCount}}</span>
+                      <span
+                        v-if="v.wrongCount == 0"
+                        style="color:#fbfbfb;font-size:12px;"
+                      >报错{{v.wrongCount}}</span>
                     </div>
                     <div
                       class="tr-sw180"
                       v-if="v.status === 3 && v.isCheck ===0"
                       style="width: 25%"
                     >
-                      <el-button type="warning"     @click="CheackHomeworkStatus(v)">
-                        <span
-                          href
-                          style="text-decoration:none;color:#ffffff;"
-                        >去检查</span>
+                      <el-button type="warning" @click="CheackHomeworkStatus(v)">
+                        <span href style="text-decoration:none;color:#ffffff;">去检查</span>
                       </el-button>
                     </div>
                   </div>
@@ -382,8 +390,16 @@
                         v-model="filters1.inputValue"
                         class="Dayinput-with-Allot"
                       />
-                     <span v-if="this.DayActiveindex == false" @click="InfoWatchDay()" class="DaySeachIcon el-icon-search"></span>
-                         <span v-if="this.DayActiveindex == true" @click="InfoKonwTeacherDayApprvalList()" class="DaySeachIcon el-icon-search"></span>
+                      <span
+                        v-if="this.DayActiveindex == false"
+                        @click="InfoWatchDay()"
+                        class="DaySeachIcon el-icon-search"
+                      ></span>
+                      <span
+                        v-if="this.DayActiveindex == true"
+                        @click="InfoKonwTeacherDayApprvalList()"
+                        class="DaySeachIcon el-icon-search"
+                      ></span>
                     </div>
                   </div>
                   <div class="teach-block">
@@ -421,7 +437,7 @@
                 <div>头像</div>
                 <div>姓名</div>
                 <div>被报错</div>
-                <div>纠正次数</div>
+                <!-- <div>纠正次数</div> -->
                 <div>科目</div>
                 <div v-if="this.DayActiveindex == false">批改有效总张数</div>
                 <div v-if="this.DayActiveindex == true">匹配总张数</div>
@@ -439,7 +455,7 @@
                   <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.correctNums}}次</div>
+                  <!-- <div class="tr-active">{{v.correctNums}}次</div> -->
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
@@ -512,24 +528,32 @@
                         v-model="filters2.inputValue"
                         class="Dayinput-with-Allot"
                       />
-                       <span v-if="this.MonthActiveindex == false" @click="InfoWatchMoth()" class="DaySeachIcon el-icon-search"></span>
-                        <span v-if="this.MonthActiveindex == true"  @click="InfoKonwTeacherMonthApprvalList()" class="DaySeachIcon el-icon-search"></span>
+                      <span
+                        v-if="this.MonthActiveindex == false"
+                        @click="InfoWatchMoth()"
+                        class="DaySeachIcon el-icon-search"
+                      ></span>
+                      <span
+                        v-if="this.MonthActiveindex == true"
+                        @click="InfoKonwTeacherMonthApprvalList()"
+                        class="DaySeachIcon el-icon-search"
+                      ></span>
                     </div>
                   </div>
                 </div>
-                 <div class="betown-block">
-              <el-date-picker
-                @change="FindSubjectChartsInfo"
-                v-model="Timevalue"
-                type="daterange"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                value-format="yyyy-MM-dd"
-                align="right"
-               :picker-options="pickerOptions0"
-              ></el-date-picker>
-            </div>
+                <div class="betown-block">
+                  <el-date-picker
+                    @change="FindSubjectChartsInfo"
+                    v-model="Timevalue"
+                    type="daterange"
+                    range-separator="至"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                    value-format="yyyy-MM-dd"
+                    align="right"
+                    :picker-options="pickerOptions0"
+                  ></el-date-picker>
+                </div>
               </div>
             </el-col>
           </el-col>
@@ -568,7 +592,10 @@
             >匹配平均时间：{{MothTeacherList.totalAvgTime}}</div>
           </el-col>
           <el-col :span="4">
-            <div   v-if="this.MonthActiveindex == false" class="main-header-item">家长满意度：{{MothTeacherList.totalSatisfactionDegree}}</div>
+            <div
+              v-if="this.MonthActiveindex == false"
+              class="main-header-item"
+            >家长满意度：{{MothTeacherList.totalSatisfactionDegree}}</div>
           </el-col>
           <el-col :span="4">
             <div class="main-header-item">正确率：{{MothTeacherList.totalAccuracyRate}}</div>
@@ -588,7 +615,7 @@
                 <div>头像</div>
                 <div>姓名</div>
                 <div>被报错</div>
-                <div>纠正次数</div>
+                <!-- <div>纠正次数</div> -->
                 <div>科目</div>
                 <div v-if="this.MonthActiveindex == false">批改总张数</div>
                 <div v-if="this.MonthActiveindex == true">匹配总张数</div>
@@ -606,7 +633,7 @@
                   <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.correctNums}}次</div>
+                  <!-- <div class="tr-active">{{v.correctNums}}次</div> -->
                   <div class="tr-active">{{v.subject}}</div>
                   <div>{{v.homeworkPicCount}}/张</div>
                   <div>{{v.accuracyRate}}</div>
@@ -647,8 +674,8 @@
           </el-col>
         </el-row>
       </el-col>
-        <!-- 组内排班 -->
-             <TeamworkScheduling v-if="this.modelindex == 3"></TeamworkScheduling>
+      <!-- 组内排班 -->
+      <TeamworkScheduling v-if="this.modelindex == 3"></TeamworkScheduling>
       <!-- 分页显示 -->
     </el-row>
     <!--可分配老师-->
@@ -751,7 +778,7 @@
             <div class="tr-secon tr-sw80">科目</div>
             <div class="tr-secon tr-sw80">年级</div>
             <div class="tr-secon width140" v-if="this.Activeindex == false">未批改老师</div>
-                <div class="tr-secon width140" v-if="this.Activeindex == true">未匹配老师</div>
+            <div class="tr-secon width140" v-if="this.Activeindex == true">未匹配老师</div>
           </div>
           <div class="tr-set" v-for="(v, k) of UnallotHomeworkInfo.list" :key="k">
             <div class="tr-secon">{{k+1}}</div>
@@ -762,15 +789,15 @@
             <div class="tr-secon tr-sw80">{{v.subject}}</div>
             <div class="tr-secon tr-sw80">{{v.grade}}</div>
             <div v-if="v.status === 1" class="tr-secon">
-               <span v-if="this.Activeindex == false">未批改</span>
+              <span v-if="this.Activeindex == false">未批改</span>
               <span v-if="this.Activeindex == true">未匹配</span>
             </div>
             <div v-if="v.status === 2" class="tr-secon">
-               <span v-if="this.Activeindex == false">批改中</span>
+              <span v-if="this.Activeindex == false">批改中</span>
               <span v-if="this.Activeindex == true">匹配中</span>
             </div>
             <div v-if="v.status === 3" class="tr-secon">
-               <span v-if="this.Activeindex == false">已批改</span>
+              <span v-if="this.Activeindex == false">已批改</span>
               <span v-if="this.Activeindex == true">已匹配</span>
             </div>
             <div class="tr-secon width140">{{v.teacherName}}</div>
@@ -810,8 +837,8 @@
       <div class="model-text">
         <div class="model-manager">
           <div v-if="this.Activeindex == false">批改老师</div>
-           <div v-if="this.Activeindex == true">匹配知识点老师</div>
-           <div v-if="this.teacherRoles ==11">(校区管理员)</div>
+          <div v-if="this.Activeindex == true">匹配知识点老师</div>
+          <div v-if="this.teacherRoles ==11">(学习管理员)</div>
           <div>
             <img src="../../assets/img/del@2x.png" alt @click="allShowModel(3)" />
           </div>
@@ -848,7 +875,11 @@
                 <div class="closeTeacherID" @click="isShow(GetTeacherDetail,6)">
                   <span class="el-icon-close">封号</span>
                 </div>
-                <div v-if="this.Activeindex == false && this.teacherRoles ==8" class="UpTeacherID" @click="isShow(GetTeacherDetail,5)">
+                <div
+                  v-if="this.Activeindex == false && this.teacherRoles ==8"
+                  class="UpTeacherID"
+                  @click="isShow(GetTeacherDetail,5)"
+                >
                   <span class="el-icon-upload2">升级</span>
                 </div>
               </div>
@@ -859,9 +890,15 @@
               </div>
             </div>
           </div>
-          <div class="model-items-other" v-if="this.Activeindex == false">批改科目 : {{GetTeacherDetail.subject}}</div>
-            <div class="model-items-other model-active" v-if="this.Activeindex == true">批改科目 : {{GetTeacherDetail.subject}}</div>
-          <div class="model-items-other  model-active" v-if="this.Activeindex == false">
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == false"
+          >批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div
+            class="model-items-other model-active"
+            v-if="this.Activeindex == true"
+          >批改科目 : {{GetTeacherDetail.subject}}</div>
+          <div class="model-items-other model-active" v-if="this.Activeindex == false">
             批改年级 :
             <span v-for="(v, k) of arrGrade" :key="k">{{v}},</span>
           </div>
@@ -872,24 +909,39 @@
                 <span>{{v}}</span>
               </div>
             </div>
-          </div> -->
+          </div>-->
           <div class="model-items-other">手机号 : {{GetTeacherDetail.phone}}</div>
           <div class="model-items-other model-active">上次登录时间 : {{GetTeacherDetail.lastOnlineTime}}</div>
-          <div class="model-items-other" v-if="this.Activeindex == false">批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
-           <div class="model-items-other" v-if="this.Activeindex == true">匹配正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == false"
+          >批改正确率 : {{GetTeacherDetail.accuracyRate}}</div>
+          <div
+            class="model-items-other"
+            v-if="this.Activeindex == true"
+          >匹配正确率 : {{GetTeacherDetail.accuracyRate}}</div>
           <div class="model-items-other model-active">
             被报错总次数 :
             <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
           </div>
-          <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div>
+          <!-- <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div> -->
           <div
-            class="model-items-other model-active" v-if="this.Activeindex == false"
+            class="model-items-other"
+            v-if="this.Activeindex == false"
           >家长满意度 : {{GetTeacherDetail.satisfactionDegree}}</div>
           <div style="display:inline-block">
-              <div       v-if="this.TeacherIdStatus ==1  && this.teacherRoles ==8" class="OutOnlineTeacherID" @click="isShow(GetTeacherDetail,11)">
-                  <span class="el-icon-close">强制下线</span>
-                </div>
-            <div class="UpTeacherID" style="width:120px;margin-top:30px;" @click="isShow(GetTeacherDetail,8)">
+            <div
+              v-if="this.TeacherIdStatus ==1  && this.teacherRoles ==8"
+              class="OutOnlineTeacherID"
+              @click="isShow(GetTeacherDetail,11)"
+            >
+              <span class="el-icon-close">强制下线</span>
+            </div>
+            <div
+              class="UpTeacherID"
+              style="width:120px;margin-top:30px;"
+              @click="isShow(GetTeacherDetail,8)"
+            >
               <span class="el-icon-user-solid">重新分配组</span>
             </div>
           </div>
@@ -941,7 +993,7 @@
               class="model-text-items-close"
             />
           </div>
-          <div>是否要将{{TeacherName}}老师升级为校区管理员？</div>
+          <div>是否要将{{TeacherName}}老师升级为学习管理员？</div>
         </div>
         <div class="model-btn">
           <div class="model-btn-items main-gay" @click="RepushTeacherAcess()">是</div>
@@ -949,7 +1001,7 @@
         </div>
       </div>
     </div>
-      <!-- 强制下线校区管理员弹框 -->
+    <!-- 强制下线校区管理员弹框 -->
     <div class="showModel" @click="allShowModel(10)" v-if="outOnline"></div>
     <div class="modelspec" v-if="outOnline">
       <div class="model-text">
@@ -1139,10 +1191,10 @@
 </template>
 <script>
 import { mapGetters, mapActions } from "vuex";
-import { IMG_BASE_URL, APPOR_BASE_URL } from "@/ImgConfig";
+import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 import TeamworkScheduling from "@/components/TeamworkScheduling";
 export default {
-  components: {TeamworkScheduling},
+  components: { TeamworkScheduling },
   name: "actvResolveLabel",
   props: {},
   data() {
@@ -1174,22 +1226,22 @@ export default {
       AllotManagerModel: false, //可分配小组管理员列表弹框
       NoAllotManagerModel: false, //所有未批改可分配老师列表弹框
       ModelStudet: false, //学生详情弹框
-      outOnline:false, //强制下线校区管理员弹框
+      outOnline: false, //强制下线校区管理员弹框
       isDown: false,
       gardeListDown: false,
       gardeListDownage: false,
-      TimeCodeListDown:false,
+      TimeCodeListDown: false,
       selecttitlepag: "批改老师",
       selecttitleage: "语文",
-      selectTimeCodeValuepag:"选时间",
-      teacherRoles:"",
+      selectTimeCodeValuepag: "选时间",
+      teacherRoles: "",
       teachList: [],
       TeacherType: 8,
       TeacherCheackStyle: 2,
       TeacherIdType: 8,
-      Timevalue:"",
-      startTime:"",
-      endTime:"",
+      Timevalue: "",
+      startTime: "",
+      endTime: "",
       pickerOptions0: {
         disabledDate(time) {
           return time.getTime() > Date.now() - 8.64e6;
@@ -1210,7 +1262,7 @@ export default {
           value: "2",
           label: "5~6年级",
           str: "五年级,六年级"
-        },
+        }
       ],
       grades: [
         {
@@ -1227,10 +1279,10 @@ export default {
           value: "2",
           label: "英语",
           str: "英语"
-        },
+        }
       ],
-         selectTime: [
-      {
+      selectTime: [
+        {
           value: "1",
           label: "今天",
           str: "1"
@@ -1265,11 +1317,11 @@ export default {
           label: "前六天",
           str: "7"
         },
-           {
+        {
           value: "0",
           label: "全部",
           str: "0"
-        },
+        }
       ],
       ItemList: [
         {
@@ -1281,7 +1333,7 @@ export default {
         {
           text: "当月"
         },
-           {
+        {
           text: "组内排班"
         }
       ],
@@ -1298,7 +1350,7 @@ export default {
         orderField: "",
         orderAD: "",
         managerId: "",
-        TimeCodeValue:0
+        TimeCodeValue: 0
       },
       filters1: {
         //超级管理员的当天数据
@@ -1401,7 +1453,7 @@ export default {
       this.isDownindex = k;
       this.TeacherHomework(v);
     },
-      // 数据列表
+    // 数据列表
     async FindSubjectChartsInfo() {
       let arr = this.Timevalue;
       if (this.Timevalue.length > 0) {
@@ -1411,10 +1463,10 @@ export default {
         }
       }
       if (this.MonthActiveindex == false) {
-        this.InfoWatchMoth()
+        this.InfoWatchMoth();
       }
       if (this.MonthActiveindex == true) {
-        this.InfoKonwTeacherMonthApprvalList()
+        this.InfoKonwTeacherMonthApprvalList();
       }
     },
     // 获取校区管理员监控数据
@@ -1428,29 +1480,8 @@ export default {
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId: this.managerId || "",
-          timeType:this.filters.TimeCodeValue
+        timeType: this.filters.TimeCodeValue
       });
-      // 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)
     },
     //
     // 获取校区管理员当天数据条件筛选
@@ -1495,7 +1526,7 @@ export default {
         pageNo: this.filters2.pageNo,
         pageSize: this.filters2.pageSize,
         managerId: this.managerId || "",
-           startTime: this.startTime,
+        startTime: this.startTime,
         endTime: this.endTime
       });
     },
@@ -1507,7 +1538,7 @@ export default {
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
     },
     // 分页查看老师批改作业列表
@@ -1517,7 +1548,7 @@ export default {
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
     },
     // 可分配老师列表
@@ -1741,7 +1772,7 @@ export default {
     selectTitle(k) {
       this.modelindex = k;
       if (k === 0) {
-            this.TeacherType = 8;
+        this.TeacherType = 8;
         this.Activeindex = false;
         this.filters.pageNo = 1;
         this.currentPage = 1;
@@ -1813,9 +1844,8 @@ export default {
         _this.isPigai = true;
         this.homeworkLIst.pageNo = 1;
         this.unmatchHomework();
-      }
-      else if (str == 11) {
-         _this.outOnline = true;
+      } else if (str == 11) {
+        _this.outOnline = true;
         _this.ModelAppor = false;
       }
     },
@@ -1867,7 +1897,7 @@ export default {
       } else if (str == 9) {
         _this.NoAllotManagerModel = false;
       } else if (str == 10) {
-       _this.outOnline = false;
+        _this.outOnline = false;
       }
     },
     // 数组去重
@@ -1922,28 +1952,28 @@ export default {
     },
     // 手动批改
     handApor() {
-       this.isDown = false;
+      this.isDown = false;
       this.TeacherType = 8;
       this.TeacherCheackStyle = 2;
       this.TeacherIdType = 8;
       this.Activeindex = false;
       this.filters.pageNo = 1;
-       this.filters.OptionsValue = '';
-         this.filters.gradesValue = '';
-        this.filters.inputValue = '';
+      this.filters.OptionsValue = "";
+      this.filters.gradesValue = "";
+      this.filters.inputValue = "";
       //  this.showApporAways = false;
       this.InfoWatch();
     },
     // 匹配知识点老师
     AutoApor() {
-        this.isDown = false;
+      this.isDown = false;
       this.TeacherType = 13;
       this.TeacherIdType = 13;
       this.TeacherCheackStyle = 4;
       this.Activeindex = true;
-       this.filters.OptionsValue = '';
-         this.filters.gradesValue = '';
-        this.filters.inputValue = '';
+      this.filters.OptionsValue = "";
+      this.filters.gradesValue = "";
+      this.filters.inputValue = "";
       // this.showApporAways = true;
       this.filters.pageNo = 1;
       this.InfoKonwTeacherWatchList();
@@ -1957,15 +1987,15 @@ export default {
         pageNo: this.filters.pageNo,
         pageSize: this.filters.pageSize,
         managerId: this.managerId || "",
-          selectTime:this.filters.TimeCodeValue
+        timeType: this.filters.TimeCodeValue
       });
     },
     // 当天数据手动批改
     DayhandApor() {
       this.DayActiveindex = false;
       this.filters1.pageNo = 1;
-       this.filters1.MaxtimeValue = '';
-      this.filters1.inputValue = '';
+      this.filters1.MaxtimeValue = "";
+      this.filters1.inputValue = "";
       //  this.showApporAways = false;
       this.InfoWatchDay();
     },
@@ -1973,8 +2003,8 @@ export default {
     DayAutoApor() {
       this.DayActiveindex = true;
       // this.showApporAways = true;
-       this.filters1.MaxtimeValue = '';
-      this.filters1.inputValue = '';
+      this.filters1.MaxtimeValue = "";
+      this.filters1.inputValue = "";
       this.filters1.pageNo = 1;
       this.InfoKonwTeacherDayApprvalList();
     },
@@ -1991,21 +2021,21 @@ export default {
         managerId: this.managerId || ""
       });
     },
-       InfoWatchDayDatas (){
-        if (this.DayActiveindex == false){
-            this.InfoWatchDay();
+    InfoWatchDayDatas() {
+      if (this.DayActiveindex == false) {
+        this.InfoWatchDay();
       }
-       if (this.DayActiveindex == true){
-          this.InfoKonwTeacherDayApprvalList()
+      if (this.DayActiveindex == true) {
+        this.InfoKonwTeacherDayApprvalList();
       }
     },
     // 当月数据手动批改
     MonthhandApor() {
       this.MonthActiveindex = false;
       this.filters2.pageNo = 1;
-         this.filters2.MaxtimeValue = '';
-      this.filters2.inputValue = '';
-      this.Timevalue = ''
+      this.filters2.MaxtimeValue = "";
+      this.filters2.inputValue = "";
+      this.Timevalue = "";
       //  this.showApporAways = false;
       this.InfoWatchMoth();
     },
@@ -2013,10 +2043,10 @@ export default {
     MonthAutoApor() {
       this.MonthActiveindex = true;
       // this.showApporAways = true;
-         this.filters2.MaxtimeValue = '';
-      this.filters2.inputValue = '';
+      this.filters2.MaxtimeValue = "";
+      this.filters2.inputValue = "";
       this.filters2.pageNo = 1;
-      this.Timevalue = ''
+      this.Timevalue = "";
       this.InfoKonwTeacherMonthApprvalList();
     },
     // 当月数据匹配知识点老师
@@ -2030,16 +2060,16 @@ export default {
         pageNo: this.filters2.pageNo,
         pageSize: this.filters2.pageSize,
         managerId: this.managerId || "",
-             startTime: this.startTime,
+        startTime: this.startTime,
         endTime: this.endTime
       });
     },
-       InfoWatchMonthDatas (){
-        if (this.MonthActiveindex == false){
-            this.InfoWatchMoth();
+    InfoWatchMonthDatas() {
+      if (this.MonthActiveindex == false) {
+        this.InfoWatchMoth();
       }
-       if (this.MonthActiveindex == true){
-          this.InfoKonwTeacherMonthApprvalList()
+      if (this.MonthActiveindex == true) {
+        this.InfoKonwTeacherMonthApprvalList();
       }
     },
     WatchhandleSizeChange(val) {
@@ -2170,10 +2200,10 @@ export default {
         maxCreateTime: "",
         pageNo: 1,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
     },
-        selectStyle2() {
+    selectStyle2() {
       this.TimeCodeListDown = true;
     },
     outStyle2() {
@@ -2187,17 +2217,19 @@ export default {
     },
     selectTip(item) {
       this.filters.OptionsValue = item.str;
-      if (this.Activeindex == false){
-          this.InfoWatch();
+      this.isDown = false;
+      if (this.Activeindex == false) {
+        this.InfoWatch();
       }
-       if (this.Activeindex == true){
-          this.InfoKonwTeacherWatchList();
+      if (this.Activeindex == true) {
+        this.InfoKonwTeacherWatchList();
       }
       this.selecttitlepag = item.label;
       this.gardeListDown = false;
     },
-      timeselectTip(item) {
+    timeselectTip(item) {
       this.filters.TimeCodeValue = item.str;
+      this.isDown = false;
       if (this.Activeindex == false) {
         this.InfoWatch();
       }
@@ -2209,11 +2241,12 @@ export default {
     },
     selectTipage(item) {
       this.filters.gradesValue = item.str;
-     if (this.Activeindex == false){
-          this.InfoWatch();
+      this.isDown = false;
+      if (this.Activeindex == false) {
+        this.InfoWatch();
       }
-       if (this.Activeindex == true){
-          this.InfoKonwTeacherWatchList();
+      if (this.Activeindex == true) {
+        this.InfoKonwTeacherWatchList();
       }
       this.selecttitleage = item.label;
       this.gardeListDownage = false;
@@ -2243,11 +2276,11 @@ export default {
   watch: {
     getTeacherIdStatus(val, oldVal) {
       //普通的watch监听
-      if (this.Activeindex == false){
-          this.InfoWatch();
+      if (this.Activeindex == false) {
+        this.InfoWatch();
       }
-       if (this.Activeindex == true){
-          this.InfoKonwTeacherWatchList();
+      if (this.Activeindex == true) {
+        this.InfoKonwTeacherWatchList();
       }
     },
     BeforetoTeacherstatues(val, oldVal) {
@@ -2258,15 +2291,15 @@ export default {
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.homeworkLIst.pageNo,
         pageSize: this.homeworkLIst.pageSize,
-           selectTime:this.filters.TimeCodeValue
+        selectTime: this.filters.TimeCodeValue
       });
-        if (this.Activeindex == false){
-          this.InfoWatch();
-            this.UnallotHomework();
+      if (this.Activeindex == false) {
+        this.InfoWatch();
+        this.UnallotHomework();
       }
-       if (this.Activeindex == true){
-          this.InfoKonwTeacherWatchList();
-          this.unmatchHomework()
+      if (this.Activeindex == true) {
+        this.InfoKonwTeacherWatchList();
+        this.unmatchHomework();
       }
     },
     InfoTeacherstatues(val, oldVal) {
@@ -2278,7 +2311,7 @@ export default {
       this.NoAllotManagerModel = false;
       this.hiddenModel = false;
       //  this.isPigai = true;
-           this.RefreshTeacherHomework();
+      this.RefreshTeacherHomework();
     },
     // 质检当前作业状态:href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
     currtHomeworkStatus(val, oldVal) {
@@ -2703,7 +2736,7 @@ ul {
   font-size: 24px;
 }
 .model-items-left-top {
-   float:left;
+  float: left;
   display: flex;
   justify-content: space-between;
 }
@@ -2814,7 +2847,7 @@ ul {
   display: inline-block;
   margin-right: 20px;
   margin-bottom: 30px;
-   /* float:left; */
+  /* float:left; */
 }
 .closeTeacherID {
   display: inline-block;
@@ -2829,8 +2862,8 @@ ul {
   cursor: pointer;
   border: 1px solid;
 }
-.OutOnlineTeacherID{
-    display: inline-block;
+.OutOnlineTeacherID {
+  display: inline-block;
   height: 40px;
   width: 140px;
   color: #fff;
@@ -3036,17 +3069,20 @@ ul {
   cursor: pointer;
 }
 .Apporvalactive {
-  background-color: #52cc60!important;
-  color: #fff!important;
+  background-color: #52cc60 !important;
+  color: #fff !important;
 }
 .main-header-numNew {
   display: flex;
   justify-content: space-between;
 }
-.el-date-editor--daterange.el-input, .el-date-editor--daterange.el-input__inner, .el-date-editor--timerange.el-input, .el-date-editor--timerange.el-input__inner {
-    width: 300px!important;
+.el-date-editor--daterange.el-input,
+.el-date-editor--daterange.el-input__inner,
+.el-date-editor--timerange.el-input,
+.el-date-editor--timerange.el-input__inner {
+  width: 300px !important;
 }
 .el-date-editor .el-range-separator {
-    padding: 5px 20px 0px 10px!important;
+  padding: 5px 20px 0px 10px !important;
 }
 </style>

src/router/index.js

@@ -20,6 +20,7 @@ import SuperAdmin from "@/pages/Super/SuperAdmin";
 import HomeworkRecycle from "@/pages/Super/HomeworkRecycle";
 import HomeworkTotally from "@/pages/Super/HomeworkTotally";
 import ComposeType from "@/pages/Super/ComposeType";
+import HomeWorkPictrue from "@/pages/Super/HomeWorkPictrue";
 
 // 质检员
 import GetCheckHomeWork from "@/pages/Qualityinspector/GetCheckHomeWork";
@@ -97,6 +98,12 @@ export const constantRouterMap =
 				  component: ComposeType,
 				  meta: { title: '排班', roles: ['3'] }
         },
+        {
+				  path: "HomeWorkPictrue",
+				  name: "HomeWorkPictrue",
+				  component: HomeWorkPictrue,
+				  meta: { title: '批改作业原图', roles: ['3'] }
+        },
        ]
      },
     //  校区管理员角色路由

src/store/getters.js

@@ -1,4 +1,5 @@
 const getters = {
+  // 管理员系统
   language: state => state.app.language,
   token: state => state.user.token,
   name: state => state.user.name,
@@ -41,6 +42,8 @@ const getters = {
   AllFindSubjectEngCharts :state => state.user.AllFindSubjectEngCharts,
   GetKnowledgeTeacherSalaryList:state => state.user.GetKnowledgeTeacherSalaryList,
   AllTeacherInfoList:state => state.user.AllTeacherInfoList,
+  StudentHomeworkDetail:state => state.scheduling.StudentHomeworkDetail,
+  StudentHomeworkNoFeedbackList:state => state.scheduling.StudentHomeworkNoFeedbackList,
   // 排班系统
   FindCalendarList:state => state.scheduling.FindCalendarList,
   FindHaveTeacherList:state => state.scheduling.FindHaveTeacherList,

src/store/modules/scheduling .js

@@ -5,9 +5,11 @@ import {FindCalendarList,FindHaveTeacherList,FindNoHaveTeacherList,
   TeacherThisMonthDutyList,SaveSysTeacherDuty,DutyTemplateList, GetManagerListForChecker,
   TeacherListForChecker,
   TeacherHomeworkListForChecker,
-  FindArrangeTemplateIntervalList
+  FindArrangeTemplateIntervalList,
+  StudentHomeworkNoFeedbackList,
+  StudentHomeworkDetail
 } from '@/api/scheduling'
-    import { APPOR_BASE_URL } from '@/ImgConfig'
+  import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
   import axios from '@/axios'
   import router from "@/router"
   import { Message } from 'element-ui'
@@ -32,10 +34,18 @@ import {FindCalendarList,FindHaveTeacherList,FindNoHaveTeacherList,
       TeacherListForChecker:[],
       TeacherHomeworkListForChecker:[],
       FindArrangeTemplateIntervalList:[],
-      FindArrangeTemplateIntervalListStatus:""
+      FindArrangeTemplateIntervalListStatus:"",
+      StudentHomeworkNoFeedbackList:[],
+      StudentHomeworkDetail:[]
     },
   
     mutations: {
+      SET_STUDENT_HOMEWORK_DETAIL_LIST: (state, StudentHomeworkDetail) => {
+        state.StudentHomeworkDetail = StudentHomeworkDetail
+      },
+      SET_STUDENT_NO_FEEDBACK_LIST: (state, StudentHomeworkNoFeedbackList) => {
+        state.StudentHomeworkNoFeedbackList = StudentHomeworkNoFeedbackList
+      },
       SET_FIND_ARRANGE_TEMPLATE_LIST: (state, FindArrangeTemplateIntervalList) => {
         state.FindArrangeTemplateIntervalList = FindArrangeTemplateIntervalList
       },
@@ -323,6 +333,32 @@ import {FindCalendarList,FindHaveTeacherList,FindNoHaveTeacherList,
           })
         })
       },
+      // 查看所有学生作业列表（不包含已批改）
+      GetStudentHomeworkNoFeedbackList({ commit, state }, data) {
+        return new Promise((resolve, reject) => {
+          axios.post(StudentHomeworkNoFeedbackList, data).then(response => {
+            const data = response.data || {}
+            if (response.code == "999"){
+              commit('SET_STUDENT_NO_FEEDBACK_LIST', data);
+            }
+          }).catch(error => {
+            reject(error)
+          })
+        })
+      },
+      // 学生作业详情
+      GetStudentHomeworkDetail({ commit, state }, data) {
+        return new Promise((resolve, reject) => {
+          axios.post(StudentHomeworkDetail, data).then(response => {
+            const data = response.data || {}
+            if (response.code == "999"){
+              commit('SET_STUDENT_HOMEWORK_DETAIL_LIST', data);
+            }
+          }).catch(error => {
+            reject(error)
+          })
+        })
+      },
     }
   }
   

src/store/modules/user.js

@@ -7,7 +7,7 @@ import { GET_UUIONID_TOKEN,GET_TOKEN,GET_VERIFICATION_CODE,GET_PHONE_TOKEN,GetIn
   CheckHomeworkStatus,FindSubjectCharts,GetRemindCount,GetKnowledgeTeacherSalaryList,AllTeacherInfoList,MonitorKnowTeacherList, MonitorKnowTeacherOneDayList,UnmatchHomeworkList,
   MonitorKnowTeacherOneMonthList
   } from '@/api'
-  import { APPOR_BASE_URL } from '@/ImgConfig'
+  import { IMG_BASE_URL, APPOR_BASE_URL } from "@/config";
 // import { getToken, setToken, removeToken } from '@/utils/auth'
 import axios from '@/axios'
 import router from "@/router"
@@ -201,7 +201,7 @@ const user = {
                             window.open(APPOR_BASE_URL + '?unionid=' + unionid);
                           }
                           if (roles == 2) {
-                            Message.success('校区管理员角色登录成功')
+                            Message.success('学习管理员角色登录成功')
                             router.push("/home");
                             // router.push({path: '/home', replace: true})
                           }
@@ -266,7 +266,7 @@ const user = {
                             window.open(APPOR_BASE_URL + '?unionid=' + unionid);
                           }
                           if (roles == 2) {
-                            Message.success('校区管理员角色登录成功')
+                            Message.success('学习管理员角色登录成功')
                             router.push("/home");
                             // router.push({path: '/home', replace: true})
                             
@@ -334,7 +334,7 @@ const user = {
                             window.open(APPOR_BASE_URL + '?unionid=' + unionid);
                           }
                           if (roles == 2) {
-                            Message.success('校区管理员角色登录成功')
+                            Message.success('学习管理员角色登录成功')
                             router.push("/home");
                             // router.push({path: '/home', replace: true})