zhangjie 1 năm trước cách đây
mục cha
commit
cae0c1645c

+ 2 - 2
package.json

@@ -1,6 +1,6 @@
 {
   "name": "teachcloud-platform-web",
-  "version": "3.2.7",
+  "version": "3.3.0",
   "scripts": {
     "start": "vue-cli-service serve",
     "serve": "vue-cli-service serve",
@@ -53,4 +53,4 @@
       "git add"
     ]
   }
-}
+}

+ 1 - 0
src/assets/styles/element-ui-costom.scss

@@ -21,6 +21,7 @@
     }
     .el-dialog__body {
       padding-top: 90px;
+      min-height: 100%;
     }
   }
 }

+ 8 - 1
src/modules/mark/components/report/Report.vue

@@ -71,7 +71,14 @@ export default {
         paperNumber: this.baseinfo.paperNumber,
       });
       if (!res) return;
-      this.setData({ ...res, baseinfo: this.baseinfo });
+      this.setData({
+        ...res,
+        baseinfo: {
+          ...this.baseinfo,
+          examName: res.examName,
+          semesterName: res.semesterName,
+        },
+      });
       this.dataReady = true;
     },
     getTemp() {

+ 1 - 1
src/modules/mark/components/report/ReportQuestion.vue

@@ -30,7 +30,7 @@
           <td>{{ item.subNumber }}</td>
           <td>{{ item.score }}</td>
           <td>{{ item.avgScore }}</td>
-          <td>{{ item.socreRate }}</td>
+          <td>{{ item.scoreRate }}</td>
           <td>{{ item.fullScoreRate }}</td>
         </tr>
       </table>

+ 4 - 2
src/modules/mark/components/report/ReportSummary.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="report-summary">
     <report-box title="总览">
-      <h1 class="report-title">{{ baseinfo.examName }}</h1>
+      <h1 class="report-title">
+        {{ baseinfo.semesterName }}{{ baseinfo.examName }}
+      </h1>
       <h1 class="report-sub-title">{{ baseinfo.courseName }} | 成绩报告</h1>
       <h2 class="page-title-2 mb-20">考试概况</h2>
       <table class="table table-border mb-20">
@@ -48,7 +50,7 @@
           <th>占比(%)</th>
         </tr>
         <tr v-for="(item, ind) in scoreRange" :key="ind">
-          <td>{{ item.minScore }}-{{ item.maxScore }}</td>
+          <td>{{ item.minScore }}-</td>
           <td>{{ item.studentCount }}</td>
           <td>{{ item.rate }}</td>
         </tr>

+ 2 - 2
src/modules/mark/components/report/ReportTeacher.vue

@@ -29,7 +29,7 @@
           <!-- <th>相对平均分</th> -->
         </tr>
         <tr v-for="(item, ind) in tgroup" :key="ind">
-          <td>{{ item.teacherName }}</td>
+          <td>{{ item.teacher }}</td>
           <td>{{ item.className }}</td>
           <!-- <td>{{ item.totalCount }}</td> -->
           <td>{{ item.maxScore }}</td>
@@ -73,7 +73,7 @@ export default {
       const teacher = this.teacher.map((item) => {
         return {
           ...item,
-          name: item.teacherName,
+          name: item.teacher,
         };
       });
       this.teacherCharts = sectionArr(