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

src/components/dialog/selectTeachingClassDialog.vue

@@ -38,10 +38,12 @@
 					</svg>
 				</div>
 				<div class="b_main" v-loading="loading">
-          <div class="b_m_classItem" :class="{'b_m_classItem_active':selectId == item.id}" v-for="item in classList" :key="item.id" @click="selectId == item.id ? selectId = '' : selectId = item.id">
+          <template v-for="item in classList" >
+            <div class="b_m_classItem" :class="{'b_m_classItem_active':selectId == item.id}" :key="item.id" v-if="item.name" @click="selectId == item.id ? selectId = '' : selectId = item.id">
             <div>{{ item.name }}</div>
             <span v-if="item.studentNum>=0">{{ item.studentNum }}名学生</span>
           </div>
+          </template>
 
           <div class="b_m_classItem" @click="editClass" v-if="courseDetail.userid == userId">
               <div>

src/components/easy2/studyStudent.vue

@@ -852,6 +852,24 @@
                               />
                             </div>
                           </div>
+                          <div class="navListItem" v-if="vitem.type == 17">
+                            <div
+                              class="navText"
+                              @click="checkHtml(vitem, vindex)"
+                              :class="isClickNav == vindex ? 'isClickNav' : ''"
+                            >
+                              {{ vitem.name }}
+                            </div>
+                            <div
+                              class="downIcon"
+                              @click="checkFileFull1(vitem.type, vitem)"
+                            >
+                              <img
+                                src="../../assets/icon/newIcon/allScreen.png"
+                                alt
+                              />
+                            </div>
+                          </div>
                         </div>
                         <div
                           class="fileC_box"
@@ -23196,6 +23214,8 @@ export default {
       );
     },
     checkHtml(f, i){
+      console.log('checkHtml',f, i);
+      
       this.showType = 16;
       this.pptImgUrl1 = f.url;
       this.isClickNav = i;

src/components/easy3/studyStudent.vue

@@ -857,6 +857,24 @@
                               />
                             </div>
                           </div>
+                          <div class="navListItem" v-if="vitem.type == 17">
+                            <div
+                              class="navText"
+                              @click="checkHtml(vitem, vindex)"
+                              :class="isClickNav == vindex ? 'isClickNav' : ''"
+                            >
+                              {{ vitem.name }}
+                            </div>
+                            <div
+                              class="downIcon"
+                              @click="checkFileFull1(vitem.type, vitem)"
+                            >
+                              <img
+                                src="../../assets/icon/newIcon/allScreen.png"
+                                alt
+                              />
+                            </div>
+                          </div>
                         </div>
                         <div class="fileC_box" v-if="fileC[0].length > 0">
                           <div class="fileC_title">以下文件不支持预览</div>

src/components/index.vue

@@ -243,7 +243,7 @@ export default {
 
   data() {
     return {
-      gotype:sessionStorage.getItem('gotype'),
+      gotype:(window.topU && window.topU.gotype) ?  window.topU.gotype : '',
       zoneList: [],
       zoneClass: [],
       page: 1,
@@ -339,6 +339,12 @@ export default {
       }else{
         window.location.href = `https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/CourseCon?userid=${this.userid}&oid=${this.oid}&org=${this.org}&role=${this.role}&tType=${this.tType}`
       }
+      try {
+        window.topU.gotype = '' 
+      } catch (error) {
+        console.log(error);
+      }
+      // sessionStorage.removeItem('gotype');
     },
     search(){
       if(this.typeCheck || this.typeCheck2){

src/components/studyStudent.vue

@@ -812,6 +812,24 @@
                                 />
                               </div>
                           </div>
+                          <div class="navListItem" v-if="vitem.type == 17">
+                              <div
+                                class="navText"
+                                @click="checkHtml(vitem, vindex)"
+                                :class="isClickNav == vindex ? 'isClickNav' : ''"
+                              >
+                                {{ vitem.name }}
+                              </div>
+                              <div
+                                class="downIcon"
+                                @click="checkFileFull1(vitem.type, vitem)"
+                              >
+                                <img
+                                  src="../assets/icon/newIcon/allScreen.png"
+                                  alt
+                                />
+                              </div>
+                          </div>
                         </div>
 
                         <div

src/components/studySutdentClass/studyStudent.vue

@@ -855,6 +855,24 @@
                               />
                             </div>
                           </div>
+                          <div class="navListItem" v-if="vitem.type == 17">
+                            <div
+                              class="navText"
+                              @click="checkHtml(vitem, vindex)"
+                              :class="isClickNav == vindex ? 'isClickNav' : ''"
+                            >
+                              {{ vitem.name }}
+                            </div>
+                            <div
+                              class="downIcon"
+                              @click="checkFileFull1(vitem.type, vitem)"
+                            >
+                              <img
+                                src="../../assets/icon/newIcon/allScreen.png"
+                                alt
+                              />
+                            </div>
+                          </div>
                         </div>
                         <div class="fileC_box" v-if="fileC[0].length > 0">
                           <div class="fileC_title">以下文件不支持预览</div>