提交最新代码

src/ImgConfig/index.js

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

src/config/index.js

@@ -2,8 +2,8 @@ let BASE_URL = ''
 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://xt.sharingschool.com/sz' //测试环境服务器地址
+    BASE_URL = 'https://t.sharingschool.com/sz'; //正式环境地址
     // BASE_URL = 'https://sx.sharingschool.com'  //实习环境地址
 }
 const TIME_OUT = 10000

src/pages/home/SchoolManager.vue

@@ -128,7 +128,7 @@
                       v-if="v.imgUrl"
                       @click="isShow(v,3)"
                     >
-                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl"  @click="isShow(v,3)" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -151,6 +151,7 @@
                       @click="dropDown(v,k)"
                     ></i>
                     <img :src="BASE_URL + v.imgUrl" alt class="table-img" @click="isShow(v,3)">
+                      <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl"  @click="isShow(v,3)" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -173,6 +174,7 @@
                       @click="dropDown(v,k)"
                     ></i>
                     <img :src="BASE_URL + v.imgUrl" alt class="table-img" @click="isShow(v,3)">
+                      <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl"  @click="isShow(v,3)" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -302,7 +304,7 @@
                 <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
-                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -404,7 +406,7 @@
                 <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
-                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -476,7 +478,7 @@
                   class="model-items-left-top-img"
                 >
                 <img
-                  src="../../assets/img/user.jpg"
+                  src="../../assets/img/attt.png"
                   v-if="!v.imgUrl"
                   alt
                   class="model-items-left-top-img"
@@ -517,7 +519,7 @@
     </div>
     <!--所有未批改作业-->
     <div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
-    <div class="model" style="width:50%; top:5%;" v-if="isPigai">
+    <div class="model" style="width:50%; top:10%;" v-if="isPigai">
       <div class="model-text">
         <div class="model-text-head">
           <div>所有未批改作业</div>
@@ -550,7 +552,7 @@
             <div v-if="v.status === 3" class="tr-secon">已批改</div>
             <div class="tr-secon width140">{{v.teacherName}}</div>
             <div class="width400">
-              <el-button  v-if="v.isAllot == '1'"  type="success" plain @click="ToAppovalOline(v)" >去批改</el-button>
+              <el-button  v-if="v.isAllot == '1'"  type="success" plain @click="AllToAppovalOline(v)" >去批改</el-button>
               <el-button type="success" @click="isShow(v,5)">去分配</el-button>
             </div>
           </div>
@@ -600,7 +602,7 @@
                   class="model-items-left-top-img"
                 >
                 <img
-                  src="../../assets/img/user.jpg"
+                  src="../../assets/img/attt.png"
                   v-if="!v.imgUrl"
                   alt
                   class="model-items-left-top-img"
@@ -652,7 +654,7 @@
                 class="model-items-first-img"
               >
               <img
-                src="../../assets/img/user.jpg"
+                src="../../assets/img/attt.png"
                 v-if="!GetTeacherDetail.imgUrl"
                 alt
                 class="model-items-first-img"
@@ -701,7 +703,7 @@
             <div>
               <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img">
               <img
-                src="../../assets/img/user.jpg"
+                src="../../assets/img/attt.png"
                 v-if="!GetStudentDetail.imgUrl"
                 alt
                 class="model-items-first-img"
@@ -878,7 +880,8 @@ export default {
         Allotsubjct: "",
         pageNo: 1,
         pageSize: 10,
-        homeworkId: ""
+        homeworkId: "",
+        teacherId:""
       },
       AllotButton: ""
     };
@@ -951,13 +954,24 @@ export default {
   },
   methods: {
     ...mapActions(["setUser"]),
-    // 去批改前分配老师
+    // 所有未批改去批改前分配老师
+    async AllToAppovalOline(v) {
+      let ApporhomeworkId = v.homeworkId;
+      this.ApporhomeworkId = ApporhomeworkId;
+      this.$store.dispatch("BeforetoTeacherAllot", {
+        teacherId: localStorage.getItem("userId"),
+        homeworkId: v.homeworkId,
+          originTeacherId: v.teacherId,
+      });
+    },
+     // 未批改去批改前分配老师
     async ToAppovalOline(v) {
       let ApporhomeworkId = v.homeworkId;
       this.ApporhomeworkId = ApporhomeworkId;
       this.$store.dispatch("BeforetoTeacherAllot", {
         teacherId: localStorage.getItem("userId"),
-        homeworkId: v.homeworkId
+        homeworkId: v.homeworkId,
+         originTeacherId:this.homeworkLIst.teacherId,
       });
     },
     // 点击下拉
@@ -1058,6 +1072,7 @@ export default {
         grade: v.grade,
         subject: v.subject,
         homeworkId: v.homeworkId,
+        originTeacherId:this.homeworkLIst.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
@@ -1071,6 +1086,7 @@ export default {
         subject: this.allotList.Allotsubjct,
         homeworkId: this.allotList.homeworkId,
         maxCreateTime: this.filters.MaxtimeValue,
+         originTeacherId:this.homeworkLIst.teacherId,
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
          name:this.inputValueAllot
@@ -1082,6 +1098,7 @@ export default {
         grade: this.allotList.Allotgarde,
         subject: this.allotList.Allotsubjct,
          homeworkId: this.allotList.homeworkId,
+          originTeacherId:this.homeworkLIst.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
@@ -1100,7 +1117,8 @@ export default {
     async GOtoTeacherAllotAppovar(v, k) {
       this.$store.dispatch("toTeacherAllot", {
         teacherId: v.teacherId,
-        homeworkId: this.allNoapprovalList.homeworkId
+        homeworkId: this.allNoapprovalList.homeworkId,
+          originTeacherId:this.allNoapprovalList.teacherId,
       });
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
@@ -1113,7 +1131,8 @@ export default {
     async GOtoTeacherAllot(v, k) {
       this.$store.dispatch("toTeacherAllot", {
         teacherId: v.teacherId,
-        homeworkId: this.allotList.homeworkId
+        homeworkId: this.allotList.homeworkId,
+        originTeacherId:this.homeworkLIst.teacherId,
       });
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
@@ -1189,7 +1208,8 @@ export default {
       } else if (str == 5) {
         this.allNoapprovalList.Allotgarde = v.grade;
         this.allNoapprovalList.Allotsubjct = v.subject;
-        this.allNoapprovalList.homeworkId = v.homeworkId;
+        this.allNoapprovalList.teacherId = v.teacherId;
+         this.allNoapprovalList.homeworkId = v.homeworkId;
         _this.NoAllotManagerModel = true;
         _this.isPigai = false;
         this.AllinputValueAllot = ""
@@ -1203,6 +1223,7 @@ export default {
         grade: v.grade || this.allNoapprovalList.Allotgarde,
         subject: v.subject || this.allNoapprovalList.Allotsubjct,
         homeworkId: v.homeworkId,
+        originTeacherId: v.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
         pageSize: this.allNoapprovalList.pageSize,
@@ -1215,6 +1236,7 @@ export default {
         grade: this.allNoapprovalList.Allotgarde,
         subject: this.allNoapprovalList.Allotsubjct,
          homeworkId:this.allNoapprovalList.homeworkId,
+        originTeacherId:this.allNoapprovalList.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
         pageSize: this.allNoapprovalList.pageSize,
@@ -1227,6 +1249,7 @@ export default {
         grade: this.allNoapprovalList.Allotgarde,
         subject: this.allNoapprovalList.Allotsubjct,
         homeworkId:this.allNoapprovalList.homeworkId,
+         originTeacherId:this.allNoapprovalList.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allNoapprovalList.pageNo,
         pageSize: this.allNoapprovalList.pageSize,

src/pages/super/HomeworkRecycle.vue

@@ -239,6 +239,7 @@
           subject: this.allotList.subject,
           maxCreateTime: this.formatDate(),
           pageNo: this.allotList.pageNo,
+          originTeacherId:"",
           pageSize: this.allotList.pageSize
         });
       },
@@ -246,6 +247,7 @@
       async GOtoTeacherAllot(v) {
         this.$store.dispatch("toTeacherAllot", {
           teacherId: v.teacherId,
+           originTeacherId:"",
           homeworkId: this.allotList.homeworkId
         });
         this.isPigai = false

src/pages/super/SchoolManager.vue

@@ -128,7 +128,7 @@
                       v-if="v.imgUrl"
                       @click="isShow(v,3)"
                     >
-                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
+                     <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl"  @click="isShow(v,3)" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -151,6 +151,7 @@
                       @click="dropDown(v,k)"
                     ></i>
                     <img :src="BASE_URL + v.imgUrl" alt class="table-img" @click="isShow(v,3)">
+                      <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl"  @click="isShow(v,3)" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -173,6 +174,7 @@
                       @click="dropDown(v,k)"
                     ></i>
                     <img :src="BASE_URL + v.imgUrl" alt class="table-img" @click="isShow(v,3)">
+                      <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl"  @click="isShow(v,3)" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div>{{v.waitCount}}份</div>
@@ -333,7 +335,7 @@
                 <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
-                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -446,7 +448,7 @@
                 <div class="tr-first" :class="{BgcColor:k%2 !== 1}">
                   <div>
                     <img :src="BASE_URL + v.imgUrl" alt v-if="v.imgUrl" class="table-img">
-                    <img src="../../assets/img/user.jpg" alt v-if="!v.imgUrl" class="table-img">
+                    <img src="../../assets/img/attt.png" alt v-if="!v.imgUrl" class="table-img">
                   </div>
                   <div>{{v.name}}</div>
                   <div v-if="v.wrongCount == 0">{{v.wrongCount}}次</div>
@@ -523,7 +525,7 @@
                   class="model-items-left-top-img"
                 >
                 <img
-                  src="../../assets/img/user.jpg"
+                  src="../../assets/img/attt.png"
                   v-if="!v.imgUrl"
                   alt
                   class="model-items-left-top-img"
@@ -562,7 +564,7 @@
     </div>
     <!--所有未批改作业-->
     <div class="showModel" @click="allShowModel(2)" v-if="isPigai"></div>
-    <div class="model" style="width:50%;top:5%;" v-if="isPigai">
+    <div class="model" style="width:50%;top:10%;" v-if="isPigai">
       <div class="model-text">
         <div class="model-text-head">
           <div>所有未批改作业</div>
@@ -631,7 +633,7 @@
                 class="model-items-first-img"
               >
               <img
-                src="../../assets/img/user.jpg"
+                src="../../assets/img/attt.png"
                 v-if="!GetTeacherDetail.imgUrl"
                 alt
                 class="model-items-first-img"
@@ -705,7 +707,7 @@
             <div>
               <img :src="BASE_URL + GetStudentDetail.imgUrl" alt class="model-items-first-img">
               <img
-                src="../../assets/img/user.jpg"
+                src="../../assets/img/attt.png"
                 v-if="!GetStudentDetail.imgUrl"
                 alt
                 class="model-items-first-img"
@@ -806,7 +808,7 @@
                   class="model-items-left-top-img"
                 >
                 <img
-                  src="../../assets/img/user.jpg"
+                  src="../../assets/img/attt.png"
                   v-if="!v.imgUrl"
                   alt
                   class="model-items-left-top-img"
@@ -871,7 +873,7 @@
                   class="model-items-left-top-img"
                 >
                 <img
-                  src="../../assets/img/user.jpg"
+                  src="../../assets/img/attt.png"
                   v-if="!v.imgUrl"
                   alt
                   class="model-items-left-top-img"
@@ -1071,7 +1073,8 @@ export default {
         Allotsubjct: "",
         pageNo: 1,
         pageSize: 10,
-        homeworkId: ""
+        homeworkId: "",
+        teacherId:""
       },
       AllotManagerList: {
         pageNo: 1,
@@ -1228,11 +1231,12 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade: v.grade,
         subject: v.subject,
-          homeworkId: v.homeworkId,
+        homeworkId: v.homeworkId,
+          originTeacherId:this.homeworkLIst.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
-          name:this.inputValueAllot
+        name:this.inputValueAllot
       });
     },
        // 搜索可分配老师列表
@@ -1241,6 +1245,7 @@ export default {
            grade: this.allotList.Allotgarde,
         subject: this.allotList.Allotsubjct,
           homeworkId: this.allotList.homeworkId,
+            originTeacherId:this.homeworkLIst.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
@@ -1254,6 +1259,7 @@ export default {
         subject: this.allotList.Allotsubjct,
             homeworkId: this.allotList.homeworkId,
         maxCreateTime: this.filters.MaxtimeValue,
+          originTeacherId:this.homeworkLIst.teacherId,
         pageNo: this.allotList.pageNo,
         pageSize: this.allotList.pageSize,
           name:this.inputValueAllot
@@ -1274,6 +1280,7 @@ export default {
         grade: v.grade || this.allNoapprovalList.Allotgarde,
         subject: v.subject || this.allNoapprovalList.Allotsubjct,
         homeworkId: v.homeworkId,
+        originTeacherId: v.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
         pageSize: this.allNoapprovalList.pageSize,
@@ -1285,7 +1292,8 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade:this.allNoapprovalList.Allotgarde,
         subject:this.allNoapprovalList.Allotsubjct,
-         homeworkId:this.allNoapprovalList.homeworkId,
+        homeworkId:this.allNoapprovalList.homeworkId,
+        originTeacherId:this.allNoapprovalList.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: 1,
         pageSize: this.allNoapprovalList.pageSize,
@@ -1297,7 +1305,8 @@ export default {
       this.$store.dispatch("TeacherAllotList", {
         grade: this.allNoapprovalList.Allotgarde,
         subject: this.allNoapprovalList.Allotsubjct,
-           homeworkId:this.allNoapprovalList.homeworkId,
+        homeworkId:this.allNoapprovalList.homeworkId,
+        originTeacherId:this.allNoapprovalList.teacherId,
         maxCreateTime: this.filters.MaxtimeValue,
         pageNo: this.allNoapprovalList.pageNo,
         pageSize: this.allNoapprovalList.pageSize,
@@ -1308,7 +1317,8 @@ export default {
     async GOtoTeacherAllot(v, k) {
       this.$store.dispatch("toTeacherAllot", {
         teacherId: v.teacherId,
-        homeworkId: this.allotList.homeworkId
+        homeworkId: this.allotList.homeworkId,
+        originTeacherId:this.homeworkLIst.teacherId,
       });
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
@@ -1318,7 +1328,8 @@ export default {
     async GOtoTeacherAllotAppovar(v, k) {
       this.$store.dispatch("toTeacherAllot", {
         teacherId: v.teacherId,
-        homeworkId: this.allNoapprovalList.homeworkId
+        homeworkId: this.allNoapprovalList.homeworkId,
+        originTeacherId:this.allNoapprovalList.teacherId,
       });
       v.type = 1;
       this.$set(this.TeacherAllotList.list, k, v);
@@ -1420,8 +1431,8 @@ export default {
       // $ ( ‘html’ ).css({ ‘overflow’ : ’hidden’ , ’position’: ’fixed’, ’top’: ’- ‘+scroll+’px’})
       if (str == 1) {
         _this.hiddenModel = true;
-           this.allotList.pageNo = 1;
-              this.inputValueAllot = ""
+        this.allotList.pageNo = 1;
+        this.inputValueAllot = ""
         this.TeacherAllot(v);
         this.allotList.Allotgarde = v.grade;
         this.allotList.Allotsubjct = v.subject;
@@ -1456,6 +1467,7 @@ export default {
         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 = ""

src/pages/super/SuperAdmin.vue

@@ -85,8 +85,14 @@
           </el-table-column>
           <el-table-column prop="status" label="" header-align="center" width="250">
             <template slot-scope="scope">
-              <el-button type="success"  @click="groupDetail(scope.row.managerId)" >小组详情</el-button>
-              <el-button type="success" plain @click="isShow(1,scope.row.managerId)" v-if="scope.$index>0">管理员详情</el-button>
+                 <div class="UpTeacherTeam"  @click="groupDetail(scope.row.managerId)">
+                  <span>小组详情</span>
+                </div>
+                  <div class="UpTeacherIDiNfo"  @click="isShow(1,scope.row.managerId)" v-if="scope.$index>0">
+                  <span>管理员详情</span>
+                </div>
+              <!-- <el-button type="success"  @click="groupDetail(scope.row.managerId)" >小组详情</el-button>
+              <el-button type="success" plain @click="isShow(1,scope.row.managerId)" v-if="scope.$index>0">管理员详情</el-button> -->
             </template>
           </el-table-column>
 
@@ -578,4 +584,42 @@
   background-color: #f56c6c;
   border-color: #f56c6c;
 }
+.UpTeacherTeam {
+  display: inline-block;
+  height: 40px;
+  width: 120px;
+  color: #67c23a;
+  background: #f0f9eb;
+  border-color: #c2e7b0;
+  /* border-radius: 20px; */
+  font-size: 14px;
+  line-height: 40px;
+  cursor: pointer;
+  border: 1px solid;
+  text-align:center;
+}
+.UpTeacherTeam:hover {
+  color: #fff;
+  background-color: #67c23a;
+  border-color: #67c23a;
+}
+.UpTeacherIDiNfo {
+  display: inline-block;
+  height: 40px;
+  width: 120px;
+  color: #fff;
+  background-color: #67c23a;
+  border-color: #67c23a;
+  /* border-radius: 20px; */
+  font-size: 14px;
+  line-height: 40px;
+  cursor: pointer;
+  border: 1px solid;
+  text-align:center;
+}
+.UpTeacherIDiNfo:hover {
+ color: #67c23a;
+  background: #f0f9eb;
+  border-color: #c2e7b0;
+}
 </style>