xinyilu/KindergartenUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2022-10-21 09:55:24 +08:00
parent f3c7362886
commit dd24182550
4 changed files with 1013 additions and 1140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/views/system/kindergartenCheckReport/index.vue
View File

@ -176,7 +176,7 @@
<el-dialog
:title="title"
:visible.sync="open"
width="1600px"
width="1350px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -186,7 +186,7 @@
<el-radio :label="1">已审核</el-radio>
</el-radio-group>
</el-form-item>
<div style="height: 600px; overflow: auto">
<div style="height: 550px; overflow: auto">
<kindergartenEcharts
v-if="open"
:itemlists="itemlist"
@ -212,7 +212,7 @@
</div>
</el-dialog>
<el-dialog :visible.sync="openiframe" width="1600px" append-to-body>
<el-dialog :visible.sync="openiframe" width="1350px" append-to-body>
<div style="height: 680px; overflow: auto">
<kindergartenEcharts
:itemlists="itemlist"
@ -544,7 +544,6 @@ export default {
listKindergartenInfo(this.kqueryParams).then((response) => {
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]),

5
src/views/system/kindergartenEcharts/index.vue
View File

@ -4,9 +4,10 @@
<div
style="
font-size: 40px;
margin: 60px auto;
margin: 0 auto;
font-weight: 600;
text-align: center;
height:160px;line-height:160px
"
>
幼儿园综合体质分析报告书
@ -707,7 +708,7 @@
>班级体质分析({{ ilist.categoryScoreList[0].className }})</span
>
</div>
<div style="margin: 0 auto; width: 1400px; line-height: 60px">
<div style="margin: 0 auto; width: 1180px; line-height: 60px">
<div style="font-size: 12px; width: 100%; overflow: auto">
<div
style="

83
src/views/system/personalCheckReport/index.vue
View File

@ -603,7 +603,7 @@
<el-dialog
:title="title"
:visible.sync="open"
width="1200px"
width="1050px"
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
@ -614,7 +614,7 @@
</el-radio-group>
</el-form-item>
</el-form>
<div style="height: 650px; overflow: auto">
<div style="height: 550px; overflow: auto">
<personalecharts
v-if="open"
:itemlists="itemlist"
@ -625,22 +625,10 @@
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
<!-- <el-form-item label="学生姓名" prop="studentId">
<el-input v-model="form.studentId" placeholder="请输入学生姓名" />
</el-form-item>
<el-form-item label="批次编号" prop="batchCode">
<el-input v-model="form.batchCode" placeholder="请输入批次编号" />
</el-form-item>
<el-form-item label="报告编号" prop="reportCode">
<el-input v-model="form.reportCode" placeholder="请输入报告编号" />
</el-form-item>
<el-form-item label="报告名称" prop="reportName">
<el-input v-model="form.reportName" placeholder="请输入报告名称" />
</el-form-item> -->
</el-dialog>
<!-- //预览 -->
<el-dialog
width="1200px"
width="1300px"
style="height: 95%"
append-to-body
:visible.sync="openiframe"
@ -839,14 +827,6 @@ export default {
this.openiframe = true;
this.loading = false;
}, 300);
// checkReportreport(item.studentId, item.batchCode).then((res) => {
// // 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);
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);
});
},
//批次关闭

63
src/views/system/personalecharts/index.vue
View File

@ -1,9 +1,8 @@
<template>
<div class="app-container">
<ul class="infinite-list" v-infinite-scroll="load" style="overflow: auto">
<img src="@/icons/pernoal.jpg" alt="" style="width: 100%;height:926.079px" />
<img src="@/icons/pernoal.jpg" alt="" style="width: 100%" />
<div
style="font-size: 40px; margin: 40px auto; font-weight: 600"
style="font-size: 40px; margin: 80px auto; font-weight: 600"
class="title"
>
幼儿体质检测报告书
@ -82,9 +81,7 @@
width: 160px;
text-align: center;
"
v-for="(
item, index
) in sythesizestudent.firstItemCategoryList"
v-for="(item, index) in sythesizestudent.firstItemCategoryList"
:key="index"
>
<span :style="index == 0 ? '' : 'margin-right:20px'">{{
@ -197,9 +194,7 @@
>
<div class="cell">
{{
shapelist.heightName
? shapelist.heightName
: "身高"
shapelist.heightName ? shapelist.heightName : "身高"
}}: {{ shapelist.heightScore
}}{{ shapelist.heightMeasureUnit }}
</div>
@ -212,9 +207,7 @@
>
<div class="cell">
{{
shapelist.weightName
? shapelist.weightName
: "体重"
shapelist.weightName ? shapelist.weightName : "体重"
}}: {{ shapelist.weightScore
}}{{ shapelist.weightMeasureUnit }}
</div>
@ -271,8 +264,7 @@
"
>
{{
((((heightMax - heightMin) / heightMin) * heightMin) /
5) *
((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
4 +
heightMin
}}
@ -296,8 +288,7 @@
"
>
{{
((((heightMax - heightMin) / heightMin) * heightMin) /
5) *
((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
3 +
heightMin
}}
@ -321,8 +312,7 @@
"
>
{{
((((heightMax - heightMin) / heightMin) * heightMin) /
5) *
((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
2 +
heightMin
}}
@ -347,8 +337,7 @@
"
>
{{
((((heightMax - heightMin) / heightMin) * heightMin) /
5) *
((((heightMax - heightMin) / heightMin) * heightMin) / 5) *
1 +
heightMin
}}
@ -454,8 +443,7 @@
"
>
{{
((((weightMax - weightMin) / weightMin) * weightMin) /
5) *
((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
4 +
weightMin
}}
@ -479,8 +467,7 @@
"
>
{{
((((weightMax - weightMin) / weightMin) * weightMin) /
5) *
((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
3 +
weightMin
}}
@ -504,8 +491,7 @@
"
>
{{
((((weightMax - weightMin) / weightMin) * weightMin) /
5) *
((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
2 +
weightMin
}}
@ -530,8 +516,7 @@
"
>
{{
((((weightMax - weightMin) / weightMin) * weightMin) /
5) *
((((weightMax - weightMin) / weightMin) * weightMin) / 5) *
1 +
weightMin
}}
@ -833,13 +818,9 @@
>
<span style="position: absolute; left: 5%; top: 10px"
>{{
item.measureUnit == "s" || item.measureUnit == "h"
? "时间"
: ""
item.measureUnit == "s" || item.measureUnit == "h" ? "时间" : ""
}}{{
item.measureUnit == "cm" || item.measureUnit == "m"
? "距离"
: ""
item.measureUnit == "cm" || item.measureUnit == "m" ? "距离" : ""
}}
{{ item.measureUnit == "kg" ? "千克" : "" }}
{{ item.measureUnit == "g" ? "克" : "" }}({{ item.measureUnit }})
@ -1072,11 +1053,7 @@
:span-method="arraySpanMethod"
style="width: 95%; margin: 0 auto"
>
<el-table-column
prop="categoryName"
label="测试分类"
align="center"
>
<el-table-column prop="categoryName" label="测试分类" align="center">
</el-table-column>
<el-table-column prop="itemName" label="测试项目" align="center">
</el-table-column>
@ -1110,11 +1087,7 @@
align="center"
>
</el-table-column>
<el-table-column
prop="itemScoreAll"
label="综合得分"
align="center"
>
<el-table-column prop="itemScoreAll" label="综合得分" align="center">
</el-table-column>
<el-table-column
prop="syntheticalAssess"
@ -1172,7 +1145,6 @@
</el-card>
</el-col>
</el-row>
</ul>
</div>
</template>
<script>
@ -1261,7 +1233,6 @@ export default {
};
},
methods: {
load() {},
//综合体质分析素质 comprehensive
comprehensive() {
synthesize(this.echartslist).then((res) => {