Inicio Explorar Axuda
Iniciar sesión
CocoRoboLabs
/
pbl-teacher-table
3
0
Fork 0
Ficheiros Incidencias 0 Pull Requests 0 Wiki
Explorar o código

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

lsc hai 6 horas
pai
a09426eb70 2bad344429
achega
cadd5a78da
Modificáronse 13 ficheiros con 8 adicións e 7 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.d257eb5647efd379234d17efb2537fda.css
  3. 0 0
      dist/static/css/app.d257eb5647efd379234d17efb2537fda.css.map
  4. 0 0
      dist/static/js/app.4855f623014d38d43f5a.js
  5. 0 0
      dist/static/js/app.4855f623014d38d43f5a.js.map
  6. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  7. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  8. 0 0
      dist/static/js/workPage.3f8a68c1d978f7fcdc29.js
  9. 0 0
      dist/static/js/workPage.3f8a68c1d978f7fcdc29.js.map
  10. 0 0
      dist/static/js/workPage.98b6d02184bf777f3815.js
  11. 1 1
      dist/workPage.html
  12. 4 3
      src/components/pages/classroomObservation/components/addNewAnalysisDialog.vue
  13. 2 2
      src/components/pages/studentManageNew/component/addstu.vue

+ 1 - 1
dist/index.html
Ver ficheiro 

@@ -37,7 +37,7 @@
 
       width: 100%;
 
       background: #e6eaf0;
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.1e0887ff02f252b756520de574708ec5.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.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.4c9f3ff1f667a5c44a1b.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.d257eb5647efd379234d17efb2537fda.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.714ff2bfc93f2f096b79.js></script><script type=text/javascript src=./static/js/app.4855f623014d38d43f5a.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.d257eb5647efd379234d17efb2537fda.css


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/css/app.d257eb5647efd379234d17efb2537fda.css.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.4855f623014d38d43f5a.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.4855f623014d38d43f5a.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/workPage.3f8a68c1d978f7fcdc29.js


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/workPage.3f8a68c1d978f7fcdc29.js.map


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/workPage.98b6d02184bf777f3815.js


+ 1 - 1
dist/workPage.html
Ver ficheiro 

@@ -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.eb039ffafd131baf9f7d229e1701a61b.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.3c2261c9f54c5ab3df69.js></script><script type=text/javascript src=./static/js/workPage.98b6d02184bf777f3815.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.eb039ffafd131baf9f7d229e1701a61b.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.3c2261c9f54c5ab3df69.js></script><script type=text/javascript src=./static/js/workPage.3f8a68c1d978f7fcdc29.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

+ 4 - 3
src/components/pages/classroomObservation/components/addNewAnalysisDialog.vue
Ver ficheiro 

@@ -729,9 +729,10 @@ export default {
 
             this.ajax
 
               .post(this.$store.state.api + "insert_smodel", params)
 
               .then(res => {
 
-                if (typeof res.data == "object") {
 
-                  this.$message.warning("该新建的模块名称已存在，请重新输入");
 
-                } else if (res.data == 1) {
 
+                //if (typeof res.data == "object") {
 
+                //  this.$message.warning("该新建的模块名称已存在，请重新输入");
 
+                //} else
 
+                if (res.data == 1) {
 
                   this.boxType = 0;
 
                   this.tagIndex = -1;
 
                   this.form = {

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

@@ -473,7 +473,7 @@ export default {
 
                 _this.org &&
 
                 _this.schoolChar
 
               ) {
 
-                if (accountVal) {
 
+                if (accountVal && /^[a-zA-Z0-9]+$/.test(accountVal)) {
 
                   obj.account = accountVal + '@' + _this.schoolChar + '.' + _this.userSuffix;
 
                 } else {
 
                   obj.account = '';
 
@@ -482,7 +482,7 @@ export default {
 
                 obj.mail =
 
                   uuidv4() + "@" + _this.schoolChar + "." + _this.userSuffix;
 
               } else {
 
-                if (accountVal) {
 
+                if (accountVal && /^[a-zA-Z0-9]+$/.test(accountVal)) {
 
                   obj.account = accountVal + '@' + _this.userSuffix;
 
                 } else {
 
                   obj.account = '';

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio