Browse Source

修改样式及格式

zengyicheng 2 years ago
parent
commit
1cf00e35f3
2 changed files with 52 additions and 157 deletions
  1. 51 156
      src/components/study.vue
  2. 1 1
      src/components/studyStudent.vue

+ 51 - 156
src/components/study.vue

@@ -133,21 +133,9 @@
             v-for="(rw, rwIndex) in jd.chapterInfo[0].taskJson"
             :key="rwIndex"
           >
-            <div
-              class="vedioBox"
-              style="
-                border-radius: 0px;
-                font-size: 18px;
-                padding: 20px;
-                display: flex;
-                flex-direction: row;
-                align-items: center;
-              "
-            >
-              <div class="vedioNav" :id="jdIndex + '-' + rwIndex">
-                任务{{ rwIndex + 1 }}
-              </div>
-              <div style="margin: 10px 0 0 10px">{{ rw.task }}</div>
+            <div class="rwCss">
+              <div :id="jdIndex + '-' + rwIndex">任务{{ rwIndex + 1 }}</div>
+              <div style="margin: 0px 0 0 10px">{{ rw.task }}</div>
             </div>
             <div
               class="vedioBox"
@@ -225,8 +213,8 @@
                       v-if="showType[jdIndex][rwIndex] == 1"
                       style="
                         box-shadow: 0 0 6px 1px #f2f2f2;
-                        width: 95%;
-                        margin: 0 auto;
+                        width: 90%;
+                        margin: 0 0 20px 30px;
                         background: #f1f1f1;
                       "
                     >
@@ -243,7 +231,7 @@
                             {{ textList[jdIndex][rwIndex][0].name }}
                           </div>
                         </el-form-item>
-                        <div style="color: #918f8f;width:85%">文档内容</div>
+                        <div style="color: #918f8f">文档内容</div>
                         <div
                           v-html="textList[jdIndex][rwIndex][0].url"
                           class="textContent"
@@ -253,7 +241,7 @@
                     <div
                       class="wheel"
                       v-if="showType[jdIndex][rwIndex] == 2"
-                      style="height: 520px; width: 95%; margin: 0 auto"
+                      style="height: 520px; width: 90%; margin: 0 0 20px 30px"
                     >
                       <iframe
                         style="width: 100%; height: 100%; border: none"
@@ -263,7 +251,7 @@
                     <div
                       class="wheel"
                       v-if="showType[jdIndex][rwIndex] == 3"
-                      style="height: 520px; width: 95%; margin: 0 auto"
+                      style="height: 520px; width: 90%; margin: 0 0 20px 30px"
                     >
                       <pdf
                         :pdfUrl="pptImgUrl1[jdIndex][rwIndex]"
@@ -273,7 +261,12 @@
                     <div
                       class="wheel"
                       v-if="showType[jdIndex][rwIndex] == 4"
-                      style="height: 520px; width: 95%; margin: 0 auto"
+                      style="
+                        height: 520px;
+                        width: 90%;
+                        margin: 0 0 20px 30px;
+                        overflow: auto;
+                      "
                     >
                       <el-image
                         :src="pptImgUrl1[jdIndex][rwIndex]"
@@ -332,7 +325,6 @@
                           class="vedioTimeBox"
                           v-for="(media, vedioIndex) in vedio[jdIndex][rwIndex]"
                           :key="vedioIndex + '1'"
-                          @click="lookVedio(media.url, jdIndex, rwIndex)"
                         >
                           <div
                             class="media"
@@ -352,7 +344,7 @@
                                   : mr
                               "
                               alt
-                              
+                              @click="lookVedio(media.url, jdIndex, rwIndex)"
                             />
                             <div class="vedioTime">{{ vedioTime }}</div>
                           </div>
@@ -368,7 +360,6 @@
                         class="newNav"
                         v-for="(text, textIndex) in textList[jdIndex][rwIndex]"
                         :key="textIndex + '2'"
-                        @click="lookText(jdIndex, rwIndex, textIndex)"
                       >
                         <div
                           class="vedioNav"
@@ -386,7 +377,7 @@
                         <div style="width: calc(100% - 115px)">
                           <div
                             class="navText"
-                            
+                            @click="lookText(jdIndex, rwIndex, textIndex)"
                           >
                             {{
                               textList[jdIndex][rwIndex].length > 0
@@ -405,7 +396,6 @@
                         class="newNav"
                         v-for="(lines, lineIndex) in lineList[jdIndex][rwIndex]"
                         :key="lineIndex + '4'"
-                        @click="doUrl(lines.url)"
                       >
                         <div
                           class="vedioNav"
@@ -425,7 +415,7 @@
                             <a
                               style="text-decoration: none; color: #000"
                               target="_Blank"
-                              
+                              @click="doUrl(lines.url)"
                               >{{ lines.url }}</a
                             >
                           </div>
@@ -440,7 +430,6 @@
                         "
                         v-for="(f, fileIndex) in file[jdIndex][rwIndex]"
                         :key="fileIndex"
-                        @click="downFile(f, fileIndex, jdIndex, rwIndex)"
                       >
                         <div
                           class="vedioNav"
@@ -458,6 +447,7 @@
                         <div style="width: calc(100% - 115px)">
                           <div
                             class="navText"
+                            @click="downFile(f, fileIndex, jdIndex, rwIndex)"
                           >
                             {{ f.name }}
                           </div>
@@ -467,7 +457,7 @@
                   </div>
                 </div>
                 <div
-                  style="padding: 10px 30px 0"
+                  style="padding: 0px 30px"
                   v-if="
                     showType[jdIndex][rwIndex] == 2 ||
                     showType[jdIndex][rwIndex] == 3
@@ -481,24 +471,7 @@
                         pptImgUrl1[jdIndex][rwIndex]
                       )
                     "
-                    >全屏查看</el-button
-                  >
-                </div>
-                <div
-                  style="padding: 10px 30px 0"
-                  v-if="
-                    showType[jdIndex][rwIndex] == 1
-                  "
-                >
-                  <el-button
-                    type="primary"
-                    @click="
-                      checkFileFull(
-                        showType[jdIndex][rwIndex],
-                        textList[jdIndex][rwIndex][0]
-                      )
-                    "
-                    >全屏查看</el-button
+                    >查看全屏</el-button
                   >
                 </div>
               </div>
@@ -649,56 +622,7 @@
                             <div v-if="tooC == 2">
                               <div class="iframeName">便签</div>
                               <iframe
-                                :src="'https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/note?userid=' + userid + '&oid=' + oid"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 25">
-                              <div class="iframeName">目标管理</div>
-                              <iframe
-                                :src="'https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/evaluation?userid=' + userid + '&oid=' + oid"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 32">
-                              <div class="iframeName">源码编辑</div>
-                              <iframe
-                                src="//kitten.codemao.cn/"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 31">
-                              <div class="iframeName">数学画板</div>
-                              <iframe
-                                src="//www.netpad.net.cn/svg.html"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 28">
-                              <div class="iframeName">翻译</div>
-                              <iframe
-                                src="//dict.youdao.com/"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 37">
-                              <div class="iframeName">魔盒识字</div>
-                              <iframe
-                                src="//games.cocorobo.cn/view/index.html#/"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 38">
-                              <div class="iframeName">24点</div>
-                              <iframe
-                                src="//24.cocorobo.cn/#/index"
-                                class="iframeCss"
-                              ></iframe>
-                            </div>
-                            <div v-if="tooC == 39">
-                              <div class="iframeName">GeoGebra</div>
-                              <iframe
-                                src="//www.geogebra.org/calculator"
+                                src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/note"
                                 class="iframeCss"
                               ></iframe>
                             </div>
@@ -964,6 +888,7 @@
                       <div>
                         <div
                           class="worksDetailBox"
+                          style="width: calc(100% - 30%)"
                           v-if="
                             worksStudent[jdIndex][rwIndex][toolIndex].length > 0
                           "
@@ -1618,17 +1543,9 @@
                 <div class="up_photo">
                   <img src="../assets/icon/uploadImg.png" alt />
                 </div>
-                <!-- <input
-                  type="file"
-                  accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/*"
-                  capture="camera"
-                  style="display: none"
-                  @change="beforeUpload1($event, 1)"
-                /> -->
                 <input
                   type="file"
-                  accept="image/*"
-                  capture="camera"
+                  accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/png, image/gif, image/jpeg"
                   style="display: none"
                   @change="beforeUpload1($event, 1)"
                 />
@@ -2016,26 +1933,6 @@
           :pdfUrl="fullUrl"
           style="width: 100%; height: 100%; overflow: auto"
         ></pdf>
-        <div
-          class="wheel"
-          v-if="fulltype == 1"
-          style="
-            box-shadow: 0 0 6px 1px #f2f2f2;
-            width: 100%;
-            background: #f1f1f1;
-          "
-        >
-          <div class="title" style="width: 100%;box-sizing: border-box;">查看文档</div>
-          <el-form class="textBox" style="height:90%">
-            <el-form-item label="文档标题" class="textTitle">
-              <div style="font-size: 22px; max-height: 100px; overflow: auto">
-                {{ fullUrl.name }}
-              </div>
-            </el-form-item>
-            <div style="color: #918f8f; width: 85%">文档内容</div>
-            <div v-html="fullUrl.url" class="textContent" style="height:auto"></div>
-          </el-form>
-        </div>
       </div>
       <!-- <div slot="footer">
         <el-button @click="fullDialogVisible = false">关 闭</el-button>
@@ -3745,13 +3642,6 @@ export default {
     },
   },
   created() {
-    if(this.screenType == 2){
-      window.parent.postMessage({ allScreen: 4 }, "*");
-    }else if(this.screenType == 3){
-      window.parent.postMessage({ allScreen: 5 }, "*");
-    }else if(this.screenType == 1){
-      window.parent.postMessage({ allScreen: 6 }, "*");
-    }
     this.selectEva();
     this.getCourseDetail();
     this.selectCount();
@@ -3777,9 +3667,9 @@ export default {
   /* .navText {
     width: 120px !important;
   } */
-  /* .textBox {
+  .textBox {
     margin: 0 !important;
-  } */
+  }
   .evaCss {
     flex-direction: column !important;
     align-items: center !important;
@@ -3880,8 +3770,7 @@ export default {
   cursor: pointer;
 }
 .box_course {
-  /* width: 60%; */
-  width: 81%;
+  width: 60%;
 }
 .wheel {
   width: 100%;
@@ -4083,7 +3972,7 @@ export default {
   margin-top: 10px;
 }
 .upload_send {
-  margin: 30px auto 30px;
+  margin: 200px auto 30px;
   width: 60%;
   background: #169bd6;
   text-align: center;
@@ -4366,11 +4255,9 @@ export default {
 .vedioList {
   background: #f2f2f2;
   border: 1px solid #ececec;
-  /* width: 38.8%; */
-  width: calc(100% - 83%);
+  width: 38.8%;
   height: 445px;
   border-radius: 10px;
-  overflow:hidden;
 }
 .vedioNav {
   margin: 10px 0 0 15px;
@@ -4626,7 +4513,7 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  width: 85%;
+  width: 100%;
 }
 .textTitle >>> .el-form-item__label {
   font-size: 22px;
@@ -4874,16 +4761,13 @@ export default {
   align-items: flex-start;
   justify-content: flex-start;
   align-content: center;
-  max-width: 240px;
-  width: calc(100% / 3 - 10px);
-  height: auto;
+  width: 240px;
+  height: 170px;
   margin-right: 10px;
-  margin-bottom:10px
 }
 .workImg {
   width: 100%;
-  /* height: calc(100% - 40px); */
-  height: calc(100%);
+  height: calc(100% - 40px);
 }
 .workImg > img {
   width: 100%;
@@ -4940,11 +4824,9 @@ export default {
 }
 .textBox {
   font-size: 20px;
-    width: 90%;
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-    margin: 20px auto 0;
+  margin: 15px 0px 20px 30px;
+  width: 90%;
+  padding: 30px 0 0 50px;
 }
 .textContent {
   font-size: 18px;
@@ -5308,13 +5190,26 @@ export default {
 }
 
 .full_diy >>> .el-dialog__body {
-  height: calc(100%  - 100px);
-  padding:4px;
+  height: calc(100% - 100px);
 }
 
 .full_diy >>> .el-dialog {
   margin: 0 !important;
   height: 100%;
 }
-
+.rwCss {
+  font-size: 24px;
+  padding: 20px;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  color: rgb(255, 255, 255);
+  background-image: linear-gradient(
+    to right,
+    rgb(69, 116, 204),
+    rgb(85, 145, 217)
+  );
+  border-radius: 10px;
+  margin: 10px 0;
+}
 </style>

+ 1 - 1
src/components/studyStudent.vue

@@ -1753,7 +1753,7 @@
               /> -->
               <input
                 type="file"
-                accept="image/*"
+                accept="*"
                 capture="camera"
                 style="display: none"
                 @change="beforeUpload1($event, 1)"