#

src/components/pages/components/exportDataDialog.vue

@@ -1819,31 +1819,29 @@ export default {
         this.loading = false;
         return this.$message.info("请选择数据后，再进行导出");
       }
-console.log('this.tableData',this.tableData);
 
       if (this.tableData.length == 1) {
         this.uid2 = this.tableData[0].userid;
         this.worksDialogCon2 = this.tableData[0];
+
         await this.getData();
-        console.log('8888');
-        
 
         if (this.data10 && this.data10.length) {
 
           this.loading = false;
           this.isDown = false;
           setTimeout(() => {
+
             this.getPdf();
-          }, 500);
+          }, 2000);
         }else{
-          console.log('getAiAnalysisCon33333333333333333333');
-
           await this.getAiAnalysisCon3()
           this.loading = false;
           this.isDown = false;
           setTimeout(() => {
+
             this.getPdf();
-          }, 500);
+          }, 2000);
         }
       } else {
         this.circulatePdf();
@@ -1866,7 +1864,7 @@ console.log('this.tableData',this.tableData);
     // 下载pdf文件
     async getPdf() {
       const content = this.$refs.reportPdf;
-      console.log("content", content.offsetHeight);
+      // console.log("content", content.offsetHeight);
 
       html2canvas(content)
         .then(canvas => {
@@ -2299,14 +2297,6 @@ console.log('this.tableData',this.tableData);
             this.loading = false;
             this.canvasLing.splice(6, 1, false);
 
-            // if (this.digNum == 0) {
-            //   this.loading = false;
-            //   this.isDown = false;
-            //   setTimeout(() => {
-            //     this.getPdf();
-            //   }, 500);
-            // }
-
             this.uploadData();
             return resolve(1);
           })
@@ -4389,7 +4379,7 @@ console.log('this.tableData',this.tableData);
   display: flex;
   flex-direction: column;
   padding: 0 110px;
-  padding-bottom: 30px;
+  padding-bottom: 100px;
   box-sizing: border-box;
   font-family: PingFang SC;
 }

src/components/pages/components/report.vue

@@ -1,5 +1,26 @@
 <template>
   <div class="r_box" v-loading="isLoading">
+    <div class="r_cbox">
+      <span>班级筛选</span>
+      <el-select
+        multiple
+        collapse-tags
+        class="r_select"
+        v-model="chooseClass"
+        placeholder="全部"
+        filterable
+        @change="changeClass"
+      >
+        <el-option
+          v-for="item in classArray"
+          :key="item.id"
+          :label="item.name"
+          :value="item.id"
+        >
+        </el-option>
+      </el-select>
+    </div>
+
     <div class="r_cbox">
       <span>学生姓名</span>
       <el-select
@@ -536,17 +557,19 @@
 import html2canvas from "html2canvas";
 import jspdf from "jspdf";
 export default {
-  props: ["cid", "dataJson"],
+  props: ["cid", "dataJson", "classArray"],
   data() {
     return {
       worksDialog: false,
       pdfUser: [],
       uname: [],
+      chooseClass: [],
       chap: [],
       task: [],
       dyAarray: [],
       dyList: [],
-      userAarray: [],
+      userAarray: [], //作业提交学生
+      userAarrayCopy: [], //班级筛选的时候使用作业提交学生
       isLoading: false,
       workList: [],
       workEvaList: []
@@ -658,7 +681,6 @@ export default {
         });
 
         if (this.dataJson.state == 5) {
-
           if (!taskList.length) {
             this.dyAarray[0].taskList.forEach(e => {
               let ar = 0 + "-" + e.id;
@@ -667,8 +689,6 @@ export default {
             });
           }
 
-         
-
           this.dyAarray[0].taskList.forEach(e => {
             let ar = 0 + "-" + e.id;
             console.log("ar", ar);
@@ -705,6 +725,7 @@ export default {
           res.data[11]; //cocopi或源码编辑作业
           res.data[12]; //文档作业
           this.workEvaList = res.data[13];
+          this.userAarrayCopy = JSON.parse(JSON.stringify(res.data[14]));
           this.userAarray = res.data[14];
 
           var dyJSON = JSON.parse(res.data[0][0].chapters);
@@ -874,6 +895,16 @@ export default {
         }
       }
     },
+    changeClass() {
+      if (this.chooseClass.length) {
+        this.userAarray = this.userAarrayCopy.filter(e => {
+          let kk = this.chooseClass.filter(item => e.classid.includes(item));
+          return kk.length ? e :''
+        });
+      } else {
+        this.userAarray = JSON.parse(JSON.stringify(this.userAarrayCopy));
+      }
+    },
     handleClose(done) {
       done();
     }
@@ -930,7 +961,7 @@ export default {
   width: 810pt;
   margin: auto;
   min-height: 1200px;
-  padding: 60px 8% 0;
+  padding: 60px 8%;
   box-sizing: border-box;
   background-color: rgb(255, 251, 220);
 }

src/components/pages/components/worksDetail2.vue

@@ -23,7 +23,7 @@
           size="small"
           >批量导出</el-button
         >
-        <el-button @click="exportData" 
+        <el-button
           v-if="DState == 5 && cutTabNum == 0 && multipleSelection.length < 2"
           type="info" 
           disabled
@@ -1594,7 +1594,7 @@
     >
       <div>
         <div>
-          <Report :cid="dataJson.courseId" :dataJson="dataJson" ref="reportRef"></Report>
+          <Report :cid="dataJson.courseId" :dataJson="dataJson" ref="reportRef" :classArray="classArray"></Report>
         </div>
       </div>
       <span slot="footer" class="dialog-footer"> </span>
@@ -1965,7 +1965,7 @@ export default {
     // 批量导出
     exportData(){
       // this.$emit("update:dialogVisibleBao", true);
-      this.$confirm("批量导出报告需要占用您较多时间，是否导出？", "提示", {
+      this.$confirm("批量导出作业需要占用您较多时间，是否导出？", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",