lsc 1 年之前
父节点
当前提交
aec19f2d31

+ 1 - 1
dist/index.html

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

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


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


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


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


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


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


+ 44 - 27
src/components/pages/synergyCourse/course.vue

@@ -175,7 +175,7 @@
             </div>
             <div class="three_bottom">
               <!-- v-if="role == '1'" @click="get(item)"-->
-              <div @click="open(item.courseId)">授课</div>
+              <div @click="open(item.courseId, item.userid)">授课</div>
               <!-- <div @click="jump(item.courseId)" v-else>评课</div> -->
               <!-- <div v-if="((item.userid == userid) ||
                 (item.course_teacher &&
@@ -191,9 +191,10 @@
                 " @click="goToCourse2(item.courseId)">
                 修改
               </div> -->
-              <div v-if="((item.userid == userid) ||
+              <!-- ||
                 (item.course_teacher &&
-                  item.course_teacher.indexOf(userid) !== -1) || role == '1') &&
+                  item.course_teacher.indexOf(userid) !== -1) || role == '1' -->
+              <div v-if="((item.userid == userid)) &&
                 item.state == 1
                 " @click="goToCourse3(item.courseId)">
                 修改
@@ -214,10 +215,11 @@
                 ">
                 评价
               </div> -->
-              <div @click="copyCourse(item.courseId)">
+              <div v-if="((item.userid == userid))" @click="copyCourse(item.courseId)">
                 复制
               </div>
-              <div v-if="item.isCourseType == 1 || role == '1'" @click="deleteCourse(item.courseId)">
+              <!-- v-if="item.isCourseType == 1 || role == '1'" -->
+              <div v-if="((item.userid == userid))" @click="deleteCourse(item.courseId)">
                 删除
               </div>
               <!-- <div class="more">
@@ -510,7 +512,18 @@ export default {
         return "";
       }
     },
-    open(cid) {
+    open(cid, uid) {
+      if (uid == this.userid) {
+        window.parent.postMessage(
+          {
+            tools: "opencCscl",
+            cid: cid,
+            gid: '',
+          },
+          "*"
+        );
+        return;
+      }
       let params = {
         cid: cid,
         classid: '1',
@@ -521,40 +534,44 @@ export default {
           if (res.data && res.data[1].length) {
             let groupPerson = res.data[1]
             let groupCid = ''
-            for(var i = 0; i <groupPerson.length;i++){
-              if(groupPerson[i].userid == this.userid){
+            for (var i = 0; i < groupPerson.length; i++) {
+              if (groupPerson[i].userid == this.userid) {
                 groupCid = groupPerson[i].groupCid
                 break;
               }
             }
-            if(groupCid){
+            if (groupCid) {
               window.parent.postMessage(
-                { 
+                {
                   tools: "opencCscl",
                   cid: cid,
                   gid: groupCid,
-                }, 
+                },
                 "*"
               );
             } else {
-              window.parent.postMessage(
-                { 
-                  tools: "opencCscl",
-                  cid: cid,
-                  gid: '',
-                }, 
-                "*"
-              );
+              this.$message.error("没有加入分组请先加入分组");
+              this.goToCourse3(cid)
+              // window.parent.postMessage(
+              //   { 
+              //     tools: "opencCscl",
+              //     cid: cid,
+              //     gid: '',
+              //   }, 
+              //   "*"
+              // );
             }
           } else {
-            window.parent.postMessage(
-              { 
-                tools: "opencCscl",
-                cid: cid,
-                gid: '',
-              }, 
-              "*"
-            );
+            this.$message.error("没有加入分组请先加入分组");
+            this.goToCourse3(cid)
+            // window.parent.postMessage(
+            //   { 
+            //     tools: "opencCscl",
+            //     cid: cid,
+            //     gid: '',
+            //   }, 
+            //   "*"
+            // );
           }
         })
         .catch((err) => {

+ 5 - 5
src/components/pages/synergyCourse/group/group.vue

@@ -16,7 +16,7 @@
                 <!-- || (courseDetail.course_teacher && courseDetail.course_teacher.indexOf(userid) != -1) -->
                 <div class="btn_right"
                     v-if="courseDetail.userid == userid">
-                    <div style="color: rgb(171 171 171); margin: 0 10px 0 0">
+                    <div style="color: rgb(171 171 171); margin: 0 10px 0 0" v-show="false">
                         提示:开启【开放选座】,能够自由加入和退出小组。
                     </div>
                     <!-- 开放选座 -->
@@ -28,18 +28,18 @@
                             style="background-color: #225bc7" @click="lockChair">
                             解锁位置
                         </div> -->
-                    <div class="group_switch">
+                    <div class="group_switch" v-show="false">
                         <span>开放选座</span>
                         <el-switch v-model="islock" active-text="" class="switchCss" @change="lockChair"></el-switch>
                     </div>
-                    <div class="group_switch">
+                    <div class="group_switch" v-show="false">
                         <span>开启分组</span>
                         <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">
+                    <div type="primary" @click="deleteCourseGroup" class="returnBtn" style="background-color: #225bc7" >
                         删除分组
                     </div>
                 </div>

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