浏览代码

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

lsc 3 月之前
父节点
当前提交
6b46fdbb69

+ 10 - 5
src/components/pages/components/exportDataDialog.vue

@@ -949,16 +949,16 @@
                     <div class="taskScoConTit">素养</div>
                     <div class="WorkConSY">
                       <div v-for="(wItem, ind) in l.eList" :key="ind + 's'">
-                        <el-tooltip
+                        <!-- <el-tooltip
                           class="item"
                           effect="dark"
                           :content="wItem.detail"
                           placement="top-start"
-                        >
+                        > -->
                           <div class="RootImgBlockSy">
                             {{ wItem.target }}
                           </div>
-                        </el-tooltip>
+                        <!-- </el-tooltip> -->
                       </div>
                     </div>
                   </div>
@@ -2856,7 +2856,7 @@ export default {
           var pdfData = {
             pdfName:
               this.worksDialogCon.course +
-              "-作业集-" +
+              "-学生报告-" +
               this.worksDialogCon.sName +
               ".pdf",
             pdfCon: pdf.output("blob")
@@ -3585,6 +3585,9 @@ export default {
       this.getClaStuInterAllWorkAi(this.data13, this.data7); // 2
     },
     getClaStuInterAllWorkAi(val, likeData) {
+    // console.log('likeData',JSON.parse(JSON.stringify(likeData)));
+    // console.log('val',JSON.parse(JSON.stringify(val)));
+    
       let hd = []; //分数每个任务的所有任务分的集合
       this.stageList.forEach((e, index) => {
         hd[index] = [];
@@ -3606,8 +3609,10 @@ export default {
           }
         });
       });
+      // console.log('claAtuInterAllLike',JSON.parse(JSON.stringify(this.claAtuInterAllLike)));
+
       this.claAtuInterAllLike = this.claAtuInterAllLike.map(e => {
-        if (e == 0) {
+        if (e == 0 || this.data12[0].num ==0) {
           return 0;
         } else {
           return (e / this.data12[0].num).toFixed(1);

+ 1 - 1
src/components/pages/components/exportWorksDialog.vue

@@ -1452,7 +1452,7 @@ export default {
   border-radius: 16px;
   background-color: #fff;
   padding: 40px 32px;
-  width: 77%;
+  width: 70%;
   font-family: PingFang SC;
   margin: 8px 0;
   color: rgba(35, 99, 205, 1);