Bladeren bron

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

zengyicheng 2 jaren geleden
bovenliggende
commit
972459e0b1

+ 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.437cca719c0f78cba0a0840b1f57eef6.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.cd2595652de953da4afa.js></script></body></html><script>function stopSafari() {
+    }</style><link href=./static/css/app.b43b14e97a6267fdec809c464e40eb17.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.e81042531bab735dba9a.js></script><script type=text/javascript src=./static/js/app.2b0fae7477d35fa623c6.js></script></body></html><script>function stopSafari() {
     //阻止safari浏览器双击放大功能
     let lastTouchEnd = 0  //更新手指弹起的时间
     document.documentElement.addEventListener("touchstart", function (event) {

File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.437cca719c0f78cba0a0840b1f57eef6.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.b43b14e97a6267fdec809c464e40eb17.css


File diff suppressed because it is too large
+ 0 - 0
dist/static/css/app.b43b14e97a6267fdec809c464e40eb17.css.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.2b0fae7477d35fa623c6.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.2b0fae7477d35fa623c6.js.map


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


File diff suppressed because it is too large
+ 1504 - 8
src/components/easy2/studyStudent.vue


File diff suppressed because it is too large
+ 1504 - 8
src/components/easy3/studyStudent.vue


+ 63 - 64
src/components/studyStudent.vue

@@ -218,13 +218,10 @@
           <img src="../assets/icon/isNoMessage.png" alt />
         </div>
         <div class="study_top" :class="{ pzClass: pzDialog }">
-          <div
-            class="vedioBox"
-            v-if="
-              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
-                .taskDetail != '' || vChapterData[taskCount].length > 0
-            "
-          >
+          <div class="vedioBox" v-if="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+            .taskDetail != '' ||
+            vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0
+            ">
             <div class="checkbox">
               <div
                 class="check"
@@ -238,14 +235,10 @@
                 学一学
               </div>
             </div>
-            <div
-              class="student_head"
-              v-if="
-                vChapterData[taskCount].length > 0 ||
-                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
-                  .taskDetail != ''
-              "
-            >
+            <div class="student_head" v-if="vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0 ||
+              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
+                .taskDetail != ''
+              ">
               <div class="taskBox">
                 <div
                   style="
@@ -393,24 +386,10 @@
                   <!-- 批 -->
                   <img src="../assets/navBtn2.png" style="width: 25px" alt="" />
                 </div>
-                <div
-                  v-if="contentDialog == true"
-                  :style="{
-                    width:
-                      vChapterData[taskCount].length > 0 && showType === ''
-                        ? 'calc(100%)'
-                        : 'calc(100% - 83%)',
-                    margin:
-                      vChapterData[taskCount].length > 0 && showType === ''
-                        ? '0 15px'
-                        : '0 15px 0 0',
-                  }"
-                >
-                  <div
-                    class="vedioList"
-                    v-if="vChapterData[taskCount].length > 0"
-                    style="height: 650px"
-                  >
+                <div v-if="contentDialog == true" :style="{
+                  width: ((vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0) && showType === '') ? 'calc(100%)' : 'calc(100% - 83%)', margin: ((vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0) && showType === '') ? '0 15px' : '0 15px 0 0'
+                }">
+                  <div class="vedioList" v-if="vChapterData[taskCount].length > 0 || fileC[taskCount].length > 0" style="height: 650px">
                     <div class="navCorOpenBox">
                       <div class="navTitile">内容列表:</div>
                       <div class="navCorOpen" @click="setContent(false)">
@@ -418,31 +397,24 @@
                       </div>
                     </div>
                     <div class="navBox">
-                      <div v-show="vChapterData[taskCount].length > 0">
-                        <div
-                          class="vedioTimeBox"
-                          v-for="(vitem, vindex) in vChapterData[taskCount]"
-                          :key="vindex + '1'"
-                        >
-                          <div
-                            @click="lookVedio(vitem.url, vindex)"
-                            v-if="vitem.type == 2"
-                            class="vedioName"
-                            :class="isClickNav == vindex ? 'isClickNav' : ''"
-                          >
-                            <span v-if="vitem.text">{{ vitem.text }}-</span
-                            >{{ vitem.name }}
+                      <div v-show="vChapterData[taskCount].length > 0  || fileC[taskCount].length > 0
+                        ">
+                        <div class="vedioTimeBox" v-for="(vitem, vindex) in vChapterData[taskCount]" :key="vindex + '1'">
+                          <div @click="lookVedio(vitem.url, vindex)" v-if="vitem.type == 2" class="vedioName" :class="isClickNav == vindex
+                            ? 'isClickNav'
+                            : ''
+                            ">
+                            <span v-if="vitem.text">{{ vitem.text }}-</span>{{ vitem.name }}
                           </div>
-                          <div
-                            style="width: calc(100% - 0px)"
-                            @click="lookText(taskCount, vindex)"
-                            v-if="vitem.type == 6"
-                          >
-                            <div
-                              class="navText"
-                              :class="isClickNav == vindex ? 'isClickNav' : ''"
-                            >
-                              {{ vitem.name }}.doc
+                          <div style="width: calc(100% - 0px)" @click="lookText(taskCount, vindex)"
+                            v-if="vitem.type == 6">
+                            <div class="navText" :class="isClickNav == vindex
+                              ? 'isClickNav'
+                              : ''
+                              ">
+                              {{
+                                vitem.name
+                              }}.doc
                             </div>
                           </div>
                           <div
@@ -493,6 +465,16 @@
                             </div>
                           </div>
                         </div>
+                        <div class="fileC_box" v-if="fileC[taskCount].length > 0">
+                          <div class="fileC_title">以下文件不支持预览</div>
+                          <div class="vedioTimeBox" v-for="(vitem, vindex) in fileC[taskCount]" :key="vindex + '1'">
+                            <div style="width: calc(100% - 0px)" @click="downloadFile2(vitem)" v-if="vitem.type == 12">
+                              <div class="navText">
+                                <span v-if="vitem.text">{{ vitem.text }}-</span>{{ vitem.name }}
+                              </div>
+                            </div>
+                          </div>
+                        </div>
                       </div>
                     </div>
                   </div>
@@ -12977,7 +12959,15 @@ export default {
               this.chapToolList[i] = [];
               this.file[i] = [];
               this.fileC[i] = [];
-              _chapterData[i] = c;
+              _chapterData[i] = c.filter(el => {
+                return el.type != 12
+              })
+              this.fileC[i] = c.filter(el => {
+                return el.type == 12
+              })
+              // else if (c[j].type == 12) {
+              //     this.fileC[i].push(c[j]);
+              //   }
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
@@ -12985,8 +12975,6 @@ export default {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
-                } else if (c[j].type == 12) {
-                  this.fileC[i].push(c[j]);
                 } else {
                   if (
                     b.indexOf(
@@ -13149,7 +13137,12 @@ export default {
               this.chapToolList[i] = [];
               this.file[i] = [];
               this.fileC[i] = [];
-              _chapterData[i] = c;
+              _chapterData[i] = c.filter(el => {
+                return el.type != 12
+              })
+              this.fileC[i] = c.filter(el => {
+                return el.type == 12
+              })
               for (var j = 0; j < c.length; j++) {
                 if (c[j].type == 7) {
                   this.chapToolList[i].push(c[j]);
@@ -13157,9 +13150,7 @@ export default {
                   this.lineList[i].push(c[j]);
                 } else if (c[j].type == 6) {
                   this.textList[i].push(c[j]);
-                } else if (c[j].type == 12) {
-                  this.fileC[i].push(c[j]);
-                } else {
+                }else {
                   if (
                     b.indexOf(
                       c[j].url
@@ -19146,4 +19137,12 @@ ol {
 .group_switch > span {
   margin-right: 5px;
 }
+
+
+.fileC_box > .fileC_title{
+  padding: 10px 5px;
+  border-top: 1px solid #cdcdcd;
+  font-size: 14px;
+  color: #868686;
+}
 </style>

Some files were not shown because too many files changed in this diff