Home Explore Help
Sign In
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'beta' of https://git.cocorobo.cn/CocoRoboLabs/pbl-teacher-table into beta

SanHQin 1 year ago
parent
7f1072dcc5 2819b88057
commit
82231ba71b
8 changed files with 27 additions and 6 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.f5dcb525eb5c9c19396816675ca08bb1.css
  3. 0 0
      dist/static/css/app.f5dcb525eb5c9c19396816675ca08bb1.css.map
  4. 0 0
      dist/static/js/app.ae9aada9043912358c24.js
  5. 0 0
      dist/static/js/app.ae9aada9043912358c24.js.map
  6. 0 0
      dist/static/js/manifest.571c38d63f24b1ae9e16.js.map
  7. 20 4
      src/components/pages/studentManage/student.vue
  8. 6 1
      src/components/pages/sz/teacher.vue

+ 1 - 1
dist/index.html
View File 

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

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.f5dcb525eb5c9c19396816675ca08bb1.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.f5dcb525eb5c9c19396816675ca08bb1.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.ae9aada9043912358c24.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.ae9aada9043912358c24.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.571c38d63f24b1ae9e16.js.map


+ 20 - 4
src/components/pages/studentManage/student.vue
View File 

@@ -690,13 +690,27 @@ export default {
 
             for (var cj = 0; cj < 3; cj++) {
 
               num += Math.floor(Math.random() * 10);
 
             }
 
-            a =
 
+            // a =
 
+            //   pinyin.getFullChars(v["学生姓名"]).toLowerCase() +
 
+            //   num +
 
+            //   "@cocorobo.cc";
 
+             a =
 
               pinyin.getFullChars(v["学生姓名"]).toLowerCase() +
 
-              num +
 
-              "@cocorobo.cc";
 
+              num + _this.userSuffix;
 
             obj.sId = v["学号"];
 
             obj.name = v["学生姓名"];
 
-            obj.mail = v["学生账号"] ? v["学生账号"] : a;
 
+            // obj.mail = v["学生账号"] ? v["学生账号"] : a;
 
+            // console.log('v["学生账号"]',v["学生账号"]==true,v["学生账号"]);
 
+            if (v["学生账号"]) {
 
+              if(/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(v["学生账号"])){
 
+                obj.mail = v["学生账号"];
 
+              }else{
 
+                obj.mail = v["学生账号"] + "@" + _this.userSuffix
 
+              }
 
+              
+            }else{
 
+              obj.mail = a;
 
+            }
 
             obj.phone = v["学生手机号"];
 
             obj.class = v["班级"];
 
             arr.push(obj);
 
@@ -739,6 +753,7 @@ export default {
 
               _this.$message.error("有学生账号格式不正确,请重新上传");
 
               break;
 
             }
 
+            //#region 
             //  else if (item.school === "") {
 
             // 	_b = 1;
 
             // 	_this.$message.error("学生学校不能为空,请重新上传");
 
@@ -964,6 +979,7 @@ export default {
 
             // }
 
             // } else {
 
             //   loading.close();
 
+            //#endregion
 
           }
 
           let z = 2;
 
           let newArr = JSON.stringify(arr);

+ 6 - 1
src/components/pages/sz/teacher.vue
View File 

@@ -850,7 +850,12 @@ export default {
 
           this.da.map(v => {
 
             let obj = {};
 
             obj.name = v["教师姓名"];
 
-            obj.mail = v["教师账号"];
 
+            // obj.mail = v["教师账号"];
 
+            if(/^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+(\.[a-zA-Z0-9_-])+/.test(v["教师账号"])){
 
+              obj.mail = v["教师账号"];
 
+            }else{
 
+              obj.mail = v["教师账号"] + "@" + _this.userSuffix
 
+            }
 
             obj.school = v["学校"];
 
             arr.push(obj);
 
           });

Some files were not shown because too many files changed in this diff