From d996f81a1303dec8d8f397266c5044beea0ae4af Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Fri, 17 Feb 2023 10:48:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A2=84=E7=BA=A6=E9=A1=B9?=
 =?UTF-8?q?=E7=9B=AE=E5=92=8C=E6=88=91=E7=9A=84=E9=A2=84=E7=BA=A6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examination.vue | 31 ++++++++++++++++++++-----------
 src/views/myExam.vue      |  4 +++-
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/views/examination.vue b/src/views/examination.vue
index b2ccfa0..4ef8b91 100644
--- a/src/views/examination.vue
+++ b/src/views/examination.vue
@@ -6,10 +6,10 @@
                 <div class="week_num" v-for="item in weekData" :key="item">{{item}}</div>
             </div>
             <div class="week_text">
-                <div class="week_txt" v-for="item in weekArr" :key="item" @click="changeDate(item)" :class="[(item < today ? 'week_none' : ''),item == selectDate.slice(-2) ? 'today_week' : '',numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)) ? numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)).isNum == 0 ? 'isnum' : 'none' : '']">
+                <div class="week_txt" v-for="item in weekArr" :key="item" @click="changeDate(item)" :class="[(item < today ? 'week_none' : ''),item == selectDate.slice(-2) ? 'today_week' : '',numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)) ? numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)).isNum == 1 ? 'isnum' : 'none' : '']">
                     <div class="top_info"></div>
                     {{item}}
-                    <div class="bottom_info" v-text="numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)) ? numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)).isNum == 0 ? '有号' :'无号' : ''"></div>
+                    <div class="bottom_info" v-text="numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)) ? numData.find(item1 => item1.date.slice(-2) == (item < 0 ? '0' + item : item)).isNum == 1 ? '有号' :'无号' : ''"></div>
                     
                 </div>
             </div>
@@ -66,7 +66,7 @@
                     <div class="name_txt">{{item.project}}</div>
                     <div class="posi_txt">
                         <img style="width:0.24rem;height:0.24rem" src="~@/assets/image/posi.png" alt="">
-                        <div style="color: #999;font-size: 0.24rem;">{{item.cuAddr}} {{systemTime}}</div>
+                        <div style="color: #999;font-size: 0.24rem;">{{item.cuAddr}}</div>
                     </div>
                 </div>
                 <div class="top_right"><div style="font-size:0.3rem;color:#333">{{item.totalApmNum}}</div><div style="font-size:0.22rem;color:rgba(51, 51, 51,0.5)">/{{item.totalNum}}</div>
@@ -187,11 +187,12 @@ export default {
                     this.numData = this.dayArr
                 }else{
                     this.dayArr = res.data;
+                    console.log(this.dayArr)
                     for(let key in this.dayArr){
                         this.dayArr[key].map(item =>{
                             this.numData.push({
-                                date:item,
-                                isNum:0
+                                date:item.date,
+                                isNum:item.enableApm
                             })
                         })
                     }
@@ -299,6 +300,15 @@ export default {
                         //     ]
                         // }
                     ];
+                     lightAppJssdk.notification.alert({
+                        message: "当前时间无体检项目",
+                        title: "提示",//可传空
+                        buttonName: "收到",
+                        success: function (data) {
+                        },
+                        fail: function (data) { //错误返回
+                        }
+                     })
                 }else{
                     this.examData = res.data;
                     
@@ -328,8 +338,8 @@ export default {
                 this.numData.forEach(item =>{
                     if(month == item.date.substr(5,2)){
                         if(day.date.getDate() == item.date.slice(-2)){
-                            item.isNum == 0 ? day.bottomInfo  = '有号' : day.bottomInfo  = '无号'
-                            item.isNum == 0 ? day.className  = 'num1' : day.className  = 'num2'
+                            item.isNum == 1 ? day.bottomInfo  = '有号' : day.bottomInfo  = '无号'
+                            item.isNum == 1 ? day.className  = 'num1' : day.className  = 'num2'
                         }
                     }
                     
@@ -347,9 +357,8 @@ export default {
                 this.numData.forEach(item =>{
                     if(month == item.date.substr(5,2)){
                         if(day.date.getDate() == item.date.slice(-2)){
-                            item.isNum == 0 ? day.bottomInfo  = '有号' : day.bottomInfo  = '无号'
-                            item.isNum == 0 ? day.className  = 'num1' : day.className  = 'num2'
-                            
+                            item.isNum == 1 ? day.bottomInfo  = '有号' : day.bottomInfo  = '无号'
+                            item.isNum == 1 ? day.className  = 'num1' : day.className  = 'num2'
                         }
                     }
                     
@@ -669,7 +678,7 @@ export default {
         .van-calendar__selected-day{
             width: 100%;
             height: 100%;
-            background: rgba(51, 51, 51, .3) !important;
+            background: rgba(22, 119, 255, .5) !important;
             border-radius: 50%;
         }
     }
diff --git a/src/views/myExam.vue b/src/views/myExam.vue
index d1a5e71..aaffd52 100644
--- a/src/views/myExam.vue
+++ b/src/views/myExam.vue
@@ -6,7 +6,7 @@
       <div class="no_txt">暂无您的预约项目，请选择医院后进行预约</div>
     </div>
     <div class="exam_box" v-for="item in examArr" :key="item.id">
-      <div class="time_box">{{ doDateFormatter(item.apmDay) }}</div>
+      <div class="time_box">{{ item.createDeptName }}</div>
       <div class="pro_box" v-for="item1 in item.details" :key="item1.project">
         <div class="pro_top">
           <div class="img_box">
@@ -203,11 +203,13 @@ export default {
       //计算相差分钟数
       var leave2 = leave1 % (3600 * 1000); //计算小时数后剩余的毫秒数
       var minutes = Math.floor(leave2 / (60 * 1000));
+      minutes = minutes < 10 ? '0' + minutes : minutes
 
       //计算相差秒数
 
       var leave3 = leave2 % (60 * 1000); //计算分钟数后剩余的毫秒数
       var seconds = Math.round(leave3 / 1000);
+      seconds = seconds < 10 ? '0' + seconds : seconds;
       // console.log(days + "天 " + hours + "小时 ")
       return  `距离体检还有${days}${hours}:${minutes}:${seconds}`
       // return {