From 120d4a0e2fd20458e5893f0688511c4022521b92 Mon Sep 17 00:00:00 2001 From: limengnan <420004014@qq.com> Date: Tue, 9 Dec 2025 09:48:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8D=95=E7=8B=AC=E6=8A=A5?= =?UTF-8?q?=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/renderer/src/views/GenerateReport.vue | 15 +- .../renderer/src/views/PopUpOnlyReport.vue | 477 ++++++++++++++++++ .../src/renderer/src/views/PopUpReport.vue | 380 +++++++------- 3 files changed, 686 insertions(+), 186 deletions(-) create mode 100644 frontend/src/renderer/src/views/PopUpOnlyReport.vue diff --git a/frontend/src/renderer/src/views/GenerateReport.vue b/frontend/src/renderer/src/views/GenerateReport.vue index 856322e0..dd40f5c2 100644 --- a/frontend/src/renderer/src/views/GenerateReport.vue +++ b/frontend/src/renderer/src/views/GenerateReport.vue @@ -206,6 +206,12 @@ :selectIds="[rawData.id,calibrationData.id]" @closePopUpReport="closePopUpReport" /> + @@ -216,7 +222,7 @@ import { historyAPI,getBackendUrl } from '@/services/api.js' // import { ipcRenderer } from 'electron' import SelectData from '@/views/SelectData.vue' import PopUpReport from '@/views/PopUpReport.vue' - +import PopUpOnlyReport from '@/views/PopUpOnlyReport.vue' const emit = defineEmits([ 'closeGenerateReport' ]); const props = defineProps({ selectedPatient: { @@ -231,7 +237,8 @@ const props = defineProps({ default: "" } }) -const isPopUpReport = ref(false) +const isPopUpReport = ref(false) // 是否弹出报告 +const isPopUpOnlyReport = ref(false) // 是否弹出原始报告 const BACKEND_URL = getBackendUrl() const rawData = ref({}) // 原始数据 const calibrationData = ref({}) // 校准数据 @@ -300,6 +307,10 @@ function confirmCancel() { ElMessage.error('请选择原始数据') return } + if(calibrationData.value.id == null){ + isPopUpOnlyReport.value = true + return + } isPopUpReport.value = true // generatePDF() // emit("closeGenerateReport",false) diff --git a/frontend/src/renderer/src/views/PopUpOnlyReport.vue b/frontend/src/renderer/src/views/PopUpOnlyReport.vue new file mode 100644 index 00000000..22790bcb --- /dev/null +++ b/frontend/src/renderer/src/views/PopUpOnlyReport.vue @@ -0,0 +1,477 @@ + + + + + \ No newline at end of file diff --git a/frontend/src/renderer/src/views/PopUpReport.vue b/frontend/src/renderer/src/views/PopUpReport.vue index e552c16c..5de75fda 100644 --- a/frontend/src/renderer/src/views/PopUpReport.vue +++ b/frontend/src/renderer/src/views/PopUpReport.vue @@ -1,194 +1,196 @@ @@ -325,7 +327,7 @@ const generatePDF = async () => { const url = URL.createObjectURL(pdfBlob); const a = document.createElement('a'); a.href = url; - a.download = 'document.pdf'; + a.download = '体态测量报告单.pdf'; document.body.appendChild(a); a.click(); document.body.removeChild(a); @@ -520,4 +522,14 @@ const generatePDF = async () => { color: #383838; padding: 5px; } +.PopUpOnlyReport-footer{ + margin-top: 40px; + padding-top: 40px; + border-top: 1px solid #333; + display: flex; + font-weight: 700; + font-style: normal; + color: rgb(40, 40, 40); + font-size: 18px; +} \ No newline at end of file