Browse Source

修改样式及功能

zengyicheng 2 years ago
parent
commit
adbd004071
4 changed files with 101 additions and 47 deletions
  1. BIN
      src/assets/icon/isVideo.png
  2. BIN
      src/assets/icon/isWord.png
  3. 97 42
      src/components/study.vue
  4. 4 5
      src/components/studyStudent.vue

BIN
src/assets/icon/isVideo.png


BIN
src/assets/icon/isWord.png


+ 97 - 42
src/components/study.vue

@@ -451,23 +451,35 @@
                         <div class="noiframeBox">
                           <div class="addPoint" v-for="(tooC, toolCIndex) in tool.tool" :key="toolCIndex">
                             <div v-if="tooC == 1">
-                              <div class="iframeName">电子白板</div>
-                              <iframe src="https://iwb.cocorobo.cn/" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/whiteBoard.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">电子白板</div>
+                              <!-- <div class="iframeName">电子白板</div>
+                              <iframe src="https://iwb.cocorobo.cn/" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 3">
-                              <div class="iframeName">思维导图</div>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/mindMapping.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">思维导图</div>
+                              <!-- <div class="iframeName">思维导图</div>
                               <iframe src="https://cloud.cocorobo.cn/kityminder-editor/dist/index.html"
-                                class="iframeCss"></iframe>
+                                class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 6">
-                              <div class="iframeName">协同文档</div>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/doc.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">协同文档</div>
+                              <!-- <div class="iframeName">协同文档</div>
                               <iframe src="https://cloud.cocorobo.cn/Office/Word/WordEditArea.htm"
-                                class="iframeCss"></iframe>
+                                class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 7">
-                              <div class="iframeName">思维网格</div>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/mindNetwork.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">思维网格</div>
+                              <!-- <div class="iframeName">思维网格</div>
                               <iframe src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/Grid"
-                                class="iframeCss"></iframe>
+                                class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 8">
                               <div class="iframeName">素材库</div>
@@ -480,9 +492,12 @@
                                 class="iframeCss"></iframe>
                             </div>
                             <div v-if="tooC == 2">
-                              <div class="iframeName">便签</div>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/note.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">便签</div>
+                              <!-- <div class="iframeName">便签</div>
                               <iframe src="https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/note"
-                                class="iframeCss"></iframe>
+                                class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 25">
                               <div class="iframeName">目标管理</div>
@@ -496,28 +511,46 @@
                               " class="iframeCss"></iframe>
                             </div>
                             <div v-if="tooC == 32">
-                              <div class="iframeName">源码编辑</div>
-                              <iframe src="//kitten.codemao.cn/" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/thirdToolList/code.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">源码编辑</div>
+                              <!-- <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>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/networkPanel.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">数学画板</div>
+                              <!-- <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>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/translation.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">翻译</div>
+                              <!-- <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>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/mohe.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">魔盒识字</div>
+                              <!-- <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>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/24game.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">24点</div>
+                              <!-- <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>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/secondToolList/GeoGebra.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">GeoGebra</div>
+                              <!-- <div class="iframeName">GeoGebra</div>
+                              <iframe src="//www.geogebra.org/calculator" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 4">
                               <div class="iframeName">选择题</div>
@@ -576,10 +609,13 @@
                               <div style="margin: 5px 0">量规评分</div>
                             </div> -->
                             <div v-if="tooC == 10">
-                              <div class="iframeName">倒计时</div>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/thirdToolList/time.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">倒计时</div>
+                              <!-- <div class="iframeName">倒计时</div>
                               <div>
                                 <Time></Time>
-                              </div>
+                              </div> -->
                             </div>
                             <div v-if="tooC == 15">
                               <div class="iframeName">问答工具</div>
@@ -605,44 +641,62 @@
                               </div>
                             </div>
                             <div v-if="tooC == 26">
-                              <div class="iframeName">课程设计</div>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/thirdToolList/courseDesign.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">课程设计</div>
+                              <!-- <div class="iframeName">课程设计</div>
                               <iframe src="https://cloud.cocorobo.cn/course-design/index.html"
-                                class="iframeCss"></iframe>
+                                class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 18">
-                              <div class="iframeName">训练平台</div>
-                              <iframe src="https://xunlian.cocorobo.cn/" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/thirdToolList/trainPlatform.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">训练平台</div>
+                              <!-- <div class="iframeName">训练平台</div>
+                              <iframe src="https://xunlian.cocorobo.cn/" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 16">
                               <img @click="addTools(tooC, toolIndex, taskCount)"
                                 src="../assets/icon/thirdToolList/work.png" alt />
-                              <div style="margin: 5px 0">作业提交</div>
+                              <div style="margin: 5px 0;padding-left: 8px;">作业提交</div>
                             </div>
                             <div v-if="tooC == 21">
-                              <div class="iframeName">编程平台</div>
-                              <iframe src="https://x.cocorobo.cn" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/fourthToolList/program.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">编程平台</div>
+                              <!-- <div class="iframeName">编程平台</div>
+                              <iframe src="https://x.cocorobo.cn" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 22">
-                              <div class="iframeName">AI体验</div>
-                              <iframe src="https://aihub.cocorobo.cn/" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/fourthToolList/AIprogram2.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">AI体验</div>
+                              <!-- <div class="iframeName">AI体验</div>
+                              <iframe src="https://aihub.cocorobo.cn/" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 23">
-                              <div class="iframeName">python</div>
-                              <iframe src="https://python-blockly.cocorobo.cn/" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/fourthToolList/Pythonprogram.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">python</div>
+                              <!-- <div class="iframeName">python</div>
+                              <iframe src="https://python-blockly.cocorobo.cn/" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 24">
-                              <div class="iframeName">AI平台</div>
-                              <iframe src="https://ai-blockly.cocorobo.cn/?lang=zh-hans" class="iframeCss"></iframe>
+                              <img @click="addTools(tooC, toolIndex, taskCount)"
+                                src="../assets/icon/fourthToolList/program.png" alt />
+                              <div style="margin: 5px 0;padding-left: 8px;">AI平台</div>
+                              <!-- <div class="iframeName">AI平台</div>
+                              <iframe src="https://ai-blockly.cocorobo.cn/?lang=zh-hans" class="iframeCss"></iframe> -->
                             </div>
                             <div v-if="tooC == 40">
                               <img @click="addTools(tooC, toolIndex, taskCount)"
                                 src="../assets/icon/secondToolList/eval.png" alt />
-                              <div style="margin: 5px 0">学生评价</div>
+                              <div style="margin: 5px 0;padding-left: 8px;">学生评价</div>
                             </div>
                             <div v-if="tooC == 41">
                               <img @click="addTools(tooC, toolIndex, taskCount)"
                                 src="../assets/icon/thirdToolList/select.png" alt />
-                              <div style="margin: 5px 0">选择填空</div>
+                              <div style="margin: 5px 0;padding-left: 8px;">选择填空</div>
                             </div>
                           </div>
                         </div>
@@ -1400,7 +1454,7 @@
                 <div class="upCover">
                   <img :src="studyJuri[0].cover[0].url" alt v-if="fileType == 0" />
                   <img :src="word" alt v-else-if="fileType == 1" />
-                  <img :src="word" alt v-else />
+                  <img :src="video" alt v-else />
                   <span class="picName">{{ studyJuri[0].cover[0].name }}</span>
 
                   <div class="deleteWord" @click="clean(1)">
@@ -1756,7 +1810,7 @@
           <div v-else style="padding: 10px 0 0 0">暂无评论</div>
         </div>
       </div>
-      <div>
+      <div style="margin-top: 10px;">
         <div style="
             color: #556db4;
             font-size: 14px;
@@ -1953,7 +2007,8 @@ export default {
         },
       ],
       mr: require("../assets/vedioPic.png"),
-      word: require("../assets/uploadMp4.png"),
+      word: require("../assets/icon/isWord.png"),
+      video:require("../assets/icon/isVideo.png"),
       noLikes: require("../assets/icon/comment/noLikes.png"),
       likes: require("../assets/icon/comment/likes.png"),
       courseDetail: {},

+ 4 - 5
src/components/studyStudent.vue

@@ -1589,7 +1589,7 @@
               <div class="upCover">
                 <img :src="studyJuri[0].cover[0].url" alt v-if="fileType == 0" />
                 <img :src="word" alt v-else-if="fileType == 1" />
-                <img :src="word" alt v-else />
+                <img :src="video" alt v-else />
                 <span class="picName">{{ studyJuri[0].cover[0].name }}</span>
 
                 <div class="deleteWord" @click="clean(1)">
@@ -1941,7 +1941,7 @@
           <div v-else style="padding: 10px 0 0 0">暂无评论</div>
         </div>
       </div>
-      <div>
+      <div style="margin-top: 10px;">
         <div style="
             color: #556db4;
             font-size: 14px;
@@ -2151,7 +2151,8 @@ export default {
         },
       ],
       mr: require("../assets/vedioPic.png"),
-      word: require("../assets/uploadMp4.png"),
+      word: require("../assets/icon/isWord.png"),
+      video:require("../assets/icon/isVideo.png"),
       noLikes: require("../assets/icon/comment/noLikes.png"),
       likes: require("../assets/icon/comment/likes.png"),
       courseDetail: {},
@@ -5846,11 +5847,9 @@ export default {
 
 .textContent {
   font-size: 18px;
-  padding: 30px 0px 0px;
   height: 600px;
   width: 95%;
   overflow: auto;
-  margin: 0 0 0 10px;
   line-height: 30px;
 }