@@ -710,6 +784,7 @@
本次检测未截图或录像操作,不予存档记录!
本次检测未截图操作,存档记录不可生成报告!
@@ -2611,9 +2686,23 @@ const isPhotoAlbum = ref(false)
function closePhotoAlbum(){
isPhotoAlbum.value = false
}
-function closecreatbox(e){
- if(e === true){
- loadPatientInfo()
+function closecreatbox(e,info){
+ if(e === '编辑'){
+ patientInfo.value.age = info.age
+ patientInfo.value.birth_date = info.birth_date
+ patientInfo.value.email = info.email
+ patientInfo.value.gender = info.gender
+ patientInfo.value.height = info.height
+ patientInfo.value.id = info.id
+ patientInfo.value.idcode = info.idcode
+ patientInfo.value.name = info.name
+ patientInfo.value.nationality = info.nationality
+ patientInfo.value.occupation = info.occupation
+ patientInfo.value.phone = info.phone
+ patientInfo.value.residence = info.residence
+ patientInfo.value.shoe_size = info.shoe_size
+ patientInfo.value.weight = info.weight
+ // loadPatientInfo()
}
isCloseCreat.value = false
}
@@ -2655,7 +2744,7 @@ function viewClick(e){
.displaycontainer {
width: 100%;
- height: 62px;
+ height: 46px;
display: flex;
align-items: center;
justify-content: space-between;
@@ -2825,10 +2914,8 @@ function viewClick(e){
text-align: left;
}
.body-footbottom-box{
- display: flex;
- align-items: center;
- justify-content: center;
- height: calc(100% - 70px);
+ height: calc(100% - 50px);
+ padding-bottom: 15px;
}
.body-footbottom-left{
width: 28%;
@@ -2841,8 +2928,8 @@ function viewClick(e){
.body-footbottom-leftbox{
min-width: 215px;
width: 80%;
- min-height: 60px;
- height: 20%;
+ min-height: 57px;
+ height: 57px;
background: inherit;
background-color: rgba(255, 255, 255, 0.1);
border-radius: 4px;
@@ -2852,8 +2939,8 @@ function viewClick(e){
padding: 0px 20px;
}
.body-footbottom-center{
- width: 40%;
- height: calc(100%);
+ width: 37%;
+ height: calc(100% - 0px);
}
.body-footbottom-topbox{
display: flex;
@@ -2888,7 +2975,7 @@ function viewClick(e){
display: flex;
justify-content: center;
flex-wrap: wrap;
- align-content:space-between ;
+ align-content:space-around;
}
.body-userinfo-box{
@@ -2896,18 +2983,18 @@ function viewClick(e){
z-index: 10;
width: 100%;
height: 346px;
- /* background: linear-gradient(135deg, rgba(42, 54, 73, 1) 0%, rgba(42, 54, 73, 1) 0%, rgba(34, 43, 56, 1) 100%, rgba(34, 43, 56, 1) 100%); */
background: linear-gradient(135deg, #1a1e2a 0%, #222b38 100%);
border: 1px solid #242E3D;
border-radius: 4px;
}
.body-userinfo-expandbox{
- height: 638px ;
+ height: 680px !important;
}
.body-userinfo-box1{
+ position: relative;
+ z-index: 10;
width: 100%;
- height: 534px ;
- /* background: linear-gradient(135deg, rgba(42, 54, 73, 1) 0%, rgba(42, 54, 73, 1) 0%, rgba(34, 43, 56, 1) 100%, rgba(34, 43, 56, 1) 100%); */
+ height: 524px ;
background: linear-gradient(135deg, #1a1e2a 0%, #222b38 100%);
border: 1px solid #242E3D;
border-radius: 4px;
@@ -2933,7 +3020,7 @@ function viewClick(e){
}
.body-video-box1{
width: 100%;
- height: calc(100% - 534px - 14px) ;
+ height: calc(100% - 534px - 4px) ;
background: linear-gradient(135deg, #1a1e2a 0%, #222b38 100%);
border: 1px solid #242E3D;
border-radius: 4px;
@@ -3070,10 +3157,10 @@ function viewClick(e){
}
.userinfo-disyplaypadding1{
width: calc(64%);
- padding-bottom: 15px;
+ padding-bottom: 20px;
}
.padding10{
- padding-bottom: 5px;
+ padding-bottom: 10px;
}
.userinfo-disyplaypadding2{
width: calc(36%);
@@ -3308,6 +3395,25 @@ function viewClick(e){
background:#14aaff;
border:1px solid #14aaff;
}
+.tipclosebutton{
+ 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;
+}
+.tipclosebutton:hover{
+ background-color: #14aaff;
+ color: #fff;
+}
.pop-up-tip-text{
width:100%;
font-weight: 400;
diff --git a/frontend/src/renderer/src/views/DiagnosticMessage.vue b/frontend/src/renderer/src/views/DiagnosticMessage.vue
index 6a533f01..2642ea67 100644
--- a/frontend/src/renderer/src/views/DiagnosticMessage.vue
+++ b/frontend/src/renderer/src/views/DiagnosticMessage.vue
@@ -33,7 +33,7 @@
-
diff --git a/frontend/src/renderer/src/views/GenerateReport.vue b/frontend/src/renderer/src/views/GenerateReport.vue
index 1b1a515e..20e50baf 100644
--- a/frontend/src/renderer/src/views/GenerateReport.vue
+++ b/frontend/src/renderer/src/views/GenerateReport.vue
@@ -213,7 +213,7 @@
{{ detectionInfo.diagnosis_info }}
处理
{{ detectionInfo.treatment_info }}
- 备注
+ 建议
{{ detectionInfo.suggestion_info }}
@@ -599,12 +599,12 @@ function closePopUpOnlyReport(e) {
.generateReport-border1{
padding: 5px;
width: 100%;
- min-height: 200px;
+ /* min-height: 200px; */
background: rgba(255, 255, 255, 1);
box-sizing: border-box;
border-width: 1px;
border-style: solid;
- border-color: rgba(220, 223, 230, 1);
+ border-color: rgba(220, 223, 230, 0);
border-radius: 4px;
font-weight: 400;
font-style: normal;
@@ -614,12 +614,12 @@ function closePopUpOnlyReport(e) {
}
.generateReport-border2{
width: 100%;
- min-height: 40px;
+ /* min-height: 40px; */
background: rgba(255, 255, 255, 1);
box-sizing: border-box;
border-width: 1px;
border-style: solid;
- border-color: rgba(220, 223, 230, 1);
+ border-color: rgba(220, 223, 230, 0);
border-radius: 4px;
font-style: normal;
font-size: 18px;
@@ -629,12 +629,12 @@ function closePopUpOnlyReport(e) {
}
.generateReport-border3{
width: 100%;
- min-height: 120px;
+ /* min-height: 120px; */
background: rgba(255, 255, 255, 1);
box-sizing: border-box;
border-width: 1px;
border-style: solid;
- border-color: rgba(220, 223, 230, 1);
+ border-color: rgba(220, 223, 230, 0);
border-radius: 4px;
font-style: normal;
font-size: 18px;
diff --git a/frontend/src/renderer/src/views/Login.vue b/frontend/src/renderer/src/views/Login.vue
index a2efde54..a27ca536 100644
--- a/frontend/src/renderer/src/views/Login.vue
+++ b/frontend/src/renderer/src/views/Login.vue
@@ -1,7 +1,10 @@
-
+
+
+
@@ -195,7 +198,6 @@
-
@@ -672,7 +674,7 @@ const copyPassword = async () => {
.login-content {
position: relative;
z-index: 10;
- width: 100%;
+ /* width: 100%; */
height: 100%;
display: flex;
/* flex-direction: column; */
diff --git a/frontend/src/renderer/src/views/PatientProfile.vue b/frontend/src/renderer/src/views/PatientProfile.vue
index 06f8a421..934cbc58 100644
--- a/frontend/src/renderer/src/views/PatientProfile.vue
+++ b/frontend/src/renderer/src/views/PatientProfile.vue
@@ -18,7 +18,10 @@
患者信息
-
+
+

+
性别
@@ -245,7 +248,13 @@
@@ -415,6 +420,51 @@
+
+
+
+
+
+
+
+

+

+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/renderer/src/views/PopUpOnlyReport.vue b/frontend/src/renderer/src/views/PopUpOnlyReport.vue
index 31c1eafe..e6352f92 100644
--- a/frontend/src/renderer/src/views/PopUpOnlyReport.vue
+++ b/frontend/src/renderer/src/views/PopUpOnlyReport.vue
@@ -140,7 +140,7 @@
-
+