Home Explore Help
Sign In
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

update

lsc 2 years ago
parent
19393686f3
commit
61b30f0853
17 changed files with 149 additions and 52 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.5791ea3bc77bd07b13437dc8996fd0e7.css.map
  3. 0 0
      dist/static/css/app.f94afc224a9652b4f475b65dd8f3f3b1.css
  4. 0 0
      dist/static/css/app.f94afc224a9652b4f475b65dd8f3f3b1.css.map
  5. 0 0
      dist/static/js/app.56b6f4e8f4bb222e81af.js
  6. 0 0
      dist/static/js/app.56b6f4e8f4bb222e81af.js.map
  7. 0 0
      dist/static/js/app.5e560f846a524f116350.js
  8. 0 0
      dist/static/js/app.5e560f846a524f116350.js.map
  9. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  10. BIN
      src/assets/icon/secondToolList/24game.png
  11. BIN
      src/assets/icon/secondToolList/GeoGebra.png
  12. BIN
      src/assets/icon/secondToolList/mohe.png
  13. BIN
      src/assets/icon/secondToolList/translation.png
  14. 3 1
      src/components/liveProjectDetail.vue
  15. 3 1
      src/components/liveProjectDetailKH.vue
  16. 57 20
      src/components/study.vue
  17. 85 29
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -18,4 +18,4 @@
 
       border-radius: 10px;
 
       border-radius: 10px;
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
 
       background-color: rgba(0, 0, 0, 0.1);
 
       background-color: rgba(0, 0, 0, 0.1);
 
-    }</style><link href=./static/css/app.5791ea3bc77bd07b13437dc8996fd0e7.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.30bffeaaa8c3b2b4d120.js></script><script type=text/javascript src=./static/js/app.56b6f4e8f4bb222e81af.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
 
+    }</style><link href=./static/css/app.f94afc224a9652b4f475b65dd8f3f3b1.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.30bffeaaa8c3b2b4d120.js></script><script type=text/javascript src=./static/js/app.5e560f846a524f116350.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

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


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


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


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


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


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


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


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


BIN
src/assets/icon/secondToolList/24game.png
View File


BIN
src/assets/icon/secondToolList/GeoGebra.png
View File


BIN
src/assets/icon/secondToolList/mohe.png
View File


BIN
src/assets/icon/secondToolList/translation.png
View File


+ 3 - 1
src/components/liveProjectDetail.vue
View File 

@@ -279,7 +279,8 @@
 
                     上传文件
 
                     上传文件
 
                     <input
 
                     <input
 
                       type="file"
 
                       type="file"
 
-                      accept="image/png, image/gif, image/jpeg"
 
+                      accept="image/*"
 
+                      capture="camera"
 
                       style="display: none"
 
                       style="display: none"
 
                       @change="beforeUpload1($event, 1)"
 
                       @change="beforeUpload1($event, 1)"
 
                     />
 
                     />
 
@@ -301,6 +302,7 @@
 
                     <input
 
                     <input
 
                       type="file"
 
                       type="file"
 
                       accept="video/mp4, video/quicktime, video/x-msvideo"
 
                       accept="video/mp4, video/quicktime, video/x-msvideo"
 
+                      capture="camera"
 
                       style="display: none"
 
                       style="display: none"
 
                       @change="beforeUpload1($event, 2)"
 
                       @change="beforeUpload1($event, 2)"
 
                     />
 
                     />

+ 3 - 1
src/components/liveProjectDetailKH.vue
View File 

@@ -279,7 +279,8 @@
 
                     上传文件
 
                     上传文件
 
                     <input
 
                     <input
 
                       type="file"
 
                       type="file"
 
-                      accept="image/png, image/gif, image/jpeg"
 
+                      accept="image/*"
 
+                      capture="camera"
 
                       style="display: none"
 
                       style="display: none"
 
                       @change="beforeUpload1($event, 1)"
 
                       @change="beforeUpload1($event, 1)"
 
                     />
 
                     />
 
@@ -301,6 +302,7 @@
 
                     <input
 
                     <input
 
                       type="file"
 
                       type="file"
 
                       accept="video/mp4, video/quicktime, video/x-msvideo"
 
                       accept="video/mp4, video/quicktime, video/x-msvideo"
 
+                      capture="camera"
 
                       style="display: none"
 
                       style="display: none"
 
                       @change="beforeUpload1($event, 2)"
 
                       @change="beforeUpload1($event, 2)"
 
                     />
 
                     />

+ 57 - 20
src/components/study.vue
View File 

@@ -225,8 +225,8 @@
 
                       v-if="showType[jdIndex][rwIndex] == 1"
 
                       v-if="showType[jdIndex][rwIndex] == 1"
 
                       style="
 
                       style="
 
                         box-shadow: 0 0 6px 1px #f2f2f2;
 
                         box-shadow: 0 0 6px 1px #f2f2f2;
 
-                        width: 90%;
 
-                        margin: 0 0 20px 30px;
 
+                        width: 95%;
 
+                        margin: 0 auto;
 
                         background: #f1f1f1;
 
                         background: #f1f1f1;
 
                       "
 
                       "
 
                     >
 
                     >
 
@@ -253,7 +253,7 @@
 
                     <div
 
                     <div
 
                       class="wheel"
 
                       class="wheel"
 
                       v-if="showType[jdIndex][rwIndex] == 2"
 
                       v-if="showType[jdIndex][rwIndex] == 2"
 
-                      style="height: 520px; width: 90%; margin: 0 0 20px 30px"
 
+                      style="height: 520px; width: 95%; margin: 0 auto"
 
                     >
 
                     >
 
                       <iframe
 
                       <iframe
 
                         style="width: 100%; height: 100%; border: none"
 
                         style="width: 100%; height: 100%; border: none"
 
@@ -263,7 +263,7 @@
 
                     <div
 
                     <div
 
                       class="wheel"
 
                       class="wheel"
 
                       v-if="showType[jdIndex][rwIndex] == 3"
 
                       v-if="showType[jdIndex][rwIndex] == 3"
 
-                      style="height: 520px; width: 90%; margin: 0 0 20px 30px"
 
+                      style="height: 520px; width: 95%; margin: 0 auto"
 
                     >
 
                     >
 
                       <pdf
 
                       <pdf
 
                         :pdfUrl="pptImgUrl1[jdIndex][rwIndex]"
 
                         :pdfUrl="pptImgUrl1[jdIndex][rwIndex]"
 
@@ -273,12 +273,7 @@
 
                     <div
 
                     <div
 
                       class="wheel"
 
                       class="wheel"
 
                       v-if="showType[jdIndex][rwIndex] == 4"
 
                       v-if="showType[jdIndex][rwIndex] == 4"
 
-                      style="
 
-                        height: 520px;
 
-                        width: 90%;
 
-                        margin: 0 0 20px 30px;
 
-                        overflow: auto;
 
-                      "
 
+                      style="height: 520px; width: 95%; margin: 0 auto"
 
                     >
 
                     >
 
                       <el-image
 
                       <el-image
 
                         :src="pptImgUrl1[jdIndex][rwIndex]"
 
                         :src="pptImgUrl1[jdIndex][rwIndex]"
 
@@ -337,6 +332,7 @@
 
                           class="vedioTimeBox"
 
                           class="vedioTimeBox"
 
                           v-for="(media, vedioIndex) in vedio[jdIndex][rwIndex]"
 
                           v-for="(media, vedioIndex) in vedio[jdIndex][rwIndex]"
 
                           :key="vedioIndex + '1'"
 
                           :key="vedioIndex + '1'"
 
+                          @click="lookVedio(media.url, jdIndex, rwIndex)"
 
                         >
 
                         >
 
                           <div
 
                           <div
 
                             class="media"
 
                             class="media"
 
@@ -356,7 +352,7 @@
 
                                   : mr
 
                                   : mr
 
                               "
 
                               "
 
                               alt
 
                               alt
 
-                              @click="lookVedio(media.url, jdIndex, rwIndex)"
 
+                              
                             />
 
                             />
 
                             <div class="vedioTime">{{ vedioTime }}</div>
 
                             <div class="vedioTime">{{ vedioTime }}</div>
 
                           </div>
 
                           </div>
 
@@ -372,6 +368,7 @@
 
                         class="newNav"
 
                         class="newNav"
 
                         v-for="(text, textIndex) in textList[jdIndex][rwIndex]"
 
                         v-for="(text, textIndex) in textList[jdIndex][rwIndex]"
 
                         :key="textIndex + '2'"
 
                         :key="textIndex + '2'"
 
+                        @click="lookText(jdIndex, rwIndex, textIndex)"
 
                       >
 
                       >
 
                         <div
 
                         <div
 
                           class="vedioNav"
 
                           class="vedioNav"
 
@@ -389,7 +386,7 @@
 
                         <div style="width: calc(100% - 115px)">
 
                         <div style="width: calc(100% - 115px)">
 
                           <div
 
                           <div
 
                             class="navText"
 
                             class="navText"
 
-                            @click="lookText(jdIndex, rwIndex, textIndex)"
 
+                            
                           >
 
                           >
 
                             {{
 
                             {{
 
                               textList[jdIndex][rwIndex].length > 0
 
                               textList[jdIndex][rwIndex].length > 0
 
@@ -408,6 +405,7 @@
 
                         class="newNav"
 
                         class="newNav"
 
                         v-for="(lines, lineIndex) in lineList[jdIndex][rwIndex]"
 
                         v-for="(lines, lineIndex) in lineList[jdIndex][rwIndex]"
 
                         :key="lineIndex + '4'"
 
                         :key="lineIndex + '4'"
 
+                        @click="doUrl(lines.url)"
 
                       >
 
                       >
 
                         <div
 
                         <div
 
                           class="vedioNav"
 
                           class="vedioNav"
 
@@ -427,7 +425,7 @@
 
                             <a
 
                             <a
 
                               style="text-decoration: none; color: #000"
 
                               style="text-decoration: none; color: #000"
 
                               target="_Blank"
 
                               target="_Blank"
 
-                              @click="doUrl(lines.url)"
 
+                              
                               >{{ lines.url }}</a
 
                               >{{ lines.url }}</a
 
                             >
 
                             >
 
                           </div>
 
                           </div>
 
@@ -442,6 +440,7 @@
 
                         "
 
                         "
 
                         v-for="(f, fileIndex) in file[jdIndex][rwIndex]"
 
                         v-for="(f, fileIndex) in file[jdIndex][rwIndex]"
 
                         :key="fileIndex"
 
                         :key="fileIndex"
 
+                        @click="downFile(f, fileIndex, jdIndex, rwIndex)"
 
                       >
 
                       >
 
                         <div
 
                         <div
 
                           class="vedioNav"
 
                           class="vedioNav"
 
@@ -459,7 +458,6 @@
 
                         <div style="width: calc(100% - 115px)">
 
                         <div style="width: calc(100% - 115px)">
 
                           <div
 
                           <div
 
                             class="navText"
 
                             class="navText"
 
-                            @click="downFile(f, fileIndex, jdIndex, rwIndex)"
 
                           >
 
                           >
 
                             {{ f.name }}
 
                             {{ f.name }}
 
                           </div>
 
                           </div>
 
@@ -469,7 +467,7 @@
 
                   </div>
 
                   </div>
 
                 </div>
 
                 </div>
 
                 <div
 
                 <div
 
-                  style="padding: 0px 30px"
 
+                  style="padding: 10px 30px 0"
 
                   v-if="
 
                   v-if="
 
                     showType[jdIndex][rwIndex] == 2 ||
 
                     showType[jdIndex][rwIndex] == 2 ||
 
                     showType[jdIndex][rwIndex] == 3
 
                     showType[jdIndex][rwIndex] == 3
 
@@ -487,7 +485,7 @@
 
                   >
 
                   >
 
                 </div>
 
                 </div>
 
                 <div
 
                 <div
 
-                  style="padding: 0px 30px"
 
+                  style="padding: 10px 30px 0"
 
                   v-if="
 
                   v-if="
 
                     showType[jdIndex][rwIndex] == 1
 
                     showType[jdIndex][rwIndex] == 1
 
                   "
 
                   "
 
@@ -670,12 +668,40 @@
 
                               ></iframe>
 
                               ></iframe>
 
                             </div>
 
                             </div>
 
                             <div v-if="tooC == 31">
 
                             <div v-if="tooC == 31">
 
-                              <div class="iframeName">网络画板</div>
 
+                              <div class="iframeName">数学画板</div>
 
                               <iframe
 
                               <iframe
 
                                 src="//www.netpad.net.cn/svg.html"
 
                                 src="//www.netpad.net.cn/svg.html"
 
                                 class="iframeCss"
 
                                 class="iframeCss"
 
                               ></iframe>
 
                               ></iframe>
 
                             </div>
 
                             </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"
 
+                                class="iframeCss"
 
+                              ></iframe>
 
+                            </div>
 
                             <div v-if="tooC == 4">
 
                             <div v-if="tooC == 4">
 
                               <div class="iframeName">问卷调查</div>
 
                               <div class="iframeName">问卷调查</div>
 
                               <div>
 
                               <div>
 
@@ -1592,9 +1618,17 @@
 
                 <div class="up_photo">
 
                 <div class="up_photo">
 
                   <img src="../assets/icon/uploadImg.png" alt />
 
                   <img src="../assets/icon/uploadImg.png" alt />
 
                 </div>
 
                 </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
 
                 <input
 
                   type="file"
 
                   type="file"
 
-                  accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/png, image/gif, image/jpeg"
 
+                  accept="image/*"
 
+                  capture="camera"
 
                   style="display: none"
 
                   style="display: none"
 
                   @change="beforeUpload1($event, 1)"
 
                   @change="beforeUpload1($event, 1)"
 
                 />
 
                 />
 
@@ -3846,7 +3880,8 @@ export default {
 
   cursor: pointer;
 
   cursor: pointer;
 
 }
 
 }
 
 .box_course {
 
 .box_course {
 
-  width: 60%;
 
+  /* width: 60%; */
 
+  width: 81%;
 
 }
 
 }
 
 .wheel {
 
 .wheel {
 
   width: 100%;
 
   width: 100%;
 
@@ -4331,9 +4366,11 @@ export default {
 
 .vedioList {
 
 .vedioList {
 
   background: #f2f2f2;
 
   background: #f2f2f2;
 
   border: 1px solid #ececec;
 
   border: 1px solid #ececec;
 
-  width: 38.8%;
 
+  /* width: 38.8%; */
 
+  width: calc(100% - 83%);
 
   height: 445px;
 
   height: 445px;
 
   border-radius: 10px;
 
   border-radius: 10px;
 
+  overflow:hidden;
 
 }
 
 }
 
 .vedioNav {
 
 .vedioNav {
 
   margin: 10px 0 0 15px;
 
   margin: 10px 0 0 15px;

+ 85 - 29
src/components/studyStudent.vue
View File 

@@ -243,8 +243,8 @@
 
                     v-if="showType == 1"
 
                     v-if="showType == 1"
 
                     style="
 
                     style="
 
                       box-shadow: 0 0 6px 1px #f2f2f2;
 
                       box-shadow: 0 0 6px 1px #f2f2f2;
 
-                      width: 90%;
 
-                      margin: 0 0 20px 30px;
 
+                      width: 95%;
 
+                      margin: 0 auto;
 
                       background: #f1f1f1;
 
                       background: #f1f1f1;
 
                     "
 
                     "
 
                   >
 
                   >
 
@@ -268,7 +268,7 @@
 
                   <div
 
                   <div
 
                     class="wheel"
 
                     class="wheel"
 
                     v-if="showType == 2"
 
                     v-if="showType == 2"
 
-                    style="height: 520px; width: 90%; margin: 0 0 20px 30px"
 
+                    style="height: 520px; width: 95%; margin: 0 auto"
 
                   >
 
                   >
 
                     <iframe
 
                     <iframe
 
                       style="width: 100%; height: 100%; border: none"
 
                       style="width: 100%; height: 100%; border: none"
 
@@ -278,7 +278,7 @@
 
                   <div
 
                   <div
 
                     class="wheel"
 
                     class="wheel"
 
                     v-if="showType == 3"
 
                     v-if="showType == 3"
 
-                    style="height: 520px; width: 90%; margin: 0 0 20px 30px"
 
+                    style="height: 520px; width: 95%; margin: 0 auto"
 
                   >
 
                   >
 
                     <!-- <iframe
 
                     <!-- <iframe
 
                       style="width: 100%; height: 100%; border: none"
 
                       style="width: 100%; height: 100%; border: none"
 
@@ -292,12 +292,7 @@
 
                   <div
 
                   <div
 
                     class="wheel"
 
                     class="wheel"
 
                     v-if="showType == 4"
 
                     v-if="showType == 4"
 
-                    style="
 
-                      height: 520px;
 
-                      width: 90%;
 
-                      margin: 0 0 20px 30px;
 
-                      overflow: auto;
 
-                    "
 
+                    style="height: 520px; width: 95%; margin: 0 auto"
 
                   >
 
                   >
 
                     <el-image
 
                     <el-image
 
                       :src="pptImgUrl1"
 
                       :src="pptImgUrl1"
 
@@ -361,6 +356,7 @@
 
                         class="vedioTimeBox"
 
                         class="vedioTimeBox"
 
                         v-for="(media, vedioIndex) in vedio[taskCount]"
 
                         v-for="(media, vedioIndex) in vedio[taskCount]"
 
                         :key="vedioIndex + '1'"
 
                         :key="vedioIndex + '1'"
 
+                        @click="lookVedio(media.url)"
 
                       >
 
                       >
 
                         <div
 
                         <div
 
                           class="media"
 
                           class="media"
 
@@ -376,7 +372,6 @@
 
                                 : mr
 
                                 : mr
 
                             "
 
                             "
 
                             alt
 
                             alt
 
-                            @click="lookVedio(media.url)"
 
                           />
 
                           />
 
                           <div class="vedioTime">{{ vedioTime }}</div>
 
                           <div class="vedioTime">{{ vedioTime }}</div>
 
                           <!-- <div class="vedioName">{{ media.name }}</div> -->
 
                           <!-- <div class="vedioName">{{ media.name }}</div> -->
 
@@ -393,6 +388,7 @@
 
                       class="newNav"
 
                       class="newNav"
 
                       v-for="(text, textIndex) in textList[taskCount]"
 
                       v-for="(text, textIndex) in textList[taskCount]"
 
                       :key="textIndex + '2'"
 
                       :key="textIndex + '2'"
 
+                      @click="lookText(taskCount, textIndex)"
 
                     >
 
                     >
 
                       <div
 
                       <div
 
                         class="vedioNav"
 
                         class="vedioNav"
 
@@ -408,10 +404,7 @@
 
                         文档
 
                         文档
 
                       </div>
 
                       </div>
 
                       <div style="width: calc(100% - 115px)">
 
                       <div style="width: calc(100% - 115px)">
 
-                        <div
 
-                          class="navText"
 
-                          @click="lookText(taskCount, textIndex)"
 
-                        >
 
+                        <div class="navText">
 
                           {{
 
                           {{
 
                             textList[taskCount].length > 0 ? text.name : ""
 
                             textList[taskCount].length > 0 ? text.name : ""
 
                           }}.doc
 
                           }}.doc
 
@@ -449,6 +442,7 @@
 
                       class="newNav"
 
                       class="newNav"
 
                       v-for="(lines, lineIndex) in lineList[taskCount]"
 
                       v-for="(lines, lineIndex) in lineList[taskCount]"
 
                       :key="lineIndex + '4'"
 
                       :key="lineIndex + '4'"
 
+                      @click="doUrl(lines.url)"
 
                     >
 
                     >
 
                       <div
 
                       <div
 
                         class="vedioNav"
 
                         class="vedioNav"
 
@@ -468,7 +462,6 @@
 
                           <a
 
                           <a
 
                             style="text-decoration: none; color: #000"
 
                             style="text-decoration: none; color: #000"
 
                             target="_Blank"
 
                             target="_Blank"
 
-                            @click="doUrl(lines.url)"
 
                             >{{ lines.url }}</a
 
                             >{{ lines.url }}</a
 
                           >
 
                           >
 
                         </div>
 
                         </div>
 
@@ -483,6 +476,7 @@
 
                       "
 
                       "
 
                       v-for="(f, fileIndex) in file[taskCount]"
 
                       v-for="(f, fileIndex) in file[taskCount]"
 
                       :key="fileIndex"
 
                       :key="fileIndex"
 
+                      @click="downFile(f, fileIndex)"
 
                     >
 
                     >
 
                       <div
 
                       <div
 
                         class="vedioNav"
 
                         class="vedioNav"
 
@@ -498,7 +492,7 @@
 
                         文档
 
                         文档
 
                       </div>
 
                       </div>
 
                       <div style="width: calc(100% - 115px)">
 
                       <div style="width: calc(100% - 115px)">
 
-                        <div class="navText" @click="downFile(f, fileIndex)">
 
+                        <div class="navText">
 
                           {{ f.name }}
 
                           {{ f.name }}
 
                         </div>
 
                         </div>
 
                       </div>
 
                       </div>
 
@@ -507,7 +501,7 @@
 
                 </div>
 
                 </div>
 
               </div>
 
               </div>
 
               <div
 
               <div
 
-                style="padding: 0px 30px"
 
+                style="padding: 10px 30px 0"
 
                 v-if="showType == 2 || showType == 3"
 
                 v-if="showType == 2 || showType == 3"
 
               >
 
               >
 
                 <el-button
 
                 <el-button
 
@@ -780,7 +774,39 @@
 
                               src="../assets/icon/secondToolList/networkPanel.png"
 
                               src="../assets/icon/secondToolList/networkPanel.png"
 
                               alt
 
                               alt
 
                             />
 
                             />
 
-                            <div style="margin: 5px 0">网络画板</div>
 
+                            <div style="margin: 5px 0">数学画板</div>
 
+                          </div>
 
+                          <div v-if="tooC == 28">
 
+                            <img
 
+                              @click="addTools(tooC, toolIndex, taskCount)"
 
+                              src="../assets/icon/secondToolList/networkPanel.png"
 
+                              alt
 
+                            />
 
+                            <div style="margin: 5px 0">翻译</div>
 
+                          </div>
 
+                          <div v-if="tooC == 37">
 
+                            <img
 
+                              @click="addTools(tooC, toolIndex, taskCount)"
 
+                              src="../assets/icon/secondToolList/networkPanel.png"
 
+                              alt
 
+                            />
 
+                            <div style="margin: 5px 0">魔盒识字</div>
 
+                          </div>
 
+                          <div v-if="tooC == 38">
 
+                            <img
 
+                              @click="addTools(tooC, toolIndex, taskCount)"
 
+                              src="../assets/icon/secondToolList/networkPanel.png"
 
+                              alt
 
+                            />
 
+                            <div style="margin: 5px 0">24点</div>
 
+                          </div>
 
+                          <div v-if="tooC == 39">
 
+                            <img
 
+                              @click="addTools(tooC, toolIndex, taskCount)"
 
+                              src="../assets/icon/secondToolList/networkPanel.png"
 
+                              alt
 
+                            />
 
+                            <div style="margin: 5px 0">GeoGebra</div>
 
                           </div>
 
                           </div>
 
                           <div v-if="tooC == 32">
 
                           <div v-if="tooC == 32">
 
                             <img
 
                             <img
 
@@ -905,7 +931,7 @@
 
                     >
 
                     >
 
                       <div
 
                       <div
 
                         class="works"
 
                         class="works"
 
-                        v-for="(w, wIndex) in worksStudent[toolIndex]"
 
+                        v-for="(w, wIndex) in workStudent[toolIndex]"
 
                         :key="wIndex"
 
                         :key="wIndex"
 
                       >
 
                       >
 
                         <div class="workImg">
 
                         <div class="workImg">
 
@@ -1718,9 +1744,17 @@
 
               <div class="up_photo">
 
               <div class="up_photo">
 
                 <img src="../assets/icon/uploadImg.png" alt />
 
                 <img src="../assets/icon/uploadImg.png" alt />
 
               </div>
 
               </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
 
               <input
 
                 type="file"
 
                 type="file"
 
-                accept="application/pdf, application/.ppt, .pptx, .xlsx, .xls, application/msword, application/vnd.openxmlformats-officedocument.wordprocessingml.document, image/png, image/gif, image/jpeg"
 
+                accept="image/*"
 
+                capture="camera"
 
                 style="display: none"
 
                 style="display: none"
 
                 @change="beforeUpload1($event, 1)"
 
                 @change="beforeUpload1($event, 1)"
 
               />
 
               />
 
@@ -2097,7 +2131,16 @@
 
     >
 
     >
 
       <div slot="title" class="header-title">
 
       <div slot="title" class="header-title">
 
         <div style="color: #fff">查看文档</div>
 
         <div style="color: #fff">查看文档</div>
 
-        <div @click="fullDialogVisible=false" style="cursor:pointer;position: absolute; top: 20px; right: 20px;color: #fff;">
 
+        <div
 
+          @click="fullDialogVisible = false"
 
+          style="
 
+            cursor: pointer;
 
+            position: absolute;
 
+            top: 20px;
 
+            right: 20px;
 
+            color: #fff;
 
+          "
 
+        >
 
           退出全屏
 
           退出全屏
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
@@ -2935,6 +2978,7 @@ export default {
 
         });
 
         });
 
     },
 
     },
 
     getCourseDetail() {
 
     getCourseDetail() {
 
+      document.scrollingElement.scrollTop = 0;
 
       const loading = this.$loading.service({
 
       const loading = this.$loading.service({
 
         background: "rgba(255, 255, 255, 0.7)",
 
         background: "rgba(255, 255, 255, 0.7)",
 
         target: document.querySelector(".student_table"),
 
         target: document.querySelector(".student_table"),
 
@@ -3680,6 +3724,14 @@ export default {
 
         window.parent.postMessage({ tools: "25" }, "*");
 
         window.parent.postMessage({ tools: "25" }, "*");
 
       } else if (t == 31) {
 
       } else if (t == 31) {
 
         window.parent.postMessage({ tools: "31" }, "*");
 
         window.parent.postMessage({ tools: "31" }, "*");
 
+      } else if (t == 28) {
 
+        window.parent.postMessage({ tools: "28" }, "*");
 
+      } else if (t == 37) {
 
+        window.parent.postMessage({ tools: "37" }, "*");
 
+      } else if (t == 38) {
 
+        window.parent.postMessage({ tools: "38" }, "*");
 
+      } else if (t == 39) {
 
+        window.parent.postMessage({ tools: "39" }, "*");
 
       } else if (t == 32) {
 
       } else if (t == 32) {
 
         window.parent.postMessage({ tools: "32" }, "*");
 
         window.parent.postMessage({ tools: "32" }, "*");
 
       } else if (t == 26) {
 
       } else if (t == 26) {
 
@@ -3814,11 +3866,11 @@ export default {
 
     },
 
     },
 
   },
 
   },
 
   created() {
 
   created() {
 
-    if(this.screenType == 2){
 
+    if (this.screenType == 2) {
 
       window.parent.postMessage({ allScreen: 4 }, "*");
 
       window.parent.postMessage({ allScreen: 4 }, "*");
 
-    }else if(this.screenType == 3){
 
+    } else if (this.screenType == 3) {
 
       window.parent.postMessage({ allScreen: 5 }, "*");
 
       window.parent.postMessage({ allScreen: 5 }, "*");
 
-    }else if(this.screenType == 1){
 
+    } else if (this.screenType == 1) {
 
       window.parent.postMessage({ allScreen: 6 }, "*");
 
       window.parent.postMessage({ allScreen: 6 }, "*");
 
     }
 
     }
 
     this.selectEva();
 
     this.selectEva();
 
@@ -3932,7 +3984,8 @@ export default {
 
   cursor: pointer;
 
   cursor: pointer;
 
 }
 
 }
 
 .box_course {
 
 .box_course {
 
-  width: 60%;
 
+  /* width: 60%; */
 
+  width: 81%;
 
 }
 
 }
 
 .wheel {
 
 .wheel {
 
   width: 100%;
 
   width: 100%;
 
@@ -4419,9 +4472,11 @@ export default {
 
 .vedioList {
 
 .vedioList {
 
   background: #f2f2f2;
 
   background: #f2f2f2;
 
   border: 1px solid #ececec;
 
   border: 1px solid #ececec;
 
-  width: 38.8%;
 
+  /* width: 38.8%; */
 
+  width: calc(100% - 83%);
 
   height: 445px;
 
   height: 445px;
 
   border-radius: 10px;
 
   border-radius: 10px;
 
+  overflow: hidden;
 
 }
 
 }
 
 .vedioNav {
 
 .vedioNav {
 
   margin: 10px 0 0 15px;
 
   margin: 10px 0 0 15px;
 
@@ -4851,7 +4906,7 @@ export default {
 
   margin-bottom: 10px;
 
   margin-bottom: 10px;
 
 }
 
 }
 
 .taskBox {
 
 .taskBox {
 
-  margin: 15px 0 20px 30px;
 
+  margin: 15px auto 20px;
 
   background: #f7f7f7;
 
   background: #f7f7f7;
 
   width: 97%;
 
   width: 97%;
 
   border-radius: 10px;
 
   border-radius: 10px;
 
@@ -4979,11 +5034,12 @@ export default {
 
 }
 
 }
 
 .title {
 
 .title {
 
   background: #1e5cc9;
 
   background: #1e5cc9;
 
-  width: 98%;
 
+  /* width: 98%; */
 
   height: 45px;
 
   height: 45px;
 
   color: #fff;
 
   color: #fff;
 
   line-height: 45px;
 
   line-height: 45px;
 
   padding-left: 20px;
 
   padding-left: 20px;
 
+  box-sizing: border-box;
 
 }
 
 }
 
 .textBox {
 
 .textBox {
 
   font-size: 20px;
 
   font-size: 20px;

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