Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-admin-web

src/modules/marking/views/Marker.vue

@@ -46,6 +46,13 @@
                 @click="searchBtnFn"
                 >查询</el-button
               >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-download"
+                @click="this.export"
+                >导出</el-button
+              >
             </el-form-item>
           </el-form>
           <div class="block-seperator"></div>
@@ -158,6 +165,35 @@ export default {
     };
   },
   methods: {
+    export() {
+      if (!this.formSearch.workId) {
+        this.$notify({
+          title: "警告",
+          message: "请选择评卷名称",
+          type: "warning"
+        });
+        return false;
+      }
+      var key = this.user.key;
+      var token = this.user.token;
+      let url =
+        DATA_PROCESS_API +
+        "/markers/export?workId=" +
+        this.formSearch.workId +
+        "&$key=" +
+        key +
+        "&$token=" +
+        token;
+      let userLoginName = this.formSearch.userLoginName;
+      if (userLoginName) {
+        url = url + "&userLoginName=" + userLoginName;
+      }
+      let userName = this.formSearch.userName;
+      if (userName) {
+        url = url + "&userName=" + userName;
+      }
+      window.location.href = url;
+    },
     clearData() {
       this.formSearch = Object.assign(this.formSearch, {
         workId: "",

src/modules/marking/views/MarkerDetail.vue

@@ -30,12 +30,16 @@
                 size="small"
                 type="primary"
                 icon="el-icon-search"
-                @click="searchSetting"
+                @click="search"
                 >查询</el-button
               >
-              <!--
-                <el-button size="small"  type="primary" icon="info" @click="exportMarker">导出</el-button>
-              -->
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-download"
+                @click="this.export"
+                >导出</el-button
+              >
               <el-button
                 size="small"
                 type="primary"
@@ -121,6 +125,31 @@ export default {
     LinkTitlesCustom
   },
   methods: {
+    export() {
+      var key = this.user.key;
+      var token = this.user.token;
+      let url =
+        MARKING_API +
+        "/markCourses/progress/export?workId=" +
+        this.workId +
+        "&$key=" +
+        key +
+        "&$token=" +
+        token;
+      let userId = this.userId;
+      if (userId) {
+        url = url + "&userId=" + userId;
+      }
+      let courseCode = this.formSearch.courseCode;
+      if (courseCode) {
+        url = url + "&courseCode=" + courseCode;
+      }
+      let courseName = this.formSearch.courseName;
+      if (courseName) {
+        url = url + "&courseName=" + courseName;
+      }
+      window.location.href = url;
+    },
     handleSettingCurrentChange(val) {
       this.currentPage = val;
       this.searchSetting();
@@ -161,6 +190,10 @@ export default {
           this.loading = false;
         });
     },
+    search() {
+      this.currentPage = 1;
+      this.searchSetting();
+    },
     searchSetting() {
       this.loading = true;
       this.$http