diff --git a/src/views/system/kindergartenCheckReport/index.vue b/src/views/system/kindergartenCheckReport/index.vue index cbacc32..4f644e7 100644 --- a/src/views/system/kindergartenCheckReport/index.vue +++ b/src/views/system/kindergartenCheckReport/index.vue @@ -176,7 +176,7 @@ @@ -186,7 +186,7 @@ 已审核 -
+
- +
{ this.kindergartenList = response.rows; this.total1 = response.total; - // console.log(this.kindergartenList); }); }, // 取消按钮 @@ -576,7 +575,6 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { - console.log(this.queryParams); this.queryParams.pageNum = 1; this.info(); }, @@ -654,7 +652,6 @@ export default { var PDF = new JsPDF("", "pt", "a4"); if (leftHeight < pageHeight) { PDF.addImage(pageData, "JPEG", 0, 0, imgWidth, imgHeight); - console.log(PDF); } else { while (leftHeight > 0) { PDF.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight); @@ -666,78 +663,47 @@ export default { } } // PDF.save("体质检测报告.pdf"); // 这里是导出的文件名 - console.log(this.form); - var basepdf = PDF.output("datauristring"); // 转base64 // basepdf = basepdf.split("filename=generated.pdf;"); // base64 转 二进制流(blob) let blob = this.dataURLtoBlob(basepdf); - // console.log(blob, "blob"); let formData = new FormData(); formData.append("kindergartenFile", blob); formData.append("kindergartenId", this.form.kindergartenId); formData.append("kindergartenName", this.form.kindergartenName); formData.append("batchCode", this.form.batchCode); formData.append("checkStatus", this.form.checkStatus); - console.log(this.form); uploadKindergartenCheckReport(formData).then((res) => { - console.log(res); if (res.code == 200) { this.$message({ - message: "审核成功", + message: "审核完成", type: "success", }); this.info(); } }); }); - - // updateKindergartenCheckReport(obj).then((response) => { - // this.$modal.msgSuccess("修改成功"); - // this.open = false; - // this.queryParams = { - // pageNum: 1, - // pageSize: 10, - // kindergartenId: null, - // batchCode: null, - // }; - // this.info(); - // }); }, //预览 lookhand(item) { this.itemlist.kindergartenId = item.kindergartenId; this.itemlist.batchCode = item.batchCode; this.itemlist.number++; - console.log(item); this.loading = true; - setTimeout(() => { this.openiframe = true; this.loading = false; }, 300); - - // report(item.kindergartenId, item.batchCode).then((res) => { - // // this.pdfurl = window.URL.createObjectURL(res); - // this.pdfurl = baseurl + res.data.downloadAddress; - // this.info(); - // this.openiframe = true; - // console.log(this.pdfurl); - // // window.open(this.pdfurl); - // }); }, /** 导出按钮操作 */ handleExport(row) { - // report(row.id).then((res) => { - // console.log(res); - // }); if (row.checkStatus == 0) { this.$message.error("未审核,不可下载"); } else if (row.checkStatus == 1) { this.download( `/system/kindergartenCheckReport/download?id=${row.id}`, {}, - row.reportName + `.pdf` + row.reportName ); } }, @@ -794,7 +760,6 @@ export default { listKindergartenInfo(this.kqueryParams).then((response) => { this.kindergartenList = response.rows; this.total1 = response.total; - // console.log(this.kindergartenList); }); }, kinresetQuery() { @@ -812,7 +777,6 @@ export default { }, // /base64转二进制 dataURLtoBlob(dataurl) { - // console.log(dataurl); var arr = dataurl.split(","), mime = arr[0].match(/:(.*?);/)[1], bstr = atob(arr[1]), diff --git a/src/views/system/kindergartenEcharts/index.vue b/src/views/system/kindergartenEcharts/index.vue index 226c942..41b4acf 100644 --- a/src/views/system/kindergartenEcharts/index.vue +++ b/src/views/system/kindergartenEcharts/index.vue @@ -4,9 +4,10 @@
幼儿园综合体质分析报告书 @@ -707,7 +708,7 @@ >班级体质分析({{ ilist.categoryScoreList[0].className }})
-
+
@@ -614,7 +614,7 @@ -
+
确 定 取 消
- { - // // this.pdfurl = window.URL.createObjectURL(res); - // this.pdfurl = baseurl + res.data.downloadAddress; - // this.getList(); - // this.openiframe = true; - // // window.open(this.pdfurl); - // }); }, /** 查询个人体质检测报告列表 */ getList() { @@ -889,7 +869,6 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { - console.log(this.queryParams); this.queryParams.pageNum = 1; this.getList(); }, @@ -906,26 +885,6 @@ export default { this.open = true; this.loading = false; }, 300); - // existCheckReport(row.studentId, row.batchCode).then((res) => { - // if (res.code == 200) { - // if (res.data.existFlag) { - // this.loading = false; - // this.open = true; - // } else { - // checkReportreport(row.studentId, row.batchCode).then((res) => { - // // this.pdfurl = window.URL.createObjectURL(res); - // this.form.id = res.data.id; - // this.getList(); - // this.loading = false; - // this.open = true; - // // window.open(this.pdfurl); - // }); - // } - // } else if (res.code == 500) { - // this.loading = false; - // this.$message.error("获取审核信息失败"); - // } - // }); }, /** 重置按钮操作 */ resetQuery() { @@ -959,7 +918,6 @@ export default { }, // /base64转二进制 dataURLtoBlob(dataurl) { - console.log(dataurl); var arr = dataurl.split(","), mime = arr[0].match(/:(.*?);/)[1], bstr = atob(arr[1]), @@ -974,21 +932,6 @@ export default { }, /** 提交按钮 */ submitForm() { - // updatePersonalCheckReport(obj).then((res) => { - // if (res.code == 200) { - // this.$modal.msgSuccess("修改成功"); - // this.queryParams = { - // pageNum: 1, - // pageSize: 10, - // studentId: null, - // batchCode: null, - // }; - // this.getList(); - // this.open = false; - // } else { - // this.$modal.msgSuccess("修改失败"); - // } - // }); //转pdf this.open = false; let shareContent = document.querySelector(".personal"), //需要截图的包裹的（原生的）DOM 对象 @@ -1023,7 +966,6 @@ export default { var PDF = new JsPDF("", "pt", "a4"); if (leftHeight < pageHeight) { PDF.addImage(pageData, "JPEG", 0, 0, imgWidth, imgHeight); - console.log(PDF); } else { while (leftHeight > 0) { PDF.addImage(pageData, "JPEG", 0, position, imgWidth, imgHeight); @@ -1038,8 +980,6 @@ export default { // basepdf = basepdf.split("filename=generated.pdf;"); // base64 转 二进制流(blob) let blob = this.dataURLtoBlob(basepdf); - console.log(blob, "blob"); - let formData = new FormData(); formData.append("personalFile", blob); formData.append("studentId", this.form.studentId); @@ -1047,8 +987,13 @@ export default { formData.append("batchCode", this.form.batchCode); formData.append("checkStatus", this.form.checkStatus); uploadPersonalCheckReport(formData).then((res) => { - console.log(res); - this.getList(); + if (res.code == 200) { + this.$message({ + message: "审核完成", + type: "success", + }); + this.getList(); + } }); // PDF.save("幼儿体质检测报告.pdf"); // 这里是导出的文件名 }); @@ -1061,7 +1006,7 @@ export default { this.download( `/system/personalCheckReport/download?id=${row.id}`, {}, - row.reportName + `.pdf` + row.reportName ); } }, @@ -1093,7 +1038,6 @@ export default { listKindergartenInfo(this.kqueryParams).then((response) => { this.kindergartenList = response.rows; this.total1 = response.total; - // console.log(this.kindergartenList); }); }, //重置学生搜素 @@ -1131,7 +1075,6 @@ export default { }, //点击批次左边 batchCodeclick(row) { - console.log(row); this.batchCode = row.batchCode; this.queryParams.batchCode = row.batchCode; this.batchName = row.batchName; @@ -1175,12 +1118,10 @@ export default { listStudentInfo(this.studentqueryParams).then((res) => { this.studentInfoList = res.rows; this.total3 = res.total; - // console.log(this.studentInfoList); }); }, //点击所属班级 classshowclick() { - console.log(this.classqueryParams); if ( this.classqueryParams.kindergartenId == "" || this.classqueryParams.kindergartenId == null @@ -1190,7 +1131,6 @@ export default { this.classshow = true; this.classinfo(); } - // console.log(this.classqueryParams); }, //学生关闭 studentcancel() { @@ -1210,7 +1150,6 @@ export default { }, //班级左侧点击 classclick(row) { - // console.log(row); this.className = row.className; this.classId = row.id; this.studentqueryParams.classId = row.id; @@ -1244,7 +1183,6 @@ export default { listClassinfo(this.classqueryParams).then((response) => { this.classinfoList = response.rows; this.total2 = response.total; - // console.log(this.classinfoList); }); }, @@ -1253,7 +1191,6 @@ export default { listKindergartenInfo(this.kqueryParams).then((response) => { this.kindergartenList = response.rows; this.total1 = response.total; - // console.log(this.kindergartenList); }); }, //批次关闭 diff --git a/src/views/system/personalecharts/index.vue b/src/views/system/personalecharts/index.vue index 2a2a6a1..f0c6de9 100644 --- a/src/views/system/personalecharts/index.vue +++ b/src/views/system/personalecharts/index.vue @@ -1,650 +1,635 @@