Ver Fonte

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

zengyicheng há 2 anos atrás
pai
commit
7ccb7d2769

+ 1 - 1
dist/index.html

@@ -18,4 +18,4 @@
       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.8c9f9a9ada396a6cd407c72d84bf4384.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.e0b99d2da8a8198154ec.js></script><script type=text/javascript src=./static/js/app.035fd34047df720f9c41.js></script></body></html><script>document.domain = "cocorobo.cn"</script>
+    }</style><link href=./static/css/app.7a8a31f272c4edbde5056d78ed7e8aee.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.e0b99d2da8a8198154ec.js></script><script type=text/javascript src=./static/js/app.a544ee4ee5fe8f766fe1.js></script></body></html><script>document.domain = "cocorobo.cn"</script>

Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.7a8a31f272c4edbde5056d78ed7e8aee.css


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/css/app.7a8a31f272c4edbde5056d78ed7e8aee.css.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.035fd34047df720f9c41.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.035fd34047df720f9c41.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.a544ee4ee5fe8f766fe1.js


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/app.a544ee4ee5fe8f766fe1.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


Diff do ficheiro suprimidas por serem muito extensas
+ 0 - 0
dist/static/js/vendor.e0b99d2da8a8198154ec.js.map


+ 46 - 26
src/components/liveProjectDetail.vue

@@ -350,7 +350,7 @@
                   mozallowfullscreen
                   allowfullscreen
                   style="width: 100%; height: 100%; border: none"
-                  src="/kityminder-editor/dist/index.html"
+                  src="//cloud.cocorobo.cn/kityminder-editor/dist/index.html"
                   ref="mind"
                 ></iframe>
               </div>
@@ -447,11 +447,11 @@
                   <span>上传中...</span>
                 </div>
               </div>
-              <div class="nextStepBox">
+              <!-- <div class="nextStepBox">
                 <div class="nextStepOne" @click="(isBlock = 4), (full = false)">
                   返回
                 </div>
-              </div>
+              </div> -->
               <div
                 class="nextStepOne"
                 style="float: right"
@@ -519,13 +519,13 @@
             style="padding: 0 0 0 25px"
           >
             <div>
-              <div v-for="(tk, tIndex) in 7" :key="tIndex" class="tkCss">
+              <div v-for="(tk, tIndex) in tools[ppage - 1].choice" :key="tIndex" class="tkCss">
                 <div style="margin-right: 10px; font-size: 18px">
                   {{ tIndex + 1 }}、
                 </div>
                 <el-select v-model="tkAnswer[tIndex]" placeholder="请选择答案">
                   <el-option
-                    v-for="(tkA, tkAIndex) in tkAnswerBox"
+                    v-for="(tkA, tkAIndex) in tools[ppage - 1].tkAnswerBox"
                     :key="tkAIndex"
                     :label="tkA"
                     :value="tkA"
@@ -687,7 +687,11 @@
                   >
 
                   <div
-                    style="margin: 10px auto 0; display: flex;align-items: center;"
+                    style="
+                      margin: 10px auto 0;
+                      display: flex;
+                      align-items: center;
+                    "
                     v-if="LuAudioUrl"
                   >
                     <span>已上传录音:</span>
@@ -879,7 +883,7 @@ export default {
       typeC: [],
       toolCount: 0,
       tools: [
-        { tools: [30] },
+        {  },//tools: [30]
         //  {
         //   file: [
         //     {
@@ -898,11 +902,11 @@ export default {
           ],
         },
         "", //问答题
-        { tools: [9], choice: 3 },
-        { tools: [9], choice: 3 }, //协同文档
-        { tools: [9], choice: 3 }, //思维导图
-        { tools: [9], choice: 3 },
-        { tools: [9], choice: 3 },
+        { tools: [9], choice: 3, answer: [2, 3] },
+        { tools: [9], choice: 3, answer: [2] }, //协同文档
+        { tools: [9], choice: 3, answer: [3] }, //思维导图
+        { tools: [9], choice: 3, answer: [1] },
+        { tools: [9], choice: 3, answer: [2] },
         { tools: [12] },
         {
           tools: [27],
@@ -915,6 +919,17 @@ export default {
             "Reason",
             "Feelings",
           ],
+          choice: 7,
+          tkAnswerBox: [
+            "Feelings",
+            "Weather",
+            "Activities before the festival",
+            "Origin",
+            "Food",
+            "Time",
+            "Activities during the festival",
+            "Reason",
+          ],
         },
         {
           file: [
@@ -925,7 +940,7 @@ export default {
           ],
         },
         { tools: [9] },
-        { tools: [3, 28] },
+        { tools: [3] },
         { tools: [16] },
         {
           tools: [14],
@@ -944,16 +959,7 @@ export default {
         //1、电子白板 2、便签 3、思维导图 4、问卷调查 5、量规评分 6、协同文档 7、思维网格 8、素材库 9、选择题 10、倒计时 11、问答题 12、选人回答 13、分小组 14、老师对提交作业进行评价 15、问答 16、作业提交 17、学习资料 18、训练平台 19、目标管理 20、课程设计 21、编程平台 22、AI体验 23、python 24、AI平台
       ],
       rateList: [],
-      tkAnswerBox: [
-        "Feelings",
-        "Weather",
-        "Activities before the festival",
-        "Origin",
-        "Food",
-        "Time",
-        "Activities during the festival",
-        "Reason",
-      ],
+      tkAnswerBox: [],
       tkAnswer: [],
       imgUrl: "",
       imgFile: "",
@@ -1683,7 +1689,21 @@ export default {
             this.tools[this.ppage - 1].tools.indexOf(29) != -1 ||
             this.tools[this.ppage - 1].tools.indexOf(13) != -1)
         ) {
-          this.isBlock = 4;
+          if (this.tools[this.ppage - 1].tools.indexOf(1) != -1) {
+            // this.toolCount = 1;
+            this.checkTools(1);
+          } else if (this.tools[this.ppage - 1].tools.indexOf(3) != -1) {
+            this.checkTools(3);
+          } else if (this.tools[this.ppage - 1].tools.indexOf(28) != -1) {
+            this.checkTools(28);
+          } else if (this.tools[this.ppage - 1].tools.indexOf(4) != -1) {
+            this.checkTools(4);
+          } else if (this.tools[this.ppage - 1].tools.indexOf(6) != -1) {
+            this.checkTools(6);
+          } else if (this.tools[this.ppage - 1].tools.indexOf(7) != -1) {
+            this.checkTools(7);
+          }
+          // this.isBlock = 2;
         } else if (
           this.tools[this.ppage - 1].file &&
           this.tools[this.ppage - 1].file.length
@@ -1748,8 +1768,8 @@ export default {
             if (this.ppage == res.data[0][0].page && this.isBlock !== 0) {
               return;
             } else {
-              // this.ppage = res.data[0][0].page;
-              this.ppage = 1;
+              this.ppage = res.data[0][0].page;
+              // this.ppage = 1;
               // this.ppage = 11;
               this.typeC = [];
               this.isAnswer = false;

Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff