提交管理员新增需求代码

src/api/index.js

@@ -6,8 +6,8 @@ const urlFn = v => BASE_URL + v
 const GET_TOKEN = urlFn('/api/kmt/login/wxlogin/newscanlogin')
 // Uniconid登录
 const GET_UUIONID_TOKEN = urlFn('/api/kmt/login/unionidlogin')
-// 手机号验证吗登陆
-const GET_PHONE_TOKEN = urlFn('/api/kmt/login/phoneLogin')
+// 手机号密码登陆
+const GET_PHONE_TOKEN = urlFn('/api/kmt/login/passwordLogin')
 // 获取手机验证码
 const GET_VERIFICATION_CODE = urlFn('/api/kmt/login/getVerificationCode')
 // 获取用户信息

src/components/NextMonthList.vue

@@ -343,13 +343,13 @@
               <div class="Selectradius">
                 <img
                   @click="DetetaiOrAddeacherTeam(item,2)"
-                  v-if="teacherIds.indexOf(item.teacherId) == -1"
+                  v-if="teacherIds && teacherIds.indexOf(item.teacherId) == -1"
                   class="Littleicon"
                   src="../assets/img/normal.png"
                 />
                 <img
                   @click="DetetaiOrAddeacherTeam(item,1)"
-                  v-if="teacherIds.indexOf(item.teacherId) != -1"
+                  v-if="teacherIds && teacherIds.indexOf(item.teacherId) != -1"
                   class="Littleicon"
                   src="../assets/img/correct -hint.png"
                 />
@@ -391,6 +391,7 @@ export default {
       DetailteacherName: "",
       inputValue: "",
       gridData: [],
+       teacherIds: [],
       isPigai: false,
       detetaiTeacherid: [],
       isApporTeacher: false, //移除添加老师
@@ -447,7 +448,6 @@ export default {
   },
   watch: {
     NextMonthlistSTUS(val, oldVal) {
-      // debugger
       //排班列表请求成功的watch监听回调
       this.Datainit();
       this.nextMonth();
@@ -458,8 +458,6 @@ export default {
       this.GetFindCalendarListInfo();
     },
     AddArrangeByTeacherStatus(val, oldVal) {
-      // debugger
-
       this.GetFindCalendarListInfo();
     },
     NextOrNewMonthStatus(val, oldVal) {
@@ -475,7 +473,9 @@ export default {
       "NextMonthlistSTUS",
       "NextMonthFindCalendarList",
       "FindHaveTeacherList",
-      "FindNoHaveTeacherList"
+      "FindNoHaveTeacherList",
+      "AddArrangeByTeacherStatus",
+      "DeleteArrangeByTeacher"
     ]),
     // 显示当前时间
     currentDateStr() {
@@ -520,7 +520,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) {
@@ -638,7 +638,6 @@ export default {
     // 时段添加老师
     async GetAddArrangeByTeacherStatus() {
       // debugger
-      this.teacherIds = [];
       this.AddTeacherModel = false;
       this.$store.dispatch("GetAddArrangeByTeacher", {
         id: this.HaveTeacherList.Teacherid,
@@ -819,7 +818,9 @@ export default {
     }
   },
 
-  mounted() {}
+  mounted() {
+     
+  }
 };
 </script>
 
@@ -1073,9 +1074,12 @@ table.bgtable tbody tr td.gray {
   text-align: center;
   word-wrap: break-word;
   width: 60px;
-  line-height: 50px;
+  line-height: 20px;
+  display: inline-block;
 }
 .tr-sw100 {
+  height: 40px;
+  line-height: 30px;
   width: 13%;
   text-align: center;
 }
@@ -1085,8 +1089,8 @@ table.bgtable tbody tr td.gray {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
-  padding: 10px;
-  line-height: 25px;
+  /* padding:10px;
+line-height:25px; */
 }
 .width120 {
   width: 200px;
@@ -1121,6 +1125,7 @@ table.bgtable tbody tr td.gray {
   border-radius: 15px;
   background-color: #7297ff;
   color: #fff;
+   display: inline-block;
 }
 .NoButtonhole {
   cursor: pointer;
@@ -1130,6 +1135,7 @@ table.bgtable tbody tr td.gray {
   line-height: 30px;
   border-radius: 15px;
   color: #fff;
+   display: inline-block;
 }
 .table-img {
   width: 36px;
@@ -1157,6 +1163,10 @@ table.bgtable tbody tr td.gray {
   height: 30px;
   top: 5px;
 }
+.Selectradius {
+  cursor: pointer;
+  display: inline-block;
+}
 .selectTeacher {
   font-size: 12px;
   text-align: left;
@@ -1343,6 +1353,7 @@ table.bgtable tbody tr td.gray {
   width: 20px;
   position: relative;
   top: 0;
+    display: inline-block;
 }
 .date {
   margin-top: 68px;

src/components/SuperComponent.vue

@@ -91,18 +91,18 @@ export default {
           name: "老师薪酬表",
           href: "CheckTeacherPay"
         },
+        // {
+        //   id: "4",
+        //   name: "待分配作业",
+        //   href: "HomeworkRecycle"
+        // },
         {
           id: "4",
-          name: "待分配作业",
-          href: "HomeworkRecycle"
-        },
-        {
-          id: "5",
           name: "作业统计",
           href: "HomeworkTotally"
         },
         {
-          id: "6",
+          id: "5",
           name: "排班",
           href: "composeType"
         }
@@ -147,15 +147,10 @@ export default {
       } else if (sessionStorage.getItem("tabIndex") == 2) {
         this.$router.push("/super/" + "CheckTeacherPay");
       } else if (sessionStorage.getItem("tabIndex") == 3) {
-        this.$router.push("/super/" + "HomeworkRecycle");
-      } else if (sessionStorage.getItem("tabIndex") == 4) {
         this.$router.push("/super/" + "HomeworkTotally");
-      } else if (sessionStorage.getItem("tabIndex") == 5) {
+      } else if (sessionStorage.getItem("tabIndex") == 4) {
         this.$router.push("/super/" + "ComposeType");
       }
-      else if (sessionStorage.getItem("tabIndex") == 6) {
-        this.$router.push("/super/" + "GetCheckHomeWork");
-      }
       // this.$router.push("/super/" + val.href);
       // this.checkindex = index;
     },

src/components/TeamworkScheduling.vue

@@ -82,6 +82,7 @@
             :page-sizes="[10]"
             layout="total, prev, pager, next"
             :total="parseInt(FindTeamTeacherList.totalElements)"
+             :current-page.sync="currentPage"
             :hide-on-single-page="true"
           ></el-pagination>
           <div style="clear:both;"></div>
@@ -263,6 +264,7 @@ export default {
       D: new Date().getDate() + " ",
       // month: new Date().getMonth() + 1,
       NewDay: "",
+      currentPage: 1,
       SelectSearchId: "",
       showSelectCodeWord: "筛选时段",
       BASE_URL: IMG_BASE_URL,
@@ -337,6 +339,7 @@ export default {
     },
     SearchGetFindTeamTeacherListInfo() {
       this.SelectSearchId = "";
+      this.filters1.pageNo = 1;
       this.showSelectCodeWord = "筛选时段";
       this.GetFindTeamTeacherListInfo();
     },

src/config/index.js

@@ -4,22 +4,22 @@ 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 {
+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 {
 
 // // 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#/' //测试环境作业批改地址
+        //      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#/' //测试环境作业批改地址
 
 // 1.分表分库测试环境配置
             // BASE_URL = ' https://xt.sharingschool.com/fk' //分表分库测试环境服务器地址
@@ -40,24 +40,24 @@ let APPOR_BASE_URL = ''
 
 // -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  // 3.OSS正式环境(aiKmt)
-            // BASE_URL = 'https://api.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正式环境作业批改地址地址;
+        //     BASE_URL = 'https://api.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实习环境作业批改地址
+         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
+}
+const TIME_OUT = 15000
 
 export {
     BASE_URL,

src/pages/Login.vue

@@ -17,7 +17,7 @@
             <img
               class="codeLogin"
               @click="loginStyle(1)"
-              src="../assets/img/CodeLogin (2).png"
+              src="../assets/img/Passworglog (1).png"
               v-show="!PasswordOrcode"
             />
             <img
@@ -41,19 +41,13 @@
                     <el-input v-model="loginForm.phoneNumber" class="inputstyle" autocomplete="off"></el-input>
                     <div class="bottomLine"></div>
                   </el-form-item>
-                  <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 v-if="Unclicktime" class="SendErcode">{{TimeClock}}</div>
-                    <div class="bottomLine"></div>
+                  <el-form-item label="密码" prop="Ercode" class="InputHeight">
+                    <el-input v-model="loginForm.Ercode" type="password" class="inputstyle" autocomplete="off"></el-input>
+                      <div class="bottomLine"></div>
                   </el-form-item>
+                       <!-- <div @click="forgetPassword" class="forgetPassword">忘记密码？</div> -->
                   <el-form-item>
+                    
                     <!-- <div class="SubmitBtn"  @click="submitForm('ruleForms')">
                       登陆
                     </div>-->
@@ -75,7 +69,7 @@
 </template>
 
 <script>
-import { APP_ID, RESET_URL, TYPE } from "@/config";
+import {APP_ID, RESET_URL, TYPE,APPOR_BASE_URL} from "@/config";
 import { Message } from "element-ui";
 export default {
   name: "login",
@@ -100,7 +94,7 @@ export default {
       PasswordOrcode: false,
       rules: {
         Ercode: [
-          { required: true, message: "请输入验证码", trigger: "blur" },
+          { required: true, message: "请输入密码", trigger: "blur" },
           { message: "", trigger: "blur" }
         ],
 
@@ -127,7 +121,7 @@ export default {
         if (valid) {
           this.$store.dispatch("PhoneCodeLogin", {
             phone: this.loginForm.phoneNumber,
-            vcode: this.loginForm.Ercode,
+            password: this.loginForm.Ercode,
             accessToken: ""
           });
         } else {
@@ -135,12 +129,17 @@ export default {
         }
       });
     },
+    forgetPassword() {
+         const unionid = localStorage.getItem("unionid")
+        window.open(APPOR_BASE_URL + '?unionid=' + unionid  +
+            "&state=" + 5);
+    },
     resetForm(ruleForms) {
       this.$refs[ruleForms].resetFields();
     },
     WxLoginCtl() {},
     isvalidPhone(str) {
-      const reg = /^1[3|4|5|7|8][0-9]\d{8}$/;
+      const reg = /^1[3|4|5|7|8|9][0-9]\d{8}$/;
       return reg.test(str);
     },
     loginStyle(str) {
@@ -237,7 +236,14 @@ export default {
   top: 100px;
   width: 400px;
 }
-
+.forgetPassword{
+  text-align:right;
+  padding:0px 10px;
+  position:relative;
+  top:-30px;
+  right:2%
+  cursor: pointer;
+}
 .passWordLogin {
   width: 400px;
   height: 366px;

src/pages/Qualityinspector/checkListInfo.vue

@@ -145,9 +145,9 @@
                   <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>在线</div>
-                  <div v-if="v.tag ==2" class="teacherSignIcon1" ><p class="positionword">放心</p></div>
-                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"><p class="positionword">一般</p></div>
-                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"><p class="positionword">重点</p></div>
+                  <div v-if="v.tag ==2" class="teacherSignIcon1" ></div>
+                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"></div>
+                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"></div>
                 </div>
                 <!-- 离线 -->
                 <div
@@ -175,9 +175,9 @@
                   <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>离线</div>
-                  <div v-if="v.tag ==2" class="teacherSignIcon1" ><p class="positionword">放心</p></div>
-                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"><p class="positionword">一般</p></div>
-                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"><p class="positionword">重点</p></div>
+                  <div v-if="v.tag ==2" class="teacherSignIcon1"></div>
+                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"></div>
+                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"></div>
                 </div>
                 <!-- 封号 -->
                 <div
@@ -205,9 +205,9 @@
                   <div>{{v.feedbackCount}}张</div>
                   <div>{{v.checkCount}}张</div>
                   <div>已封号</div>
-                    <div v-if="v.tag ==2" class="teacherSignIcon1" ><p class="positionword">放心</p></div>
-                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"><p class="positionword">一般</p></div>
-                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"><p class="positionword">重点</p></div>
+                    <div v-if="v.tag ==2" class="teacherSignIcon1" ></div>
+                  <div  v-if="v.tag ==3"  class="teacherSignIcon2"></div>
+                  <div  v-if="v.tag ==1"  class="teacherSignIcon3"></div>
                 </div>
                 <div
                   class="tr-setNo"
@@ -768,8 +768,8 @@ export default {
         APPOR_BASE_URL +
           "?homeworkId=" +
           this.CurrthomeworkIdStatus +
-          "&unionid=" +
-          this.unionid +
+          "&accessToken=" +
+          this.accessToken +
           "&teacherId=" +
           this.homeworkLIst.teacherId +
           "&state=" +
@@ -1008,15 +1008,15 @@ ul {
   /* padding:0px!important; */
 }
 .teacherSignIcon1{
- background:url(../../assets/img/Nice.png) no-repeat 10px 10px;
+ background:url(../../assets/img/NiceTip.png) no-repeat 10px 10px;
  color:#ffff;
 }
 .teacherSignIcon2{
- background:url(../../assets/img/goob.png) no-repeat 10px 10px;
+ background:url(../../assets/img/goodTip.png) no-repeat 10px 10px;
  color:#ffff;
 }
 .teacherSignIcon3{
- background:url(../../assets/img/important.png) no-repeat 10px 10px;
+ background:url(../../assets/img/importantTip.png) no-repeat 10px 10px;
  color:#ffff;
 }
 .positionword{

src/pages/home/SchoolManager.vue

@@ -241,7 +241,41 @@
                   <div>{{v.maxWaitTime}}</div>
                   <div style="width:200px;">{{v.totalCorrectTime}}</div>
                   <div>{{v.respSpeed}}</div>
-                  <div>已封号</div>
+                  <div>
+                    <span class="topictap">已封号</span>
+                     <span class="topictap">{{v.bannedTime}}</span>
+                  </div>
+                </div>
+                     <!-- 已注销 -->
+                <div
+                  v-if="v.status == '4'"
+                  style="color:#BEBEBE"
+                  class="tr-first"
+                  :class="{BgcColor:k%2 !== 1}"
+                >
+                  <div>
+                    <i
+                      style="cursor:pointer;"
+                      :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
+                      @click="dropDown(v,k)"
+                    ></i>
+                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" />
+                    <img
+                      src="../../assets/img/attt.png"
+                      alt
+                      v-if="v.imgUrl ==''"
+                      class="table-img"
+                    />
+                  </div>
+                  <div>{{v.name}}</div>
+                  <div>{{v.waitCount}}份</div>
+                  <div>{{v.maxWaitTime}}</div>
+                  <div style="width:240px;">{{v.totalCorrectTime}}</div>
+                  <div>{{v.respSpeed}}</div>
+                  <div>
+                    <span class="topictap">已注销</span>
+                     <span class="topictap">{{v.cancelledTime}}</span>
+                  </div>
                 </div>
                 <div
                   class="tr-setNo"
@@ -957,6 +991,14 @@
                 <div v-if="GetTeacherDetail.status ===0" class="Online">（离线）</div>
                 <div class="model-items-first-left-down">{{GetTeacherDetail.school}}</div>
               </div>
+                <div class="closeTeacherID"  v-if="this.teacherRoles != 11  && this.TeacherIdStatus !==3" @click="isShow(GetTeacherDetail,6)">
+                  <span class="el-icon-close">封号</span>
+                </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
@@ -985,7 +1027,11 @@
             被报错总次数 :
             <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
           </div>
-          <!-- <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div> -->
+          <div    v-if="this.Activeindex == true" class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div>
+           <div class="model-items-other ">本月封号次数 : 
+                <span style="color:red;">{{GetTeacherDetail.bannedNums}}次</span>
+                </div>
+                 <div v-if="GetTeacherDetail.bannedLong" class="model-items-other model-active">距现在封号时长 : {{GetTeacherDetail.bannedLong}}</div>
           <div
             class="model-items-other"
             v-if="this.Activeindex == false"
@@ -1025,6 +1071,48 @@
         </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>
 </template>
 <script>
@@ -1051,6 +1139,8 @@ export default {
       unionid: localStorage.getItem("unionid"),
       accessToken: localStorage.getItem("accessToken"), //token
       managerId: "", // 超级管理员登陆ID
+      TeacherIds: "", //封号，升级，解封
+      TeacherIdStatus:"",
       ApporhomeworkId: "",
       CurrthomeworkIdStatus: "",
       BASE_URL: IMG_BASE_URL,
@@ -1085,6 +1175,8 @@ export default {
       Timevalue: "",
       startTime: "",
       endTime: "",
+      OpenID:false,
+      closeID:false,
       pickerOptions0: {
         disabledDate(time) {
           return time.getTime() > Date.now() - 8.64e6;
@@ -1278,18 +1370,14 @@ export default {
     this.managerId = managerId;
   },
   watch: {
-    getTeacherIdStatus(val, oldVal) {
-      //普通的watch监听
-      this.InfoWatch();
-    },
     BeforetoTeacherAllotCode(val, oldVal) {
       //去批改前的watch监听
       window.open(
         APPOR_BASE_URL +
           "?homeworkId=" +
           this.ApporhomeworkId +
-          "&unionid=" +
-          this.unionid +
+          "&accessToken=" +
+          this.accessToken +
           "&teacherId=" +
           this.homeworkLIst.teacherId +
           "&state=" +
@@ -1303,8 +1391,8 @@ export default {
         APPOR_BASE_URL +
           "?homeworkId=" +
           this.CurrthomeworkIdStatus +
-          "&unionid=" +
-          this.unionid +
+          "&accessToken=" +
+          this.accessToken +
           "&teacherId=" +
           this.homeworkLIst.teacherId +
           "&state=" +
@@ -1347,7 +1435,16 @@ export default {
       if (this.Activeindex == true) {
         this.unmatchHomework();
       }
-    }
+    },
+        getTeacherIdStatus(val, oldVal) {
+      //普通的watch监听
+      if (this.Activeindex == false) {
+        this.InfoWatch();
+      }
+      if (this.Activeindex == true) {
+        this.InfoKonwTeacherWatchList();
+      }
+    },
   },
   computed: {
     ...mapGetters([
@@ -1366,7 +1463,7 @@ export default {
       "BeforetoTeacherstatues",
       "InfoTeacherstatues",
       "ApporingTeacherstatues",
-      "currtHomeworkStatus"
+      "currtHomeworkStatus",
     ])
   },
   methods: {
@@ -1426,6 +1523,24 @@ export default {
         this.InfoKonwTeacherMonthApprvalList();
       }
     },
+        // 封号
+    async CloseTeacherId() {
+      this.closeID = false;
+      this.$store.dispatch("CloseIdTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 2,
+        type: this.TeacherType
+      });
+    },
+        // 解封
+    async OPenTeacherId() {
+      this.OpenID = false;
+      this.$store.dispatch("OpenIdTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 3,
+        type: this.TeacherType
+      });
+    },
     // 获取校区管理员监控数据
     async InfoWatch() {
       this.isDown = false;
@@ -1799,6 +1914,8 @@ export default {
         this.UnallotHomework();
       } else if (str == 3) {
         _this.ModelAppor = true;
+         this.TeacherIdStatus = v.status;
+          this.TeacherIds = v.teacherId;
         this.teacherRoles = v.role;
         this.GetTeacherInfo(v);
       } else if (str == 4) {
@@ -1814,6 +1931,12 @@ export default {
         this.AllinputValueAllot = "";
         this.NoapporvalTeacherAllot(v);
         // this.GetAllotManagerInfo()
+      }  else if (str == 6) {
+        _this.closeID = true;
+        _this.ModelAppor = false;
+      } else if (str == 7) {
+        _this.OpenID = true;
+        _this.ModelAppor = false;
       } else if (str == 10) {
         _this.isPigai = true;
         this.homeworkLIst.pageNo = 1;
@@ -1941,6 +2064,11 @@ export default {
       } else if (str == 5) {
         _this.NoAllotManagerModel = false;
       }
+       else if (str == 6) {
+        _this.closeID = false;
+      } else if (str == 7) {
+        _this.OpenID = false;
+      }
     },
     // 数组去重
     uniq(array) {
@@ -2492,7 +2620,7 @@ el-table {
   width: 60%;
   height: auto;
   position: fixed;
-  top: 15%;
+ top: 5%!important;
   left: 30%;
   margin: auto;
   background: #fff;
@@ -2790,4 +2918,101 @@ el-table {
 .el-date-editor .el-range-separator {
   padding: 5px 20px 0px 10px !important;
 }
+.topictap{
+  display:block;
+  height:25px;
+}
+.closeTeacherID {
+  display: inline-block;
+  height: 40px;
+  width: 100px;
+  color: #f56c6c;
+  background: #fef0f0;
+  border-color: #fbc4c4;
+  border-radius: 20px;
+  font-size: 14px;
+  line-height: 40px;
+  cursor: pointer;
+  border: 1px solid;
+}
+.UpTeacherID {
+  display: inline-block;
+  height: 40px;
+  width: 100px;
+  color: #67c23a;
+  background: #f0f9eb;
+  border-color: #c2e7b0;
+  border-radius: 20px;
+  font-size: 14px;
+  line-height: 40px;
+  cursor: pointer;
+  border: 1px solid;
+}
+.UpTeacherID:hover {
+  color: #fff;
+  background-color: #67c23a;
+  border-color: #67c23a;
+}
+.modelspec {
+  z-index: 10000;
+  width: 35.5%;
+  height: auto;
+  position: fixed;
+  top: 30%;
+  left: 32.5%;
+  margin: auto;
+  background: #fff;
+  border-radius: 10px;
+  text-align: center;
+}
+.model-text {
+  background: rgba(255, 255, 255, 1);
+  border-radius: 10px;
+}
+.model-text-items-close {
+  position: absolute;
+  top: 10px;
+  right: 15px;
+  cursor: pointer;
+}
+.model-text-items {
+  position: relative;
+  color: #000000;
+  font-size: 24px;
+  text-align: center;
+  padding: 40px 0 50px 0;
+}
+.model-btn-items {
+  font-size: 18px;
+}
+.model-btn {
+  display: flex;
+  justify-content: space-around;
+  margin-bottom: 44px;
+}
+.main-gay {
+  background: rgba(246, 247, 251, 1);
+  color: #7e7e7e;
+  width: 154px;
+  height: 50px;
+  line-height: 50px;
+  cursor: pointer;
+}
+.main-red {
+  background: #FF6465;
+  color: #ffff;
+  width: 180px;
+  height: 60px;
+  line-height: 60px;
+  cursor: pointer;
+  border-radius:30px;
+}
+.model-grdeen {
+  background-color: #52cc60;
+  color: #fff;
+  width: 154px;
+  height: 50px;
+  line-height: 50px;
+  cursor: pointer;
+}
 </style>

src/pages/super/CheckTeacherPay.vue

@@ -699,9 +699,9 @@ export default {
               "," +
               arr[i].status +
               "," +
-              arr[i].telephone +
+             "\t" + arr[i].idNumber.toString() +
               "," +
-              arr[i].idNumber +
+              "\t" + arr[i].idNumber.toString() +
               "," +
               arr[i].bankName +
               "," +

src/pages/super/SchoolManager.vue

@@ -233,7 +233,41 @@
                   <div>{{v.maxWaitTime}}</div>
                   <div style="width:200px;">{{v.totalCorrectTime}}</div>
                   <div>{{v.respSpeed}}</div>
-                  <div>已封号</div>
+                  <div>
+                    <span class="topictap">已封号</span>
+                     <span class="topictap">{{v.bannedTime}}</span>
+                  </div>
+                </div>
+                 <!-- 已注销 -->
+                <div
+                  v-if="v.status == '4'"
+                  style="color:#BEBEBE"
+                  class="tr-first"
+                  :class="{BgcColor:k%2 !== 1}"
+                >
+                  <div>
+                    <i
+                      style="cursor:pointer;"
+                      :class="[isDown && isDownindex === k?'el-icon-caret-bottom':'el-icon-caret-right']"
+                      @click="dropDown(v,k)"
+                    ></i>
+                    <img :src="BASE_URL + v.imgUrl" alt class="table-img" />
+                    <img
+                      src="../../assets/img/attt.png"
+                      alt
+                      v-if="v.imgUrl ==''"
+                      class="table-img"
+                    />
+                  </div>
+                  <div>{{v.name}}</div>
+                  <div>{{v.waitCount}}份</div>
+                  <div>{{v.maxWaitTime}}</div>
+                  <div style="width:240px;">{{v.totalCorrectTime}}</div>
+                  <div>{{v.respSpeed}}</div>
+                  <div>
+                    <span class="topictap">已注销</span>
+                     <span class="topictap">{{v.cancelledTime}}</span>
+                  </div>
                 </div>
                 <div
                   class="tr-setNo"
@@ -857,12 +891,14 @@
           <div class="model-items-first">
             <div>
               <img
+                @click="isShow(GetTeacherDetail,12)"
                 :src="BASE_URL + GetTeacherDetail.imgUrl"
                 v-if="GetTeacherDetail.imgUrl"
                 alt
                 class="model-items-first-img"
               />
               <img
+                @click="isShow(GetTeacherDetail,12)"
                 src="../../assets/img/attt.png"
                 v-if="!GetTeacherDetail.imgUrl"
                 alt
@@ -934,7 +970,12 @@
             被报错总次数 :
             <span style="color:red;">{{GetTeacherDetail.wrongCount}}次</span>
           </div>
-          <!-- <div class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div> -->
+           <div    v-if="this.Activeindex == true" class="model-items-other">纠正次数 : {{GetTeacherDetail.correctNums}}次</div>
+            <div class="model-items-other">本月封号次数 : 
+                <span style="color:red;">{{GetTeacherDetail.bannedNums}}次</span>
+                </div>
+                    <div v-if="GetTeacherDetail.bannedLong" class="model-items-other model-active">距现在封号时长 : {{GetTeacherDetail.bannedLong}}</div>
+
           <div
             class="model-items-other"
             v-if="this.Activeindex == false"
@@ -1198,6 +1239,62 @@
         ></el-pagination>
       </div>
     </div>
+       <!-- 注销校区管理员弹框 -->
+    <div class="showModel" @click="allShowModel(11)" v-if="DeteleTeacherID"></div>
+    <div class="modelspec" v-if="DeteleTeacherID">
+      <div class="model-text">
+        <div class="model-text-items">
+          <div>
+            <img
+              src="../../assets/img/del@2x.png"
+              alt
+              @click="allShowModel(11)"
+              class="model-text-items-close"
+            />
+          </div>
+             <div class="teacherdetelebox">
+              <img
+                @click="isShow(GetTeacherDetail,12)"
+                :src="BASE_URL + GetTeacherDetail.imgUrl"
+                v-if="GetTeacherDetail.imgUrl"
+                alt
+                class="model-items-first-deteleimg"
+              />
+              <img
+                @click="isShow(GetTeacherDetail,12)"
+                src="../../assets/img/attt.png"
+                v-if="!GetTeacherDetail.imgUrl"
+                alt
+                class="model-items-first-deteleimg"/>
+                <div class="model-items-first-left-down">{{GetTeacherDetail.school}}</div>
+              </div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-red" @click="isShow(GetTeacherDetail,13)">注销此账号</div>
+        </div>
+      </div>
+    </div>
+     <!-- 注销校区管理员弹框提醒确认弹框 -->
+    <div class="showModel" @click="allShowModel(12)" v-if="confirmDeteleTeacherID"></div>
+    <div class="modelspec" v-if="confirmDeteleTeacherID">
+      <div class="model-text">
+        <div class="model-text-items">
+          <div>
+            <img
+              src="../../assets/img/del@2x.png"
+              alt
+              @click="allShowModel(12)"
+              class="model-text-items-close"
+            />
+          </div>
+          <div>注销账号，此老师所有资料信息都将被删除，是否注销？</div>
+        </div>
+        <div class="model-btn">
+          <div class="model-btn-items main-gay" @click="confirmDeteleTeacherIDFun()">是</div>
+          <div class="model-btn-items model-grdeen" @click="allShowModel(12)">否</div>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
@@ -1238,6 +1335,8 @@ export default {
       NoAllotManagerModel: false, //所有未批改可分配老师列表弹框
       ModelStudet: false, //学生详情弹框
       outOnline: false, //强制下线校区管理员弹框
+      DeteleTeacherID:false, //注销老师ID
+      confirmDeteleTeacherID:false,//确认注销老师ID
       isDown: false,
       gardeListDown: false,
       gardeListDownage: false,
@@ -1709,6 +1808,15 @@ export default {
         type: this.TeacherIdType
       });
     },
+      // 注销
+    async confirmDeteleTeacherIDFun() {
+      this.confirmDeteleTeacherID = false;
+      this.$store.dispatch("CloseIdTeacher", {
+        teacherId: this.TeacherIds,
+        operate: 5,
+        type: this.TeacherIdType
+      });
+    },
     //强制下线
     async OutLineTeacherAcess() {
       this.outOnline = false;
@@ -1860,6 +1968,14 @@ export default {
         _this.outOnline = true;
         _this.ModelAppor = false;
       }
+      else if (str == 12) {
+        _this.DeteleTeacherID = true;
+         _this.ModelAppor = false;
+      }
+       else if (str == 13) {
+        _this.confirmDeteleTeacherID = true;
+         _this.DeteleTeacherID = false;
+      }
     },
     // 去分配
     allocation() {
@@ -1910,7 +2026,14 @@ export default {
         _this.NoAllotManagerModel = false;
       } else if (str == 10) {
         _this.outOnline = false;
-      }
+      }   else if (str == 11) {
+       _this.DeteleTeacherID = false;
+         _this.ModelAppor = true;
+      }  
+       else if (str == 12) {
+       _this.confirmDeteleTeacherID = false;
+         _this.DeteleTeacherID = true;
+      }  
     },
     // 数组去重
     uniq(array) {
@@ -2348,8 +2471,8 @@ export default {
         APPOR_BASE_URL +
           "?homeworkId=" +
           this.CurrthomeworkIdStatus +
-          "&unionid=" +
-          this.unionid +
+          "&accessToken=" +
+          this.accessToken +
           "&teacherId=" +
           this.homeworkLIst.teacherId +
           "&state=" +
@@ -2687,7 +2810,7 @@ ul {
   width: 60%;
   height: auto;
   position: fixed;
-  top: 15%;
+  top: 5%!important;
   left: 30%;
   margin: auto;
   background: #fff;
@@ -2724,6 +2847,13 @@ ul {
   position: relative;
   bottom: 20px;
 }
+.model-items-first-deteleimg {
+  width: 120px;
+  height: 120px;
+  border-radius: 8px;
+  position: relative;
+  bottom: 20px;
+}
 .model-items-first-left {
   display: inline-block;
   color: #393939;
@@ -2800,6 +2930,15 @@ ul {
   line-height: 50px;
   cursor: pointer;
 }
+.main-red {
+  background: #FF6465;
+  color: #ffff;
+  width: 180px;
+  height: 60px;
+  line-height: 60px;
+  cursor: pointer;
+  border-radius:30px;
+}
 .model-grdeen {
   background-color: #52cc60;
   color: #fff;
@@ -3112,4 +3251,11 @@ ul {
 .el-date-editor .el-range-separator {
   padding: 5px 20px 0px 10px !important;
 }
+.teacherdetelebox{
+  padding:100px;
+}
+.topictap{
+  display:block;
+  height: 25px;
+}
 </style>

src/store/modules/user.js

@@ -247,7 +247,7 @@ const user = {
           }
         })
       },
-       // 手机号验证码登陆
+       // 手机号密码登陆
          //  获取TOKEN
       PhoneCodeLogin({ state, commit, dispatch }, data) {
         console.log(data);
@@ -309,9 +309,8 @@ const user = {
                         localStorage.removeItem("accessToken");
                           Message.error('用户信息验证失败,请重新登录')
                       })
-          } else {
-            Message.error('验证失败,请重新登录')
-                    router.push("/");
+          } else if (res && res.code == '000') {
+            Message.error("登陆失败该手机账号还未注册绑定，请前往批改系统登陆完成资料注册绑定")
           }
         })
       },