update

src/components/easy2/studyStudent.vue

@@ -217,7 +217,7 @@
                     <pdf :pdfUrl="pptImgUrl1" style="width: 100%; height: 100%; overflow: auto"></pdf>
                   </div>
                   <div class="wheel" v-if="showType == 4" style="width: 95%; margin: 0 auto">
-                    <el-image :src="pptImgUrl1" fit="cover" style="width: 100%"></el-image>
+                    <el-image :src="pptImgUrl1" fit="contain" style="width: 100%;height:100%;cursor: pointer;" @click="previewImg(pptImgUrl1)"></el-image>
                   </div>
                 </div>
                 <div class="pButton" style="
@@ -283,6 +283,14 @@
                               <span v-if="vitem.text">{{ vitem.text }}-</span>{{ vitem.name }}
                             </div>
                           </div>
+                          <div style="width: calc(100% - 0px)" @click="checkPhoto(vitem, vindex)" v-if="vitem.type == 13">
+                            <div class="navText" :class="isClickNav == vindex
+                              ? 'isClickNav'
+                              : ''
+                              ">
+                              {{ vitem.name }}
+                            </div>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -8888,6 +8896,11 @@ export default {
                       _url;
                   }
                 } else if (
+                    _chapterData[this.taskCount][0].type == 13
+                  ) {
+                    this.showType = 4;
+                    this.pptImgUrl1 = _url;
+                  } else if (
                   _chapterData[this.taskCount][0].type == 6
                 ) {
                   this.showType = 1;
@@ -9031,6 +9044,11 @@ export default {
                       _url;
                   }
                 } else if (
+                    _chapterData[this.taskCount][0].type == 13
+                  ) {
+                    this.showType = 4;
+                    this.pptImgUrl1 = _url;
+                  } else if (
                   _chapterData[this.taskCount][0].type == 6
                 ) {
                   this.showType = 1;
@@ -9586,6 +9604,12 @@ export default {
       // this.isClickNav = "line" + i;
       this.isClickNav = i;
     },
+    checkPhoto(f, i){
+      this.showType = 4;
+      this.pptImgUrl1 = f.url;
+      this.isClickNav = i;
+      this.$forceUpdate();
+    },
     downFile(f, i) {
       this.isClickNav = "";
       this.pptImgUrl1 = "";

src/components/easy3/studyStudent.vue

@@ -216,7 +216,7 @@
                     <pdf :pdfUrl="pptImgUrl1" style="width: 100%; height: 100%; overflow: auto"></pdf>
                   </div>
                   <div class="wheel" v-if="showType == 4" style="width: 95%; margin: 0 auto">
-                    <el-image :src="pptImgUrl1" fit="cover" style="width: 100%"></el-image>
+                    <el-image :src="pptImgUrl1" fit="contain" style="width: 100%;height:100%;cursor: pointer;" @click="previewImg(pptImgUrl1)"></el-image>
                   </div>
                 </div>
                 <div class="pButton" style="
@@ -281,6 +281,14 @@
                               <span v-if="vitem.text">{{ vitem.text }}-</span>{{ vitem.name }}
                             </div>
                           </div>
+                          <div style="width: calc(100% - 0px)" @click="checkPhoto(vitem, vindex)" v-if="vitem.type == 13">
+                            <div class="navText" :class="isClickNav == vindex
+                              ? 'isClickNav'
+                              : ''
+                              ">
+                              {{ vitem.name }}
+                            </div>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -8888,6 +8896,11 @@ export default {
                       _url;
                   }
                 } else if (
+                    _chapterData[this.taskCount][0].type == 13
+                  ) {
+                    this.showType = 4;
+                    this.pptImgUrl1 = _url;
+                  } else if (
                   _chapterData[taskCount][0].type == 6
                 ) {
                   this.showType = 1;
@@ -9453,6 +9466,12 @@ export default {
       // this.isClickNav = "line" + i;
       this.isClickNav = i;
     },
+    checkPhoto(f, i){
+      this.showType = 4;
+      this.pptImgUrl1 = f.url;
+      this.isClickNav = i;
+      this.$forceUpdate();
+    },
     downFile(f, i) {
       this.isClickNav = "";
       this.pptImgUrl1 = "";

src/components/group/group.vue

@@ -32,10 +32,10 @@
                             <span>开放选座</span>
                             <el-switch v-model="islock" active-text="" class="switchCss" @change="lockChair"></el-switch>
                         </div>
-                        <!-- <div class="group_switch">
+                        <div class="group_switch">
                             <span>开启分组</span>
                             <el-switch v-model="isopen" class="switchCss" @change="openChair"></el-switch>
-                        </div> -->
+                        </div>
                         <div type="primary" @click="updateGroup" class="returnBtn" style="background-color: #225bc7">
                             分组设置
                         </div>

src/components/studyStudent.vue

@@ -232,7 +232,7 @@
                     <pdf :pdfUrl="pptImgUrl1" style="width: 100%; height: 100%; overflow: auto"></pdf>
                   </div>
                   <div class="wheel" v-if="showType == 4" style="width: 95%; margin: 0 auto">
-                    <el-image :src="pptImgUrl1" fit="cover" style="width: 100%"></el-image>
+                    <el-image :src="pptImgUrl1" fit="contain" style="width: 100%;height:100%;cursor: pointer;" @click="previewImg(pptImgUrl1)"></el-image>
                   </div>
                 </div>
                 <div class="pButton" style="
@@ -298,6 +298,14 @@
                               <span v-if="vitem.text">{{ vitem.text }}-</span>{{ vitem.name }}
                             </div>
                           </div>
+                          <div style="width: calc(100% - 0px)" @click="checkPhoto(vitem, vindex)" v-if="vitem.type == 13">
+                            <div class="navText" :class="isClickNav == vindex
+                              ? 'isClickNav'
+                              : ''
+                              ">
+                              {{ vitem.name }}
+                            </div>
+                          </div>
                         </div>
                       </div>
                     </div>
@@ -9298,13 +9306,18 @@ export default {
                   ) {
                     this.showType = 4;
                     this.pptImgUrl1 = _url;
-                  } else {
+                  }else {
                     this.showType = 2;
                     this.pptImgUrl1 =
                       "https://view.officeapps.live.com/op/view.aspx?src=" +
                       _url;
                   }
                 } else if (
+                    _chapterData[this.taskCount][0].type == 13
+                  ) {
+                    this.showType = 4;
+                    this.pptImgUrl1 = _url;
+                  }  else if (
                   _chapterData[this.taskCount][0].type == 6
                 ) {
                   this.showType = 1;
@@ -9436,13 +9449,18 @@ export default {
                   ) {
                     this.showType = 4;
                     this.pptImgUrl1 = _url;
-                  } else {
+                  }else {
                     this.showType = 2;
                     this.pptImgUrl1 =
                       "https://view.officeapps.live.com/op/view.aspx?src=" +
                       _url;
                   }
                 } else if (
+                    _chapterData[this.taskCount][0].type == 13
+                  ) {
+                    this.showType = 4;
+                    this.pptImgUrl1 = _url;
+                  }  else if (
                   _chapterData[this.taskCount][0].type == 6
                 ) {
                   this.showType = 1;
@@ -9555,6 +9573,11 @@ export default {
                 el.works = [];
                 return el;
               });
+              if(courseGroup.isopen == 2){
+                this.isGroup = false;
+                this.selectSWorks(gindex);
+                return;
+              }
               this.courseGroup = courseGroup;
               let groupPerson = res.data[1];
               let group = JSON.parse(res.data[0][0].group).group;
@@ -9575,7 +9598,11 @@ export default {
               this.courseGroupStudent = courseGroupStudent;
               this.courseGroupStudentUid = courseGroupStudentUid;
             }
-            this.isGroup = true;
+            if(this.courseGroup.isopen == 2){
+              this.isGroup = false;
+            }else{
+              this.isGroup = true;
+            }
             this.selectSWorks(gindex);
           } else {
             this.selectSWorks(gindex);
@@ -10074,6 +10101,12 @@ export default {
       this.isClickNav = i;
       this.$forceUpdate();
     },
+    checkPhoto(f, i){
+      this.showType = 4;
+      this.pptImgUrl1 = f.url;
+      this.isClickNav = i;
+      this.$forceUpdate();
+    },
     downFile(f, i) {
       this.isClickNav = "";
       this.pptImgUrl1 = "";