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 16 horas
pai
4895c73c76 91d1a1b200
achega
72f20a374b
Modificáronse 15 ficheiros con 7 adicións e 7 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/js/app.9583236e49b11166b038.js
  3. 0 0
      dist/static/js/app.9583236e49b11166b038.js.map
  4. 0 0
      dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map
  5. 0 0
      dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map
  6. 0 0
      dist/static/js/workPage.14ab58561611f7901e3a.js
  7. 0 0
      dist/static/js/workPage.14ab58561611f7901e3a.js.map
  8. 0 0
      dist/static/js/workPage.a31b38ac9f7ef5830349.js
  9. 0 0
      dist/static/js/workPage.a31b38ac9f7ef5830349.js.map
  10. 1 1
      dist/workPage.html
  11. 1 1
      src/components/pages/PersonnelManagement/components/student.vue
  12. 1 1
      src/components/pages/liyuan/page/student.vue
  13. 1 1
      src/components/pages/student.vue
  14. 1 1
      src/components/pages/studentManage/student.vue
  15. 1 1
      src/components/pages/studentManageNew/component/addstu.vue

+ 1 - 1
dist/index.html
Ver ficheiro 

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

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


A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 0
dist/static/js/app.9583236e49b11166b038.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.14ab58561611f7901e3a.js


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


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


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


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

+ 1 - 1
src/components/pages/PersonnelManagement/components/student.vue
Ver ficheiro 

@@ -335,7 +335,7 @@ export default {
 
         userid: this.userid
 
         userid: this.userid
 
       };
 
       };
 
       this.ajax
 
       this.ajax
 
-        .get(this.$store.state.api + "selectUser", params)
 
+        .get(this.$store.state.api + "selectuserinfoyym", params)
 
         .then(res => {
 
         .then(res => {
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1];
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1];
 
         })
 
         })

+ 1 - 1
src/components/pages/liyuan/page/student.vue
Ver ficheiro 

@@ -288,7 +288,7 @@ export default {
 
         userid: this.userid
 
         userid: this.userid
 
       }
 
       }
 
       this.ajax
 
       this.ajax
 
-        .get(this.$store.state.api + "selectUser", params)
 
+        .get(this.$store.state.api + "selectuserinfoyym", params)
 
         .then((res) => {
 
         .then((res) => {
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1]
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1]
 
         })
 
         })

+ 1 - 1
src/components/pages/student.vue
Ver ficheiro 

@@ -295,7 +295,7 @@ export default {
 
         userid: this.userid
 
         userid: this.userid
 
       }
 
       }
 
       this.ajax
 
       this.ajax
 
-        .get(this.$store.state.api + "selectUser", params)
 
+        .get(this.$store.state.api + "selectuserinfoyym", params)
 
         .then((res) => {
 
         .then((res) => {
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1]
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1]
 
         })
 
         })

+ 1 - 1
src/components/pages/studentManage/student.vue
Ver ficheiro 

@@ -321,7 +321,7 @@ export default {
 
         userid: this.userid
 
         userid: this.userid
 
       }
 
       }
 
       this.ajax
 
       this.ajax
 
-        .get(this.$store.state.api + "selectUser", params)
 
+        .get(this.$store.state.api + "selectuserinfoyym", params)
 
         .then((res) => {
 
         .then((res) => {
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1]
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1]
 
         })
 
         })

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

@@ -786,7 +786,7 @@ export default {
 
       };
 
       };
 
       this.userSuffixloading = true;
 
       this.userSuffixloading = true;
 
       this.ajax
 
       this.ajax
 
-        .get(this.$store.state.api + "selectUser", params)
 
+        .get(this.$store.state.api + "selectuserinfoyym", params)
 
         .then((res) => {
 
         .then((res) => {
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1];
 
           this.userSuffix = res.data[0][0].accountNumber.split("@")[1];
 
           this.userSuffixloading = false;
 
           this.userSuffixloading = false;

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