|
|
|
|
@ -186,21 +186,21 @@
|
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<el-col :span="6"> |
|
|
|
|
<el-form-item label="报告时间" style="width: 360px; margin-bottom: 0;"> |
|
|
|
|
<el-date-picker |
|
|
|
|
v-model="query.reportDateRange" |
|
|
|
|
type="daterange" |
|
|
|
|
unlink-panels |
|
|
|
|
range-separator="至" |
|
|
|
|
start-placeholder="开始日期" |
|
|
|
|
end-placeholder="结束日期" |
|
|
|
|
value-format="YYYY-MM-DD" |
|
|
|
|
format="YYYY-MM-DD" |
|
|
|
|
style="width: 100%;" |
|
|
|
|
/> |
|
|
|
|
</el-form-item> |
|
|
|
|
</el-col> |
|
|
|
|
<!-- <el-col :span="6">--> |
|
|
|
|
<!-- <el-form-item label="报告时间" style="width: 360px; margin-bottom: 0;">--> |
|
|
|
|
<!-- <el-date-picker--> |
|
|
|
|
<!-- v-model="query.reportDateRange"--> |
|
|
|
|
<!-- type="daterange"--> |
|
|
|
|
<!-- unlink-panels--> |
|
|
|
|
<!-- range-separator="至"--> |
|
|
|
|
<!-- start-placeholder="开始日期"--> |
|
|
|
|
<!-- end-placeholder="结束日期"--> |
|
|
|
|
<!-- value-format="YYYY-MM-DD"--> |
|
|
|
|
<!-- format="YYYY-MM-DD"--> |
|
|
|
|
<!-- style="width: 100%;"--> |
|
|
|
|
<!-- />--> |
|
|
|
|
<!-- </el-form-item>--> |
|
|
|
|
<!-- </el-col>--> |
|
|
|
|
</el-row> |
|
|
|
|
<div class="form-row flex"> |
|
|
|
|
<label class="text-center">问题信息</label> |
|
|
|
|
@ -1227,9 +1227,9 @@ const reportGenerationFun = async ()=>{
|
|
|
|
|
// await feedback.confirm("请确定生成当前页面数据的报告"); |
|
|
|
|
debugger |
|
|
|
|
console.log(userStore.user.userName) |
|
|
|
|
const reportDateRange = query.value.reportDateRange; |
|
|
|
|
if (!reportDateRange){ |
|
|
|
|
feedback.msgError("请选择对应报告时间") |
|
|
|
|
const crtTime = query.value.crtTime; |
|
|
|
|
if (!crtTime){ |
|
|
|
|
feedback.msgError("请选择对应录入时间") |
|
|
|
|
return |
|
|
|
|
} |
|
|
|
|
const loading = ElLoading.service({ |
|
|
|
|
@ -1239,10 +1239,7 @@ const reportGenerationFun = async ()=>{
|
|
|
|
|
}); |
|
|
|
|
try { |
|
|
|
|
// 发送请求到后端生成报告 |
|
|
|
|
const body = { |
|
|
|
|
beginTime: query.value.reportDateRange[0], |
|
|
|
|
endTime: query.value.reportDateRange[1], |
|
|
|
|
} |
|
|
|
|
const body = JSON.parse(JSON.stringify(query.value)); |
|
|
|
|
const res = await generateReport(body); |
|
|
|
|
|
|
|
|
|
const blob = res.blob; |
|
|
|
|
|