11wqe1 4 週間 前
コミット
5bcc9ea02d

+ 4 - 2
src/components/pages/studentManageNew/component/addstu.vue

@@ -250,7 +250,6 @@ export default {
         if (newVal == 1) {
         if (newVal == 1) {
           this.stuListTypeList = [];
           this.stuListTypeList = [];
           this.addStuType = 3;
           this.addStuType = 3;
-          // this.$refs.allClaAddSturef.clearData();
         } else if (newVal == 0) {
         } else if (newVal == 0) {
           this.stuListTypeList = this.tab1;
           this.stuListTypeList = this.tab1;
           this.addStuType = 1;
           this.addStuType = 1;
@@ -346,9 +345,12 @@ export default {
 
 
       // this.addStuType=1
       // this.addStuType=1
       if (this.boxType == 1) {
       if (this.boxType == 1) {
-        this.$refs.allClaAddSturef.clearData();
         this.stuListTypeList = [];
         this.stuListTypeList = [];
         this.addStuType = 3;
         this.addStuType = 3;
+        // this.nextTick(() => {
+        //   this.$refs.allClaAddSturef.clearData();
+        // });
+
       } else if (this.boxType == 0) {
       } else if (this.boxType == 0) {
         this.stuListTypeList = this.tab1;
         this.stuListTypeList = this.tab1;
         this.addStuType = 1;
         this.addStuType = 1;

+ 7 - 10
src/components/pages/studentManageNew/component/editInterstcla.vue

@@ -35,11 +35,7 @@ export default {
     interestClaEditInfo: {
     interestClaEditInfo: {
       type: Object,
       type: Object,
       default: () => {},
       default: () => {},
-    },
-    cascaderData: {
-      type: Array,
-      default: () => [],
-    },
+    }
   },
   },
   watch: {
   watch: {
     interestClaEditInfo: {
     interestClaEditInfo: {
@@ -56,11 +52,6 @@ export default {
       oid: this.$route.query.oid,
       oid: this.$route.query.oid,
       role: this.$route.query.role,
       role: this.$route.query.role,
       clainfo: {}, // 班级信息
       clainfo: {}, // 班级信息
-      studentColumns: [
-        { label: this.lang.StudentName, prop: "username" },
-        { label: this.lang.Account, prop: "acc" },
-        { label: this.lang.Class, prop: "classname" },
-      ],
       InterestClaEditvisible: false, // 兴趣班编辑信息
       InterestClaEditvisible: false, // 兴趣班编辑信息
       isLoading: false, // 是否加载中
       isLoading: false, // 是否加载中
     };
     };
@@ -102,6 +93,10 @@ export default {
               message: this.lang.Editsuccessful,
               message: this.lang.Editsuccessful,
               type: "success",
               type: "success",
             });
             });
+            this.$emit("getInterestClass");
+            this.$emit("getCascaderData");
+            this.InterestClaEditvisible = false;
+
             this.addOp3('1', "", { type: "interest_class_edit" }, "success")
             this.addOp3('1', "", { type: "interest_class_edit" }, "success")
           }
           }
         })
         })
@@ -110,6 +105,8 @@ export default {
             message: this.lang.Modificationfailed,
             message: this.lang.Modificationfailed,
             type: "error",
             type: "error",
           });
           });
+          this.InterestClaEditvisible = false;
+
           console.error(err);
           console.error(err);
           this.addOp3('1', "", { type: "interest_class_edit" }, err)
           this.addOp3('1', "", { type: "interest_class_edit" }, err)
         });
         });

+ 56 - 4
src/components/pages/studentManageNew/component/table.vue

@@ -277,7 +277,7 @@
                     <div @click="editStudent(scope.row)">{{ lang.edit }}</div>
                     <div @click="editStudent(scope.row)">{{ lang.edit }}</div>
                     <div
                     <div
                       v-if="boxType == 1 && interestType == 1"
                       v-if="boxType == 1 && interestType == 1"
-                      @click="deleteClassStudent(scope.row.userid)"
+                      @click="deleteClassStudentone(scope.row)"
                     >
                     >
                       {{ lang.Remove }}
                       {{ lang.Remove }}
                     </div>
                     </div>
@@ -536,6 +536,7 @@
     <editInterstcla
     <editInterstcla
       ref="editInterstcla"
       ref="editInterstcla"
       @getCascaderData="getCascaderData"
       @getCascaderData="getCascaderData"
+      @getInterestClass="getInterestClass"
       :cascaderData="cascaderData"
       :cascaderData="cascaderData"
       :interestClaEditInfo="InterestClaEditInfo"
       :interestClaEditInfo="InterestClaEditInfo"
     />
     />
@@ -589,6 +590,9 @@
             <div v-if="deltypy == 10">
             <div v-if="deltypy == 10">
               {{ lang.ssConfirmEditStu.replace(/\*/g, stuEditInfo.username) }}
               {{ lang.ssConfirmEditStu.replace(/\*/g, stuEditInfo.username) }}
             </div>
             </div>
+            <div v-if="deltypy == 11">
+              {{ lang.ssConfirmDeleteClassStudentone.replace(/\*/g, deleteClassStudentoneId.username) }}
+            </div>
           </div>
           </div>
           <div class="msgContxt" v-if="deltypy == 7 || deltypy == 8">
           <div class="msgContxt" v-if="deltypy == 7 || deltypy == 8">
             <div v-if="deltypy == 7">
             <div v-if="deltypy == 7">
@@ -691,6 +695,9 @@ export default {
       tab1Loading: false,
       tab1Loading: false,
       tab2Loading: false,
       tab2Loading: false,
 
 
+      deleteClassStudentoneId: {}, // 兴趣班移除学生信息
+
+
       delClaid: "",
       delClaid: "",
       delClaidtype: "",
       delClaidtype: "",
 
 
@@ -1086,6 +1093,36 @@ export default {
           });
           });
       });
       });
     },
     },
+    deleteClassStudentone(val) {
+      this.deltypy = 11;
+      this.popBoxdia = true;
+      this.deleteClassStudentoneId = val;
+    },
+    confirmDeleteClassStudentone() {
+      this.popBoxdia = false;
+      let params = [{ uid: this.deleteClassStudentoneId.userid, cid: this.activeId }];
+        this.ajax
+          .post(this.$store.state.api + "deleteClassStudent", params)
+          .then(res => {
+            console.log("res", res);
+            this.$message({
+              message: this.lang.ssRemoveStuSucc,
+              type: "success"
+            });
+            this.popBoxdia = false;
+            this.deleteClassStudentoneId = {};
+            this.refresh();
+            this.$emit("getGrade");
+          })
+          .catch(err => {
+            this.$message({
+              message: this.lang.ssRemoveStuFail,
+              type: "error"
+            });
+            this.deleteClassStudentoneId = {};
+            console.error(err);
+          });
+    },
 
 
     // 批量重置密码
     // 批量重置密码
     resetPassword() {
     resetPassword() {
@@ -1231,6 +1268,9 @@ export default {
       } else if (this.deltypy == 10) {
       } else if (this.deltypy == 10) {
         this.update_Student(this.EditStubox);
         this.update_Student(this.EditStubox);
         this.addOp3('1', "", { type: "student_edit" }, "success")
         this.addOp3('1', "", { type: "student_edit" }, "success")
+      } else if (this.deltypy == 11) {
+        this.confirmDeleteClassStudentone();
+        this.addOp3('1', "", { type: "student_remove" }, "success")
       }
       }
     },
     },
     // 删除学生
     // 删除学生
@@ -1596,7 +1636,11 @@ export default {
       }
       }
     },
     },
     getStudent() {
     getStudent() {
-      this.tab0Loading = true;
+      if(this.boxType == 0){
+        this.tab0Loading = true;
+      }else if(this.boxType == 1){
+        this.tab1Loading = true;
+      }
       this.tableColumns = [];
       this.tableColumns = [];
       this.tableColumns = this.studentColumns;
       this.tableColumns = this.studentColumns;
       let params = {
       let params = {
@@ -1607,7 +1651,11 @@ export default {
       this.ajax
       this.ajax
         .get(this.$store.state.api + "selectclaStu", params)
         .get(this.$store.state.api + "selectclaStu", params)
         .then(res => {
         .then(res => {
-          this.tab0Loading = false;
+          if(this.boxType == 0){
+            this.tab0Loading = false;
+          }else if(this.boxType == 1){
+            this.tab1Loading = false;
+          }
           let box1 = res.data[0];
           let box1 = res.data[0];
           box1.forEach(e => {
           box1.forEach(e => {
             let kk = [];
             let kk = [];
@@ -1628,7 +1676,11 @@ export default {
           );
           );
         })
         })
         .catch(err => {
         .catch(err => {
-          this.tab0Loading = false;
+          if(this.boxType == 0){
+            this.tab0Loading = false;
+          }else if(this.boxType == 1){
+            this.tab1Loading = false;
+          }
           console.error(err);
           console.error(err);
         });
         });
     },
     },

+ 2 - 15
src/lang/cn.json

@@ -1048,20 +1048,6 @@
   "ssQChainNotGen":"问题链还未生成完,请前往查看,回答完毕后再次操作。",
   "ssQChainNotGen":"问题链还未生成完,请前往查看,回答完毕后再次操作。",
   "ssCourseSettings":"课程设置",
   "ssCourseSettings":"课程设置",
   "ssApply":"应用",
   "ssApply":"应用",
-  "ssPublishCourse":"发布课程",
-  "ssVisibilityRange":"可见范围",
-  "ssOnlyStudentsVisible":"仅发布学生可见",
-  "ssOnlyStudentsDesc":"仅对发布的班级学生可见,其他人无法访问",
-  "ssOrganizationVisible":"组织可见",
-  "ssOrganizationDesc":"学校内所有教师均可查看",
-  "ssCourseCover":"课程封面",
-  "ssHoverToSelectUpload":"悬浮选择上传方式",
-  "ssUploadFromLocal":"自本地上传",
-  "ssSearchFromWeb":"自网页搜索",
-  "ssGenerateFromAI":"自AI生成",
-  "ssWebSearchImage":"网页搜索图片",
-  "ssSearchKeyword":"搜索关键词",
-  "ssConfirmPublish":"确认发布",
   "ssTargetNotGen":"目标层还未生成完,请前往查看,回答完毕后再次操作。",
   "ssTargetNotGen":"目标层还未生成完,请前往查看,回答完毕后再次操作。",
   "ssTaskClusNotGen":"任务簇还未生成完,请前往查看,回答完毕后再次操作。",
   "ssTaskClusNotGen":"任务簇还未生成完,请前往查看,回答完毕后再次操作。",
   "ssGenDescFirst":"请生成简要描述后再生成大纲",
   "ssGenDescFirst":"请生成简要描述后再生成大纲",
@@ -2032,7 +2018,8 @@
   "ssUntitledCourse":"暂未命名",
   "ssUntitledCourse":"暂未命名",
   "ssPPtUpProgress":"上传进度(*)",
   "ssPPtUpProgress":"上传进度(*)",
   "ssBilibiliVideoSearchKeyword":"请输入关键词",
   "ssBilibiliVideoSearchKeyword":"请输入关键词",
-  "ssEditGrade":"编辑年级"
+  "ssEditGrade":"编辑年级",
+  "ssConfirmDeleteClassStudentone":"确认移除*学生?"
 
 
 
 
 
 

+ 2 - 1
src/lang/en.json

@@ -2031,6 +2031,7 @@
   "ssUntitledCourse":"Untitled Course",
   "ssUntitledCourse":"Untitled Course",
   "ssPPtUpProgress":"Uploading (*)",
   "ssPPtUpProgress":"Uploading (*)",
   "ssBilibiliVideoSearchKeyword":"Please enter a keyword",
   "ssBilibiliVideoSearchKeyword":"Please enter a keyword",
-  "ssEditGrade":"Edit Grade"
+  "ssEditGrade":"Edit Grade",
+  "ssConfirmDeleteClassStudentone":"Confirm remove * student?"
 
 
 }
 }

+ 2 - 1
src/lang/hk.json

@@ -2031,7 +2031,8 @@
   "ssUntitledCourse":"暫未命名",
   "ssUntitledCourse":"暫未命名",
   "ssPPtUpProgress":"上傳進度(*)",
   "ssPPtUpProgress":"上傳進度(*)",
   "ssBilibiliVideoSearchKeyword":"請輸入關鍵詞",
   "ssBilibiliVideoSearchKeyword":"請輸入關鍵詞",
-  "ssEditGrade":"修改年級"
+  "ssEditGrade":"修改年級",
+  "ssConfirmDeleteClassStudentone":"確定移除 * 名學生嗎?"