print page changed

src/views/elective/report/components/elective-ai-analysis-step.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="elective-ai-container">
-    <el-divider><h1>{{ simulateActive.title }}AI分析</h1></el-divider>
+    <el-divider class="new-page"><h1>{{ simulateActive.title }}AI分析</h1></el-divider>
     <index-card :title="`${simulateActive.title}AI分析表`">
       <elective-ai-table :generation="generation" :optional-majors="inheritOptionalMajors" readonly></elective-ai-table>
     </index-card>

src/views/elective/report/components/major-introduce-batch.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="professDetail">
+  <div class="professDetail" v-if="details.length">
+    <el-divider class="new-page"><h1>专业介绍</h1></el-divider>
     <index-card v-for="detail in details" :key="detail.code" :title="majors[detail.code]" class="index-card print-page">
       <el-divider content-position="left"><span class="f28">专业概况</span></el-divider>
       <major-introduce-info :major-detail="detail.overview" class="print-page"></major-introduce-info>
@@ -59,6 +60,15 @@ export default {
 </script>
 
 <style scoped>
+.professDetail > .el-divider {
+  margin: 40px 0;
+}
+
+h1 {
+  font-size: 36px;
+  margin: 0;
+}
+
 .index-card + .index-card {
   margin-top: 20px;
 }

src/views/elective/report/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" v-loading="loading">
     <div class="elective-report-container">
       <!--   print-hidden定义在PDF生成程序中   -->
       <div v-if="electiveVisible" class="print-hidden text-right mb10">
@@ -9,19 +9,18 @@
         <el-image :src="require('@/assets/images/elective/elective_report_cover.png')"></el-image>
       </div>
       <elective-test-reports></elective-test-reports>
-      <el-divider><h1>选科大数据分析</h1></el-divider>
+      <el-divider class="new-page"><h1>选科大数据分析</h1></el-divider>
       <group-subject-query class="print-page"></group-subject-query>
-      <el-divider><h1>自选专业</h1></el-divider>
+      <el-divider class="new-page"><h1>自选专业</h1></el-divider>
       <major-match-optional class="print-page"></major-match-optional>
-      <el-divider><h1>专业介绍</h1></el-divider>
       <major-introduce-batch></major-introduce-batch>
-      <el-divider><h1>选科成绩表</h1></el-divider>
+      <el-divider class="new-page"><h1>选科成绩表</h1></el-divider>
       <group-score-table class="print-page"></group-score-table>
-      <el-divider><h1>选科进程表</h1></el-divider>
+      <el-divider class="new-page"><h1>选科进程表</h1></el-divider>
       <elective-flow-table class="print-page"></elective-flow-table>
       <!-- AI分析可能有也可能没有，在elective-ai-analysis内部控制 -->
       <elective-ai-analysis></elective-ai-analysis>
-      <el-divider><h1>选科录取分析报告</h1></el-divider>
+      <el-divider class="new-page"><h1>选科录取分析报告</h1></el-divider>
       <elective-enroll-analysis class="print-page"></elective-enroll-analysis>
     </div>
   </div>
@@ -74,13 +73,18 @@ export default {
   methods: {
     handlePrint() {
       if (!this.generation?.status?.roundId) return
+      this.loading = true
       getSelectedBookReport({
         roundId: this.generation.status.roundId,
         reportType: consts.enum.electiveReportType.student
       }).then(res => {
+        this.loading = false
         if (res.data?.url) {
           this.$router.push({ path: '/elective/report/flip', query: { path: res.data.url } })
         }
+      }).catch(e => {
+        this.loading = false
+        this.$message.error(e)
       })
     }
   }