接口联调

梁保满
1 parent 7812e986
Showing 15 changed files with 114 additions and 29 deletions
public/tex-mml-chtml.js → public/Temp/js/tex-mml-chtml.js
src/api/apis/apis.js
src/api/axios.js
src/api/urls/apis.js
src/components/exportDia.vue
src/views/basic/ask/analysis.vue
src/views/basic/ask/components/detail.vue
src/views/basic/ask/index.vue
src/views/basic/ask/list.vue
src/views/basic/setUp/student.vue
src/views/basic/test/components/contrast.vue
src/views/basic/test/components/multipleSubTest.vue
src/views/basic/test/components/multipleTest.vue
src/views/basic/test/list.vue
src/views/layout/header/header.vue
@@ -1287,6 +1287,15 @@ export default {
       data
     });
   },
+  //  导出随堂问单科多课时报表
+  pExportPhaseAnswerReport(data) {
+    return service({
+      url: setUpUrls.pExportPhaseAnswerReport,
+      method: "POST",
+      data,
+      responseType: 'arraybuffer',
+    });
+  },
  
   /** 平台管理 */
   //账户管理
@@ -1593,7 +1602,8 @@ export default {
     return service({
       url: setUpUrls.exportExamMultiReport,
       method: "POST",
-      data
+      data,
+      responseType: 'arraybuffer',
     });
   },
   // 查询即时测多班默认等级列表
@@ -1651,7 +1661,8 @@ export default {
     return service({
       url: setUpUrls.exportTClassAndStudent,
       method: "POST",
-      data
+      data,
+      responseType: 'arraybuffer',
     });
   },
   // 删除班级信息(新)
@@ -20,17 +20,15 @@ service.interceptors.request.use(
   (config) => {
     NProgress.start();
     // config.headers["Content-Type"] = "application/json;charset=UTF-8";
-
     const source = axios.CancelToken.source();
     store.commit("setTokenSources", [source.token, source.cancel]);
     config.cancelToken = source.token;
-    const role = store.getters.info.showRole || store.getters.info.permissions[0].role;
+    const role = store.getters.info?.showRole
     if (role == "ROLE_BANZHUREN") {
-      const classes = store.getters.classes
+      const classes = store.getters?.classes
       config.manager = 1
       config.classes = classes
     }
-    console.log(config)
     return config;
   },
   (error) => {
@@ -364,6 +364,9 @@ export default {
   //   载指定版本授课端
   pGetAppDownloadUrl: "/api_html/personal/getAppDownloadUrl",
  
+  //导出随堂问单科多课时报表
+  pExportPhaseAnswerReport: "/api_html/personal/exportPhaseAnswerReport",
+
  
   //   修改密码
   changePwd: "/api_html/changePwd",
@@ -24,13 +24,17 @@
           <el-table-column type="selection"></el-table-column>
           <el-table-column prop="studentName" label="姓名" align="center"></el-table-column>
           <el-table-column label="班名" align="center">
-            <template slot-scope="scoped">{{
-              scoped.row.classRank || scoped.row.rank || scoped.row.examList[0].classRank }}</template>
+            <template slot-scope="scoped">
+              <span v-if="scoped.row.classRank || scoped.row.rank">{{
+                scoped.row.classRank || scoped.row.rank }}</span>
+              <span v-else>{{ scoped.row.examList && scoped.row.examList[0].classRank }}</span>
+
+            </template>
           </el-table-column>
           <el-table-column prop="correctRate" :label="this.lastLabel" align="center"><template slot-scope="scoped">
               <span v-if="scoped.row.correctRate || scoped.row.scoringRate">{{
                 scoped.row.correctRate || scoped.row.scoringRate }}%</span>
-              <span v-else>{{ scoped.row.examList[0].score }}</span>
+              <span v-else>{{ scoped.row.examList && scoped.row.examList[0].score }}</span>
             </template></el-table-column>
         </el-table>
       </ul>
@@ -89,7 +93,7 @@ export default {
           return item.studentId
         })
       }
-      this.$emit('exportData', { studentIds: studentIds })
+      this.$emit('exportData', studentIds)
     },
     cancel() {
       if (this.exportType == 2) {
@@ -116,4 +120,30 @@ export default {
     cursor: pointer;
   }
 }
+
+:deep(.el-dialog) {
+  .el-dialog__body {
+    padding: 0 20px 10px;
+  }
+
+  .down-item {
+    font-size: 15px;
+    margin-bottom: 10px;
+
+    .tit {
+      line-height: 18px;
+      padding: 10px 0;
+    }
+  }
+
+  .export-tit {
+    text-align: center;
+    font-size: 16px;
+    padding-bottom: 10px;
+  }
+}
+
+.dialog-footer {
+  text-align: center;
+}
 </style>
 \ No newline at end of file
@@ -2,7 +2,10 @@
   <div>
     <back-box>
       <template slot="title">
-        <span>单课分析</span>
+        <span>{{
+          types == 1 ? "单课分析" :
+          types == 2 ? `${className}-${subjectNames[0]}汇总分析` :
+            `${className}-多科汇总分析` }}</span>
       </template>
     </back-box>
     <div class="page-content">
@@ -14,7 +17,7 @@
         <div id="print-content">
  
           <!-- 学生答题情况 -->
-          <Detail v-if="type == 1" :types="types" :detail="detail" />
+          <Detail v-if="type == 1" :types="types" :detail="detail" :id="id" />
           <!-- 学生答题情况 -->
           <Example v-if="type == 1" :types="types" :tableData="tableData" />
           <!-- 学生问答 -->
@@ -56,6 +59,7 @@ export default {
       role: "",
       loading: false,
       classId: "",
+      className: "",
       subjectNames: "",
       id: [],
       type: 1,
@@ -76,6 +80,7 @@ export default {
       this.$store.getters.info.showRole ||
       this.$store.getters.info.permissions[0].role;
     this.types = Number(this.$route.query.types)
+    this.className = this.$route.query.className
     const queryData = JSON.parse(this.$route.query.params)
     this.classId = queryData.classId
     console.log(this.$route.query)
@@ -189,13 +194,16 @@ export default {
         }
       }
       if (this.types == 1) {
+        query.periodId = this.id[0]
         query.type = this.type - 1
-      } else if (this.types == 3) {
-        query.subjectNames = this.subjectNames
+      } else {
+        query.periodIds = this.id
+        if (this.types == 3) {
+          query.subjectNames = this.subjectNames
+        }
       }
       this.loading = true;
       let { data, info, status } = await queryData({
-        periodIds: this.id,
         classId: this.classId,
         ...query,
       });
@@ -223,17 +231,20 @@ export default {
           queryData = this.$request.periodStudentReport
         }
         query.type = this.type - 1
-      } else if (this.types == 2) {
-        queryData = this.$request.phaseAnswerReport
-      } else if (this.types == 3) {
-        queryData = this.$request.cTPhaseAnswerReport
+        query.periodId = this.id[0]
+      } else {
+        query.periodIds = this.id
+        if (this.types == 2) {
+          queryData = this.$request.phaseAnswerReport
+        } else if (this.types == 3) {
+          queryData = this.$request.cTPhaseAnswerReport
+        }
       }
       if (this.types != 1) {
         query.classId = this.classId
       }
       this.loading = true;
       let { data, info, status } = await queryData({
-        periodIds: this.id,
         onlyRate: true,
         ...query,
       });
@@ -262,8 +273,16 @@ export default {
       } else if (studentIds.length > 0) {
         query.studentIds = studentIds
       }
-      const data = await this.$request.exportPeriodReport({
-        periodIds: this.id,
+      let exportPeriodReport = ""
+      if (this.id.length == 1) {
+        query.periodId = this.id[0]
+        exportPeriodReport = this.$request.exportPeriodReport
+      } else {
+        query.periodIds = this.id
+        exportPeriodReport = this.role == "ROLE_PERSONAL" ? this.$request.pExportPhaseAnswerReport : this.$request.exportPhaseAnswerReport
+      }
+      const data = await exportPeriodReport({
+        classId: this.classId,
         ...query
       });
       this.exportLoading = false;
@@ -23,7 +23,8 @@
   </ul>
   <ul class="info" v-else-if="types == 2">
     <li class="info-item">科目：{{ detail.subjectName }}</li>
-    <li class="info-item">课时总数：{{ detail.title }}</li>
+    <li class="info-item" v-if="id.length == 1">课时名称：{{ detail.title }}</li>
+    <li class="info-item" v-else>课时总数：{{ id.length }}</li>
     <li class="info-item">课时时长：{{ detail.duration }}分钟</li>
     <li class="info-item">
       反馈时长：{{ setDuration(detail.consumingDuration) }}
@@ -45,6 +46,7 @@
 <script>
 export default {
   props: {
+    id: Array,
     types: Number,
     detail: Object,
   },
@@ -224,9 +224,16 @@ export default {
     },
     //去列表
     goList() {
+      let className;
+      this.classList.map(item => {
+        if (item.value == this.query.classId) {
+          className = item.label
+        }
+      })
       this.$router.push({
         path: '/askList',
         query: {
+          className: className,
           params: JSON.stringify(this.query)
         }
       })
@@ -137,7 +137,9 @@ export default {
         query: {
           id: JSON.stringify([obj.id]),
           types: types,
+          subjectNames: obj.subjectName,
           params: this.$route.query.params,
+          className: this.$route.query.className,
         },
       });
     },
@@ -160,6 +162,7 @@ export default {
           types: this.multipleSelection.length == 1 ? 1 : subjectArr.length == 1 ? 2 : 3,
           subjectNames: subjectArr.join(','),
           params: this.$route.query.params,
+          className: this.$route.query.className,
         },
       });
     },
@@ -446,6 +446,7 @@ export default {
       const { data, status, info } = await this.$request.delStudent({
         type: this.query.classType,
         studentId: obj.id,
+        classId: this.query.classId
       });
       if (status === 0) {
         this.$message.success("删除成功");
@@ -339,7 +339,7 @@ export default {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
         downloadFile(
-          `多班_${this.subjectNames}_${this.title}_测练成绩对比分析`,
+          `多班_${this.subjectName}_${this.title}_测练成绩对比分析`,
           blob
         );
       } else {
@@ -244,7 +244,8 @@ export default {
         query.studentIds = studentIds
       }
       const data = await this.$request.exportExamReport({
-        examId: this.ids,
+        classId: this.classId,
+        examIds: this.ids,
         ...query
       });
       this.exportLoading = false;
@@ -258,6 +259,8 @@ export default {
             : "即时测-单卷测练报表.xlsx",
           blob
         );
+        this.$message.error("下载成功");
+        this.cancel()
       } else {
         this.$message.error("下载失败");
       }
@@ -31,7 +31,8 @@
         <LineChart id="lineChart" :params="chartData" :xAxis="xAxis" :formatterYAxis="false" />
       </div>
     </el-dialog>
-    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData" lastLabel="总分"/>
+    <ExportDia :exportStudent="exportStudent" :diaShow="diaShow" @cancel="cancel" @exportData="exportData"
+      lastLabel="总分" />
   </div>
   <!-- 单科多卷 -->
 </template>
@@ -201,7 +202,7 @@ export default {
     async exportData(arr) {
       if (this.exportLoading == true) return;
       this.exportLoading = true;
-      let studentIds = arr
+      let studentIds = [...arr]
       let query = {};
       if (studentIds.length == this.exportStudent.length) {
         query.studentIds = []
@@ -212,7 +213,9 @@ export default {
         ? this.$request.pExportPhaseExamReport
         : this.$request.exportPhaseExamReport;
       const data = await exportPhaseExamReport({
-        examId: this.ids,
+        classId: this.classId,
+        examIds: this.ids,
+        ...query
       });
       this.exportLoading = false;
       if (data) {
@@ -220,6 +223,8 @@ export default {
           type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         });
         downloadFile("即时测-单科多卷报表.xlsx", blob);
+        this.$message.error("下载成功");
+        this.cancel()
       } else {
         this.$message.error("下载失败");
       }
@@ -231,7 +231,8 @@ export default {
           classId: obj.classIds.join(','),
           subjectName: obj.subjectName,
           title: obj.title,
-          type: 4
+          type: 4,
+          params: this.$route.query.params
         },
       });
     },
@@ -298,6 +298,7 @@ export default {
     handleCommand(command) {
       //刷新权限跳转首页
       this.$store.dispatch("permissions", command);
+      this.$store.commit('setClasses', "")
     },
     async logOut() {
       const { data, status, info } = await this.$request.logout();
@@ -311,6 +312,7 @@ export default {
           this.$store.commit("setInfo", "");
           this.$store.commit("setRouters", "");
           this.$store.commit("resetTabnavBox");
+          this.$store.commit('setClasses', "")
           this.$router.push({
             path: "/login",
           });