Merge branch 'dev_v4.0.1' of http://git.qmth.com.cn/examcloud-frontend/examcloud-admin-web into dev_v4.0.1

src/constants/constants.js

@@ -66,7 +66,7 @@ export const PUBLISH_STATUS = [
 ];
 //公告接受规则类型
 export const NOTICE_RECEIVER_RULE_TYPE = [
-  { code: "STUDENTS_OF_EXAM", name: "学生-按考试批次选择" },
+  { code: "STUDENTS_OF_EXAM", name: "学生-按考试选择" },
   { code: "ALL_STUDENTS_OF_ROOT_ORG", name: "学生-学校中所有学生" },
   { code: "TEACHER_OF_MARK_WORK", name: "老师-按评卷老师选择" },
   { code: "COMMON_USERS_OF_ROLE", name: "老师-学习中心老师" }

src/modules/examwork/view/examStudent.vue

@@ -157,14 +157,6 @@
               @click="openAddingDialog"
               >新增</el-button
             >
-            <el-button
-              v-if="rolePrivileges.del_examStudent"
-              size="small"
-              type="danger"
-              icon="el-icon-delete"
-              @click="deleteStuByExam"
-              >批次删除</el-button
-            >
             <el-button
               v-if="rolePrivileges.copy_examStudent"
               size="small"
@@ -173,6 +165,14 @@
               @click="copy"
               >复制</el-button
             >
+            <el-button
+              v-if="rolePrivileges.del_examStudent"
+              size="small"
+              type="danger"
+              icon="el-icon-delete"
+              @click="deleteStuByExam"
+              >按考试删除</el-button
+            >
           </el-form-item>
         </el-form>
 
@@ -604,7 +604,7 @@
             :inline="true"
             label-width="120px"
           >
-            <el-form-item label="源考试批次" prop="sourceExamId">
+            <el-form-item label="源考试" prop="sourceExamId">
               <el-select
                 class="input"
                 :remote-method="queryExams4CopyFrom"
@@ -623,7 +623,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="目标考试批次" prop="targetExamId">
+            <el-form-item label="目标考试" prop="targetExamId">
               <el-select
                 class="input"
                 :remote-method="queryExams4CopyTo"
@@ -1128,7 +1128,7 @@ export default {
           {
             type: "number",
             required: true,
-            message: "请选择源考试批次",
+            message: "请选择源考试",
             trigger: "change"
           }
         ],
@@ -1136,7 +1136,7 @@ export default {
           {
             type: "number",
             required: true,
-            message: "请选择目标考试批次",
+            message: "请选择目标考试",
             trigger: "change"
           }
         ]
@@ -1497,19 +1497,19 @@ export default {
         });
       });
     },
-    //按批次删除方法
+    //按考试删除方法
     deleteStuByExam() {
       if (!this.formSearch.examId) {
         this.$notify({
           type: "warning",
-          message: "请选择要删除的批次"
+          message: "请选择要删除的考试"
         });
         return;
       }
 
       this.$msgbox({
         title: "提示",
-        message: "是否删除该批次所有考生?",
+        message: "是否删除该考试所有考生?",
         showCancelButton: false,
         confirmButtonText: "确定",
         beforeClose: (action, instance, done) => {
@@ -1708,7 +1708,7 @@ export default {
           ) {
             this.$notify({
               type: "error",
-              message: "源批次与目标批次不能相同"
+              message: "源考试与目标考试不能相同"
             });
             return;
           }
@@ -1790,7 +1790,7 @@ export default {
     checkUpload() {
       if (!this.studentImportForm.examId) {
         this.$notify({
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "error"
         });
         return false;
@@ -1896,7 +1896,7 @@ export default {
             exam.specialSettingsType == "STAGE_BASED"
           ) {
             this.examStageDisabled4Search = false;
-            this.examStageDisabled4Update = false; //编辑同查询一致，考试批次不可修改
+            this.examStageDisabled4Update = false; //编辑同查询一致，考试不可修改
             this.queryExamStages4Search("");
             this.queryExamStages(value, "", "insertOrUpdate");
           } else {

src/modules/examwork/view/examStudentImport.vue

@@ -272,7 +272,7 @@ export default {
     checkUpload() {
       if (!this.studentImportForm.examId) {
         this.$notify({
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "error"
         });
         return false;

src/modules/examwork/view/notice.vue

@@ -295,7 +295,7 @@
             >
             <el-button @click="cancel">关 闭</el-button>
           </div>
-          <!-- 考试批次弹框 start-->
+          <!-- 考试弹框 start-->
           <el-dialog
             width="600px"
             :before-close="handleClose"
@@ -384,7 +384,7 @@
               <el-button @click="examCancel">取消</el-button>
             </div>
           </el-dialog>
-          <!-- 考试批次弹框 end-->
+          <!-- 考试弹框 end-->
           <!-- 阅卷工作弹框 start-->
           <el-dialog
             :before-close="handleClose"
@@ -633,7 +633,7 @@ export default {
     },
     examSelectChange(row) {
       if (this.getAfterAddCount(this.selectedExam, row) > 10) {
-        this.warn("一次最多只能选择10个考试批次！");
+        this.warn("一次最多只能选择10个考试！");
         return;
       }
       this.tempSelectedExam = row;

src/modules/marking/views/MarkWork.vue

@@ -221,13 +221,13 @@
                   </el-option>
                 </el-select>
               </el-form-item>
-              <el-form-item label="考试批次" prop="examIds">
+              <el-form-item label="考试" prop="examIds">
                 <el-select
                   :disabled="examDisabled"
                   v-model="formMarkWork.examIds"
                   filterable
                   multiple
-                  placeholder="考试批次"
+                  placeholder="考试"
                   style="width: 200px;"
                 >
                   <el-option
@@ -285,7 +285,7 @@ export default {
         examIds: [
           {
             required: true,
-            message: "请选择考试批次",
+            message: "请选择考试",
             trigger: "change",
             type: "array"
           }

src/modules/oe/component/commonExport.vue

@@ -28,7 +28,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 1000
         });

src/modules/oe/component/commonForm.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form :model="form" label-width="70px">
     <el-col :span="6">
-      <el-form-item label="考试批次">
+      <el-form-item label="考试">
         <el-select
           class="form_search_width"
           v-model="form.examId"
@@ -11,7 +11,7 @@
           @change="changeExam"
           clearable
           @clear="getExams"
-          placeholder="请选择考试批次"
+          placeholder="请选择考试"
           size="small"
         >
           <el-option

src/modules/oe/views/absent.vue

@@ -148,7 +148,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 1000
         });

src/modules/oe/views/alreadyAudited.vue

@@ -399,7 +399,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 2000
         });

src/modules/oe/views/awaitingAudit.vue

@@ -532,7 +532,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 2000
         });

src/modules/oe/views/examDetail.vue

@@ -80,11 +80,13 @@
         <el-col v-show="currentPagePrivileges.EXAM_DETAIL_EXPORT">
           <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">
@@ -435,11 +437,10 @@
 <script>
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
-import commonExportVue from "../component/commonExport.vue";
 import pagePrivilege from "../mixin/pagePrivilege.js";
 import _ from "lodash";
 export default {
-  components: { commonFormVue, commonExportVue },
+  components: { commonFormVue },
   mixins: [pagePrivilege],
   data() {
     return {
@@ -454,6 +455,7 @@ export default {
       dialogVisible: false,
       // uploadDisabled: true,
       form: {
+        rootOrgId: null,
         examRecordDataId: null,
         hasStranger: null,
         courseId: null,
@@ -468,14 +470,12 @@ export default {
         isWarn: null,
         pageNo: 1,
         pageSize: 10,
-        rootOrgId: null,
         startTime: null,
         endTime: null,
         infoCollector: null,
         hasVirtual: null,
         ORG_FIND_ALL: false //查询所有机构
       },
-
       getExamCondition: {
         params: {
           name: "",
@@ -484,7 +484,7 @@ export default {
         filterCondition: ""
       },
       tableData: [],
-      exportUrl: "/api/ecs_oe_admin/exam/record/detail/list/export",
+      exportUrl: "/api/ecs_oe_admin/exam/record/detail/list/export/async",
       exportFileName: "考试明细",
       currentPagePrivileges: {
         EXAM_DETAIL_EXPORT: false, //导出
@@ -575,7 +575,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 2000
         });
@@ -628,6 +628,37 @@ export default {
         path: "/oe/captureDetail/" + examRecordDataId + "/examDetail"
       });
     },
+    exportData() {
+      if (!this.form.examId) {
+        this.$notify({
+          title: "警告",
+          message: "请选择考试",
+          type: "warning",
+          duration: 1000
+        });
+        return false;
+      }
+
+      this.$confirm("确定执行导出?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        this.form.rootOrgId = this.user.rootOrgId;
+        this.$http
+          .get(this.exportUrl, {
+            params: {
+              query: this.form
+            }
+          })
+          .then(() => {
+            this.$notify({
+              type: "success",
+              message: "正在后台导出中，请稍后到“导出任务列表”中下载！"
+            });
+          });
+      });
+    },
     downloadOfflineFile(files) {
       if (files && files.length > 0) {
         if (files[0].fileType != "image") {

src/modules/oe/views/examScheduling.vue

@@ -577,7 +577,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 2000
         });

src/modules/oe/views/examSummary.vue

@@ -4,7 +4,7 @@
       <el-row>
         <el-col :span="7">
           <el-form>
-            <el-form-item label="考试批次">
+            <el-form-item label="考试">
               <el-select
                 v-model="examId"
                 filterable
@@ -13,7 +13,7 @@
                 clearable
                 @clear="getExams"
                 @change="changeExam"
-                placeholder="请选择考试批次"
+                placeholder="请选择考试"
                 size="small"
               >
                 <el-option
@@ -677,7 +677,7 @@ export default {
       if (!this.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 2000
         });

src/modules/oe/views/export_task_list.vue

@@ -5,7 +5,7 @@
       :inline="true"
       style="border-bottom: 1px solid rgb(221, 221, 221);margin-bottom: 10px;"
     >
-      <el-form-item label="考试名称">
+      <el-form-item label="考试">
         <el-select
           v-model="formSearch.examId"
           :remote-method="getExams"

src/modules/oe/views/illegalityNameList.vue

@@ -280,7 +280,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 1000
         });

src/modules/oe/views/reexamine.vue

@@ -206,7 +206,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 1000
         });

src/modules/oe/views/scoreStatistics.vue

@@ -222,7 +222,6 @@
 <script>
 import { mapState } from "vuex";
 import commonFormVue from "../component/commonForm.vue";
-//import commonExportVue from "../component/commonExport.vue";
 import pagePrivilege from "../mixin/pagePrivilege.js";
 export default {
   components: { commonFormVue },
@@ -256,7 +255,6 @@ export default {
         endLimit: "",
         ORG_FIND_ALL: false //查询所有机构
       },
-
       getExamCondition: {
         params: {
           name: "",
@@ -265,7 +263,7 @@ export default {
         filterCondition: ""
       },
       tableData: [],
-      exportUrl: "/api/ecs_oe_admin/exam/score/statistic/list/export",
+      exportUrl: "/api/ecs_oe_admin/exam/score/statistic/list/export/async",
       exportFileName: "成绩统计",
       currentPagePrivileges: {
         SCORE_STATICS_EXPORT: false //导出
@@ -305,7 +303,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 1000
         });
@@ -347,7 +345,7 @@ export default {
       if (!this.form.examId) {
         this.$notify({
           title: "警告",
-          message: "请选择考试批次",
+          message: "请选择考试",
           type: "warning",
           duration: 1000
         });
@@ -381,9 +379,8 @@ export default {
     },
     asyncExportData() {
       this.form.rootOrgId = this.user.rootOrgId;
-      let url = "/api/ecs_oe_admin/exam/score/statistic/list/export/async";
       this.$http
-        .get(url, {
+        .get(this.exportUrl, {
           params: {
             query: this.form
           }