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

frontend/src/renderer/src/views/Dashboard.vue

@@ -17,7 +17,7 @@
             </div>
             <div>
             <div class="primary-add-buttons" @click="createNewPatient">
-              <img src="@/assets/home/add.png" alt="" style="margin-right: 5px;">           新建患者档案
+              <img src="@/assets/home/add.png" alt="" style="margin-right: 5px;">新建患者档案
             </div>
             </div>
           </div>
@@ -40,7 +40,8 @@
             <el-table-column prop="doctor" label="测试医生" min-width="80" align="center" />
             <el-table-column  label="操作" width="100">
               <template #default="scope">
-                <el-button link type="primary" style="font-size: 18px;" size="small" @click="delClick(scope.row.id)">删除</el-button>
+
+                <div @click.stop="delRowClick(scope.row.id)" class="tabledel" >删除</div>
               </template>
             </el-table-column>
           </el-table>
@@ -222,6 +223,22 @@
       :archiveType="false"
       :selectedPatient="selectedPatient"
       @closePatientProfile="closePatientProfile"/>
+    <div class="pop-up-mask homepop-up-mask" v-if="isTip">
+      <div class="pop-up-tip-container">
+        <div class="pop-up-tip-header">
+            <div>{{ tipTitle }}</div>
+            <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="tipCancel">
+        </div>
+        <div class="pop-up-tip-text">{{ tipValue }}</div>
+        <div class="tipconfirmbutton-box" v-if="tipType == '删除'">
+          <div class="pop-up-tip-cancelbutton" @click="tipCancel">取消</div> 
+          <el-button type="primary" class="tipconfirmbutton" @click="tipConfirm">确定</el-button>
+        </div>
+        <div class="tipconfirmbutton-box" v-if="tipType == '授权'">
+          <el-button type="primary" class="tipconfirmbutton" @click="tipCancel">确定</el-button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -236,11 +253,17 @@ import PatientCreate from '@/views/PatientCreate.vue'
 import Detection from '@/views/Detection.vue'
 import PatientProfile from '@/views/PatientProfile.vue'
 const router = useRouter()
+const isTip = ref(false) // 显示提示框
+
 const authStore = useAuthStore()
 const isDetection = ref(false) // 显示检查页面
 const isPatientProfile =ref(false)
 const patienttype = ref('add')
 const patienttotal = ref(0)
+const tipValue = ref('确定删除该条患者信息吗？') // 提示框内容
+const tipTitle =ref('提示') // 提示框标题
+const tipType = ref('删除') // 提示框类型
+const deleteId = ref('')
 // 响应式数据
 const activeNav = ref('detection')
 const searchKeyword = ref('')
@@ -269,6 +292,28 @@ const patientForm = ref({
   email: ''
 })
 const calculatedAge = ref('')
+function delRowClick(id){ 
+  tipType.value = '删除'
+  tipTitle.value = '删除提示'
+  tipValue.value = '确定删除该条患者信息吗？'
+  deleteId.value = id
+  isTip.value = true
+}
+
+function tipConfirm(){ 
+  delClick(deleteId.value)
+  isTip.value = false
+}
+function tipCancel(){
+  isTip.value = false
+}
+function tipLogin(){
+  tipType.value = '退出登录'
+  tipTitle.value = '提出提示'
+  tipValue.value = '确定要退出登录吗？'
+  handleLogout()
+  isTip.value = false
+}
 // 实现年龄计算方法 calculateAgeres
 const calculateAgeres = (date) => {
   if (!date) return '0'
@@ -320,29 +365,23 @@ const createNewPatient = async () => {
       return
     }
     const msg ='['+ (response && response.data && response.data.message)+']，软件使用授权不正确，您不能创建新患者！'
-    await ElMessageBox.alert(msg, '软件授权', {
+    // await ElMessageBox.alert(msg, '软件授权', {
-      confirmButtonText: '确定',
+    //   confirmButtonText: '确定',
-      type: 'warning'
+    //   type: 'warning'
-    })
+    // })
+    tipType.value = '授权'
+    tipTitle.value = '软件授权'
+    tipValue.value = msg
+    isTip.value = true
   } catch (error) {
-    await ElMessageBox.alert('无法获取授权信息，请检查后端服务是否启动或授权状态是否有效。', '错误', {
+    tipType.value = '授权'
-      confirmButtonText: '确定',
+    tipTitle.value = '错误'
-      type: 'error'
+    tipValue.value = '无法获取授权信息，请检查后端服务是否启动或授权状态是否有效。'
-    })
+    isTip.value = true
-  }
+    // await ElMessageBox.alert('无法获取授权信息，请检查后端服务是否启动或授权状态是否有效。', '错误', {
-}
+    //   confirmButtonText: '确定',
-
+    //   type: 'error'
-const handleUserCommand = (command) => {
+    // })
-  switch (command) {
-    case 'profile':
-      // 个人信息
-      break
-    case 'settings':
-      // 系统设置
-      break
-    case 'logout':
-      handleLogout()
-      break
   }
 }
 
@@ -442,13 +481,7 @@ onMounted(() => {
   // 加载患者列表
   loadPatients()
 })
-function delClick(id) {
+async function delClick(id) {
-  ElMessageBox.confirm('确定删除该条患者信息吗？', '删除提示', {
-    confirmButtonText: '确定',
-    cancelButtonText: '取消',
-    type: 'warning',
-  })
-    .then(async () => {
   try {
     const response = await patientAPI.deletePatient(id);
     if (response.success) {
@@ -469,9 +502,6 @@ function delClick(id) {
       message: '删除患者信息失败，请稍后重试',
     });
   }
-    })
-    .catch(() => {
-    });
 }
 const isCloseCreat = ref(false)
 function closecreatbox(e,e2){
@@ -1308,4 +1338,149 @@ function editClick(){
   display: flex;
   justify-content: space-between;
 }
+
+
+
+.homepop-up-mask.pop-up-mask{
+  position: fixed;
+  z-index: 199;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.4);
+}
+
+.homepop-up-mask .pop-up-tip-container {
+  width: 500px;
+  height:220px;
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  margin: auto;
+  border-radius: 10px;
+  background: linear-gradient(135deg, rgba(53, 67, 90, 1) 0%, rgba(53, 67, 90, 1) 0%, rgba(62, 79, 105, 1) 99%, rgba(62, 79, 105, 1) 100%);
+}
+.homepop-up-mask .pop-up-camera-container{
+  width: 608px;
+  height:495px;
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  margin: auto;
+  background: linear-gradient(135deg, rgb(53, 67, 90) 0%, rgb(53, 67, 90) 0%, rgb(62, 79, 105) 99%, rgb(62, 79, 105) 100%);
+  border-radius: 10px;
+  box-shadow: rgb(17, 24, 33) 0px 0px 10px;
+}
+.homepop-up-mask .pop-up-camera-header{
+  width: 100%;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 40px;
+  font-family: 'Noto Sans SC';
+  font-weight: 700;
+  font-style: normal;
+  font-size: 20px;
+  color: #FFFFFF;
+  text-align: left;
+  border-radius:10px 10px 0 0;
+}
+
+.homepop-up-mask .pop-up-tip-header{
+  width: 100%;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 30px;
+  font-family: 'Noto Sans SC';
+  font-weight: 700;
+  font-style: normal;
+  font-size: 20px;
+  color: #FFFFFF;
+  text-align: left;
+}
+.homepop-up-mask .tipconfirmbutton-box{
+  width:100%;
+  display:flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 0 30px;
+  padding-top: 10px;
+}
+.homepop-up-mask .tipconfirmbutton{
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: rgb(255, 255, 255);
+  background:#0b94d5;
+  border:1px solid #0b94d5;
+  width: 80px;
+  height: 40px;
+}
+.homepop-up-mask .tipconfirmbutton:hover{
+  background:#14aaff;
+  border:1px solid #14aaff;
+}
+
+.homepop-up-mask .pop-up-tip-text{
+  width:100%;
+  font-weight: 400;
+  font-style: normal;
+  font-size: 16px;
+  color: #FFFFFF;
+  text-align: left;
+  height: 80px;
+  box-sizing: border-box;
+  padding-left: 30px;
+  padding-right: 30px;
+  padding-top:20px ;
+  /* padding:20px 10px 30px; */
+}
+
+.homepop-up-mask .pop-up-tip-cancelbutton{
+  width: 80px;
+  height: 40px;
+  background-color: #597194;
+  border-radius: 4px;
+  color: rgba(255, 255, 255, 0.6);
+  font-weight: 400;
+  font-style: normal;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 20px;
+  cursor: pointer;
+}
+.homepop-up-mask .pop-up-tip-cancelbutton:hover{
+  background-color: #14aaff;
+  color: #fff;
+}
+.patientprofile-container-info .el-select__placeholder{
+  color: #fff;
+}
+.tabledel{
+  font-family: 'Noto Sans SC';
+  font-weight: 400;
+  font-style: normal;
+  font-size: 16px;
+  color: #FF3300;
+  text-align: center;
+  cursor: pointer;
+}
+.current-row .unprocessed-status{
+  color: #e9775b;
+}
+.current-row .processed-status{
+  color: rgb(59, 242, 198);
+}
 </style>

frontend/src/renderer/src/views/Detection.vue

@@ -364,7 +364,7 @@
       <div class="pop-up-tip-container">
         <div class="pop-up-tip-header">
             <div>提示</div>
-            <img src="@/assets/detection/close.png" alt="" style="cursor: pointer;" @click="handleCancel">
+            <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
         </div>
         <div class="pop-up-tip-text">本次检测未截图或录像操作，不予存档记录！</div>
         <div class="tipconfirmbutton-box">
@@ -387,7 +387,7 @@
       <div class="pop-up-camera-container">
         <div class="pop-up-camera-header">
             <div>相机参数设置</div>
-            <img src="@/assets/detection/close.png" alt="" style="cursor: pointer;" @click="handleCameraCancel">
+            <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCameraCancel">
         </div>
         <div class="pop-up-camera-body">
           <div class="pop-up-camera-display">

frontend/src/renderer/src/views/DiagnosticMessage.vue

@@ -4,7 +4,7 @@
     <div class="form-container">
       <div class="form-container-header">
          <div>诊断信息</div>
-         <img src="@/assets/detection/close.png" alt="" style="cursor: pointer;" @click="handleCancel">
+         <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
       </div>
       <div style="padding:20px 40px;">
         <el-form :model="diagnosticForm" label-width="60px">

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

@@ -6,7 +6,7 @@
       <div class="generateReport-container-cancelbutton" @click="closeCancel">取消</div>
       <div class="generateReport-container-confirmbutton" @click="confirmGenerateReport">确定</div>
     </div>
-    <img src="@/assets/archive/close.png" alt="" @click="closeCancel" style="cursor: pointer;">
+    <img src="@/assets/header/closepage.png" alt="" @click="closeCancel" style="cursor: pointer;">
    </div>
    <div class="generateReport-container-body">
     <el-scrollbar height="calc(100%)" style="padding:0 90px; box-sizing: border-box;">

frontend/src/renderer/src/views/Header.vue

@@ -21,7 +21,7 @@
             <img src="@/assets/new/u13.png" alt="Avatar" style="width: 30px;height: 30px;">
             <span class="username">{{ userInfo.name }}</span>
             <div class="user-line"></div>
-            <span class="username user-return"  @click="handleLogout">退出登录</span>           
+            <span class="username user-return"  @click="isTip = true">退出登录</span>           
           </div>
         </div>
       </div>
@@ -44,10 +44,20 @@
       <div v-if="isLicense" class="License-dialog-box">
         <License v-if="isLicense" @closeLicense="handleLicenseClose"/>
       </div>
-      <!-- <el-dialog v-model="isLicense" title="授权中心" width="800px" :before-close="handleLicenseClose"
+      <div class="pop-up-mask homepop-up-mask" v-if="isTip">
-         class="userInfoviewDialog">
+        <div class="pop-up-tip-container">
-         <License v-if="isLicense" @closeLicense="handleLicenseClose"/>
+          <div class="pop-up-tip-header">
-      </el-dialog> -->
+              <div>退出提示</div>
+              <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="tipCancel">
+          </div>
+          <div class="pop-up-tip-text">确定要退出登录吗？</div>
+ 
+          <div class="tipconfirmbutton-box">
+            <div class="pop-up-tip-cancelbutton" @click="tipCancel">取消</div> 
+            <el-button type="primary" class="tipconfirmbutton" @click="tipLogin">确定</el-button>
+          </div>
+        </div>
+      </div>
     </div>
   </template>
   
@@ -59,7 +69,7 @@
   import api from '../services/api.js'
   import License from '@/views/License.vue'
   const isLicense = ref(false)
-
+  const isTip = ref(false) // 显示提示框
   
   const router = useRouter()
   const authStore = useAuthStore()
@@ -103,12 +113,6 @@
   }
   const handleLogout = async () => {
     try {
-      await ElMessageBox.confirm('确定要退出登录吗？', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-  
       // 调用认证状态管理的logout方法清除所有认证信息
       await authStore.logout()
       ElMessage.success('已退出登录')
@@ -178,6 +182,14 @@
     // router.push('/license')
     isLicense.value = true
   }
+
+function tipCancel(){
+  isTip.value = false
+}
+function tipLogin(){
+  handleLogout()
+  isTip.value = false
+}
   </script>
   
   <style scoped>
@@ -345,4 +357,132 @@
   color: rgb(59, 242, 198);
   padding-left:10px;
 }
+
+.homepop-up-mask.pop-up-mask{
+  position: fixed;
+  z-index: 199;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(0, 0, 0, 0.4);
+}
+
+.homepop-up-mask .pop-up-tip-container {
+  width: 500px;
+  height:220px;
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  margin: auto;
+  border-radius: 10px;
+  background: linear-gradient(135deg, rgba(53, 67, 90, 1) 0%, rgba(53, 67, 90, 1) 0%, rgba(62, 79, 105, 1) 99%, rgba(62, 79, 105, 1) 100%);
+}
+.homepop-up-mask .pop-up-camera-container{
+  width: 608px;
+  height:495px;
+  position: absolute;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  margin: auto;
+  background: linear-gradient(135deg, rgb(53, 67, 90) 0%, rgb(53, 67, 90) 0%, rgb(62, 79, 105) 99%, rgb(62, 79, 105) 100%);
+  border-radius: 10px;
+  box-shadow: rgb(17, 24, 33) 0px 0px 10px;
+}
+.homepop-up-mask .pop-up-camera-header{
+  width: 100%;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 40px;
+  font-family: 'Noto Sans SC';
+  font-weight: 700;
+  font-style: normal;
+  font-size: 20px;
+  color: #FFFFFF;
+  text-align: left;
+  border-radius:10px 10px 0 0;
+}
+
+.homepop-up-mask .pop-up-tip-header{
+  width: 100%;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+  padding: 0 30px;
+  font-family: 'Noto Sans SC';
+  font-weight: 700;
+  font-style: normal;
+  font-size: 20px;
+  color: #FFFFFF;
+  text-align: left;
+}
+.homepop-up-mask .tipconfirmbutton-box{
+  width:100%;
+  display:flex;
+  align-items: center;
+  justify-content: flex-end;
+  padding: 0 30px;
+  padding-top: 10px;
+}
+.homepop-up-mask .tipconfirmbutton{
+  font-weight: 400;
+  font-style: normal;
+  font-size: 14px;
+  color: rgb(255, 255, 255);
+  background:#0b94d5;
+  border:1px solid #0b94d5;
+  width: 80px;
+  height: 40px;
+}
+.homepop-up-mask .tipconfirmbutton:hover{
+  background:#14aaff;
+  border:1px solid #14aaff;
+}
+
+.homepop-up-mask .pop-up-tip-text{
+  width:100%;
+  font-weight: 400;
+  font-style: normal;
+  font-size: 16px;
+  color: #FFFFFF;
+  text-align: left;
+  height: 80px;
+  box-sizing: border-box;
+  padding-left: 30px;
+  padding-right: 30px;
+  padding-top:20px ;
+  /* padding:20px 10px 30px; */
+}
+
+.homepop-up-mask .pop-up-tip-cancelbutton{
+  width: 80px;
+  height: 40px;
+  background-color: #597194;
+  border-radius: 4px;
+  color: rgba(255, 255, 255, 0.6);
+  font-weight: 400;
+  font-style: normal;
+  font-size: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-right: 20px;
+  cursor: pointer;
+}
+.homepop-up-mask .pop-up-tip-cancelbutton:hover{
+  background-color: #14aaff;
+  color: #fff;
+}
+.patientprofile-container-info .el-select__placeholder{
+  color: #fff;
+}
 </style>

frontend/src/renderer/src/views/License.vue

@@ -2,7 +2,7 @@
   <div class="license-container">
     <div class="form-container-header">
         <div>授权中心</div>
-        <img src="@/assets/detection/close.png" alt="" style="cursor: pointer;" @click="handleCancel">
+        <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
     </div>
     <div style="display: flex;border-bottom: 1px solid rgba(255, 255, 255, 0.15);
     margin-left: 30px;margin-right: 30px;padding-top: 20px;">
@@ -86,53 +86,7 @@
           @click="activatePackage" 
           :loading="activating">激活授权文件</el-button>
       </div>
-      
     </div>
-    
-
-    <!-- <el-tabs v-model="activeTab">
-      <el-tab-pane label="授权申请" name="request">
-        <div class="tab-content">
-          <el-form :model="form" label-width="120px" class="license-form">
-            <el-form-item label="公司名称">
-              <el-input v-model="form.company_name" placeholder="请输入公司名称" />
-            </el-form-item>
-            <el-form-item label="联系方式">
-              <el-input v-model="form.contact_info" placeholder="请输入联系方式" />
-            </el-form-item>
-            <div class="hintbox">软件信息</div>
-            <el-form-item label="产品">
-              <el-input :model-value="software.product" disabled />
-            </el-form-item>
-            <el-form-item label="版本">
-              <el-input :model-value="software.version" disabled />
-            </el-form-item>
-            <el-form-item label="机器码">
-              <el-input :model-value="software.machine_id" disabled />
-            </el-form-item>
-          </el-form>
-          <div class="actions">
-            <el-button type="primary" @click="exportActivationFile" :loading="exporting">导出激活文件</el-button>
-          </div>
-        </div>
-      </el-tab-pane>
-
-      <el-tab-pane label="激活授权" name="activate">
-        <div class="tab-content">
-          <el-upload
-            :auto-upload="false"
-            :show-file-list="true"
-            :on-change="onZipChange"
-            accept=".zip"
-          >
-            <el-button type="primary">选择授权包(.zip)</el-button>
-          </el-upload>
-          <div class="actions">
-            <el-button type="success" :disabled="!zipFile" @click="activatePackage" :loading="activating">激活授权文件</el-button>
-          </div>        
-        </div>
-      </el-tab-pane>
-    </el-tabs> -->
   </div>
 </template>
 
@@ -277,7 +231,7 @@ const activatePackage = async () => {
   left: 0;
   bottom: 0;
   margin: auto;
-  background: #465367;
+  background: #394860;
   border-radius: 10px;
   box-shadow: 0px 0px 16px rgba(17, 24, 33, 1);
   color: #fff;
@@ -369,9 +323,11 @@ const activatePackage = async () => {
   color: rgba(255, 255, 255, 0.6);
 }
 .tab-content .formreturnCancel:hover{
-  background: #425b89;
+  background-color: #14aaff;
-  color: #266fff;
+  color: #fff;
-  border: 1px solid #266fff;
+   /* background: #425b89;
+  color: #266fff; */
+  border: 1px solid #14aaff;
 }
 .tab-content .formsaveCancel{
   width: 80px;
@@ -385,8 +341,10 @@ const activatePackage = async () => {
 }
 .tab-content  .formsaveCancel:hover{
   
-  background: #5189ff;
+  /* background: #5189ff;
-  border: 1px solid #5189ff;
+  border: 1px solid #5189ff; */
+  background:#14aaff;
+  border:1px solid #14aaff;
  
 }
 .license-container .form-container-header{

frontend/src/renderer/src/views/PatientCreate.vue

@@ -4,7 +4,7 @@
     <div class="form-container">
       <div class="form-container-header">
          <div>{{ patienttitle }}  </div>
-         <img src="@/assets/detection/close.png" alt="" style="cursor: pointer;" @click="handleCancel">
+         <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
       </div>
       <el-form ref="patientFormRef" :model="patientForm" :rules="formRules" label-width="80px" class="patient-form">
         <div class="form-section">
@@ -409,7 +409,7 @@ const handleSave = async () => {
   left: 0;
   bottom: 0;
   margin: auto;
-  background: #465367;
+  background: linear-gradient(135deg, rgba(53, 67, 90, 1) 0%, rgba(53, 67, 90, 1) 0%, rgba(62, 79, 105, 1) 99%, rgba(62, 79, 105, 1) 100%);
   border-radius: 10px;
   box-shadow: 0px 0px 16px rgba(17, 24, 33, 1);
 }
@@ -651,8 +651,8 @@ const handleSave = async () => {
 .formreturnCancel{
   width: 80px;
   height: 40px;
-  background: rgba(89, 113, 148, 1);
+  background: #597194;
-  border: 1px solid rgba(89, 113, 148, 1);
+  border: 1px solid #597194;
   font-family: 'Noto Sans SC';
   font-weight: 400;
   font-style: normal;
@@ -660,9 +660,9 @@ const handleSave = async () => {
   color: rgba(255, 255, 255, 0.6);
 }
 .formreturnCancel:hover{
-  background: #425b89;
+  background-color: #14aaff;
-  color: #266fff;
+  color: #fff;
-  border: 1px solid #266fff;
+  border: 1px solid #14aaff;
 }
 .formsaveCancel{
   width: 80px;
@@ -676,8 +676,8 @@ const handleSave = async () => {
 }
 .formsaveCancel:hover{
   
-  background: #5189ff;
+  background: #14aaff;
-  border: 1px solid #5189ff;
+  border: 1px solid #14aaff;
  
 }
 .el-date-editor.el-input{

frontend/src/renderer/src/views/PatientProfile.vue

@@ -8,7 +8,7 @@
         <div class="username-line"></div>
         <div class="patientprofiletext3">{{ calculateAge(selectedPatient.birth_date) }}岁</div>
       </div>
-      <img src="@/assets/archive/close.png" alt="" style="cursor: pointer;" @click="handleCancel">
+      <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
     </div>
     <div class="patientprofile-container">
       <div style="height: 100%;width: 500px;margin-right: 15px;">
@@ -293,7 +293,7 @@
       <div class="pop-up-tip-container">
         <div class="pop-up-tip-header">
             <div>提示</div>
-            <img src="@/assets/detection/close.png" alt="" style="cursor: pointer;" @click="tipCancel">
+            <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="tipCancel">
         </div>
         <div class="pop-up-tip-text">{{ tipValue }}</div>
         <div class="tipconfirmbutton-box">

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

@@ -130,6 +130,7 @@
 
 <script setup>
 import { ref, onMounted, onUnmounted } from 'vue'
+import { ElMessage } from 'element-plus'
 import { getBackendUrl } from '@/services/api.js'
 // import html2canvas from 'html2canvas';
 // import jsPDF from 'jspdf';

frontend/src/renderer/src/views/ViewUser.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="ViewUserInfo-container">
-    <img src="@/assets/detection/close.png" alt="" 
+    <img src="@/assets/header/closepage.png" alt="" 
       class="ViewUserInfo-container-close" @click="handleCancel">
       <div class="ViewUserInfo-content-top">
         <div class="ViewUserInfo-useravatar-box">

frontend/src/renderer/src/views/viewPDF.vue

@@ -3,7 +3,7 @@
     <div class="viewPDF-header">
       <div style="display: flex; align-items: center;">
       </div>
-      <img src="@/assets/archive/close.png" alt="" style="cursor: pointer;" @click="handleCancel">
+      <img src="@/assets/header/closepage.png" alt="" style="cursor: pointer;" @click="handleCancel">
     </div>
     <div style="padding: 0 20px;height: calc(100vh - 80px);">
       <iframe :src="pdfUrl" width="100%" height="100%" frameborder="0"></iframe>