Startsida Utforska Hjälp
Logga in
CocoRoboLabs
/
pbl-student-table
3
0
Fork 0
Filer Ärenden 0 Pull-förfrågningar 0 Wiki
Bläddra i källkod

Merge branch 'beta' into alpha

lsc 9 månader sedan
förälder
c3abe066f1 99171c68dc
incheckning
a44d064e68
14 ändrade filer med 22 tillägg och 20 borttagningar
Unifierad Vy Visa Diff Statistik
  1. 1 1
      dist/index.html
  2. 0 0
      dist/static/css/app.9540294b2ad4dc013678d50882150826.css
  3. 0 0
      dist/static/css/app.9540294b2ad4dc013678d50882150826.css.map
  4. 0 0
      dist/static/img/aiTalk.1469289.svg
  5. 0 0
      dist/static/img/aiVanish.cc2e3bf.svg
  6. 0 0
      dist/static/img/aiWait2.c8d31c6.svg
  7. 0 0
      dist/static/img/practice.25766a7.svg
  8. 0 0
      dist/static/img/robot3.c50070a.svg
  9. 0 0
      dist/static/js/app.4abf41ee5d0da9791dd5.js
  10. 0 0
      dist/static/js/app.4abf41ee5d0da9791dd5.js.map
  11. 0 0
      dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map
  12. 17 15
      src/components/easy2/studyStudent.vue
  13. 2 2
      src/components/easy3/studyStudent.vue
  14. 2 2
      src/components/studyStudent.vue

+ 1 - 1
dist/index.html
Visa fil 

@@ -27,7 +27,7 @@
 
     html,
 
     html,
 
     body{
 
     body{
 
       font-family: '黑体';
 
       font-family: '黑体';
 
-    }</style><link href=./static/css/app.9dd7723205855d05946629f6731df635.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.d8c2c3723ff95bed3004.js></script></body></html><script>function stopSafari() {
 
+    }</style><link href=./static/css/app.9540294b2ad4dc013678d50882150826.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.b5a78a47ec38c79eb330.js></script><script type=text/javascript src=./static/js/app.4abf41ee5d0da9791dd5.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) {

Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.9540294b2ad4dc013678d50882150826.css


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/css/app.9540294b2ad4dc013678d50882150826.css.map


+ 0 - 0
dist/static/img/aiTalk.2196c9f.svg → dist/static/img/aiTalk.1469289.svg
Visa fil


+ 0 - 0
dist/static/img/aiVanish.9288360.svg → dist/static/img/aiVanish.cc2e3bf.svg
Visa fil


+ 0 - 0
dist/static/img/aiWait2.d0390d3.svg → dist/static/img/aiWait2.c8d31c6.svg
Visa fil


+ 0 - 0
dist/static/img/practice.01fb3fa.svg → dist/static/img/practice.25766a7.svg
Visa fil


+ 0 - 0
dist/static/img/robot3.e6b4e70.svg → dist/static/img/robot3.c50070a.svg
Visa fil


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.4abf41ee5d0da9791dd5.js


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/app.4abf41ee5d0da9791dd5.js.map


Filskillnaden har hållts tillbaka eftersom den är för stor
+ 0 - 0
dist/static/js/manifest.3ad1d5771e9b13dbdad2.js.map


+ 17 - 15
src/components/easy2/studyStudent.vue
Visa fil 

@@ -1357,7 +1357,7 @@
 
                       @click="openWordCloud(toolIndex)"
 
                       @click="openWordCloud(toolIndex)"
 
                       >生成词云</el-button
 
                       >生成词云</el-button
 
                     >
 
                     >
 
-                    <el-button
 
+                    <!-- <el-button
 
                       type="primary"
 
                       type="primary"
 
                       v-if="
 
                       v-if="
 
                         tool.tool[0] == 16 && worksStudent[toolIndex].length > 0
 
                         tool.tool[0] == 16 && worksStudent[toolIndex].length > 0
 
@@ -1365,7 +1365,7 @@
 
                       style="position: absolute; right: 30px; top: -45px"
 
                       style="position: absolute; right: 30px; top: -45px"
 
                       @click="uploadWorks(toolIndex)"
 
                       @click="uploadWorks(toolIndex)"
 
                       >导出作业</el-button
 
                       >导出作业</el-button
 
-                    >
 
+                    >  -->
 
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
 
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
 
                         position: absolute;
 
                         position: absolute;
 
                         right: 30px;
 
                         right: 30px;
 
@@ -18411,16 +18411,17 @@ export default {
 
             // 来判断ai评分是否可用，因为有的评分教师全选的人工打分，所以全是人工打分的话，ai评分就不能使用
 
             // 来判断ai评分是否可用，因为有的评分教师全选的人工打分，所以全是人工打分的话，ai评分就不能使用
 
             // 不然会无限循环报错，会很难受
 
             // 不然会无限循环报错，会很难受
 
               let aiSNum = 0
 
               let aiSNum = 0
 
-              chapInfoListCopy[this.taskCount].eList.forEach(e=>{
 
-                if (e.isai == 2) {
 
-                  aiSNum++
 
+              if(chapInfoListCopy[this.taskCount].eList && chapInfoListCopy[this.taskCount].eList.length){
 
+                chapInfoListCopy[this.taskCount].eList.forEach(e=>{
 
+                  if (e.isai == 2) {
 
+                    aiSNum++
 
+                  }
 
+                })
 
+                if(aiSNum ==  chapInfoListCopy[this.taskCount].eList.length){
 
+                  this.isaiNum = aiSNum
 
+                }else{
 
+                  this.isaiNum = 0
 
                 }
 
                 }
 
-              })
 
-              if(aiSNum ==  chapInfoListCopy[this.taskCount].eList.length){
 
-                this.isaiNum = aiSNum
 
-              }else{
 
-                this.isaiNum = 0
 
-              }
 
 
 
 
 
 
 
@@ -18430,12 +18431,13 @@ export default {
 
 
 
 
 
 
 
-            for (let k = 0; k < chapInfoListCopy[this.taskCount].eList.length; k++) {
 
-              if(!chapInfoListCopy[this.taskCount].eList[k].rule){
 
-                this.againEva(this.taskCount,k)
 
+              for (let k = 0; k < chapInfoListCopy[this.taskCount].eList.length; k++) {
 
+                if(!chapInfoListCopy[this.taskCount].eList[k].rule){
 
+                  this.againEva(this.taskCount,k)
 
+                }
 
               }
 
               }
 
-            }
 
 
 
+          }

+ 2 - 2
src/components/easy3/studyStudent.vue
Visa fil 

@@ -1387,7 +1387,7 @@
 
                       @click="openWordCloud(toolIndex)"
 
                       @click="openWordCloud(toolIndex)"
 
                       >生成词云</el-button
 
                       >生成词云</el-button
 
                     >
 
                     >
 
-                    <el-button
 
+                    <!-- <el-button
 
                       type="primary"
 
                       type="primary"
 
                       v-if="
 
                       v-if="
 
                         tool.tool[0] == 16 && worksStudent[toolIndex].length > 0
 
                         tool.tool[0] == 16 && worksStudent[toolIndex].length > 0
 
@@ -1395,7 +1395,7 @@
 
                       style="position: absolute; right: 30px; top: -45px"
 
                       style="position: absolute; right: 30px; top: -45px"
 
                       @click="uploadWorks(toolIndex)"
 
                       @click="uploadWorks(toolIndex)"
 
                       >导出作业</el-button
 
                       >导出作业</el-button
 
-                    >
 
+                    > -->
 
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
 
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
 
                         position: absolute;
 
                         position: absolute;
 
                         right: 30px;
 
                         right: 30px;

+ 2 - 2
src/components/studyStudent.vue
Visa fil 

@@ -1356,7 +1356,7 @@
 
                       @click="openWordCloud(toolIndex)"
 
                       @click="openWordCloud(toolIndex)"
 
                       >生成词云</el-button
 
                       >生成词云</el-button
 
                     >
 
                     >
 
-                    <el-button
 
+                    <!-- <el-button
 
                       type="primary"
 
                       type="primary"
 
                       v-if="
 
                       v-if="
 
                         tool.tool[0] == 16 && worksStudent[toolIndex].length > 0
 
                         tool.tool[0] == 16 && worksStudent[toolIndex].length > 0
 
@@ -1364,7 +1364,7 @@
 
                       style="position: absolute; right: 30px; top: -45px"
 
                       style="position: absolute; right: 30px; top: -45px"
 
                       @click="uploadWorks(toolIndex)"
 
                       @click="uploadWorks(toolIndex)"
 
                       >导出作业</el-button
 
                       >导出作业</el-button
 
-                    >
 
+                    > -->
 
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
 
                     <!-- <el-button type="primary" v-if="tool.tool[0] == 57" style="
 
                         position: absolute;
 
                         position: absolute;
 
                         right: 30px;
 
                         right: 30px;

Vissa filer visades inte eftersom för många filer har ändrats