Home Verkennen Help
Inloggen
CocoRoboLabs
/
pbl-teacher-table
3
0
Vork 0
Bestanden Issues 0 Pull-aanvragen 0 Wiki
Bladeren bron

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

zengyicheng 1 jaar geleden
bovenliggende
ea6779e53d cfddb9968f
commit
42c45503bc
10 gewijzigde bestanden met toevoegingen van 34 en 25 verwijderingen
Zij-aan-zij weergave Toon Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.61419a135c1f46af104846873a65949d.css.map
  3. 0 0
      dist/static/css/app.b7bf8aa9d238b84a0bf71ccfa38b4a4a.css
  4. 0 0
      dist/static/css/app.b7bf8aa9d238b84a0bf71ccfa38b4a4a.css.map
  5. 0 0
      dist/static/js/app.5b9cc6c5210b96c5ffb0.js
  6. 0 0
      dist/static/js/app.9c290ce7899724613e8a.js
  7. 0 0
      dist/static/js/app.9c290ce7899724613e8a.js.map
  8. 0 0
      dist/static/js/manifest.3512a67a6213c2df4180.js.map
  9. 6 6
      src/components/pages/course.vue
  10. 27 18
      src/components/pages/easy/addCourse.vue

+ 1 - 1
dist/index.html
Bestand weergeven 

@@ -25,7 +25,7 @@
 
       height: 100%;
 
       width: 100%;
 
       background: #e6eaf0;
 
-    }</style><link href=./static/css/app.61419a135c1f46af104846873a65949d.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.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.5b9cc6c5210b96c5ffb0.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.b7bf8aa9d238b84a0bf71ccfa38b4a4a.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.f1661c5ebfd33221b88f.js></script><script type=text/javascript src=./static/js/app.9c290ce7899724613e8a.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


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


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


+ 6 - 6
src/components/pages/course.vue
Bestand weergeven 

@@ -232,10 +232,10 @@
 
               <!-- <div @click="jump(item.courseId)" v-else>评课</div> -->
 
               <div
 
                 v-if="
 
-                  (!item.course_teacher ||
 
-                    item.userid == userid ||
 
+                  ((!item.course_teacher &&
 
+                    item.userid == userid) ||
 
                     (item.course_teacher &&
 
-                      item.course_teacher.indexOf(userid) == -1)) &&
 
+                      item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
                   item.state == 1
 
                 "
 
                 @click="goToCourse(item.courseId)"
 
@@ -244,10 +244,10 @@
 
               </div>
 
               <div
 
                 v-if="
 
-                  (!item.course_teacher ||
 
-                    item.userid == userid ||
 
+                  ((!item.course_teacher &&
 
+                    item.userid == userid) ||
 
                     (item.course_teacher &&
 
-                      item.course_teacher.indexOf(userid) == -1)) &&
 
+                      item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
 
                   item.state == 2
 
                 "
 
                 @click="goToCourse2(item.courseId)"

+ 27 - 18
src/components/pages/easy/addCourse.vue
Bestand weergeven 

@@ -3466,14 +3466,23 @@ export default {
 
       this.rightBoxHeight = $(".rightBox")[0].scrollHeight;
 
       // document.querySelector('.course_left').scrollHeight
 
       // document.querySelector('.stepsBottom2').scrollHeight
 
+
 
       let stepsBottom2 = $(".stepsBottom2")[0].clientHeight
 
       let client = $(".course_left")[0].clientHeight - stepsBottom2
 
       let top = $(".rightBox")[0].scrollTop - 400
 
-      if (top > client) {
 
-        $('.stepsBottom2')[0].style.top = client + 'px'
 
-      } else if (top > 0) {
 
+      // if (top > client) {
 
+      //   let top = $(".rightBox")[0].offsetTop
 
+      //   $('.stepsBottom2')[0].style.position = 'fixed'
 
+      //   $('.stepsBottom2')[0].style.top = top + 'px'
 
+      //   // $('.stepsBottom2')[0].style.top = client + 'px'
 
+      // } else 
+      if (top > 0) {
 
+        let top = $(".rightBox")[0].offsetTop
 
+        $('.stepsBottom2')[0].style.position = 'fixed'
 
         $('.stepsBottom2')[0].style.top = top + 'px'
 
+        // $('.stepsBottom2')[0].style.top = top + 'px'
 
       } else {
 
+        $('.stepsBottom2')[0].style.position = 'absolute'
 
         $('.stepsBottom2')[0].style.top = '0px'
 
       }
 
     },
 
@@ -3709,19 +3718,19 @@ export default {
 
           );
 
           _this.$message.success("删除成功");
 
 
-          this.$nextTick(() => {
 
-            $('.stepsBottom2')[0].style.transition = 'unset'
 
-            setTimeout(() => {
 
-              let stepsBottom2 = $(".stepsBottom2")[0].clientHeight
 
-              let client = $(".basic_box2")[0].clientHeight - stepsBottom2 - 100
 
-              let top = $('.stepsBottom2')[0].offsetTop - 20
 
-              if (top > client) {
 
-                $('.stepsBottom2')[0].style.top = client + 'px'
 
-              }
 
-              $('.stepsBottom2')[0].style.transition = 'all .5s'
 
-              this.$forceUpdate()
 
-            }, 500)
 
-          })
 
+          // this.$nextTick(() => {
 
+          //   $('.stepsBottom2')[0].style.transition = 'unset'
 
+          //   setTimeout(() => {
 
+          //     let stepsBottom2 = $(".stepsBottom2")[0].clientHeight
 
+          //     let client = $(".basic_box2")[0].clientHeight - stepsBottom2 - 100
 
+          //     let top = $('.stepsBottom2')[0].offsetTop - 20
 
+          //     if (top > client) {
 
+          //       $('.stepsBottom2')[0].style.top = client + 'px'
 
+          //     }
 
+          //     $('.stepsBottom2')[0].style.transition = 'all .5s'
 
+          //     this.$forceUpdate()
 
+          //   }, 500)
 
+          // })
 
         })
 
         .catch(() => {
 
           return;
 
@@ -9908,7 +9917,7 @@ ol {
 
 }
 
 
 .stepsBottom2 {
 
-  width: 100%;
 
+  width: 300px;
 
   margin: 20px 0;
 
   /* box-shadow: 0 0 10px 10px #f7f7f7; */
 
   /* background: #f7f7f7; */
 
@@ -9916,7 +9925,7 @@ ol {
 
   overflow: hidden;
 
   height: fit-content;
 
   position: relative;
 
-  transition: all .5s;
 
+  /* transition: all .5s; */
 
 }
 
 
 .navTop {

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