فهرست منبع

Merge branch 'beta'

SanHQin 9 ساعت پیش
والد
کامیت
fed4b4a49a

+ 1 - 1
dist/index.html

@@ -37,7 +37,7 @@
       width: 100%;
       background: #e6eaf0;
       font-family: '黑体';
-    }</style><link href=./static/css/app.bed48d3b47454c513017f836d0a3c202.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.4fe3039e3721320d6197.js></script><script type=text/javascript src=./static/js/app.1115b0f0d87f105aef38.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.37b23da2405638b40f02855369dd8bdd.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.23ea04dc469b57e2b4f8.js></script><script type=text/javascript src=./static/js/vendor.4fe3039e3721320d6197.js></script><script type=text/javascript src=./static/js/app.be54a270ad4225a81177.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.37b23da2405638b40f02855369dd8bdd.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/app.37b23da2405638b40f02855369dd8bdd.css.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/workPage.91a4a1baa0e76d9a14a8d9811829bb2f.css


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/css/workPage.91a4a1baa0e76d9a14a8d9811829bb2f.css.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.be54a270ad4225a81177.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/app.be54a270ad4225a81177.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/workPage.7e753ce511945ee8291a.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/workPage.7e753ce511945ee8291a.js.map


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/workPage.d5f28b0154bea83da9f5.js


تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
dist/static/js/workPage.d5f28b0154bea83da9f5.js.map


+ 1 - 1
dist/workPage.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.af08843a59d829cbfdea917b65895436.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b6275e4cf468b42a92b.js></script><script type=text/javascript src=./static/js/workPage.7e753ce511945ee8291a.js></script></body></html><script>function stopSafari() {
+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><title>工作页面 - CocoFlow</title><link rel=icon href=../static/logo.ico><link href=./static/css/workPage.91a4a1baa0e76d9a14a8d9811829bb2f.css rel=stylesheet></head><body><noscript><strong>We're sorry but this app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script type=text/javascript src=./static/js/workPage-manifest.2ece51fa34be51c8610a.js></script><script type=text/javascript src=./static/js/workPage-vendor.7b6275e4cf468b42a92b.js></script><script type=text/javascript src=./static/js/workPage.d5f28b0154bea83da9f5.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

+ 1 - 1
src/components/pages/studentManageNew/component/allClaAddStu.vue

@@ -103,7 +103,7 @@
         height="300px"
         :show-header="false"
         class="tableList"
-        v-loading="tableLoading"
+        v-loading="tableLoading || confirmLoading"
         @selection-change="handleInterestClaSelectionChange"
       >
         <el-table-column

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

@@ -70,6 +70,11 @@ export default {
         });
         return;
       }
+      if (this.isLoading) {
+        this.$message.warning(this.lang.ssEditing);
+        return;
+      }
+      this.isLoading = true;
       this.confirmClaEdit();
     },
     // 修改班级名称确定
@@ -83,6 +88,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "updateClassNew", params)
         .then((res) => {
+          this.isLoading = false;
           if (res.data[0] && res.data[0][0].classname == 1) {
             this.$message({
               message: this.lang.Cannotsameothercla,
@@ -102,6 +108,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.isLoading = false;
           this.$message({
             message: this.lang.Modificationfailed,
             type: "error",

+ 80 - 7
src/components/pages/studentManageNew/component/table.vue

@@ -400,7 +400,7 @@
           <span>{{ lang.ssAddInterCla }}</span>
         </div>
       </template>
-      <div class="dia_box_item2">
+      <div class="dia_box_item2" v-loading="addInterestClaLoading">
         <div class="addcla_box_item">
           <span>{{ lang.ssInterClaNameColon }}</span>
           <el-input
@@ -556,7 +556,7 @@
 
     <div class="pop-upBox">
       <el-dialog :visible.sync="popBoxdia" width="480px" :show-close="false">
-        <div class="msgCon">
+        <div class="msgCon" v-loading="isLoading">
           <img
             style="width: 20px;"
             v-if="deltypy == 7 || deltypy == 8"
@@ -695,7 +695,7 @@ export default {
       tab0Loading: false,
       tab1Loading: false,
       tab2Loading: false,
-
+      addInterestClaLoading: false,
       deleteClassStudentoneId: {}, // 兴趣班移除学生信息
 
 
@@ -875,13 +875,14 @@ export default {
               type: "success"
             });
             this.popBoxdia = false;
-
+            this.isLoading = false;
             this.$emit("getGrade", this.delClaidtype);
             this.refresh();
             this.delClaid = "";
             this.deltypy = 0;
           })
           .catch(err => {
+            this.isLoading = false;
             this.$message.error(this.lang.Deletefailed);
             console.error(err);
           });
@@ -1016,6 +1017,7 @@ export default {
               this.moveClaVisible = false;
               this.moveClaCascaderDataPath = [];
               this.popBoxdia = false;
+              this.isLoading = false;
               this.$emit("getGrade");
               this.refresh();
             })
@@ -1025,9 +1027,12 @@ export default {
                 message: this.lang.ssMoveStuFail,
                 type: "error"
               });
+              this.isLoading = false;
             });
         })
-        .catch(() => {});
+        .catch(() => {
+          this.isLoading = false;
+        });
       // })
       // .catch(() => {});
     },
@@ -1073,10 +1078,12 @@ export default {
           });
 
           this.popBoxdia = false;
+          this.isLoading = false;
           this.refresh();
           this.$emit("getGrade");
         })
         .catch(err => {
+          this.isLoading = false;
           console.error(err);
           this.$message({
             message: this.lang.ssRemoveStuFail,
@@ -1107,7 +1114,11 @@ export default {
       this.deleteClassStudentoneId = val;
     },
     confirmDeleteClassStudentone() {
-      this.popBoxdia = false;
+      if (this.isLoading) {
+        this.$message.warning(this.lang.ssRemoving);
+        return;
+      }
+      this.isLoading = true;
       let params = [{ uid: this.deleteClassStudentoneId.userid, cid: this.activeId }];
         this.ajax
           .post(this.$store.state.api + "deleteClassStudent", params)
@@ -1118,11 +1129,14 @@ export default {
               type: "success"
             });
             this.popBoxdia = false;
+            this.isLoading = false;
             this.deleteClassStudentoneId = {};
             this.refresh();
             this.$emit("getGrade");
           })
           .catch(err => {
+            this.isLoading = false;
+            this.popBoxdia = false;
             this.$message({
               message: this.lang.ssRemoveStuFail,
               type: "error"
@@ -1157,11 +1171,13 @@ export default {
       });
       Promise.all(promises)
         .then(() => {
+          this.isLoading = false;
           this.popBoxdia = false;
           this.deltypy = 7;
           this.popBoxdia = true;
         })
         .catch(err => {
+          this.isLoading = false;
           console.error(err);
           this.$message({
             message: this.lang.ssResetPwdPartErr,
@@ -1222,12 +1238,14 @@ export default {
           //   type: "success",
           // });
           this.popBoxdia = false;
+          this.isLoading = false;
           this.deltypy = 8;
           this.popBoxdia = true;
           // this.$refs.msgboxref.dialogVisible = true;
         })
         .catch(err => {
           this.popBoxdia = false;
+          this.isLoading = false;
           this.$message({
             message: this.lang.ssResetPwdFail,
             type: "error"
@@ -1248,21 +1266,51 @@ export default {
     // 判断使用单删onedelstu ,twodelstu批量删除
     confirmDelStu() {
       if (this.deltypy == 1) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssDeleting);
+          return;
+        }
+        this.isLoading = true;
         this.onedelstu();
         this.addOp3('1', "", { type: "student_delete" }, "success")
       } else if (this.deltypy == 2) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssDeleting);
+          return;
+        }
+        this.isLoading = true;
         this.twodelstu();
         this.addOp3('1', "", { type: "student_delete" }, "success")
       } else if (this.deltypy == 3) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssDeletingClass);
+          return;
+        }
+        this.isLoading = true;
         this.confirmdeleteCla();
         this.addOp3('1', "", { type: "class_delete" }, "success")
       } else if (this.deltypy == 4) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssRemovingStu);
+          return;
+        }
+        this.isLoading = true;
         this.confirmRemove();
         this.addOp3('1', "", { type: "student_remove" }, "success")
       } else if (this.deltypy == 5) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssResettingPwd);
+          return;
+        }
+        this.isLoading = true;
         this.confirmrestpsd();
         this.addOp3('1', "", { type: "student_reset_password" }, "success")
       } else if (this.deltypy == 6) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssResettingPwd);
+          return;
+        }
+        this.isLoading = true;
         this.confirminPassword();
         this.addOp3('1', "", { type: "student_reset_password" }, "success")
       } else if (this.deltypy == 7) {
@@ -1271,9 +1319,19 @@ export default {
       } else if (this.deltypy == 8) {
         this.popBoxdia = false;
       } else if (this.deltypy == 9) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssMoving);
+          return;
+        }
+        this.isLoading = true;
         this.confirmMoveClaEditStu();
         this.addOp3('1', "", { type: "student_move" }, "success")
       } else if (this.deltypy == 10) {
+        if (this.isLoading) {
+          this.$message.warning(this.lang.ssEditingStu);
+          return;
+        }
+        this.isLoading = true;
         this.update_Student(this.EditStubox);
         this.addOp3('1', "", { type: "student_edit" }, "success")
       } else if (this.deltypy == 11) {
@@ -1290,6 +1348,7 @@ export default {
           // this.getAllStudent();
           this.delStuinfo = {};
           this.popBoxdia = false;
+          this.isLoading = false;
           this.$emit("getGrade");
 
           this.refresh();
@@ -1299,6 +1358,7 @@ export default {
           });
         })
         .catch(err => {
+          this.isLoading = false;
           console.error(err);
           this.popBoxdia = false;
           this.$message({
@@ -1315,6 +1375,7 @@ export default {
         .then(() => {
           this.refresh();
           this.popBoxdia = false;
+          this.isLoading = false;
           this.cancelAllSelection();
           this.$emit("getGrade");
           this.$message({
@@ -1328,6 +1389,9 @@ export default {
             message: this.lang.ssPartDelFail,
             type: "error"
           });
+        })
+        .finally(() => {
+          this.isLoading = false;
         });
     },
     // 删除学生Promise
@@ -1350,6 +1414,7 @@ export default {
     closeDia() {
       this.delStuinfo = {};
       this.popBoxdia = false;
+      this.isLoading = false;
     },
     // 移动班级学生级联选中数据路径改变
     handlemoveChangecascader(val) {
@@ -1415,6 +1480,11 @@ export default {
         });
         return;
       }
+      if (this.addInterestClaLoading) {
+        this.$message.warning(this.lang.ssAddingInterCla);
+        return;
+      }
+      this.addInterestClaLoading = true;
       //新增班级
       let params = [
         {
@@ -1429,6 +1499,7 @@ export default {
       this.ajax
         .post(this.$store.state.api + "addClassgraNew", params)
         .then(res => {
+          this.addInterestClaLoading = false;
           if (res.data[0] && res.data[0][0].classname == 1) {
             this.$message({
               message: this.lang.Cannotsameothercla,
@@ -1446,6 +1517,7 @@ export default {
           }
         })
         .catch(err => {
+          this.addInterestClaLoading = false;
           this.$message({
             message: this.lang.Additionfailed,
             type: "error"
@@ -1521,12 +1593,13 @@ export default {
           this.refresh();
           this.$emit("getGrade");
           this.popBoxdia = false;
+          this.isLoading = false;
           this.EditStubox = "";
           this.stuEditInfo = {};
           this.cascaderDataPath = [];
         })
         .catch(err => {
-          // this.isLoading = false;
+          this.isLoading = false;
           this.$message({
             message: this.lang.Modificationfailed,
             type: "error"

+ 27 - 4
src/components/pages/studentManageNew/index.vue

@@ -149,7 +149,7 @@
       :show-close="false"
       class="addClassDialog"
     >
-      <div class="addcla_box">
+      <div class="addcla_box" v-loading="addgraLoading">
         <div class="addcla_box_item">
           <span>{{ lang.ssGradeType }}{{ lang.ssColon }}</span>
           <el-input v-model.trim="addgraName" :placeholder="lang.EnterGrade"></el-input>
@@ -189,7 +189,7 @@
 
     <div class="pop-upBox">
       <el-dialog :visible.sync="popBoxdia" width="480px" :show-close="false">
-        <div class="msgCon">
+        <div class="msgCon" v-loading="isLoading">
           <img
             style="width: 20px;"
             src="../../../assets/stuImg/tishi.svg"
@@ -225,7 +225,7 @@
       :show-close="false"
       class="addClassDialog"
     >
-      <div class="addcla_box">
+      <div class="addcla_box" v-loading="editGradeLoading">
         <div class="addcla_box_item">
           <span>{{ lang.ssGradeType }}:</span>
           <el-input v-model.trim="editGradeName" :placeholder="lang.EnterGrade"></el-input>
@@ -264,7 +264,9 @@ export default {
       addgraVisible:false,
       addclaName: "", // 新增班级名称
       addclaGrade: "", // 新增班级所属年级
-
+      isLoading: false,
+      addgraLoading: false,
+      editGradeLoading: false,
       addgraName:'',
 
       orglist:[
@@ -315,6 +317,11 @@ export default {
 
     // 确认编辑年级
     confirmEditGrade(){
+      if (this.editGradeLoading) {
+        this.$message.warning(this.lang.ssEditing);
+        return;
+      }
+      this.editGradeLoading = true;
       if (!this.editGradeName) {
         this.$message.error(this.lang.EnterGradeName)
         this.editGradeName = this.tableData.find((item) => item.id == this.editGradeId).name
@@ -332,6 +339,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "updateGrade", params)
         .then((res) => {
+          this.editGradeLoading = false;
           if (res.data[0] && res.data[0][0].classname == 1) {
             this.$message({
               message: this.lang.Cannotsameother,
@@ -350,6 +358,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.editGradeLoading = false;
           this.$message({
             message: this.lang.Modificationfailed,
             type: "error",
@@ -366,6 +375,11 @@ export default {
     },
     // 确认删除年级
     confirmDeleteGrade(){
+      if (this.isLoading) {
+        this.$message.warning(this.lang.ssDeleting);
+        return;
+      }
+      this.isLoading = true;
       let params = {
         id: this.deleteGradeId,
       };
@@ -373,6 +387,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "deleteGrade", params)
         .then((res) => {
+          this.isLoading = false;
           this.$message({
             message: this.lang.Successfullydelete,
             type: "success",
@@ -383,6 +398,7 @@ export default {
           this.addOp3('1', "", { type: "grade_delete" }, "success")
         })
         .catch((err) => {
+          this.isLoading = false;
           this.$message.error(this.lang.Deletefailed);
           this.addOp3('1', "", { type: "grade_delete" }, err)
           console.error(err);
@@ -390,6 +406,11 @@ export default {
     },
     // 添加年级
     addgra(){
+      if (this.addgraLoading) {
+        this.$message.warning(this.lang.ssAdding);
+        return;
+      }
+      this.addgraLoading = true;
       if (!this.addgraName) {
         this.$message.error(this.lang.EnterGradeName)
       }
@@ -401,6 +422,7 @@ export default {
       this.ajax
         .get(this.$store.state.api + "insertGrade", params)
         .then((res) => {
+          this.addgraLoading = false;
           if (res.data[0] && res.data[0][0].classname == 1) {
             this.$message({
               message: this.lang.Cannotsameother,
@@ -420,6 +442,7 @@ export default {
           }
         })
         .catch((err) => {
+          this.addgraLoading = false;
           this.addOp3('1', "", { type: "grade_add" }, err)
           this.$message({
             message: this.lang.Additionfailed,

+ 10 - 0
src/lang/cn.json

@@ -1999,6 +1999,16 @@
   "ssResetPwdPartErr":"部分密码重置失败,请重试",
   "ssResetPwdFail":"密码重置失败",
   "ssPartDelFail":"部分删除失败,请重试",
+  "ssDeleting":"正在删除中",
+  "ssAdding":"正在添加中",
+  "ssAddingInterCla":"正在添加兴趣班中",
+  "ssDeletingClass":"正在删除班级中",
+  "ssRemoving":"正在移除中",
+  "ssRemovingStu":"正在移除学生中",
+  "ssResettingPwd":"正在重置密码中",
+  "ssMoving":"正在移动中",
+  "ssEditing":"正在编辑中",
+  "ssEditingStu":"正在编辑学生中",
   "ssOnlyCreatorEdit":"仅限创建者编辑",
   "ssTargetClass":"目标班级:",
   "ssSearchStuLbl":"搜索学生:",

+ 10 - 0
src/lang/en.json

@@ -1998,6 +1998,16 @@
   "ssResetPwdPartErr":"Some passwords failed to reset, please try again",
   "ssResetPwdFail":"Password reset failed",
   "ssPartDelFail":"Some deletions failed, please try again",
+  "ssDeleting":"Deleting...",
+  "ssAdding":"Adding...",
+  "ssAddingInterCla":"Adding interest class...",
+  "ssDeletingClass":"Deleting class...",
+  "ssRemoving":"Removing...",
+  "ssRemovingStu":"Removing student...",
+  "ssResettingPwd":"Resetting password...",
+  "ssMoving":"Moving...",
+  "ssEditing":"Editing...",
+  "ssEditingStu":"Editing student...",
   "ssOnlyCreatorEdit":"Only the creator can edit",
   "ssTargetClass":"Target class:",
   "ssSearchStuLbl":"Search student:",

+ 10 - 0
src/lang/hk.json

@@ -1998,6 +1998,16 @@
   "ssResetPwdPartErr":"部分密碼重置失敗,請重試",
   "ssResetPwdFail":"密碼重置失敗",
   "ssPartDelFail":"部分刪除失敗,請重試",
+  "ssDeleting":"正在刪除中",
+  "ssAdding":"正在添加中",
+  "ssAddingInterCla":"正在添加興趣班中",
+  "ssDeletingClass":"正在刪除班級中",
+  "ssRemoving":"正在移除中",
+  "ssRemovingStu":"正在移除學生中",
+  "ssResettingPwd":"正在重置密碼中",
+  "ssMoving":"正在移動中",
+  "ssEditing":"正在編輯中",
+  "ssEditingStu":"正在編輯學生中",
   "ssOnlyCreatorEdit":"僅限創建者編輯",
   "ssTargetClass":"目標班級:",
   "ssSearchStuLbl":"搜索學生:",

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است