From d8f81d39d443470a8ee0d879d514539e3f406ef1 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Fri, 24 Feb 2023 11:47:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E6=97=B6=E9=97=B4=E4=B8=8B?=
 =?UTF-8?q?=E5=8D=88=E6=97=B6=E9=97=B4=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/examination.vue | 55 ++++++++++-----------------------------
 src/views/myExam.vue      | 25 +++++++++++++-----
 2 files changed, 33 insertions(+), 47 deletions(-)

diff --git a/src/views/examination.vue b/src/views/examination.vue
index c6e342b..8fb8ce9 100644
--- a/src/views/examination.vue
+++ b/src/views/examination.vue
@@ -61,7 +61,7 @@
                 <div class="exam_bottom">
                     <div class="exam_txt" v-for="item1 in item.detailList" :key="item1.time"
                         @click="clickExam(item, item1)"
-                        :class="[(item1.residueNum == 0 ? 'isAct' : ''), (item1.isSelect ? 'active' : ''), Date.parse(new Date(item.apmDay.substring(0, 10) + ' ' + item1.timeFrame.split('-')[1] + ':00')) < Date.parse(new Date(systemTime)) ? 'isAct' : '']">
+                        :class="[(item1.residueNum == 0 ? 'isAct' : ''), (item1.isSelect ? 'active' : ''), Date.parse(new Date(calcTime(item.apmDay.substring(0, 10),item1))) < Date.parse(new Date(systemTime)) ? 'isAct' : '']">
                         <div class="txt" style="font-size:0.22rem;color:#666;"><span
                                 style="font-size:0.24rem;color:#666">{{ item1.period }}</span> {{ item1.timeFrame }}
                         </div>
@@ -80,6 +80,7 @@
 <script>
 import { queryDays, queryList } from "@/api/examination";
 import { getSystemTime, } from "@/api/hospital";
+import { dateFormat } from "@/utils/date";
 export default {
     data() {
         return {
@@ -94,26 +95,7 @@ export default {
             minDate1: new Date(new Date().getFullYear(), new Date().getMonth() + 1, 1),
             maxDate1: new Date(new Date().getFullYear(), new Date().getMonth() + 1, new Date(new Date().getFullYear(), new Date().getMonth() + 2, 0).getDate()),
             numData: [],
-            examData: [
-                // {name:'单眼视力',position:'门诊楼3楼眼科门诊',total:20,residue:15,examArr:[
-                //     {moment:'上午',time:'8:00-8:30',num:2},
-                //     {moment:'上午',time:'8:30-9:00',num:0},
-                //     {moment:'上午',time:'9:00-9:30',num:1},
-                //     {moment:'上午',time:'9:30-10:00',num:1},
-                // ]},
-                // {name:'肢体',position:'门诊楼3楼',total:20,residue:15,examArr:[
-                //     {moment:'上午',time:'8:00-8:30',num:2},
-                //     {moment:'上午',time:'8:30-9:00',num:0},
-                //     {moment:'上午',time:'9:00-9:30',num:1},
-                //     {moment:'上午',time:'9:30-10:00',num:1},
-                // ]},
-                // {name:'听力',position:'门诊楼3楼听力门诊',total:20,residue:15,examArr:[
-                //     {moment:'上午',time:'8:00-8:30',num:2},
-                //     {moment:'上午',time:'8:30-9:00',num:0},
-                //     {moment:'上午',time:'9:00-9:30',num:1},
-                //     {moment:'上午',time:'9:30-10:00',num:1},
-                // ]}
-            ],
+            examData: [],
             selectArr: [],
             selectDate: '',
             today: '',
@@ -123,7 +105,8 @@ export default {
             endTime: '',
             cupCardNo: '',
             dayArr: [],
-            yesterDay: ''
+            yesterDay: '',
+            systemTime: dateFormat(new Date(), 'yyyy-MM-dd')
         }
     },
     created() {
@@ -159,6 +142,12 @@ export default {
 
     },
     methods: {
+        //上午下午日期转换
+        calcTime(apmDay, item) {
+            let lattime = apmDay.replace(/-/gi,'/') + ' ' + (item.period == '下午' ? 12 + parseInt(item.timeFrame.split('-')[1].split(':')[0]) : item.timeFrame.split('-')[1].split(':')[0]) + ':' + item.timeFrame.split('-')[1].split(':')[1] + ':00';
+            console.log('lattime22', lattime , this.systemTime);
+            return lattime;
+        },
         querySystemTime() {
             if (this.GlobalConfig.appMode) {
                 vaildInterfacefn("cgstjyyxuwxt", "qdsgajjtjczhqxtsj", JSON.stringify({}), "2", "https://" + this.GlobalConfig.urlCreatesign, "https://" + this.GlobalConfig.urlGateway)
@@ -247,21 +236,7 @@ export default {
                         this.$toast.clear();
                         let retData = JSON.parse(value)
                         console.log(retData.data)
-                        if (retData.data.length == 0) {
-                            this.examData = retData.data
-                            // lightAppJssdk.notification.alert({
-                            //     message: "当前时间无体检项目",
-                            //     title: "提示",//可传空
-                            //     buttonName: "收到",
-                            //     success:  (data) => {
-
-                            //     //    console.log(this.examData)
-                            //     },
-                            //     fail: data => { //错误返回
-                            //     //  this.$toast.clear();
-                            //     }
-                            // })
-                        } else {
+                        if(retData.code == 200) {
                             this.examData = retData.data;
                             this.examData.map(item => {
                                 item.detailList.map(item1 => {
@@ -270,7 +245,6 @@ export default {
                             })
 
                         }
-                        console.log('data ===>', this.examData)
                     }, err => {
                         this.$toast.clear();
                     })
@@ -283,9 +257,7 @@ export default {
                     }
                 ).then(res => {
                     this.$toast.clear();
-                    if (res.data.length == 0) {
-                        this.examData = res.data;
-                    } else {
+                    if (res.code == 200) {
                         this.examData = res.data;
                         this.examData.map(item => {
                             item.detailList.map(item1 => {
@@ -349,6 +321,7 @@ export default {
         changeDate(item) {
             // let year = new Date().getFullYear()
             // let month = new Date().getMonth() < 10 ? '0' + parseInt(new Date().getMonth() + 1) : new Date().getMonth() + 1
+            this.examData = [];
             this.selectDate = item;
             console.log(this.selectDate)
             this.getList()
diff --git a/src/views/myExam.vue b/src/views/myExam.vue
index 43b1151..22462f9 100644
--- a/src/views/myExam.vue
+++ b/src/views/myExam.vue
@@ -27,10 +27,11 @@
               </div>
               <div class="pro_name">{{ item1.project }} </div>
               <div class="pro_pos"
-                :class="[item1.apmStatus === 2 ? 'tips' : item1.apmStatus == 1 ? 'cancel_tip' : '',]">
+                :class="[item1.apmStatus == 2 &&
+                item1.lastExamTime === 0 ? 'timeout_tip' : item1.apmStatus === 2 ? 'tips' : '', item1.apmStatus == 1 ? 'cancel_tip' : '',]">
                 {{
                   item1.apmStatus == 1 ? '您的体检项目已取消' : item1.apmStatus == 3 ? '体检项目已完成' : (item1.apmStatus == 2 &&
-                    item1.lastExamTime == 0) ? '您的体检已过期' : item1.limitTime
+                    item1.lastExamTime === 0) ? '您的体检已过期' : item1.limitTime
                 }}</div>
             </div>
             <div class="pro_right">
@@ -131,8 +132,12 @@ export default {
                   console.log(item)
                   let systemTime = Date.parse(new Date(this.systemTime));
                   item.starTime = systemTime
-                  let latime = item1.apmDay.substr(0, 10) + ' ' + item.timeFrame.split('-')[1] + ':00';
-                  let lasCanTime = item1.apmDay.substr(0, 10) + ' ' + item.timeFrame.split('-')[0] + ':00';
+                  let _lattime = (item.period == '下午' ? 12 + parseInt(item.timeFrame.split('-')[1].split(':')[0]) : item.timeFrame.split('-')[1].split(':')[0]) + ':' + item.timeFrame.split('-')[1].split(':')[1];
+                  console.log('lattime', _lattime);
+                  let latime = item1.apmDay.substr(0, 10) + ' ' + _lattime + ':00';
+                  let _lasCanTime = (item.period == '下午' ? 12 + parseInt(item.timeFrame.split('-')[0].split(':')[0]) : item.timeFrame.split('-')[0].split(':')[0]) + ':' + item.timeFrame.split('-')[0].split(':')[1];
+                  console.log('lasCanTime', _lasCanTime);
+                  let lasCanTime = item1.apmDay.substr(0, 10) + ' ' + _lasCanTime + ':00';
                   // item.lastCanTime = Date.parse(new Date(lasCanTime.replaceAll('-', '/')))
                   // item.lastTime = Date.parse(new Date(latime.replaceAll('-', '/')))
                   item.lastCanTime = Date.parse(new Date(lasCanTime.replace(/-/g, '/')))
@@ -182,8 +187,12 @@ export default {
               item1.details.map(item => {
                 let systemTime = Date.parse(new Date(this.systemTime));
                 item.starTime = systemTime
-                let latime = item1.apmDay.substr(0, 10) + ' ' + item.timeFrame.split('-')[1] + ':00';
-                let lasCanTime = item1.apmDay.substr(0, 10) + ' ' + item.timeFrame.split('-')[0] + ':00';
+                let _lattime = (item.period == '下午' ? 12 + parseInt(item.timeFrame.split('-')[1].split(':')[0]) : item.timeFrame.split('-')[1].split(':')[0]) + ':' + item.timeFrame.split('-')[1].split(':')[1];
+                console.log('lattime', _lattime);
+                let latime = item1.apmDay.substr(0, 10) + ' ' + _lattime + ':00';
+                let _lasCanTime = (item.period == '下午' ? 12 + parseInt(item.timeFrame.split('-')[0].split(':')[0]) : item.timeFrame.split('-')[0].split(':')[0]) + ':' + item.timeFrame.split('-')[0].split(':')[1];
+                console.log('lasCanTime', _lasCanTime);
+                let lasCanTime = item1.apmDay.substr(0, 10) + ' ' + _lasCanTime + ':00';
                 // item.lastCanTime = Date.parse(new Date(lasCanTime.replaceAll('-', '/')))
                 // item.lastTime = Date.parse(new Date(latime.replaceAll('-', '/')))
                 item.lastCanTime = Date.parse(new Date(lasCanTime.replace(/-/g, '/')))
@@ -554,6 +563,10 @@ export default {
           .cancel_tip {
             color: #F93A4A;
           }
+
+          .timeout_tip {
+            color: #999;
+          }
         }
 
         .pro_right {