xiatian 4 gadi atpakaļ
vecāks
revīzija
bad6580b16

+ 0 - 1
src/modules/basic/view/admin_operate.vue

@@ -158,7 +158,6 @@ export default {
           this.$nextTick(function() {
             this.paginationShow = true;
           });
-          this.getStatus();
         })
         .finally(() => (this.loading = false));
     },

+ 40 - 8
src/modules/oe/views/examScheduling.vue

@@ -84,11 +84,13 @@
         >
           <div class="block-seperator"></div>
           <span>操作:</span>
-          <commonExportVue
-            :form="form"
-            :exportUrl="exportUrl"
-            :exportFileName="exportFileName"
-          ></commonExportVue>
+          <el-button
+            type="primary"
+            size="small"
+            icon="el-icon-download"
+            @click="exportData"
+            >导出</el-button
+          >
         </el-col>
       </el-row>
       <el-row class="margin-top-10">
@@ -407,12 +409,11 @@
 <script>
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
-import commonExportVue from "../component/commonExport.vue";
 import pagePrivilege from "../mixin/pagePrivilege.js";
 // import MD5 from "js-md5";
 import SparkMD5 from "spark-md5";
 export default {
-  components: { commonFormVue, commonExportVue },
+  components: { commonFormVue },
   mixins: [pagePrivilege],
   data() {
     return {
@@ -460,7 +461,8 @@ export default {
         filterCondition: ""
       },
       tableData: [],
-      exportUrl: "/api/ecs_oe_admin/exam/student/examScheduling/list/export",
+      exportUrl:
+        "/api/ecs_oe_admin/exam/student/examScheduling/list/export/async",
       exportFileName: "考试进度详情",
       currentOfflineExamRecordDataId: "",
       offlineAnswerFile: "",
@@ -486,6 +488,36 @@ export default {
     }
   },
   methods: {
+    exportData() {
+      if (!this.form.examId) {
+        this.$notify({
+          title: "警告",
+          message: "请选择考试",
+          type: "warning",
+          duration: 1000
+        });
+        return false;
+      }
+
+      this.$confirm("确定执行导出?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.$http
+          .get(this.exportUrl, {
+            params: {
+              query: this.form
+            }
+          })
+          .then(() => {
+            this.$notify({
+              type: "success",
+              message: "正在后台导出中,请稍后到“导出任务列表”中下载!"
+            });
+          });
+      });
+    },
     cancelUpload() {
       this.uploadAnswerDialogVisible = false;
       this.removeImgs();

+ 1 - 0
src/modules/oe/views/export_task_list.vue

@@ -37,6 +37,7 @@
         >
           <el-option label="考试明细" value="EXAM_DETAIL"></el-option>
           <el-option label="成绩统计" value="SCORE_STATISTIC"></el-option>
+          <el-option label="考试进度" value="EXAM_SCHEDULING"></el-option>
         </el-select>
       </el-form-item>