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

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

lsc 1 year ago
parent
9c10310f40 30b10c8269
commit
03a2c00ce2
11 changed files with 15 additions and 8 deletions
Split View Show Diff Stats
  1. 4 0
      dist/index.html
  2. 1 0
      dist/static/css/app.e2c340dc96d07b734b8e6327882b6ff9.css
  3. 1 0
      dist/static/css/app.ff5aa040269b5231d6ddd53e2898dc14.css
  4. 0 0
      dist/static/css/app.ff5aa040269b5231d6ddd53e2898dc14.css.map
  5. 0 0
      dist/static/js/app.3b572a793cfa7f653608.js.map
  6. 0 0
      dist/static/js/app.c5bf277ec8f8c6e6108a.js
  7. 1 0
      dist/static/js/app.c5bf277ec8f8c6e6108a.js.map
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 4 4
      src/components/pages/synergyCourse/addCourse.vue
  10. 3 3
      src/components/pages/synergyCourse/course.vue
  11. 1 1
      src/components/pages/synergyCourse/group/group.vue

+ 4 - 0
dist/index.html
View File 

@@ -25,7 +25,11 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
+<<<<<<< HEAD
 
     }</style><link href=./static/css/app.e2c340dc96d07b734b8e6327882b6ff9.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3512a67a6213c2df4180.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.3b572a793cfa7f653608.js></script></body></html><script>function stopSafari() {
 
+=======
 
+    }</style><link href=./static/css/app.ff5aa040269b5231d6ddd53e2898dc14.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.4ae2783fdfe7ab52e4d5.js></script><script type=text/javascript src=./static/js/vendor.b01159b52abeac4e6216.js></script><script type=text/javascript src=./static/js/app.c5bf277ec8f8c6e6108a.js></script></body></html><script>function stopSafari() {
 
+>>>>>>> 30b10c826902226fec1c147b97a34a6a20c6f3f5
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


+ 4 - 4
src/components/pages/synergyCourse/addCourse.vue
View File 

@@ -1799,7 +1799,7 @@
 
           @current-change="handleCurrentChange"></el-pagination>
 
       </div>
 
       <span slot="footer" class="dialog-footer">
 
-        <el-button @click="dialogVisibleMember = false;">取 消</el-button>
 
+        <el-button @click="page = 0;dialogVisibleMember = false;">取 消</el-button>
 
         <el-button type="primary" @click="isAddPPTeacher">确定</el-button>
 
       </span>
 
     </el-dialog>
 
@@ -3288,6 +3288,7 @@ export default {
 
       this.$forceUpdate();
 
     },
 
     handleClose(done) {
 
+      this.page = 0;
 
       done();
 
     },
 
     closePan(tool) {
 
@@ -5164,6 +5165,7 @@ export default {
 
       this.dialogVisibleClass = false;
 
     },
 
     isAddPPTeacher() {
 
+      this.page = 0;
 
       this.dialogVisibleMember = false;
 
       this.setMan();
 
       this.checkAll=false;
 
@@ -8807,10 +8809,8 @@ export default {
 
 
 .people {
 
   border: 1px solid rgb(229 229 229);
 
-  height: 495px;
 
   border-radius: 5px;
 
   width: 100%;
 
-  overflow: auto;
 
 }
 
 
 .people_top {
 
@@ -8858,12 +8858,12 @@ export default {
 
 }
 
 
 .people_name {
 
+  height: 40vh;
 
   display: flex;
 
   justify-content: flex-start;
 
   padding: 10px 0 0 25px;
 
   flex-direction: column;
 
   flex-wrap: nowrap;
 
-  height: calc(100% - 140px);
 
   overflow-y: auto;
 
   overflow-x: hidden;
 
   flex-direction: column;

+ 3 - 3
src/components/pages/synergyCourse/course.vue
View File 

@@ -549,14 +549,14 @@ export default {
 
       ];
 
       this.ajax
 
         .post(this.$store.state.api + "addSynergyCourse", params)
 
-        .then(() => {
 
-          // if (this.steps != 1 && this.steps != 2 && this.steps != 3) {
 
+        .then((res) => {
 
+          console.log(res);
 
           this.$message({
 
             message: "新增成功",
 
             type: "success",
 
           });
 
           this.getCourse();
 
-          // }
 
+          this.open(res.data.courseId, this.userid)
 
         })
 
         .catch((err) => {
 
           this.$message.error("网络不佳");

+ 1 - 1
src/components/pages/synergyCourse/group/group.vue
View File 

@@ -37,7 +37,7 @@
 
                         <el-switch v-model="isopen" class="switchCss" @change="openChair"></el-switch>
 
                     </div>
 
                     <div type="primary" @click="updateGroup" class="returnBtn" style="background-color: #225bc7">
 
-                        创建分组
 
+                        添加分组
 
                     </div>
 
                     <div type="primary" @click="deleteCourseGroup" class="returnBtn" style="background-color: #225bc7" >
 
                         删除分组

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