浏览代码

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

zengyicheng 2 年之前
父节点
当前提交
f7de120b09

+ 1 - 1
dist/index.html

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

文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.5126387e4239b1e155d7a7c2ce86326a.css


文件差异内容过多而无法显示
+ 0 - 0
dist/static/css/app.5126387e4239b1e155d7a7c2ce86326a.css.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.739abcd281687074399b.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.92fc91a303ec886c0841.js


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/app.92fc91a303ec886c0841.js.map


文件差异内容过多而无法显示
+ 0 - 0
dist/static/js/manifest.3512a67a6213c2df4180.js.map


+ 4 - 3
src/components/pages/scourse.vue

@@ -80,7 +80,7 @@
             </div>
             <div class="three_bottom">
               <div @click="jump(item.courseId)">评论</div>
-              <div @click="get(item.courseId)">查看内容</div>
+              <div @click="get(item.courseId)">预览</div>
               <div @click="getA(item.courseId)">项目进展</div>
               <div @click="goToCourse(item.courseId)">
                 修改
@@ -215,7 +215,7 @@ export default {
       now: "",
       courseDetail: {},
       addCourse: {},
-      groupA: "1",
+      groupA: "2",
       classX: "",
       course: [],
       courseName: "",
@@ -413,9 +413,10 @@ export default {
       }
       this.isLoading = true;
       let params = {
-        type: this.role == '1' ? '2' : this.groupA,
+        type: this.groupA,
         uid: this.userid,
         oid: this.oid,
+        org: this.org,
         typea: typea != undefined ? typea : "",
         typeb: typeb != undefined ? typeb : "",
         typec: typec != undefined ? typec : "",

+ 1 - 0
src/components/pages/student/checkCourse.vue

@@ -331,6 +331,7 @@ export default {
         type: this.groupA,
         uid: this.tuserid,
         oid: this.oid,
+        org: this.org,
         typea: typea != undefined ? typea : "",
         typeb: typeb != undefined ? typeb : "",
         typec: typec != undefined ? typec : "",

+ 2 - 1
src/components/pages/student/course.vue

@@ -80,7 +80,7 @@
             </div>
             <div class="three_bottom">
               <div @click="jump(item.courseId)">评论</div>
-              <div @click="get(item.courseId)">查看内容</div>
+              <div @click="get(item.courseId)">预览</div>
               <div @click="getA(item.courseId)">项目进展</div>
               <div v-if="groupA == '0'" @click="goToCourse(item.courseId)">
                 修改
@@ -416,6 +416,7 @@ export default {
         type: this.groupA,
         uid: this.userid,
         oid: this.oid,
+        org: this.org,
         typea: typea != undefined ? typea : "",
         typeb: typeb != undefined ? typeb : "",
         typec: typec != undefined ? typec : "",

部分文件因为文件数量过多而无法显示