Browse Source

导入导出结果查询完毕

zhangjie 2 years ago
parent
commit
7412ba5cce

+ 38 - 18
src/modules/exam/views/ExamTaskManage.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="exam-task-manage">
   <div class="exam-task-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期:">
           <el-form-item label="学期:">
@@ -90,23 +90,34 @@
           >
           >
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'BatchAdd')"
-          icon="el-icon-circle-plus-outline"
-          type="info"
-          @click="toBatchAdd"
-        >
-          批量新建命题任务
-        </el-button>
-        <el-button
-          v-if="checkPrivilege('button', 'add')"
-          icon="el-icon-circle-plus-outline"
-          type="primary"
-          @click="toAdd"
-        >
-          新建命题任务
-        </el-button>
+      <div class="box-justify">
+        <div>
+          <el-button
+            v-if="checkPrivilege('button', 'BatchAdd')"
+            icon="el-icon-circle-plus-outline"
+            type="info"
+            @click="toBatchAdd"
+          >
+            批量新建命题任务
+          </el-button>
+          <el-button
+            v-if="checkPrivilege('button', 'BatchAdd')"
+            type="primary"
+            icon="el-icon-s-order"
+            @click="toDataTask"
+            >批量新建结果查询</el-button
+          >
+        </div>
+        <div>
+          <el-button
+            v-if="checkPrivilege('button', 'add')"
+            icon="el-icon-circle-plus-outline"
+            type="primary"
+            @click="toAdd"
+          >
+            新建命题任务
+          </el-button>
+        </div>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -234,6 +245,12 @@
       ref="BatchAddExamTask"
       ref="BatchAddExamTask"
       @modified="taskModified"
       @modified="taskModified"
     ></batch-add-exam-task>
     ></batch-add-exam-task>
+    <!-- data-task-dialog -->
+    <data-task-dialog
+      v-if="checkPrivilege('button', 'BatchAdd')"
+      ref="DataTaskDialog"
+      task-type="QUESTION_MISSION_BATCH_CREATE"
+    ></data-task-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -367,6 +384,9 @@ export default {
     taskModified() {
     taskModified() {
       this.getList();
       this.getList();
       this.updateWaitTaskCount();
       this.updateWaitTaskCount();
+    },
+    toDataTask() {
+      this.$refs.DataTaskDialog.open();
     }
     }
   }
   }
 };
 };

+ 40 - 20
src/modules/exam/views/TaskReviewManage.vue

@@ -10,7 +10,7 @@
         >{{ val }}</el-button
         >{{ val }}</el-button
       >
       >
     </div>
     </div>
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template
         <template
           v-if="
           v-if="
@@ -93,17 +93,27 @@
           >
           >
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action" v-if="!AUDITED">
-        <el-button
-          v-if="checkPrivilege('button', 'notReviewExport')"
-          icon="el-icon-download"
-          type="success"
-          :disabled="loading"
-          @click="toExport"
-        >
-          导出审核样本
-        </el-button>
-        <!-- <el-button
+      <div class="box-justify" v-if="!AUDITED">
+        <div>
+          <el-button
+            v-if="checkPrivilege('button', 'notReviewExport')"
+            icon="el-icon-download"
+            type="success"
+            :disabled="loading"
+            @click="toExport"
+          >
+            导出审核样本
+          </el-button>
+          <el-button
+            v-if="checkPrivilege('button', 'notReviewExport')"
+            type="primary"
+            icon="el-icon-s-order"
+            @click="toDataTask"
+            >导出结果查询</el-button
+          >
+        </div>
+        <div>
+          <!-- <el-button
           v-if="checkPrivilege('button', 'notReviewBatchNotPass')"
           v-if="checkPrivilege('button', 'notReviewBatchNotPass')"
           icon="el-icon-circle-close"
           icon="el-icon-circle-close"
           type="danger"
           type="danger"
@@ -111,14 +121,15 @@
         >
         >
           批量不通过
           批量不通过
         </el-button> -->
         </el-button> -->
-        <el-button
-          v-if="checkPrivilege('button', 'notReviewBatchPass')"
-          icon="el-icon-circle-check"
-          type="primary"
-          @click="toBatchAudit(1)"
-        >
-          批量通过
-        </el-button>
+          <el-button
+            v-if="checkPrivilege('button', 'notReviewBatchPass')"
+            icon="el-icon-circle-check"
+            type="primary"
+            @click="toBatchAudit(1)"
+          >
+            批量通过
+          </el-button>
+        </div>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -247,6 +258,12 @@
         >
         >
       </div>
       </div>
     </el-dialog>
     </el-dialog>
+    <!-- data-task-dialog -->
+    <data-task-dialog
+      v-if="checkPrivilege('button', 'notReviewExport')"
+      ref="DataTaskDialog"
+      task-type="SAMPLE_EXPORT"
+    ></data-task-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -446,6 +463,9 @@ export default {
     taskModified() {
     taskModified() {
       this.getList();
       this.getList();
       this.updateWaitTaskCount();
       this.updateWaitTaskCount();
+    },
+    toDataTask() {
+      this.$refs.DataTaskDialog.open();
     }
     }
   }
   }
 };
 };

+ 3 - 1
src/modules/print/views/BusinessDataExport.vue

@@ -277,7 +277,9 @@
     </import-file>
     </import-file>
     <!-- data-task-dialog -->
     <!-- data-task-dialog -->
     <data-task-dialog
     <data-task-dialog
-      v-if="checkPrivilege('button', 'import')"
+      v-if="
+        checkPrivilege('button', 'import') || checkPrivilege('button', 'export')
+      "
       ref="DataTaskDialog"
       ref="DataTaskDialog"
       :task-type="taskType"
       :task-type="taskType"
     ></data-task-dialog>
     ></data-task-dialog>

+ 30 - 11
src/modules/print/views/PrintTaskManage.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="print-task-manage">
   <div class="print-task-manage">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
       <el-form ref="FilterForm" label-position="left" label-width="85px" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期:">
           <el-form-item label="学期:">
@@ -118,16 +118,26 @@
           >
           >
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'BatchDownload')"
-          icon="el-icon-download"
-          type="primary"
-          :disabled="loading"
-          @click="toExport"
-        >
-          批量下载PDF
-        </el-button>
+      <div class="box-justify">
+        <div></div>
+        <div>
+          <el-button
+            v-if="checkPrivilege('button', 'BatchDownload')"
+            icon="el-icon-download"
+            type="primary"
+            :disabled="loading"
+            @click="toExport"
+          >
+            批量下载PDF
+          </el-button>
+          <el-button
+            v-if="checkPrivilege('button', 'BatchDownload')"
+            type="primary"
+            icon="el-icon-s-order"
+            @click="toDataTask"
+            >下载结果查询</el-button
+          >
+        </div>
       </div>
       </div>
     </div>
     </div>
     <div class="part-box part-box-pad box-justify">
     <div class="part-box part-box-pad box-justify">
@@ -388,6 +398,12 @@
       >
       >
       <div slot="footer"></div>
       <div slot="footer"></div>
     </el-dialog>
     </el-dialog>
+    <!-- data-task-dialog -->
+    <data-task-dialog
+      v-if="checkPrivilege('button', 'BatchDownload')"
+      ref="DataTaskDialog"
+      task-type="PRINT_PDF_DOWNLOAD"
+    ></data-task-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -595,6 +611,9 @@ export default {
 
 
       this.$message.success("文件下载任务提交成功!");
       this.$message.success("文件下载任务提交成功!");
     },
     },
+    toDataTask() {
+      this.$refs.DataTaskDialog.open();
+    },
     async toNormal(row) {
     async toNormal(row) {
       const typeName = row.normal ? "作废" : "恢复";
       const typeName = row.normal ? "作废" : "恢复";
       const action = await this.$confirm(
       const action = await this.$confirm(

+ 61 - 29
src/modules/stmms/views/ScoreArchive.vue

@@ -1,6 +1,6 @@
 <template>
 <template>
   <div class="score-archive">
   <div class="score-archive">
-    <div class="part-box part-box-filter part-box-flex">
+    <div class="part-box part-box-filter">
       <el-form ref="FilterForm" label-position="left" inline>
       <el-form ref="FilterForm" label-position="left" inline>
         <template v-if="checkPrivilege('condition', 'condition')">
         <template v-if="checkPrivilege('condition', 'condition')">
           <el-form-item label="学期:">
           <el-form-item label="学期:">
@@ -40,34 +40,52 @@
           >
           >
         </el-form-item>
         </el-form-item>
       </el-form>
       </el-form>
-      <div class="part-box-action">
-        <el-button
-          v-if="checkPrivilege('button', 'sync')"
-          type="success"
-          icon="el-icon-refresh"
-          :loading="syncLoading"
-          :disabled="!filter.semesterId || !filter.examId"
-          @click="toSync"
-          >同步</el-button
-        >
-        <el-button
-          v-if="checkPrivilege('button', 'BatchDownload')"
-          type="primary"
-          icon="el-icon-download"
-          :loading="loading"
-          :disabled="!filter.semesterId || !filter.courseCode"
-          @click="toDownloadAll"
-          >一键下载</el-button
-        >
-        <el-button
-          v-if="checkPrivilege('button', 'export')"
-          type="primary"
-          icon="el-icon-download"
-          :loading="exportLoading"
-          :disabled="!filter.semesterId || !filter.courseCode"
-          @click="toExport"
-          >成绩导出</el-button
-        >
+      <div class="box-justify">
+        <div>
+          <el-button
+            v-if="checkPrivilege('button', 'sync')"
+            type="success"
+            icon="el-icon-refresh"
+            :loading="syncLoading"
+            :disabled="!filter.semesterId || !filter.examId"
+            @click="toSync"
+            >同步</el-button
+          >
+          <el-button
+            v-if="checkPrivilege('button', 'BatchDownload')"
+            type="primary"
+            icon="el-icon-download"
+            :loading="loading"
+            :disabled="!filter.semesterId || !filter.courseCode"
+            @click="toDownloadAll"
+            >一键下载</el-button
+          >
+          <el-button
+            v-if="checkPrivilege('button', 'BatchDownload')"
+            type="primary"
+            icon="el-icon-s-order"
+            @click="toDataTask('SCORE_DOWNLOAD')"
+            >下载结果查询</el-button
+          >
+        </div>
+        <div>
+          <el-button
+            v-if="checkPrivilege('button', 'export')"
+            type="primary"
+            icon="el-icon-download"
+            :loading="exportLoading"
+            :disabled="!filter.semesterId || !filter.courseCode"
+            @click="toExport"
+            >成绩导出</el-button
+          >
+          <el-button
+            v-if="checkPrivilege('button', 'export')"
+            type="primary"
+            icon="el-icon-s-order"
+            @click="toDataTask('SCORE_EXPORT')"
+            >导出结果查询</el-button
+          >
+        </div>
       </div>
       </div>
     </div>
     </div>
 
 
@@ -177,6 +195,15 @@
       @on-next="toNextImage"
       @on-next="toNextImage"
       ref="SimpleImagePreview"
       ref="SimpleImagePreview"
     ></simple-image-preview>
     ></simple-image-preview>
+    <!-- data-task-dialog -->
+    <data-task-dialog
+      v-if="
+        checkPrivilege('button', 'export') ||
+          checkPrivilege('button', 'BatchDownload')
+      "
+      ref="DataTaskDialog"
+      :task-type="taskType"
+    ></data-task-dialog>
   </div>
   </div>
 </template>
 </template>
 
 
@@ -215,6 +242,7 @@ export default {
       syncLoading: false,
       syncLoading: false,
       exportLoading: false,
       exportLoading: false,
       loading: false,
       loading: false,
+      taskType: "",
       // img view
       // img view
       curImageIndex: 0,
       curImageIndex: 0,
       imageList: []
       imageList: []
@@ -281,6 +309,10 @@ export default {
       if (!res) return;
       if (!res) return;
       this.$message.success("下载成功!");
       this.$message.success("下载成功!");
     },
     },
+    toDataTask(taskType) {
+      this.taskType = taskType;
+      this.$refs.DataTaskDialog.open();
+    },
     // img view
     // img view
     toViewSheetPaper(row) {
     toViewSheetPaper(row) {
       const dataList = row.sheetUrls ? JSON.parse(row.sheetUrls) : [];
       const dataList = row.sheetUrls ? JSON.parse(row.sheetUrls) : [];