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

src/modules/oe/component/commonExport.vue

@@ -34,30 +34,36 @@ export default {
         });
         return false;
       }
-      this.exportLoading = true;
-      this.$http
-        .get(this.exportUrl, {
-          params: {
-            query: this.form
-          },
-          responseType: "arraybuffer"
-        })
-        .then(response => {
-          if (response.data) {
-            var blob = new Blob([response.data], {
-              type:
-                "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-            });
-            var url = URL.createObjectURL(blob);
-            var a = document.createElement("a");
-            a.href = url;
-            a.download = this.exportFileName + ".xlsx";
-            a.target = "_blank";
-            a.click();
-            URL.revokeObjectURL(url);
-          }
-          this.exportLoading = false;
-        });
+      this.$confirm("确定执行导出?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.exportLoading = true;
+        this.$http
+          .get(this.exportUrl, {
+            params: {
+              query: this.form
+            },
+            responseType: "arraybuffer"
+          })
+          .then(response => {
+            if (response.data) {
+              var blob = new Blob([response.data], {
+                type:
+                  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
+              });
+              var url = URL.createObjectURL(blob);
+              var a = document.createElement("a");
+              a.href = url;
+              a.download = this.exportFileName + ".xlsx";
+              a.target = "_blank";
+              a.click();
+              URL.revokeObjectURL(url);
+            }
+            this.exportLoading = false;
+          });
+      });
     }
   }
 };

src/modules/oe/views/alreadyAudited.vue

@@ -81,7 +81,7 @@
           v-if="!showAllCondition"
           @click="showMoreCondition"
         >
-          更多查询
+          高级查询
         </el-button>
         <el-button
           size="small"

src/modules/oe/views/awaitingAudit.vue

@@ -96,7 +96,7 @@
           v-if="!showAllCondition"
           @click="showMoreCondition"
         >
-          更多查询
+          高级查询
         </el-button>
         <el-button
           size="small"

src/modules/oe/views/examDetail.vue

@@ -53,7 +53,7 @@
           v-if="!showAllCondition"
           @click="showMoreCondition"
         >
-          更多查询
+          高级查询
         </el-button>
         <el-button
           size="small"
@@ -323,7 +323,9 @@ export default {
       this.search();
     },
     examPaperDetail(courseId, examRecordDataId) {
-      window.open("/oe/examPaperDetail/" + courseId + "/" + examRecordDataId);
+      window.open(
+        "/admin/oe/examPaperDetail/" + courseId + "/" + examRecordDataId
+      );
     },
     gotoCaptureDetail(examRecordDataId) {
       this.$router.push({

src/modules/oe/views/examScheduling.vue

@@ -58,7 +58,7 @@
           v-if="!showAllCondition"
           @click="showMoreCondition"
         >
-          更多查询
+          高级查询
         </el-button>
         <el-button
           size="small"