Ver Fonte

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

lsc há 1 semana atrás
pai
commit
83bc670d4e

+ 1 - 1
dist/index.html

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

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.35c2887dadc3b3351bc610d7ffe97261.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.35c2887dadc3b3351bc610d7ffe97261.css.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/workPage.056421ef26c31f5e230cfb83ae266086.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/workPage.056421ef26c31f5e230cfb83ae266086.css.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.de8ec94b3fcbeec4ca6e.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.de8ec94b3fcbeec4ca6e.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/manifest.23ea04dc469b57e2b4f8.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/workPage-manifest.2ece51fa34be51c8610a.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/workPage.25f204977262bbefe9d9.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/workPage.25f204977262bbefe9d9.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/workPage.5cd7414aada9b247cb4b.js


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

+ 3 - 3
src/mixins/mixin.js

@@ -36,19 +36,19 @@ export const myMixin = {
         return "Other Browser";
       }
     },
-    async addOp3(userTime, loadTime, object, status) {
+    async addOp3(userTime, loadTime, object, status,api = 'selectUser') {
       if (!this.$route.query.userid) return
 
       try {
         if(!this.userJson || !this.userJson.accountNumber){
-            let res = await this.ajax.get(this.$store.state.api + "selectUser", {
+            let res = await this.ajax.get(this.$store.state.api + api, {
             userid: this.$route.query.userid
             });
             this.userJson = res.data[0][0]
         }
       } catch (e) {
         console.log(e);
-        return this.addOp3(userTime, loadTime, object, status);
+        return this.addOp3(userTime, loadTime, object, status,'selectUser2');
       }
       let _time = new Date()
         .toLocaleString("zh-CN", { hour12: false, timeZone: "Asia/Shanghai" })

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff