zhangjie 1 rok pred
rodič
commit
d8025a2e05

+ 2 - 1
src/features/paperAnalysis/PaperAnalysis.vue

@@ -183,7 +183,8 @@ async function getProject() {
   });
   curProject = res.data.content[0];
 }
-function toViewReport() {
+async function toViewReport() {
+  await getProject();
   if (curProject && curProject.needCompute) {
     void message.info("有数据更新请重新计算");
     return;

+ 2 - 1
src/features/paperAnalysis/PaperReport.vue

@@ -56,7 +56,8 @@ const projectId = +route.params.projectId;
 const paperId = +route.params.paperId;
 const compareProjectId = (route.params.compareProjectId as string)
   .split(",")
-  .map((item) => Number(item));
+  .filter((item) => !!item.trim())
+  .map((item) => Number(item.trim()));
 
 const reportMainRef = ref();
 const { loading, setLoading } = useLoading();

+ 11 - 2
src/features/report/ReportBatchDownload.vue

@@ -74,6 +74,8 @@ import {
   uploadProjectReportCont,
   getProjectReportResult,
 } from "@/api/allAnalysisPage";
+import { getProjectList } from "@/api/projectManagementPage";
+
 import { useRouter } from "vue-router";
 import { onBeforeMount, onMounted, nextTick } from "vue";
 import { downloadByLink } from "@/utils/utils";
@@ -147,8 +149,15 @@ function clearSetTs() {
   setTs = [];
 }
 
-function exportReport() {
-  if (props.curProject && props.curProject.needCompute) {
+async function exportReport() {
+  const res = await getProjectList({
+    id: props.curProject.id,
+    rootOrgId: -1,
+    pageNo: 1,
+    pageSize: 1,
+  });
+  const project = res.data.content[0];
+  if (project && project.needCompute) {
     void message.info("有数据更新请重新计算");
     return;
   }

+ 10 - 8
src/features/report/ReportCompare.vue

@@ -108,17 +108,19 @@
         </div>
       </div>
 
-      <div class="compare-rate report-part chart-part">
+      <div class="compare-rate report-part">
         <h3 class="report-part-title">
           {{ props.comparePapers[0].courseName }}科目成绩(总分)等距({{
             scoreGap
           }}分)分组频数分布对比分析
         </h3>
-        <v-chart
-          :initOptions="{ renderer: 'svg' }"
-          :option="scoreChartOption()"
-          :autoresize="true"
-        />
+        <div class="chart-part">
+          <v-chart
+            :initOptions="{ renderer: 'svg' }"
+            :option="scoreChartOption()"
+            :autoresize="true"
+          />
+        </div>
       </div>
       <!-- <div class="count-intro report-part result-part">
         <p>
@@ -391,7 +393,7 @@ function scoreChartOption() {
     legend: {
       show: true,
       left: 0,
-      top: 25,
+      top: 10,
       itemWidth: 12,
       itemHeight: 8,
       textStyle: {
@@ -408,7 +410,7 @@ function scoreChartOption() {
       left: 35,
       bottom: 20,
       right: 5,
-      top: 60,
+      top: 45,
       borderColor: "#A3B4CC",
     },
     xAxis: {

+ 7 - 2
src/features/report/assets/report.css

@@ -353,8 +353,13 @@
 .compare-charts .chart-part {
   height: 273px;
 }
-.compare-rate {
-  height: 283px;
+.compare-rate .report-part-title {
+  position: relative;
+  top: 0;
+  height: auto;
+}
+.compare-rate .chart-part {
+  height: 260px;
 }
 .result-part {
   min-height: 86px;

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
src/features/report/reportTemp.ts


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov