提交最新代码

index.html

@@ -6,6 +6,7 @@
   <title>私塾家作业批改后台</title>
   <link rel=icon href=/favicon.ico>
   <link rel="shortcut icon" type="image/x-icon" href="static/favicon.ico">
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <!-- <meta name="viewport" content="width=1920, target-densityDpi=device-dpi, user-scalable=no"> -->
   <!-- <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0" />  -->
   <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

src/ImgConfig/index.js

@@ -4,12 +4,12 @@ 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 = 'http://sxkmt.sharingschool.com/kmt/index.html' //实习环境作业批改地址
+    // APPOR_BASE_URL = 'https://kmt.sharingschool.com/aijia/kmt/index.html'; //正式环境作业批改地址地址;
+    APPOR_BASE_URL = 'http://sxkmt.sharingschool.com/kmt/index.html' //实习环境作业批改地址
 }
 export {
     IMG_BASE_URL,

src/api/index.js

@@ -52,6 +52,8 @@ const errorWarning = urlFn('/api/kmt/correctSys/errorWarning')
 const errorDetail = urlFn('/api/kmt/correctSys/errorDetail')
 // 退出登陆
 const logout = urlFn('/api/kmt/login/logout')
+// 质检前校验作业状态
+const CheckHomeworkStatus = urlFn('/api/kmt/correctSys/checkHomeworkStatus')
 export {
     GET_TOKEN,
     GET_UUIONID_TOKEN,
@@ -77,5 +79,6 @@ export {
     HomeworkRecoveryList,
     errorWarning,
     errorDetail,
-    logout
+    logout,
+    CheckHomeworkStatus
 }

src/axios/index.js

@@ -83,6 +83,7 @@ axios.interceptors.response.use(
 );
 // 数据统一处理来自网络及服务器的错误
 function checkStatus (response) {
+    console.log("11123456")
     if (response && response.status === 200 || response && response.status === 304){
         // Message.success('请求成功')
         return response.data
@@ -117,6 +118,7 @@ function checkStatus (response) {
 
 // 处理来自程序的异常
 function checkCode (response) {
+    console.log("chucuole")
     if (response.status && response.status !== 'ok'){
         response.error = response.error || '出错了！'
     }

src/config/index.js

@@ -3,8 +3,8 @@ if (process.env.NODE_ENV === 'development') {
     BASE_URL = 'https://xt.sharingschool.com/sz'
 } else {
     // BASE_URL = 'https://xt.sharingschool.com/sz' //测试环境服务器地址
-    BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址
-    // BASE_URL = 'https://sx.sharingschool.com'  //实习环境地址
+    // BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址
+    BASE_URL = 'https://sx.sharingschool.com/sz'  //实习环境地址
 }
 const TIME_OUT = 10000
 

src/pages/Login.vue

@@ -45,6 +45,7 @@ export default {
   },
   watch: {},
   created() {
+     localStorage.removeItem("accessToken")
     this.getTKByUnionid();
   },
   methods: {
@@ -90,10 +91,12 @@ export default {
     var obj = new WxLogin({
       self_redirect: false,
       id: "login_container",
-      appid: "wxd18ca9555a939281",
+      // appid: "wxd18ca9555a939281",
+         appid: "wx7fe760dc3c45794d", //实训环境
       scope: "snsapi_login",
       redirect_uri: encodeURIComponent(
-        "https://kmt.sharingschool.com/aijia/manager/index.html"
+        // "https://kmt.sharingschool.com/aijia/manager/index.html"
+          "https://sxkmt.sharingschool.com/manager/index.html" //实训环境
       ),
       state: "",
       style: "width: 250px",

src/pages/home/SchoolManager.vue

@@ -217,19 +217,21 @@
                       <span>{{v.checkCount}}</span>
                       <span style="color:#bbbbbb;">/{{v.picTotal}}</span>
                       <el-button type="info">
-                        <a
+                        <span href="" @click="CheackHomeworkStatus(v)"  style="text-decoration:none;color:#ffffff;">已检查</span>
+                        <!-- <a
                           style="text-decoration:none;color:#ffffff;"
                           :href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
-                        >已检查</a>
+                        >已检查</a> -->
                       </el-button>
                       <span class="WorngCount">报错{{v.wrongCount}}</span>
                     </div>
                     <div class="tr-sw180" v-if="v.status === 3 && v.isCheck ===0" style="width: 25%">
                       <el-button type="warning">
-                        <a
+                         <span href="" @click="CheackHomeworkStatus(v)"  style="text-decoration:none;color:#ffffff;">去检查</span>
+                        <!-- <a
                           style="text-decoration:none;color:#ffffff;"
                           :href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
-                        >去检查</a>
+                        >去检查</a> -->
                       </el-button>
                     </div>
                   </div>
@@ -444,7 +446,7 @@
 
     <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
-    <div class="model teacerMOdel" style="left:20%;top:5%" v-if="hiddenModel">
+    <div class="model"  style="width:50%; top:5%;" v-if="hiddenModel">
       <div class="model-text">
         <div class="model-text-head">
           <div>可分配老师</div>
@@ -570,8 +572,8 @@
     </div>
     <!--所有未批改可分配老师列表弹框-->
     <div class="showModel" @click="allShowModel(5)" v-if="NoAllotManagerModel"></div>
-    <div class="model" style="width:40%!important" v-if="NoAllotManagerModel">
-      <div class="model-text" style="padding: 0 10px">
+    <div class="model"  style="width:45%;top:5%;" v-if="NoAllotManagerModel">
+      <div class="model-text">
         <div class="model-manager">
           <div>作业可分配老师</div>
             <div class="teach-Allot">
@@ -735,6 +737,7 @@ export default {
       accessToken: localStorage.getItem("accessToken"), //token
       managerId: "", // 超级管理员登陆ID
       ApporhomeworkId: "",
+      CurrthomeworkIdStatus:"",
       BASE_URL: IMG_BASE_URL,
       APPOR_BASE_URL: APPOR_BASE_URL,
       isDownindex: "",
@@ -896,7 +899,7 @@ export default {
       this.InfoWatch();
     },
     BeforetoTeacherAllotCode(val, oldVal) {
-      //普通的watch监听
+      //去批改前的watch监听
       window.open(
         APPOR_BASE_URL +
           "?homeworkId=" +
@@ -909,6 +912,21 @@ export default {
           1
       );
     },
+    // 质检当前作业状态:href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
+       currtHomeworkStatus(val, oldVal) {
+      //去检查的watch监听
+      window.open(
+        APPOR_BASE_URL +
+          "?homeworkId=" +
+          this.CurrthomeworkIdStatus +
+          "&unionid=" +
+          this.unionid +
+          "&teacherId=" +
+          this.homeworkLIst.teacherId +
+          "&state=" +
+          2
+      );
+    },
     BeforetoTeacherstatues(val, oldVal) {
       //普通的watch监听
       // 查看老师批改作业列表
@@ -948,7 +966,8 @@ export default {
       "BeforetoTeacherAllotCode",
       "BeforetoTeacherstatues",
       "InfoTeacherstatues",
-      "ApporingTeacherstatues"
+      "ApporingTeacherstatues",
+      "currtHomeworkStatus"
       
     ])
   },
@@ -964,6 +983,15 @@ export default {
           originTeacherId: v.teacherId,
       });
     },
+    // 质检当前作业状态
+       async CheackHomeworkStatus(v) {
+           let CurrthomeworkIdStatus = v.homeworkId;
+      this.CurrthomeworkIdStatus = CurrthomeworkIdStatus;
+      this.$store.dispatch("CheckCurrHomeworkStatus", {
+        homeworkId: v.homeworkId,
+         originTeacherId:this.homeworkLIst.teacherId,
+      });
+    },
      // 未批改去批改前分配老师
     async ToAppovalOline(v) {
       let ApporhomeworkId = v.homeworkId;
@@ -1566,7 +1594,7 @@ font-size:12px;
   width: 36px;
   height: 36px;
   border-radius: 6px;
-  margin-left: 14px;
+  /* margin-left: 14px; */
   cursor: pointer;
 }
 .table {
@@ -1742,14 +1770,14 @@ width: 100px;
 .TeacherApporTime {
   text-align:center;
   display: inline-block;
-  height: 40px;
-  width: 80px;
+  height: 30px;
+  width: 60px;
   color: #706f6f;
   background: #b6b6b6;
   border-color: #929492;
   border-radius: 20px;
   font-size: 14px;
-  line-height: 40px;
+  line-height: 30px;
   cursor: pointer;
   margin:0 5px;
 }
@@ -1869,7 +1897,7 @@ width: 100px;
 }
 .buttonAppoval {
   display: inline-block;
-  height: 40px;
+  height: 30px;
 }
 .model-items-left-top {
   display: flex;

src/pages/super/SchoolManager.vue

@@ -227,10 +227,11 @@
                       <span>{{v.checkCount}}</span>
                       <span style="color:#bbbbbb;">/{{v.picTotal}}</span>
                       <el-button type="info">
-                        <a
+                           <span href="" @click="CheackHomeworkStatus(v)"  style="text-decoration:none;color:#ffffff;">已检查</span>
+                        <!-- <a
                           style="text-decoration:none;color:#ffffff;"
                           :href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
-                        >已检查</a>
+                        >已检查</a> -->
                       </el-button>
                       <span style="color:red;font-size:12px;">报错{{v.wrongCount}}</span>
                     </div>
@@ -240,10 +241,11 @@
                       style="width: 25%"
                     >
                       <el-button type="warning">
-                        <a
+                           <span href="" @click="CheackHomeworkStatus(v)"  style="text-decoration:none;color:#ffffff;">去检查</span>
+                        <!-- <a
                           style="text-decoration:none;color:#ffffff!important;"
                           :href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
-                        >去检查</a>
+                        >去检查</a> -->
                       </el-button>
                     </div>
                   </div>
@@ -491,7 +493,7 @@
     </el-row>
     <!--可分配老师-->
     <div class="showModel" @click="allShowModel(1)" v-if="hiddenModel"></div>
-    <div class="model" style="left:20%;top:5%;" v-if="hiddenModel">
+    <div class="model" style="width:50%; top:5%;" v-if="hiddenModel">
       <div class="model-text">
         <div class="model-text-head">
           <div>可分配老师</div>
@@ -789,8 +791,8 @@
     </div>
     <!--可分配小组管理员列表弹框-->
     <div class="showModel" @click="allShowModel(8)" v-if="AllotManagerModel"></div>
-    <div class="model" style="width:44.5%" v-if="AllotManagerModel">
-      <div class="model-text" style="padding: 0 30px">
+    <div class="model"  style="width:45%;top:5%;" v-if="AllotManagerModel">
+      <div class="model-text">
         <div class="model-manager">
           <div>可分配小组</div>
           <div>
@@ -842,8 +844,8 @@
     </div>
     <!--所有未批改可分配老师列表弹框-->
     <div class="showModel" @click="allShowModel(9)" v-if="NoAllotManagerModel"></div>
-    <div class="model" style="width:50%" v-if="NoAllotManagerModel">
-      <div class="model-text" style="padding: 0 30px">
+    <div class="model" style="width:45%; top:5%;" v-if="NoAllotManagerModel">
+      <div class="model-text">
         <div class="model-manager">
           <div>作业可分配老师</div>
            <div class="teach-Allot">
@@ -1066,6 +1068,7 @@ export default {
         pageSize: 10,
         homeworkId: ""
       },
+       CurrthomeworkIdStatus:"",
        inputValueAllot:"",
       AllinputValueAllot:"",
       allNoapprovalList: {
@@ -1103,7 +1106,8 @@ export default {
       "getAllotManagerList",
       "BeforetoTeacherstatues",
       "InfoTeacherstatues",
-      "ApporingTeacherstatues"
+      "ApporingTeacherstatues",
+      "currtHomeworkStatus"
     ])
   },
   methods: {
@@ -1300,6 +1304,15 @@ export default {
         name:this.AllinputValueAllot
       });
     },
+    // 质检当前作业状态
+       async CheackHomeworkStatus(v) {
+           let CurrthomeworkIdStatus = v.homeworkId;
+      this.CurrthomeworkIdStatus = CurrthomeworkIdStatus;
+      this.$store.dispatch("CheckCurrHomeworkStatus", {
+        homeworkId: v.homeworkId,
+         originTeacherId:this.homeworkLIst.teacherId,
+      });
+    },
     // 未批改作业可分配老师分页列表
     async NoapporvalTeacherAllotfy() {
       this.$store.dispatch("TeacherAllotList", {
@@ -1725,6 +1738,21 @@ export default {
         //  this.isPigai = true;
       this.RefreshTeacherHomework();
     },
+      // 质检当前作业状态:href="APPOR_BASE_URL+'?homeworkId='+v.homeworkId+'&unionid='+unionid+'&teacherId='+homeworkLIst.teacherId+'&state='+2"
+       currtHomeworkStatus(val, oldVal) {
+      //去检查的watch监听
+      window.open(
+        APPOR_BASE_URL +
+          "?homeworkId=" +
+          this.CurrthomeworkIdStatus +
+          "&unionid=" +
+          this.unionid +
+          "&teacherId=" +
+          this.homeworkLIst.teacherId +
+          "&state=" +
+          2
+      );
+    },
   }
 };
 </script>
@@ -1832,7 +1860,7 @@ el-table {
   width: 36px;
   height: 36px;
   border-radius: 6px;
-  margin-left: 14px;
+  /* margin-left: 14px; */
   cursor: pointer;
 }
 .table {
@@ -2283,14 +2311,14 @@ ul {
 .TeacherApporTime {
   text-align:center;
   display: inline-block;
-  height: 40px;
-  width: 80px;
+  height: 30px;
+  width: 60px;
   color: #706f6f;
   background: #b6b6b6;
   border-color: #929492;
   border-radius: 20px;
   font-size: 14px;
-  line-height: 40px;
+  line-height: 30px;
   cursor: pointer;
   margin:0 5px;
 }

src/pages/super/SuperAdmin.vue

@@ -54,11 +54,11 @@
             label="老师出勤率"
             header-align="center"
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             prop="homeworkCount"
             label="作业批改总份数"
             header-align="center">
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="homeworkPicCount"
             label="作业批改总张数"

src/store/getters.js

@@ -33,5 +33,6 @@ const getters = {
   InfoTeacherstatues :state => state.user.InfoTeacherstatues,
   GetTeacherstatues :state => state.user.GetTeacherstatues,
   ApporingTeacherstatues :state => state.user.ApporingTeacherstatues,
+  currtHomeworkStatus :state => state.user.currtHomeworkStatus,
 }
 export default getters

src/store/modules/user.js

@@ -3,7 +3,8 @@ import { GET_UUIONID_TOKEN,GET_TOKEN,GetInfo,InfoWatch,InfoWatchDay,
   TeacherAllot,UnallotHomeworkList,GetTeacherDetail,
   GetStudentDetail,GetManagerDetail,Downgrade,SuperManagerList,
   SuperApplyTeacherList,ApplyOperate,GetTeacherSalaryList,DealCorrectTeacher,
-  GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,errorWarning,errorDetail,logout
+  GetAllotManagerList,AllotTeacherToManager,HomeworkRecoveryList,errorWarning,errorDetail,logout,
+  CheckHomeworkStatus
   } from '@/api'
   import { APPOR_BASE_URL } from '@/ImgConfig'
 import { getToken, setToken, removeToken } from '@/utils/auth'
@@ -39,7 +40,8 @@ const user = {
     pictureIndex:0,
     InfoTeacherstatues:"",
     GetTeacherstatues:"",
-    ApporingTeacherstatues:""
+    ApporingTeacherstatues:"",
+    currtHomeworkStatus:""
   },
 
   mutations: {
@@ -135,6 +137,9 @@ const user = {
       console.log(pictureIndex)
       state.pictureIndex = pictureIndex
     },
+    SET_CURRT_HOMEWORK_STATUS:(state,currtHomeworkStatus) => {
+      state.currtHomeworkStatus = currtHomeworkStatus
+    },
   },
 
   actions: {
@@ -157,10 +162,12 @@ const user = {
                         localStorage.setItem("userId",userId)
                         if (isBanned == 0) {
                           if (roles == 0) {
+                            localStorage.removeItem("accessToken");
                             Message.error('无用户角色')
                           }
                           if (roles == 1) {
                             Message.success('在线批改老师角色登录成功')
+                            localStorage.removeItem("accessToken");
                             window.open(APPOR_BASE_URL + '?unionid=' + unionid);
                           }
                           if (roles == 2) {
@@ -174,10 +181,12 @@ const user = {
                             // router.push({path: '/super', replace: true})
                           }
                         } if (isBanned == 1) {
+                          localStorage.removeItem("accessToken");
                           Message.error('您已被封号')
                           router.push("/");
                         }
                       }).catch(() => {
+                        localStorage.removeItem("accessToken");
                           Message.error('用户信息验证失败,请重新登录')
                       })
           } else {
@@ -209,9 +218,11 @@ const user = {
                         if (isBanned == 0) {
                           if (roles == 0) {
                             Message.error('无用户角色')
+                            localStorage.removeItem("accessToken");
                           }
                           if (roles == 1) {
                             Message.success('在线批改老师角色登录成功')
+                            localStorage.removeItem("accessToken");
                             window.open(APPOR_BASE_URL + '?unionid=' + unionid);
                           }
                           if (roles == 2) {
@@ -227,10 +238,12 @@ const user = {
                             
                           }
                         } if (isBanned == 1) {
+                          localStorage.removeItem("accessToken");
                           Message.error('您已被封号')
                           router.push("/");
                         }
                       }).catch(() => {
+                        localStorage.removeItem("accessToken");
                           Message.error('用户信息验证失败,请重新登录')
                       })
           } else {
@@ -302,6 +315,34 @@ const user = {
         })
       })
     },
+        // 质检当前作业状态
+        CheckCurrHomeworkStatus({ commit, state }, data) {
+          return new Promise((resolve, reject) => {
+            axios.post(CheckHomeworkStatus, data).then(response => {
+              const data = response.data || {}
+              if (response.code === '999'){
+                if (data.status == 3){
+                  commit('SET_CURRT_HOMEWORK_STATUS',new Date());
+                  resolve(response)
+                }
+                if (data.status == 1){
+                  Message.error("当前作业还未批改，请手动刷新当前作业列表！")
+                  resolve(response)
+                }
+                if (data.status == 2){
+                  Message.error("当前作业正在批改中，请手动刷新当前作业列表！")
+                  resolve(response)
+                }
+              }
+              if (response.code === '000'){
+                Message.error(response.msg)
+                resolve(response)
+              }
+            }).catch(error => {
+              reject(error)
+            })
+          })
+        },
        // 查看可分配老师列表
        TeacherAllotList({ commit, state }, data) {
         return new Promise((resolve, reject) => {