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

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

zengyicheng 2 years ago
parent
763e9c3342 1fa2e09a9c
commit
fd0eef9378
10 changed files with 5 additions and 4 deletions
Split View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.b13cc929c398e870ca63f74f559efe93.css
  3. 0 0
      dist/static/css/app.b13cc929c398e870ca63f74f559efe93.css.map
  4. 0 0
      dist/static/css/app.e6eac8167c936c8f232514c96c9f2e86.css.map
  5. 0 0
      dist/static/js/app.afdb26fd8546f35b701c.js
  6. 0 0
      dist/static/js/app.afdb26fd8546f35b701c.js.map
  7. 0 0
      dist/static/js/app.e6e235fda9fad243c510.js
  8. 0 0
      dist/static/js/app.e6e235fda9fad243c510.js.map
  9. 0 0
      dist/static/js/manifest.85f48b0184f614b2b8d9.js.map
  10. 4 3
      src/components/pages/Grid.vue

+ 1 - 1
dist/index.html
View File 

@@ -25,4 +25,4 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.e6eac8167c936c8f232514c96c9f2e86.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.d797842b29c6f5dac7b7.js></script><script type=text/javascript src=./static/js/app.afdb26fd8546f35b701c.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>
 
+    }</style><link href=./static/css/app.b13cc929c398e870ca63f74f559efe93.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.85f48b0184f614b2b8d9.js></script><script type=text/javascript src=./static/js/vendor.d797842b29c6f5dac7b7.js></script><script type=text/javascript src=./static/js/app.e6e235fda9fad243c510.js></script></body></html><script>document.domain = document.domain.split(".").slice(-2).join(".");</script>

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


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


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


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


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


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


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


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


+ 4 - 3
src/components/pages/Grid.vue
View File 

@@ -839,7 +839,7 @@ export default {
 
             // this.RoomInfo = res.data[0][0];
 
             this.data = JSON.parse(res.data[0][0].data);
 
             this.dialogVisible3 = false;
 
-            this.dialogVisible2 = true;
 
+            // this.dialogVisible2 = true;//邀请弹窗
 
             // this.getMindNetwork(res.data[0][0].id, this.userinfo.userid);
 
             // this.data.splice(0,1)
 
             // this.updateRoomData()
 
@@ -892,7 +892,8 @@ export default {
 
             // this.RoomInfo = res.data[0][0];
 
             this.data = JSON.parse(res.data[0][0].data);
 
             this.dialogVisible3 = false;
 
-            this.dialogVisible2 = true;
 
+
 
+            // this.dialogVisible2 = true;//邀请弹窗
 
 
             // this.getMindNetwork(res.data[0][0].id, this.userinfo.userid);
 
 
@@ -1051,7 +1052,7 @@ export default {
 
               this.data = res.data[0][0].data;
 
             }
 
             this.dialogVisible3 = false;
 
-            this.dialogVisible2 = true;
 
+            // this.dialogVisible2 = true;//邀请弹窗
 
           }
 
           console.log(res);
 
         })

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