Merge branch 'dev-v15' of http://121.37.111.42:3000/ThbTech/BodyBalanceEvaluation into dev-v15

frontend/src/renderer/src/views/AloneReportComparison.vue

@@ -237,9 +237,6 @@ const props = defineProps({
 const BACKEND_URL = getBackendUrl()
 const rawOneData = ref({}) // 原始数据
 const rawTwoData = ref({}) // 原始数据
-const calibrationOneData = ref({}) // 校准数据
-const calibrationTwoData = ref({}) // 校准数据
-const imageList = ref([])
 const headPoseMaxValuesLeft = ref({  
   rotationLeftMax: 0,    // 旋转-左旋最大值
   rotationRightMax: 0,   // 旋转-右旋最大值
@@ -274,7 +271,7 @@ onMounted(() => {
 })
 const leftInfo = ref({})
 const rightInfo = ref({})
-const sessionsByIdLeft = async (session_id) => {
+const sessionsByIdLeft = async (session_id) => {// 获取详情
   try {
     // 导出报告逻辑
     const response = await historyAPI.sessionsById(session_id)
@@ -294,12 +291,10 @@ const sessionsByIdLeft = async (session_id) => {
     ElMessage.error('获取失败')
   }
 }
-const sessionsByIdRight = async (session_id) => {
+const sessionsByIdRight = async (session_id) => { // 获取详情
   try {
-    // 导出报告逻辑
     const response = await historyAPI.sessionsById(session_id)
     if (response.success) {
-      // 回填会话诊断信息到左侧表单
       rightInfo.value = response.data
       response.data.data.forEach(element => {
         if(element.id == props.selectedData[1].data_ids.split(",")[0]){

frontend/src/renderer/src/views/GenerateReport.vue

@@ -342,14 +342,19 @@ function closeSelectData(is,val){
   }
   isSelectData.value = false
 }
-function closePopUpReport() { 
+function closePopUpReport(e) { 
   isPopUpReport.value = false
+  if(e==true){
     emit("closeGenerateReport",true)
+  }
 }
 
-function closePopUpOnlyReport() { 
+function closePopUpOnlyReport(e) { 
   isPopUpOnlyReport.value = false
+  
+  if(e==true){
     emit("closeGenerateReport",true)
+  }
 }
 
 

frontend/src/renderer/src/views/PopUpOnlyReport.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="PopUpOnlyReport-container" id="popup-report-root">
+    <img src="@/assets/header/closepage.png" 
+      alt="" style="cursor: pointer;position: fixed; right: 20px; top: 20px;z-index: 99;" 
+      @click="handleCancel">
     <div class="PopUpOnlyReport-container-body"  id="pdf-content">
       <div style="height: 100%; padding:0 90px; box-sizing: border-box;">
         <div class="PopUpOnlyReport-container-bodytitle">体态测量报告单</div>
@@ -330,6 +333,9 @@ const generatePDF = async () => {
 //   URL.revokeObjectURL(url); 
 //   emit("closePopUpOnlyReport",false)
 // };
+function handleCancel(){
+  emit('closePopUpOnlyReport', false)
+}
 </script>
 
 <style scoped>
@@ -339,7 +345,7 @@ const generatePDF = async () => {
   left: 0;
   width: 100%;
   height: 100vh;
-  background-color: #fff;
+  background-color: #000;
   z-index: 50;
   overflow: auto;
 }

frontend/src/renderer/src/views/PopUpReport.vue

@@ -1,5 +1,8 @@
 <template>
   <div class="PopUpReport-container" id="popup-report-root">
+    <img src="@/assets/header/closepage.png" 
+    alt="" style="cursor: pointer;position: fixed; right: 20px; top: 20px;z-index: 99;" 
+    @click="handleCancel">
    <div class="PopUpReport-container-body"  id="pdf-content">
     <div style="height: 100%; padding:0 90px; box-sizing: border-box;">
       <div class="PopUpReport-container-bodytitle">体态测量报告单</div>
@@ -332,6 +335,9 @@ const generatePDF = async () => {
     ElMessage.error(`报告生成失败：${e.message}`)
   }
 };
+function handleCancel(){
+  emit('closePopUpReport', false)
+}
 function getFormattedTime() {
   const now = new Date();
   const year = now.getFullYear(); 
@@ -353,7 +359,7 @@ function getFormattedTime() {
   left: 0;
   width: 100%;
   height: 100vh;
-  background-color: #fff;
+  background-color: #000;
   z-index: 50;
   overflow: auto;
 }