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 @@