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

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

SanHQin 9 months ago
parent
b0e0393fdf c427b53f69
commit
0134ee2e59
7 changed files with 52 additions and 2 deletions
Unified View Show Diff Stats
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.6a3ffdf990b912df4af2fd3087f41104.css
  3. 0 0
      dist/static/css/app.6a3ffdf990b912df4af2fd3087f41104.css.map
  4. 0 0
      dist/static/js/app.f5bf4f61ebdf1eb25e52.js
  5. 0 0
      dist/static/js/app.f5bf4f61ebdf1eb25e52.js.map
  6. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  7. 51 1
      src/components/easy3/studyStudent.vue

+ 1 - 1
dist/index.html
View File 

@@ -27,7 +27,7 @@
 
     html,
 
     html,
 
     body{
 
     body{
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.40a33dbb1e44c0deb4f85246b2fd70de.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.733814fc48c2bd2222aa.js></script><script type=text/javascript src=./static/js/app.e11f0bbc1d77cff06603.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.6a3ffdf990b912df4af2fd3087f41104.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.733814fc48c2bd2222aa.js></script><script type=text/javascript src=./static/js/app.f5bf4f61ebdf1eb25e52.js></script></body></html><script>function stopSafari() {
 
     //阻止safari浏览器双击放大功能
 
     //阻止safari浏览器双击放大功能
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     let lastTouchEnd = 0  //更新手指弹起的时间
 
     document.documentElement.addEventListener("touchstart", function (event) {
 
     document.documentElement.addEventListener("touchstart", function (event) {

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


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


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


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


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


+ 51 - 1
src/components/easy3/studyStudent.vue
View File 

@@ -224,7 +224,7 @@
 
           </div>
 
           </div>
 
         </div>
 
         </div>
 
       </div>
 
       </div>
 
-      <div class="body_student":style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
+      <div class="body_student" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
         <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
         <div class="new_topFixed" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }"></div>
 
         <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
         <div class="new_top" :style="{width: mlDialog ? 'calc(100% - '+classRoomHelperWidth+' - 20% - 40px)' : 'calc(100% - '+classRoomHelperWidth+' - 10px)', left: mlDialog ? 'calc(20% + 35px)' : '10px' }">
 
           <div class="courseIndex">
 
           <div class="courseIndex">
 
@@ -432,6 +432,8 @@
 
               .toolChoose[0].tool.length == 0 &&
 
               .toolChoose[0].tool.length == 0 &&
 
             chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
             chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
               .taskDetail == '' &&
 
               .taskDetail == '' &&
 
+            !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+              .taskDetail3 &&
 
             !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
             !chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
               .eList &&
 
               .eList &&
 
             !(
 
             !(
 
@@ -447,6 +449,8 @@
 
           <div
 
           <div
 
             class="vedioBox"
 
             class="vedioBox"
 
             v-if="
 
             v-if="
 
+              chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                .taskDetail3 ||
 
               chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
               chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
                 .taskDetail != '' ||
 
                 .taskDetail != '' ||
 
               vChapterData[0].length > 0 ||
 
               vChapterData[0].length > 0 ||
 
@@ -454,6 +458,44 @@
 
             "
 
             "
 
             style="border-radius: 0 0 20px 20px"
 
             style="border-radius: 0 0 20px 20px"
 
           >
 
           >
 
+          <div
 
+              class="taskBox"
 
+              v-if="
 
+                chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                  .taskDetail3
 
+              "
 
+            >
 
+              <div
 
+                style="
 
+                  display: flex;
 
+                  flex-wrap: nowrap;
 
+                  flex-direction: column;
 
+                  position: relative;
 
+                "
 
+              >
 
+                <div
 
+                  style="
 
+                    padding: 15px 0;
 
+                    line-height: 29px;
 
+                    font-size: 18px;
 
+                    color: #0e1e33;
 
+                  "
 
+                  class="cont"
 
+                  v-if="
 
+                    chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                      .taskDetail3 != ''
 
+                  "
 
+                  v-html="
 
+                    chapInfoList[courseType].chapterInfo[0].taskJson[taskCount]
 
+                      .taskDetail3
 
+                      ? MarkdownT(chapInfoList[courseType].chapterInfo[0].taskJson[
 
+                          taskCount
 
+                        ].taskDetail3)
 
+                      : '暂无描述'
 
+                  "
 
+                ></div>
 
+              </div>
 
+            </div>
 
             <div
 
             <div
 
               class="taskBox"
 
               class="taskBox"
 
               v-if="
 
               v-if="
 
@@ -11896,6 +11938,7 @@ import correctText from '../components/correctText.vue'
 
 import scoreItem from '../scoreList/scoreItem.vue'
 
 import scoreItem from '../scoreList/scoreItem.vue'
 
 import scoreZong from '../scoreZong/index.vue'
 
 import scoreZong from '../scoreZong/index.vue'
 
 import classRoomHelper from '../classRoomHelper/index.vue'
 
 import classRoomHelper from '../classRoomHelper/index.vue'
 
+import MarkdownIt from "markdown-it";
 
 
 
 const getFile = (url) => {
 
 const getFile = (url) => {
 
   return new Promise((resolve, reject) => {
 
   return new Promise((resolve, reject) => {
 
@@ -19913,6 +19956,13 @@ export default {
 
               .replaceAll(/\s/g, " &nbsp")
 
               .replaceAll(/\s/g, " &nbsp")
 
           : "";
 
           : "";
 
       };
 
       };
 
+    },
 
+    MarkdownT() {
 
+      return function (c) {
 
+        let md = new MarkdownIt();
 
+        return c
 
+          ? md.render(c) : "";
 
+      };
 
     },
 
     },
 
 		commentRight(){
 
 		commentRight(){
 
 			if(!this.orgArray.includes(this.org) && !this.oidArray.includes(this.oid)){
 
 			if(!this.orgArray.includes(this.org) && !this.oidArray.includes(this.oid)){

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