report 调整

src/api/allAnalysisPage.ts

@@ -75,7 +75,7 @@ export function uploadProjectReportCont(params: {
   paperId: number;
   htmlContent: string;
 }) {
-  return httpApp.post("/api/ess/report/task/html", { params });
+  return httpApp.post("/api/ess/report/task/html", { ...params });
 }
 // 报告文件生成进度结果查询
 export function getProjectReportResult(taskId: number) {
@@ -87,5 +87,5 @@ export function getProjectReportResult(taskId: number) {
         status: string;
       };
     }
-  >("/api/ess/report/task/result", { taskId });
+  >("/api/ess/report/task/result", {}, { params: { taskId } });
 }

src/features/report/ReportBatchDownload.vue

@@ -126,6 +126,7 @@ async function projectSelected(projectId: number) {
   taskId = res.data.taskId;
   paperIds = res.data.paperIds;
   totalTaskCount = paperIds.length;
+  console.log(paperIds, totalTaskCount);
 
   if (!paperIds.length) {
     closeLoadModal();
@@ -205,17 +206,21 @@ function registWindowSubmit() {
       closeLoadModal();
       return;
     }
+    // console.log(htmlContent);
 
     const res = await uploadProjectReportCont({
       taskId,
       paperId: curPaperId as number,
       htmlContent,
-    }).catch(() => false);
+    }).catch(() => {
+      closeLoadModal();
+    });
     if (!res) return;
 
     finishPaperIds.push(curPaperId as number);
     updateProgress(getPaperProgress());
-    await startTask();
+
+    // await startTask();
   };
 }
 
@@ -231,7 +236,7 @@ onBeforeMount(() => {
 
 <style>
 .report-load-body {
-  width: 200px;
+  width: 300px;
   margin: 0 auto;
   color: #fff;
   font-size: 16px;

src/features/report/ReportCover.vue

@@ -1,8 +1,5 @@
 <template>
   <div class="report-page report-cover">
-    <div class="report-cover-bg">
-      <img src="./assets/bg-cover.png" alt="cover" />
-    </div>
     <div class="report-body">
       <h1 class="cover-title">成绩分析研究报告</h1>
 

src/features/report/ReportMain.vue

@@ -162,21 +162,19 @@ onMounted(async () => {
   }
 
   if (viewType === "frame") {
-    emitFrameResult(true, "", getPreviewTemp());
+    setTimeout(() => {
+      emitFrameResult(true, "", getPreviewTemp());
+    }, 1000);
   }
 });
 
-function emitFrameResult(success = true, errorMsg = "", htmlCont = "") {
+function emitFrameResult(success = true, errorMsg = "", htmlContent = "") {
   window.parent &&
     // @ts-ignore
     window.parent.submitReportTemp &&
     // @ts-ignore
     // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-    window.parent.submitReportTemp({
-      success,
-      errorMsg,
-      htmlCont,
-    });
+    window.parent.submitReportTemp(success, errorMsg, htmlContent);
 }
 
 function getPreviewTemp() {

src/features/report/assets/report.css

@@ -59,6 +59,7 @@
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
+  text-align: right;
 }
 
 .report-phead {
@@ -87,7 +88,7 @@
   right: 0;
   width: 93px;
   height: 3px;
-  background-image: url(./bg-color.png);
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAACCAYAAADl56r+AAAAAXNSR0IArs4c6QAAADlJREFUKFNjZEj5/5+BCNAjTIQiBgaGojOZRClk1L9MlDoGk5dEqbPWv0OUumNPpxOljnE0YLCHEwD/nBSjeg9W+wAAAABJRU5ErkJggg==");
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
@@ -112,7 +113,7 @@
   left: 0;
   width: 93px;
   height: 3px;
-  background-image: url(./bg-color.png);
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEYAAAACCAYAAADl56r+AAAAAXNSR0IArs4c6QAAADlJREFUKFNjZEj5/5+BCNAjTIQiBgaGojOZRClk1L9MlDoGk5dEqbPWv0OUumNPpxOljnE0YLCHEwD/nBSjeg9W+wAAAABJRU5ErkJggg==");
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }
@@ -148,25 +149,11 @@
 /* report cover */
 .report-cover {
   background-color: #fff;
+  background-image: url(./bg-cover.png);
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
   color: #fff;
 }
-.report-cover-bg {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  top: 0;
-  left: 0;
-  z-index: 1;
-}
-.report-cover-bg img {
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.report-cover .report-body {
-  position: relative;
-  z-index: 2;
-}
 .report-cover .cover-title {
   position: absolute;
   font-size: 59px;
@@ -335,7 +322,7 @@
   left: 27px;
   z-index: 9;
 
-  background-image: url(./bg-start.png);
+  background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAMAAABg3Am1AAAAY1BMVEUAAACTgP+NeP+Md/+NeP+Md/+NeP+Nd/+Nef+Nef+Md//////Fu//8/P/AtP+Pev/18//x7v/u7P+6rv+bif/6+f/Syv/Oxf+rm/+mlv+XhP+Ugf/p5f/h2/+zpf/d2P/d1/9drecdAAAACnRSTlMAG/Py2baba05un7UgfgAAASVJREFUSMeVltuCgiAQhjFPxQhIoKZWu+//lKstF0lDzHz3HzAc/kEEirauTjLBqarbQrxTNDJL86acS0mgPIvARRK5hPElmdccRUkXyr2ORjJotgkki0K0PKEVNU+oRcUTKoHfB+OcwW+JkCgjwChRcOEGGze6YOwuWEMWJngxUYVZ/QtqJgleDxAYtM8I63O0cMCOzzUtaAUISieFAVCGpPDAhUdSWHpA6JdIiDY0Rs3fttV9Cu77OUwQMWUOzvRRASYjyPtRuMuccD0K16wQLykrqGhTc4KBiFzRa1j6708oZiUUbTvfbfjOUope3P74d2EPA7eQ3nQQUBJBprtO40GWiEqvtcejkh3G7LhnNxRuy2I3RW7bZTd2/teB/zlhf3/+AIRfWWyi63byAAAAAElFTkSuQmCC");
   background-repeat: no-repeat;
   background-size: 100% 100%;
 }

src/features/report/pdf.txt

@@ -1,3 +0,0 @@
-// http://localhost:3030/web/report/print/4/101/1?eyJpZGVudGl0eSI6IiRVU0VSX1NFU1NJT05fLTEiLCJ0b2tlbiI6Ik5nektJWkJSTDh6WTdIUlVXOGkxaXNtSzhPeVpNMGZ4In0=
-// --pageSize '{"width":210000,"height":297000}'
-// --pageSize '{"width":157500,"height":222750}'