From d5b0dcf56db5caece6284c4ad3fb9614b773cafc Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Thu, 16 Mar 2023 16:55:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=87=E9=A2=98=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E5=BA=94=E7=94=A8=E5=90=8D=E7=A7=B0=EF=BC=9B=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=97=B6=E9=97=B4=E6=9B=BF=E6=8D=A2-=E4=B8=BA?=
 =?UTF-8?q?=E6=96=9C=E6=9D=A0=EF=BC=9B=E5=A2=9E=E5=8A=A0=E5=B7=B2=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/index.html         |  2 +-
 src/router/index.js       |  6 +--
 src/utils/aisdapp.js      |  2 +-
 src/views/examination.vue | 10 ++---
 src/views/myExam.vue      | 77 ++++++++++++---------------------------
 5 files changed, 34 insertions(+), 63 deletions(-)

diff --git a/public/index.html b/public/index.html
index 40b7041..dd58b42 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
   <meta name="viewport" content="width=device-width,initial-scale=1.0">
   <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-  <title>体检预约</title>
+  <title>车管所体检预约</title>
   <style>
     * {
       padding: 0;
diff --git a/src/router/index.js b/src/router/index.js
index 14bcb36..c8098ab 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -64,9 +64,9 @@ const router = new VueRouter({
   routes,
 });
 router.beforeEach((to, from, next) => {
-  to.meta.title
-    ? (document.title = to.meta.title)
-    : (document.title = "体检预约");
+  // to.meta.title
+  //   ? (document.title = to.meta.title)
+  //   : (document.title = "体检预约");
   next();
 });
 export default router;
diff --git a/src/utils/aisdapp.js b/src/utils/aisdapp.js
index 56f2c2e..4b49442 100644
--- a/src/utils/aisdapp.js
+++ b/src/utils/aisdapp.js
@@ -5,7 +5,7 @@ export const appword = "aKd20dbGdFvmuwrt"
 
 const appid = 'cgstjyyxuwxt';
 
-const appMode = false;//是否开启爱山东中控台接口调用方式
+const appMode = true;//是否开启爱山东中控台接口调用方式
 
 export default {
     appid,
diff --git a/src/views/examination.vue b/src/views/examination.vue
index 77dcdcf..b61080f 100644
--- a/src/views/examination.vue
+++ b/src/views/examination.vue
@@ -106,7 +106,7 @@ export default {
             cupCardNo: '',
             dayArr: [],
             yesterDay: '',
-            systemTime: dateFormat(new Date(), 'yyyy-MM-dd'),
+            systemTime: dateFormat(new Date(), 'yyyy/MM/dd'),
             currentIndex:'0',
             currentMonth:''
         }
@@ -136,15 +136,15 @@ export default {
         })
         this.startTime = year + '-' + month + '-' + this.today;
         this.endTime = this.getLastDay(year,month1);
-        this.getDays()
         this.querySystemTime();
+        this.getDays()
 
     },
     methods: {
         //上午下午日期转换
         calcTime(apmDay, item) {
             let lattime = apmDay.replace(/-/g,'/') + ' ' + (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);
+            console.log('lattime22', lattime , this.systemTime);
             return lattime;
         },
         querySystemTime() {
@@ -153,11 +153,11 @@ export default {
                     .then((value) => {
                         let retData = JSON.parse(value);
                         // console.log('retData ===>',retData)
-                        this.systemTime = retData.data
+                        this.systemTime = retData.data.replace(/-/g,'/');
                     })
             } else {
                 getSystemTime().then(res => {
-                    this.systemTime = res.data;
+                    this.systemTime = res.data.replace(/-/g,'/');
                 })
             }
 
diff --git a/src/views/myExam.vue b/src/views/myExam.vue
index 7e12a19..f3260ff 100644
--- a/src/views/myExam.vue
+++ b/src/views/myExam.vue
@@ -28,18 +28,20 @@
               <div class="pro_name">{{ item1.project }} </div>
               <div class="pro_pos"
                 :class="[item1.apmStatus == 2 &&
-                item1.lastExamTime === 0 ? 'timeout_tip' : item1.apmStatus === 2 ? 'tips' : '', item1.apmStatus == 1 ? 'cancel_tip' : '',]">
+                  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 == -1) ? '请尽快报到' : (item1.apmStatus == 2 &&
+                      item1.lastExamTime === 0) ? '您的体检已过期' : item1.limitTime
                 }}</div>
             </div>
             <div class="pro_right">
               <div class="cancel" @click="cancelRegisiter(item1)"
                 :class="[item1.apmStatus == 3 ? 'finish' : item1.apmStatus == 1 || item1.limitCancelTime < 30 * 60 * 1000 ? 'cancel_item' : '',]">
                 {{
-  item1.apmStatus == 1 ? '已取消' : item1.apmStatus == 2 &&
-    item1.lastExamTime === 0 ? '已过期' : item1.apmStatus == 2 ? '取消预约' : item1.apmStatus == 3 ? '已完成' : '取消预约'
+                  item1.apmStatus == 1 ? '已取消' : (item1.apmStatus == 2 &&
+                    item1.lastExamTime == -1) ? '已超时' : item1.apmStatus == 2 &&
+                      item1.lastExamTime === 0 ? '已过期' : item1.apmStatus == 2 ? '取消预约' : item1.apmStatus == 3 ? '已完成' : '取消预约'
                 }}</div>
             </div>
           </div>
@@ -61,7 +63,7 @@ export default {
       examArr: [],
       userInfo: null,
       loading: true,
-      systemTime: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss'),
+      systemTime: dateFormat(new Date(), 'yyyy/MM/dd hh:mm:ss'),
       setInterval: 0,
       interVal: null,
       starTime: '',
@@ -101,14 +103,14 @@ export default {
           console.log(typeof (value), 'systemtime', value);
           let retData = typeof (value) == 'string' ? JSON.parse(value) : value;
           if (retData.code == 200) {
-            this.systemTime = retData.data;
+            this.systemTime = retData.data.replace(/-/g,'/');
           }
         }, err => {
         })
       }
       else {
         getSystemTime().then(res => {
-          this.systemTime = res.data;
+          this.systemTime = res.data.replace(/-/g,'/');
         })
       }
     },
@@ -135,17 +137,18 @@ export default {
                   item.starTime = systemTime
                   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 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';
+                  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, '/')))
+                  item.lastCanTime = Date.parse(new Date(lasCanTime.replace(/-/g, '/')));
                   item.lastTime = Date.parse(new Date(latime.replace(/-/g, '/')))
-                  item.limitTime = this.intervalTime(item.starTime, item.lastTime)
-                  item.lastExamTime = systemTime < item.lastTime ? item.lastTime - systemTime : 0
-                  item.limitCancelTime = systemTime < item.lastCanTime ? item.lastCanTime - systemTime : 0;//距离取消预约剩余毫秒数
+                  item.limitTime = this.intervalTime(item.starTime, item.lastTime);//距离体检体检结束时间还剩多少时间
+                  //距离预约结束时间剩余毫秒数 大于结束时间并且是当天设为-1作为超时判断 大于当天设为0作为过期判断
+                  item.lastExamTime = systemTime < item.lastTime ? item.lastTime - systemTime : this.isToday(systemTime,item.lastTime) ? -1 : 0;
+                  item.limitCancelTime = systemTime < item.lastCanTime ? item.lastCanTime - systemTime : 0;//距离预约开始时间剩余毫秒数
                   // console.log(latime,item.lastTime,lasCanTime,item.lastCanTime,item.limitCancelTime) //670422000
                   // this.$set(
                   //   item,"limitTime",item.limitTime
@@ -199,7 +202,7 @@ export default {
                 item.lastCanTime = Date.parse(new Date(lasCanTime.replace(/-/g, '/')))
                 item.lastTime = Date.parse(new Date(latime.replace(/-/g, '/')))
                 item.limitTime = this.intervalTime(item.starTime, item.lastTime)
-                item.lastExamTime = systemTime < item.lastTime ? item.lastTime - systemTime : 0
+                item.lastExamTime = systemTime < item.lastTime ? item.lastTime - systemTime : this.isToday(systemTime,item.lastTime) ? -1 : 0
                 item.limitCancelTime = systemTime < item.lastCanTime ? item.lastCanTime - systemTime : 0;//距离取消预约剩余毫秒数
                 // console.log(latime,item.lastTime,lasCanTime,item.lastCanTime,item.limitCancelTime) //670422000
                 // this.$set(
@@ -216,42 +219,6 @@ export default {
               this.current++
             }
             this.loading = false
-            // this.examArr.map(item => {
-            //   let systemTime = Date.parse(new Date(this.systemTime));
-            //   this.starTime = systemTime
-            //   let latime = item.apmDay.substr(0,10) + ' ' + item.timeFrame.split('-')[1] + ':00';
-            //   let lasCanTime =item.apmDay.substr(0,10) + ' ' + item.timeFrame.split('-')[0] + ':00';
-            //   this.lastCanTime = Date.parse(new Date(lasCanTime))
-            //   this.lastTime = Date.parse(new Date(latime))
-            //   let time = item.timeFrame.split('-')[1].split(':');
-            //   let endTime = Date.parse(new Date(this.doDateFormatter(item.apmDay) + ' ' + (time[0] < 10 ? '0' + time[0] : time[0]) + ':' + (time[1] < 10 ? '0' + time[1] : time[1]) + ':00'));
-            //   let time2 = item.timeFrame.split('-')[0].split(':');
-            //   let startTime = Date.parse(new Date(this.doDateFormatter(item.apmDay) + ' ' + (time2[0] < 10 ? '0' + time2[0] : time2[0]) + ':' + (time2[1] < 10 ? '0' + time2[1] : time2[1]) + ':00'));
-            //   item.time = systemTime < endTime ? endTime - systemTime : 0;
-            //   // item.limitTime = this.calcDateTimeStr(systemTime < endTime ? endTime - systemTime : 0);//距离体检时间剩余毫秒数
-            //   item.limitTime = this.intervalTime(this.starTime,this.lastTime)
-            //   // console.log('time ===>',item.limitTime)
-            //   item.limitCancelTime = systemTime < this.lastCanTime ? this.lastCanTime - systemTime : 0;//距离取消预约剩余毫秒数
-            //   console.log(item.limitCancelTime)
-            // })
-            // //开启倒计时
-            // if (this.setInterval) {
-            //   clearInterval(this.setInterval);
-            // }
-            // this.setInterval = setInterval(() => {
-            //   // console.log(this.examArr)
-            //   this.timeArr = this.examArr;
-            //   this.timeArr.map(item => {
-            //     this.starTime = this.starTime > 1000 ? this.starTime + 1000 : 0;
-            //     item.limitTime = this.intervalTime(this.starTime,this.lastTime)
-            //     // item.limitCancelTime = item.limitCancelTime > 1000 ? item.limitCancelTime - 1000 : 0;
-            //     // item.limitCancelTime = this.intervalTime(this.starTime,Date.parse(new Date(this.lastCanTime)))
-
-            //   })
-            //   // console.log(this.timeArr)
-
-            // }, 1000);
-            // this.examArr = arr
           }, err => {
             this.$toast.clear();
           })
@@ -271,7 +238,7 @@ export default {
           item.details.map(item1 => {
             item1.starTime = item1.starTime > 1000 ? item1.starTime + 1000 : 0;
             item1.limitTime = this.intervalTime(item1.starTime, item1.lastTime);
-            item1.lastExamTime = item1.lastExamTime > 1000 ? item1.lastExamTime - 1000 : 0;
+            item1.lastExamTime = item1.lastExamTime > 1000 ? item1.lastExamTime - 1000 : this.isToday(this.systemTime,item1.lastTime) ? -1 : 0;
             item1.limitCancelTime = item1.limitCancelTime > 1000 ? item1.limitCancelTime - 1000 : 0
             this.$set(item.details, item1.limitTime, item1.limitTime)
             // this.$set(item.details,item1.limitCancelTime,item1.limitCancelTime)
@@ -322,11 +289,15 @@ export default {
       //   seconds
       // } 
     },
-
+    //判断是否是当天
+    isToday(systemTime,lastTime) {
+      console.log(dateFormat(new Date(systemTime), 'yyyy-MM-dd'), dateFormat(new Date(lastTime), 'yyyy-MM-dd'),dateFormat(new Date(systemTime), 'yyyy-MM-dd') == dateFormat(new Date(lastTime), 'yyyy-MM-dd'))
+      return dateFormat(new Date(systemTime), 'yyyy-MM-dd') == dateFormat(new Date(lastTime), 'yyyy-MM-dd')
+    },
 
     //日期格式化
     doDateFormatter(date) {
-      return dateFormat(new Date(date.replace(/-/g,'/')), 'yyyy-MM-dd');
+      return dateFormat(new Date(date.replace(/-/g, '/')), 'yyyy-MM-dd');
     },
     //计算距离体检还剩多长时间
     calcDateTime(item) {