1

src/pages/subjects-manage/index.vue

@@ -118,7 +118,7 @@
         <a-button
           type="primary"
           class="tw-flex tw-items-center operation-button"
-          @click="showExportModal = true"
+          @click="downloadPaperStruct"
         >
           <!--          <template #icon>-->
           <!--            <UploadOutlined />-->
@@ -243,7 +243,7 @@
       </a-form>
     </a-modal>
 
-    <a-modal
+    <!-- <a-modal
       v-model:visible="showExportModal"
       :maskClosable="false"
       :title="`导出`"
@@ -285,7 +285,7 @@
           </a-select>
         </a-form-item>
       </a-form>
-    </a-modal>
+    </a-modal> -->
   </div>
 </template>
 
@@ -402,14 +402,14 @@ const query = reactive<
 });
 
 const showExportModal = ref(false);
-watch(showExportModal, (val: any) => {
-  if (val) {
-    exportParams.schoolId = query.schoolId;
-    exportParams.examId = query.examId;
-    querySchoolList("", "form");
-  } else {
-  }
-});
+// watch(showExportModal, (val: any) => {
+//   if (val) {
+//     exportParams.schoolId = query.schoolId;
+//     exportParams.examId = query.examId;
+//     querySchoolList("", "form");
+//   } else {
+//   }
+// });
 
 /** table配置 */
 const columns: TableColumnType[] = [
@@ -580,19 +580,27 @@ const exportRef = ref();
 /** 导出主观题 */
 const downloadPaperStruct = async () => {
   try {
-    await exportRef.value.validateFields();
-    try {
-      await downloadPaperStructHttp({
-        ...query,
-        groupFinish: [void 0, true, false][query.groupFinish],
-        ...exportParams,
-      });
-    } catch (error) {
-      return Promise.reject(error);
-    }
-  } catch (errorInfo) {
-    console.log("Failed:", errorInfo);
+    await downloadPaperStructHttp({
+      ...query,
+      groupFinish: [void 0, true, false][query.groupFinish],
+    });
+  } catch (error) {
+    return Promise.reject(error);
   }
+  // try {
+  //   await exportRef.value.validateFields();
+  //   try {
+  //     await downloadPaperStructHttp({
+  //       ...query,
+  //       groupFinish: [void 0, true, false][query.groupFinish],
+  //       ...exportParams,
+  //     });
+  //   } catch (error) {
+  //     return Promise.reject(error);
+  //   }
+  // } catch (errorInfo) {
+  //   console.log("Failed:", errorInfo);
+  // }
 };
 
 const handleRemove: UploadProps["onRemove"] = (file) => {