首页 发现 帮助
登录
CocoRoboLabs
/
pbl-teacher-table
3
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

Merge branch 'beta'

lsc 4 月之前
父节点
51220d486a 2287092e4c
当前提交
2c794faf09
共有 28 个文件被更改，包括 133 次插入 和 115 次删除
分列视图 显示文件统计
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.7a0cb1561e75ad229de627f9ba86ff60.css
  3. 0 0
      dist/static/css/app.7a0cb1561e75ad229de627f9ba86ff60.css.map
  4. 0 0
      dist/static/js/0.4f3b05586c3acc102a54.js.map
  5. 0 0
      dist/static/js/0.7da288988865a9378b49.js
  6. 0 0
      dist/static/js/0.7da288988865a9378b49.js.map
  7. 0 0
      dist/static/js/app.c343f868dae8d6eb89e5.js
  8. 0 0
      dist/static/js/app.c343f868dae8d6eb89e5.js.map
  9. 2 2
      dist/static/js/manifest.3eade43afd174522bb8a.js
  10. 0 0
      dist/static/js/manifest.3eade43afd174522bb8a.js.map
  11. 0 0
      dist/static/js/vendor.5e9ad9b4b6b6930254c8.js
  12. 0 0
      dist/static/js/vendor.5e9ad9b4b6b6930254c8.js.map
  13. 3 3
      src/components/pages/GM/teacher.vue
  14. 14 19
      src/components/pages/aiAddCourse/addCourse.vue
  15. 4 4
      src/components/pages/class.vue
  16. 4 4
      src/components/pages/grade/index.vue
  17. 18 29
      src/components/pages/newCourse/addCourse.vue
  18. 4 4
      src/components/pages/record/class.vue
  19. 5 5
      src/components/pages/student.vue
  20. 3 3
      src/components/pages/studentGM.vue
  21. 4 4
      src/components/pages/studentManage/class.vue
  22. 4 4
      src/components/pages/studentManage/grade/index.vue
  23. 5 5
      src/components/pages/studentManage/student.vue
  24. 48 14
      src/components/pages/sz/teacher.vue
  25. 4 4
      src/components/pages/teacherOffice/index.vue
  26. 4 4
      src/components/pages/teacherOffice/teacherType.vue
  27. 3 3
      src/components/pages/tencent/student.vue
  28. 3 3
      src/components/pages/tencent/teacher.vue

+ 1 - 1
dist/index.html
查看文件 

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

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.7a0cb1561e75ad229de627f9ba86ff60.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.7a0cb1561e75ad229de627f9ba86ff60.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.4f3b05586c3acc102a54.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/0.7da288988865a9378b49.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.c343f868dae8d6eb89e5.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.c343f868dae8d6eb89e5.js.map


+ 2 - 2
dist/static/js/manifest.161e82026ac2ae03ab6f.js → dist/static/js/manifest.3eade43afd174522bb8a.js
查看文件 

@@ -1,2 +1,2 @@
 
-!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,c,a){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in c)Object.prototype.hasOwnProperty.call(c,i)&&(e[i]=c[i]);for(n&&n(r,c,a);l.length;)l.shift()();if(a)for(s=0;s<a.length;s++)f=o(o.s=a[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var c=document.getElementsByTagName("head")[0],a=document.createElement("script");a.type="text/javascript",a.charset="utf-8",a.async=!0,a.timeout=12e4,o.nc&&a.setAttribute("nonce",o.nc),a.src=o.p+"static/js/"+e+"."+{0:"4f3b05586c3acc102a54",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){a.onerror=a.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return a.onerror=a.onload=u,c.appendChild(a),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
-//# sourceMappingURL=manifest.161e82026ac2ae03ab6f.js.map
 
+!function(e){var n=window.webpackJsonp;window.webpackJsonp=function(r,a,c){for(var i,u,f,s=0,l=[];s<r.length;s++)u=r[s],t[u]&&l.push(t[u][0]),t[u]=0;for(i in a)Object.prototype.hasOwnProperty.call(a,i)&&(e[i]=a[i]);for(n&&n(r,a,c);l.length;)l.shift()();if(c)for(s=0;s<c.length;s++)f=o(o.s=c[s]);return f};var r={},t={6:0};function o(n){if(r[n])return r[n].exports;var t=r[n]={i:n,l:!1,exports:{}};return e[n].call(t.exports,t,t.exports,o),t.l=!0,t.exports}o.e=function(e){var n=t[e];if(0===n)return new Promise(function(e){e()});if(n)return n[2];var r=new Promise(function(r,o){n=t[e]=[r,o]});n[2]=r;var a=document.getElementsByTagName("head")[0],c=document.createElement("script");c.type="text/javascript",c.charset="utf-8",c.async=!0,c.timeout=12e4,o.nc&&c.setAttribute("nonce",o.nc),c.src=o.p+"static/js/"+e+"."+{0:"7da288988865a9378b49",1:"14e8e8c7e44fc858e4a6",2:"94e1427bfc7ef0b4c685",3:"3a9f53a78da16650e6b8"}[e]+".js";var i=setTimeout(u,12e4);function u(){c.onerror=c.onload=null,clearTimeout(i);var n=t[e];0!==n&&(n&&n[1](new Error("Loading chunk "+e+" failed.")),t[e]=void 0)}return c.onerror=c.onload=u,a.appendChild(c),r},o.m=e,o.c=r,o.d=function(e,n,r){o.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},o.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return o.d(n,"a",n),n},o.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},o.p="./",o.oe=function(e){throw console.error(e),e}}([]);
 
+//# sourceMappingURL=manifest.3eade43afd174522bb8a.js.map

文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.3eade43afd174522bb8a.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/vendor.5e9ad9b4b6b6930254c8.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/vendor.5e9ad9b4b6b6930254c8.js.map


+ 3 - 3
src/components/pages/GM/teacher.vue
查看文件 

@@ -188,7 +188,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加教师的账号密码为123456
 
+          注：添加教师的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -331,7 +331,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           org:this.org,
 
           oid: this.schoolName,
 
@@ -588,7 +588,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               org: _this.org,
 
             },
 
           ];

+ 14 - 19
src/components/pages/aiAddCourse/addCourse.vue
查看文件 

@@ -317,12 +317,12 @@
 
                     <div class="wb_j_box_btn" @click="openMember">
 
                       <div class="wb_j_box_title">协同人员</div>
 
                       <div class="wb_j_box_btn_c">
 
-                        <el-tooltip effect="dark" :content="getListMan2(checkboxList3)" placement="top"
 
-                          v-if="checkboxList3.length" popper-class="text_tooltip2">
 
-                          <div class="wb_j_box_span">
 
+                        <!-- <el-tooltip effect="dark" :content="getListMan2(checkboxList3)" placement="top"
 
+                          v-if="checkboxList3.length" popper-class="text_tooltip2"> -->
 
+                          <div class="wb_j_box_span" v-if="checkboxList3.length">
 
                             {{ getListMan2(checkboxList3) }}
 
                           </div>
 
-                        </el-tooltip>
 
+                        <!-- </el-tooltip> -->
 
                         <div v-else class="wb_j_box_span">请选择协同人员</div>
 
                         <div class="wb_j_box_arrow"></div>
 
                       </div>
 
@@ -8226,23 +8226,18 @@ export default {
 
     },
 
     getListMan2() {
 
       return function (list) {
 
+        console.log('getListMan2',list);
 
         let _people2 = [];
 
         if (this.ManAarray.length) {
 
-          for (var j = 0; j < list.length; j++) {
 
-            let people = list[j];
 
-            for (var i = 0; i < this.ManAarray.length; i++) {
 
-              if (
 
-                this.ManAarray[i].userid == people &&
 
-                people != this.courseUserid
 
-              ) {
 
-                _people2.push(this.ManAarray[i].name);
 
-                break;
 
-              }
 
+          list.slice(0, 10).forEach(people => {
 
+            let name = this.ManAarray.find(man => man.userid === people && people !== this.courseUserid).name || "";
 
+            if (name) {
 
+              _people2.push(name);
 
             }
 
-          }
 
+          });
 
         }
 
 
-        return this.ManAarray.length ? _people2.join("、") : "";
 
+        return _people2.join("、");
 
       };
 
     },
 
     isInvite() {
 
@@ -16166,7 +16161,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
             }, 0);
 
             this.timer = setTimeout(() => {
 
               this.seleteCourseUpdate();
 
-            }, 1000);
 
+            }, 5000);
 
           } else if (index == 2) {
 
             let _this = this;
 
             _this
 
@@ -16201,7 +16196,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
                 }, 0);
 
                 _this.timer = setTimeout(() => {
 
                   _this.seleteCourseUpdate();
 
-                }, 1000);
 
+                }, 5000);
 
               });
 
           }
 
           // 在复制操作之前记录滚动位置
 
@@ -16245,7 +16240,7 @@ ${_this.unitJson[0].chapterInfo[0].taskJson[index].taskDetail3.replaceAll('#',''
 
           }, 0);
 
           this.timer = setTimeout(() => {
 
             this.seleteCourseUpdate();
 
-          }, 1000);
 
+          }, 5000);
 
         })
 
         .catch((err) => {
 
           this.$message.error("网络不佳");

+ 4 - 4
src/components/pages/class.vue
查看文件 

@@ -386,7 +386,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -470,7 +470,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -978,7 +978,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -1248,7 +1248,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 4 - 4
src/components/pages/grade/index.vue
查看文件 

@@ -300,7 +300,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -384,7 +384,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -803,7 +803,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -1075,7 +1075,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 18 - 29
src/components/pages/newCourse/addCourse.vue
查看文件 

@@ -351,17 +351,17 @@
 
                     <div class="wb_j_box_btn" @click="openMember">
 
                       <div class="wb_j_box_title">协同人员</div>
 
                       <div class="wb_j_box_btn_c">
 
-                        <el-tooltip
 
+                        <!-- <el-tooltip
 
                           effect="dark"
 
                           :content="getListMan2(checkboxList3)"
 
                           placement="top"
 
                           v-if="checkboxList3.length"
 
                           popper-class="text_tooltip2"
 
-                        >
 
-                          <div class="wb_j_box_span">
 
-                            {{ getListMan2(checkboxList3) }}
 
-                          </div>
 
-                        </el-tooltip>
 
+                        > -->
 
+                        <div class="wb_j_box_span" v-if="checkboxList3.length">
 
+                          {{ getListMan2(checkboxList3) }}
 
+                        </div>
 
+                        <!-- </el-tooltip> -->
 
                         <div v-else class="wb_j_box_span">请选择协同人员</div>
 
                         <div class="wb_j_box_arrow"></div>
 
                       </div>
 
@@ -7763,17 +7763,12 @@ export default {
 
         let _people = people;
 
         let _people2 = "";
 
         if (this.ManAarray.length) {
 
-          for (var i = 0; i < this.ManAarray.length; i++) {
 
-            if (this.ManAarray[i].userid == people) {
 
-              _people2 = this.ManAarray[i].name;
 
-              break;
 
-            }
 
-          }
 
+          _people2 = this.ManAarray.find(man => man.userid === people).name || "";
 
         }
 
-        if (people == this.courseUserid) {
 
+        if (people === this.courseUserid) {
 
           return "";
 
         }
 
-        return this.ManAarray.length ? _people2 : "";
 
+        return _people2;
 
       };
 
     },
 
     getListMan2() {
 
@@ -7781,21 +7776,15 @@ export default {
 
         console.log('getListMan2',list);
 
         let _people2 = [];
 
         if (this.ManAarray.length) {
 
-          for (var j = 0; j < list.length; j++) {
 
-            let people = list[j];
 
-            for (var i = 0; i < this.ManAarray.length; i++) {
 
-              if (
 
-                this.ManAarray[i].userid == people &&
 
-                people != this.courseUserid
 
-              ) {
 
-                _people2.push(this.ManAarray[i].name);
 
-                break;
 
-              }
 
+          list.slice(0, 10).forEach(people => {
 
+            let name = this.ManAarray.find(man => man.userid === people && people !== this.courseUserid).name || "";
 
+            if (name) {
 
+              _people2.push(name);
 
             }
 
-          }
 
+          });
 
         }
 
 
-        return this.ManAarray.length ? _people2.join("、") : "";
 
+        return _people2.join("、");
 
       };
 
     },
 
     isInvite() {
 
@@ -12841,7 +12830,7 @@ export default {
 
             }, 0);
 
             this.timer = setTimeout(() => {
 
               this.seleteCourseUpdate();
 
-            }, 1000);
 
+            }, 5000);
 
           } else if (index == 2) {
 
             let _this = this;
 
             _this
 
@@ -12876,7 +12865,7 @@ export default {
 
                 }, 0);
 
                 _this.timer = setTimeout(() => {
 
                   _this.seleteCourseUpdate();
 
-                }, 1000);
 
+                }, 5000);
 
               });
 
           }
 
           // 在复制操作之前记录滚动位置
 
@@ -12920,7 +12909,7 @@ export default {
 
           }, 0);
 
           this.timer = setTimeout(() => {
 
             this.seleteCourseUpdate();
 
-          }, 1000);
 
+          }, 5000);
 
         })
 
         .catch((err) => {
 
           this.$message.error("网络不佳");

+ 4 - 4
src/components/pages/record/class.vue
查看文件 

@@ -367,7 +367,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -451,7 +451,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -1205,7 +1205,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -1475,7 +1475,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456
 
+              pa: 'Coco1234'
 
             }
 
           ];
 
           this.ajax

+ 5 - 5
src/components/pages/student.vue
查看文件 

@@ -177,7 +177,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -222,7 +222,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -438,7 +438,7 @@ export default {
 
       let params = [
 
         {
 
           username: mail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -951,7 +951,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               oid: _this.oid,
 
             },
 
           ];
 
@@ -1042,7 +1042,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 3 - 3
src/components/pages/studentGM.vue
查看文件 

@@ -182,7 +182,7 @@
 
             ></el-option>
 
           </el-select>
 
         </el-form-item>
 
-        <div style="text-align: center; color: #adb3b7">注：添加学生的账号密码为123456</div>
 
+        <div style="text-align: center; color: #adb3b7">注：添加学生的账号密码为Coco1234</div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
         <el-button class="right" @click="insertStudent">确认</el-button>
 
@@ -358,7 +358,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -635,7 +635,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               oid: _this.oid,
 
               org: _this.org,
 
             },

+ 4 - 4
src/components/pages/studentManage/class.vue
查看文件 

@@ -233,7 +233,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -278,7 +278,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -718,7 +718,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -988,7 +988,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 4 - 4
src/components/pages/studentManage/grade/index.vue
查看文件 

@@ -185,7 +185,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -230,7 +230,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -602,7 +602,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -874,7 +874,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 5 - 5
src/components/pages/studentManage/student.vue
查看文件 

@@ -196,7 +196,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -241,7 +241,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加学生的账号密码为123456
 
+          注：添加学生的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -457,7 +457,7 @@ export default {
 
       let params = [
 
         {
 
           username: mail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -997,7 +997,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               oid: _this.oid,
 
             },
 
           ];
 
@@ -1088,7 +1088,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 48 - 14
src/components/pages/sz/teacher.vue
查看文件 

@@ -287,7 +287,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加教师的账号密码为123456
 
+          注：添加教师的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -363,21 +363,55 @@ export default {
 
   methods: {
 
     getUser() {
 
       
-      let params = {
 
-        userid: this.userid
 
-      };
 
-      // console.log(111,params);
 
+      // let params = {
 
+      //   userid: this.userid
 
+      // };
 
+      // // console.log(111,params);
 
+      // this.ajax
 
+      //   .get(this.$store.state.api + "selectUser", params)
 
+      //   .then(res => {
 
+      //     // console.log(res);
 
+      //     this.userSuffix = res.data[0][0].accountNumber.split("@")[1];
 
+      //     // console.log(this.userSuffix);
 
+      //   })
 
+      //   .catch(err => {
 
+      //     console.error(err);
 
+      //   });
 
+
 
+        let params = [
 
+        {
 
+          functionName: "select_Suffix", // 调用存储过程的名称
 
+          org: this.org, //组织id
 
+          oid: this.oid, //学校id
 
+        },
 
+      ];
 
+
 
+      // 发起请求
 
       this.ajax
 
-        .get(this.$store.state.api + "selectUser", params)
 
-        .then(res => {
 
-          // console.log(res);
 
-          this.userSuffix = res.data[0][0].accountNumber.split("@")[1];
 
-          // console.log(this.userSuffix);
 
+        .post(this.$store.state.api + "onlinePost", params)
 
+        .then((res) => {
 
+          console.log('getSuffix',res)
 
+          let data = res.data[0]
 
+          let orgData = res.data[1]
 
+
 
+          if(data.length > 0){
 
+            let ap = data[0].username
 
+            this.userSuffix =  this.getEmailWithAt(ap)[0]
 
+          } else if (orgData.length > 0) {
 
+            let ap = orgData[0].username
 
+            this.userSuffix =  this.getEmailWithAt(ap)[0]
 
+          }
 
+        
         })
 
-        .catch(err => {
 
-          console.error(err);
 
+        .catch((err) => {
 
+          console.error("请求失败，错误信息：", err);
 
         });
 
     },
 
+    getEmailWithAt(email) {
 
+      const regex = /@[^@]+$/;  // 匹配最后一个 @ 及其后的内容
 
+      const match = email.match(regex);
 
+      return match ? match : '';
 
+    },
 
     // 确定修改信息
 
     conModify() {
 
       if (!this.modifyDiaData.dName) {
 
@@ -592,7 +626,7 @@ export default {
 
       let params = [
 
         {
 
           username: mail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           org:
 
             this.org && this.org != "undefined" && this.org != "null"
 
@@ -889,7 +923,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               org:
 
                 _this.org && _this.org != "undefined" && _this.org != "null"
 
                   ? _this.org

+ 4 - 4
src/components/pages/teacherOffice/index.vue
查看文件 

@@ -184,7 +184,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加老师的账号密码为123456
 
+          注：添加老师的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -229,7 +229,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加老师的账号密码为123456
 
+          注：添加老师的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -733,7 +733,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -1003,7 +1003,7 @@ export default {
 
           let params = [
 
             {
 
               uid: id,
 
-              pa: 123456,
 
+              pa: 'Coco1234',
 
             },
 
           ];
 
           this.ajax

+ 4 - 4
src/components/pages/teacherOffice/teacherType.vue
查看文件 

@@ -178,7 +178,7 @@
 
             </el-select>
 
           </el-form-item>
 
           <div style="text-align: center; color: #adb3b7">
 
-            注：添加老师的账号密码为123456
 
+            注：添加老师的账号密码为Coco1234
 
           </div>
 
         </el-form>
 
         <span slot="footer" class="dialog-footer flex">
 
@@ -223,7 +223,7 @@
 
             </el-select>
 
           </el-form-item>
 
           <div style="text-align: center; color: #adb3b7">
 
-            注：添加老师的账号密码为123456
 
+            注：添加老师的账号密码为Coco1234
 
           </div>
 
         </el-form>
 
         <span slot="footer" class="dialog-footer flex">
 
@@ -681,7 +681,7 @@
 
         let params = [
 
           {
 
             username: this.sMail,
 
-            userpassword: 123456,
 
+            userpassword: 'Coco1234',
 
             alias: this.sName,
 
             oid: this.oid,
 
             ph: this.sPhone,
 
@@ -954,7 +954,7 @@
 
             let params = [
 
               {
 
                 uid: id,
 
-                pa: 123456,
 
+                pa: 'Coco1234',
 
               },
 
             ];
 
             this.ajax

+ 3 - 3
src/components/pages/tencent/student.vue
查看文件 

@@ -143,7 +143,7 @@
 
             <el-option v-for="(item, index) in classJuri" :key="index" :label="item.name" :value="item.id"></el-option>
 
           </el-select>
 
         </el-form-item>
 
-        <div style="text-align: center; color: #adb3b7">注：添加学生的账号密码为123456</div>
 
+        <div style="text-align: center; color: #adb3b7">注：添加学生的账号密码为Coco1234</div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
         <el-button class="right" @click="insertStudent">确认</el-button>
 
@@ -334,7 +334,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail.indexOf("@") != -1 ? this.sMail : this.sMail + "@qq.com",
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           oid: this.oid,
 
           ph: this.sPhone,
 
@@ -611,7 +611,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               oid: _this.oid,
 
               org: _this.org,
 
             },

+ 3 - 3
src/components/pages/tencent/teacher.vue
查看文件 

@@ -197,7 +197,7 @@
 
           </el-select>
 
         </el-form-item>
 
         <div style="text-align: center; color: #adb3b7">
 
-          注：添加教师的账号密码为123456
 
+          注：添加教师的账号密码为Coco1234
 
         </div>
 
       </el-form>
 
       <span slot="footer" class="dialog-footer flex">
 
@@ -365,7 +365,7 @@ export default {
 
       let params = [
 
         {
 
           username: this.sMail,
 
-          userpassword: 123456,
 
+          userpassword: 'Coco1234',
 
           alias: this.sName,
 
           org:
 
             this.org && this.org != "undefined" && this.org != "null"
 
@@ -652,7 +652,7 @@ export default {
 
           let params = [
 
             {
 
               arr: newArr,
 
-              userpassword: 123456,
 
+              userpassword: 'Coco1234',
 
               org:
 
                 _this.org && _this.org != "undefined" && _this.org != "null"
 
                   ? _this.org

部分文件因为文件数量过多而无法显示