lsc 1 rok pred
rodič
commit
7513e5f080

+ 1 - 1
dist/index.html

@@ -18,7 +18,7 @@
       border-radius: 10px;
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
       background-color: rgba(0, 0, 0, 0.1);
-    }</style><link href=./static/css/app.de1098a2745c2366f7a9f3fbf6373c58.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.257b11831736f4184ff9.js></script><script type=text/javascript src=./static/js/app.f90b265d88a51f7edf4c.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.968efb29a5f922cc5da4eba04487817b.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.257b11831736f4184ff9.js></script><script type=text/javascript src=./static/js/app.7a7b12802f725d3c9d7d.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.968efb29a5f922cc5da4eba04487817b.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.968efb29a5f922cc5da4eba04487817b.css.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.de1098a2745c2366f7a9f3fbf6373c58.css


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/css/app.de1098a2745c2366f7a9f3fbf6373c58.css.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.7a7b12802f725d3c9d7d.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.7a7b12802f725d3c9d7d.js.map


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/app.f90b265d88a51f7edf4c.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 56 - 13
src/components/group/group.vue

@@ -14,7 +14,8 @@
                         <div @click="setClassid(item.id)" :class="{ active: classid == item.id }"
                             v-for="(item, index) in classList" :key="index">{{ item.name }}</div>
                     </div>
-                    <div class="btn_right" v-if="courseDetail.userid == userid || courseDetail.course_teacher.indexOf(userid) != -1">
+                    <div class="btn_right"
+                        v-if="courseDetail.userid == userid || courseDetail.course_teacher.indexOf(userid) != -1">
                         <div style="color: rgb(171 171 171); margin: 0 10px 0 0">
                             提示:开启【开放选座】,学生能够自由加入和退出小组。
                         </div>
@@ -34,6 +35,9 @@
                         <div type="primary" @click="updateGroup" class="returnBtn" style="background-color: #225bc7">
                             分组设置
                         </div>
+                        <div type="primary" @click="deleteCourseGroup" class="returnBtn" style="background-color: #225bc7">
+                            删除分组
+                        </div>
                     </div>
                 </div>
                 <div>
@@ -152,7 +156,8 @@
                                                 groupStudent[g.id][
                                                     groupStudentUid[g.id].indexOf(userid)
                                                 ].id)
-                                        " v-else-if="groupStudentUid && groupStudentUid[g.id].indexOf(userid) != -1">
+                                            "
+                                            v-else-if="groupStudentUid && groupStudentUid[g.id].indexOf(userid) != -1">
                                             退出分组
                                         </div>
                                         <div style="margin-top:10px"
@@ -366,7 +371,8 @@
                     </el-checkbox>
                 </el-checkbox-group> -->
                 <div class="i_box_login2" v-if="classJuri.length">
-                    <div :class="{active:checkboxList3.indexOf(item.userid)!= -1}" v-for="item in classJuri" :key="item.userid" :label="item.userid" @click="addGroupUser(item.userid)">
+                    <div :class="{ active: checkboxList3.indexOf(item.userid) != -1 }" v-for="item in classJuri"
+                        :key="item.userid" :label="item.userid" @click="addGroupUser(item.userid)">
                         <el-tooltip placement="top" :content="item.name ? item.name : '暂无姓名'">
                             <span>{{ item.name ? item.name : "暂无姓名" }}</span>
                         </el-tooltip>
@@ -401,7 +407,7 @@ export default {
                 number: undefined,
                 islock: 1,
             },
-            islock:false,
+            islock: false,
             timer: null,
             groupStudent: {},
             groupStudentUid: {},
@@ -494,6 +500,39 @@ export default {
             }
             this.dialogVisibleGroup2 = true;
         },
+        deleteCourseGroup() {
+            this.$confirm(
+                "确定删除该分组么?删除后分组将会被清空!",
+                "提示",
+                {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                }
+            )
+                .then(() => {
+                    let params = [{
+                        gid: this.groupid,
+                    }];
+                    this.ajax
+                        .post(this.$store.state.api + "deleteCourseGroup", params)
+                        .then((res) => {
+                            this.groupJson = {
+                                group: [],
+                                number: undefined,
+                                islock: 1,
+                            }
+                            this.islock = false
+                            this.$message.success("操作成功");
+                            this.getCourseGroup();
+                            this.$forceUpdate()
+                        })
+                        .catch((err) => {
+                            console.error(err);
+                        });
+                })
+                .catch(() => { });
+        },
         addGroup() {
             this.groupJson2.group.push({
                 name: "第" + (this.groupJson2.group.length + 1) + "组",
@@ -714,11 +753,11 @@ export default {
                     console.error(err);
                 });
         },
-        addGroupUser(uid){
-            if(this.checkboxList3.indexOf(uid) == -1){
+        addGroupUser(uid) {
+            if (this.checkboxList3.indexOf(uid) == -1) {
                 this.checkboxList3.push(uid)
-            }else{
-                this.checkboxList3.splice(this.checkboxList3.indexOf(uid),1)
+            } else {
+                this.checkboxList3.splice(this.checkboxList3.indexOf(uid), 1)
             }
         },
         async joinGroup2() {
@@ -1190,18 +1229,21 @@ export default {
     padding: 0 5px;
     overflow: hidden;
     background: rgb(225, 237, 255);
-    margin: 10px calc((100% - (80px*5)) / 4 ) 0 0 ;
+    margin: 10px calc((100% - (80px*5)) / 4) 0 0;
     color: rgb(37 124 255);
     border-radius: 5px;
     box-sizing: border-box;
 }
+
 .i_box_login2>div:nth-child(5n) {
-    margin: 10px 0 0 0 ;
+    margin: 10px 0 0 0;
 }
-.i_box_login2 > .active{
+
+.i_box_login2>.active {
     background: rgb(92, 157, 255);
     color: #fff;
 }
+
 .i_box_login2>div>span {
     width: 100%;
     overflow: hidden;
@@ -1210,13 +1252,14 @@ export default {
     display: block;
 }
 
-.group_switch{
+.group_switch {
     margin-right: 10px;
     height: 30px;
     display: flex;
     align-items: center;
 }
-.group_switch>span{
+
+.group_switch>span {
     margin-right: 5px;
 }
 </style>

+ 38 - 6
src/components/studyStudent.vue

@@ -142,16 +142,22 @@
             >
               下一步
             </div>
-            <div
+            <!-- <div
               class="returnBtn"
               @click="allScrell"
               v-if="!(IsFollow && tType == 2)"
             >
               全屏
+            </div> -->
+            <div
+              class="returnBtn"
+              @click="refreshCourse"
+            >
+              刷新
             </div>
             <div
               class="returnBtn"
-              @click="ispzType = 4"
+              @click="setPz"
               v-if="tType == 1"
             >
               评课
@@ -268,7 +274,7 @@
                   "
                 >
                   <div
-                    style="padding: 15px 0 15px 20px; line-height: 25px"
+                    style="padding: 15px 0 15px 20px; line-height: 29px;font-size:18px;"
                     class="cont"
                     v-if="
                       chapInfoList[courseType].chapterInfo[0].taskJson[
@@ -321,6 +327,7 @@
                         :playsinline="true"
                         :options="playerO[taskCount]"
                         @play="onPlayerPlay($event)"
+                        @timeupdate="onPlayerTimeupdate($event)"
                         style="width: 100%; height: 100%; margin: 0 0 0 30px"
                       ></video-player>
                     </div>
@@ -8469,7 +8476,7 @@
       class="dialog_diy"
     >
       <el-form>
-        <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;">
           <span>表格内容</span>  
           <el-button type="primary" size="small" @click="returnTableText">还原模板</el-button>
         </div>
@@ -8517,7 +8524,7 @@
       class="dialog_diy"
     >
       <el-form>
-        <div>
+        <div style="display: flex;align-items: center;justify-content: space-between;">
           <span>文档内容</span> 
           <el-button type="primary" size="small" @click="returnWordText">还原模板</el-button>
         </div>
@@ -12774,6 +12781,11 @@ export default {
           console.error(err);
         });
     },
+    refreshCourse(){
+      // window.location.reload();
+      this.navList = [];
+      this.getCourseDetail(1)
+    },
     getCourseDetail(type, gindex) {
       let loading;
       if (type != 2) {
@@ -13189,7 +13201,7 @@ export default {
                 ].toolChoose[_this.toolindex].groupJson;
             }
 
-            if (_this.tType == 4) {
+            if (_this.tType == 4 || _this.ispzType == 4) {
               _this.selectPz();
             }
           }, 5000);
@@ -13349,6 +13361,11 @@ export default {
         })
         .catch(() => {});
     },
+    setPz(){
+      this.ispzType = 4
+      this.pzDialog = true
+      this.selectPz();
+    },
     selectPz() {
       let params = {
         cid: this.id,
@@ -13660,6 +13677,20 @@ export default {
       this.playerO = this.playerOptions;
     },
     onPlayerPlay() {},
+    onPlayerTimeupdate(player) {
+      let gklog = player.cache_.currentTime;//当前播放的秒数
+      let a=player.cache_.duration//视频的总时长
+      let gklog2 = parseInt(gklog)
+      // if(gklog2 == '3'){
+      //   player.pause()
+      //   setTimeout(()=>{
+      //     player.currentTime(gklog2+1)
+      //     player.play()
+      //   },1000)
+      // }
+      console.log(" onPlayerTimeupdate!", gklog);
+      console.log(" onPlayerTimeupdate!", gklog2);
+    },
     lookVedio(u, i) {
       this.isClickNav = "";
       // this.playerOptions.sources[0].src = u;
@@ -15842,6 +15873,7 @@ export default {
   padding: 20px;
   line-height: 30px;
   word-break: break-word;
+  font-size:18px;
 }
 
 .file {

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov