Browse Source

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

zengyicheng 2 years ago
parent
commit
414cacf059

+ 5 - 1
dist/index.html

@@ -18,4 +18,8 @@
       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.9f329b9a77ae76cece5e4a8b75ee0814.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.8585370f4405bf8a83e7.js></script><script type=text/javascript src=./static/js/app.dc4b5e8dfe618b2cccbf.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+<<<<<<< HEAD
+    }</style><link href=./static/css/app.c7641732fe70f1a0619aa27e53898a41.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.9ee756a2ee35100de898.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+=======
+    }</style><link href=./static/css/app.9f329b9a77ae76cece5e4a8b75ee0814.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.8585370f4405bf8a83e7.js></script><script type=text/javascript src=./static/js/app.dc4b5e8dfe618b2cccbf.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+>>>>>>> 0345a2c875cce4531bd71ab1149ea9b016fa7e98

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


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


BIN
dist/static/img/24game.65e7f22.png


BIN
dist/static/img/mohe.ec1fd2f.png


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


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


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


+ 125 - 30
src/components/study.vue

@@ -231,7 +231,7 @@
                             {{ textList[jdIndex][rwIndex][0].name }}
                           </div>
                         </el-form-item>
-                        <div style="color: #918f8f">文档内容</div>
+                        <div style="color: #918f8f; width: 85%">文档内容</div>
                         <div
                           v-html="textList[jdIndex][rwIndex][0].url"
                           class="textContent"
@@ -241,7 +241,7 @@
                     <div
                       class="wheel"
                       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
                         style="width: 100%; height: 100%; border: none"
@@ -251,7 +251,7 @@
                     <div
                       class="wheel"
                       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
                         :pdfUrl="pptImgUrl1[jdIndex][rwIndex]"
@@ -261,12 +261,7 @@
                     <div
                       class="wheel"
                       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
                         :src="pptImgUrl1[jdIndex][rwIndex]"
@@ -325,6 +320,7 @@
                           class="vedioTimeBox"
                           v-for="(media, vedioIndex) in vedio[jdIndex][rwIndex]"
                           :key="vedioIndex + '1'"
+                          @click="lookVedio(media.url, jdIndex, rwIndex)"
                         >
                           <div
                             class="media"
@@ -344,7 +340,6 @@
                                   : mr
                               "
                               alt
-                              @click="lookVedio(media.url, jdIndex, rwIndex)"
                             />
                             <div class="vedioTime">{{ vedioTime }}</div>
                           </div>
@@ -360,6 +355,7 @@
                         class="newNav"
                         v-for="(text, textIndex) in textList[jdIndex][rwIndex]"
                         :key="textIndex + '2'"
+                        @click="lookText(jdIndex, rwIndex, textIndex)"
                       >
                         <div
                           class="vedioNav"
@@ -375,10 +371,7 @@
                           文档
                         </div>
                         <div style="width: calc(100% - 115px)">
-                          <div
-                            class="navText"
-                            @click="lookText(jdIndex, rwIndex, textIndex)"
-                          >
+                          <div class="navText">
                             {{
                               textList[jdIndex][rwIndex].length > 0
                                 ? text.name
@@ -396,6 +389,7 @@
                         class="newNav"
                         v-for="(lines, lineIndex) in lineList[jdIndex][rwIndex]"
                         :key="lineIndex + '4'"
+                        @click="doUrl(lines.url)"
                       >
                         <div
                           class="vedioNav"
@@ -415,7 +409,6 @@
                             <a
                               style="text-decoration: none; color: #000"
                               target="_Blank"
-                              @click="doUrl(lines.url)"
                               >{{ lines.url }}</a
                             >
                           </div>
@@ -430,6 +423,7 @@
                         "
                         v-for="(f, fileIndex) in file[jdIndex][rwIndex]"
                         :key="fileIndex"
+                        @click="downFile(f, fileIndex, jdIndex, rwIndex)"
                       >
                         <div
                           class="vedioNav"
@@ -445,10 +439,7 @@
                           文档
                         </div>
                         <div style="width: calc(100% - 115px)">
-                          <div
-                            class="navText"
-                            @click="downFile(f, fileIndex, jdIndex, rwIndex)"
-                          >
+                          <div class="navText">
                             {{ f.name }}
                           </div>
                         </div>
@@ -457,7 +448,7 @@
                   </div>
                 </div>
                 <div
-                  style="padding: 0px 30px"
+                  style="padding: 10px 30px 0"
                   v-if="
                     showType[jdIndex][rwIndex] == 2 ||
                     showType[jdIndex][rwIndex] == 3
@@ -471,7 +462,22 @@
                         pptImgUrl1[jdIndex][rwIndex]
                       )
                     "
-                    >查看全屏</el-button
+                    >全屏查看</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
                   >
                 </div>
               </div>
@@ -626,6 +632,60 @@
                                 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"
+                                class="iframeCss"
+                              ></iframe>
+                            </div>
                             <div v-if="tooC == 4">
                               <div class="iframeName">问卷调查</div>
                               <div>
@@ -888,7 +948,6 @@
                       <div>
                         <div
                           class="worksDetailBox"
-                          style="width: calc(100% - 30%)"
                           v-if="
                             worksStudent[jdIndex][rwIndex][toolIndex].length > 0
                           "
@@ -985,7 +1044,7 @@
                           ]"
                           :key="wIndex"
                         >
-                          <div class="workImg">
+                          <div class="workImg" v-if="w.type == 2">
                             <!-- <img
                             src="../assets/icon/works/noImg.png"
                             @click="openTools(15, toolIndex, taskCount, w.works)"
@@ -1933,6 +1992,32 @@
           :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>
@@ -3642,6 +3727,13 @@ 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();
@@ -3667,9 +3759,9 @@ export default {
   /* .navText {
     width: 120px !important;
   } */
-  .textBox {
+  /* .textBox {
     margin: 0 !important;
-  }
+  } */
   .evaCss {
     flex-direction: column !important;
     align-items: center !important;
@@ -3770,7 +3862,8 @@ export default {
   cursor: pointer;
 }
 .box_course {
-  width: 60%;
+  /* width: 60%; */
+  width: 81%;
 }
 .wheel {
   width: 100%;
@@ -3972,7 +4065,7 @@ export default {
   margin-top: 10px;
 }
 .upload_send {
-  margin: 200px auto 30px;
+  margin: 30px auto 30px;
   width: 60%;
   background: #169bd6;
   text-align: center;
@@ -4255,9 +4348,11 @@ export default {
 .vedioList {
   background: #f2f2f2;
   border: 1px solid #ececec;
-  width: 38.8%;
+  /* width: 38.8%; */
+  width: calc(100% - 83%);
   height: 445px;
   border-radius: 10px;
+  overflow: hidden;
 }
 .vedioNav {
   margin: 10px 0 0 15px;
@@ -4513,7 +4608,7 @@ export default {
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
-  width: 100%;
+  width: 85%;
 }
 .textTitle >>> .el-form-item__label {
   font-size: 22px;
@@ -5192,8 +5287,8 @@ export default {
 
 .full_diy >>> .el-dialog__body {
   height: calc(100% - 100px);
+  padding: 4px;
 }
-
 .full_diy >>> .el-dialog {
   margin: 0 !important;
   height: 100%;

+ 12 - 12
src/components/studyStudent.vue

@@ -779,7 +779,7 @@
                           <div v-if="tooC == 28">
                             <img
                               @click="addTools(tooC, toolIndex, taskCount)"
-                              src="../assets/icon/secondToolList/networkPanel.png"
+                              src="../assets/icon/secondToolList/translation.png"
                               alt
                             />
                             <div style="margin: 5px 0">翻译</div>
@@ -787,7 +787,7 @@
                           <div v-if="tooC == 37">
                             <img
                               @click="addTools(tooC, toolIndex, taskCount)"
-                              src="../assets/icon/secondToolList/networkPanel.png"
+                              src="../assets/icon/secondToolList/mohe.png"
                               alt
                             />
                             <div style="margin: 5px 0">魔盒识字</div>
@@ -795,7 +795,7 @@
                           <div v-if="tooC == 38">
                             <img
                               @click="addTools(tooC, toolIndex, taskCount)"
-                              src="../assets/icon/secondToolList/networkPanel.png"
+                              src="../assets/icon/secondToolList/24game.png"
                               alt
                             />
                             <div style="margin: 5px 0">24点</div>
@@ -803,7 +803,7 @@
                           <div v-if="tooC == 39">
                             <img
                               @click="addTools(tooC, toolIndex, taskCount)"
-                              src="../assets/icon/secondToolList/networkPanel.png"
+                              src="../assets/icon/secondToolList/GeoGebra.png"
                               alt
                             />
                             <div style="margin: 5px 0">GeoGebra</div>
@@ -934,7 +934,7 @@
                         v-for="(w, wIndex) in workStudent[toolIndex]"
                         :key="wIndex"
                       >
-                        <div class="workImg">
+                        <div class="workImg" v-if="w.type == 2">
                           <!-- <img
                             src="../assets/icon/works/noImg.png"
                             @click="openTools(15, toolIndex, taskCount, w.works)"
@@ -1260,7 +1260,7 @@
                         v-for="(w, wIndex) in worksStudent[toolIndex]"
                         :key="wIndex"
                       >
-                        <div class="workImg">
+                        <div class="workImg" v-if="w.type == 2">
                           <!-- <img
                             src="../assets/icon/works/noImg.png"
                             @click="openTools(15, toolIndex, taskCount, w.works)"
@@ -4980,7 +4980,7 @@ export default {
   width: calc(100% / 3 - 10px);
   height: auto;
   margin-right: 10px;
-  margin-bottom: 10px;
+  margin-bottom:10px
 }
 .workImg {
   width: 100%;
@@ -5043,11 +5043,11 @@ export default {
 }
 .textBox {
   font-size: 20px;
-  width: 90%;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  margin: 20px auto 0;
+    width: 90%;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    margin: 20px auto 0;
 }
 .textContent {
   font-size: 18px;

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