From 4c07c0e0bf8141041f283696c41ff90ea88dd001 Mon Sep 17 00:00:00 2001 From: xuechunyuan <17853500702@163.com> Date: Tue, 14 Feb 2023 18:00:54 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=80=92=E8=AE=A1=E6=97=B6?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/hospital.js | 7 ++++ src/utils/date.js | 22 ++++++++++ src/views/myExam.vue | 96 +++++++++++++++++++++++++++++++++++--------- 3 files changed, 106 insertions(+), 19 deletions(-) diff --git a/src/api/hospital.js b/src/api/hospital.js index d65ff25..6838513 100644 --- a/src/api/hospital.js +++ b/src/api/hospital.js @@ -49,4 +49,11 @@ export const recordCancel = (id) => { id, } }) +}; +//系统时间 +export const getSystemTime = () => { + return request({ + url: '/api//blade-business/common-api/get-system-datetime', + method: 'get' + }) }; \ No newline at end of file diff --git a/src/utils/date.js b/src/utils/date.js index 4c1f250..ed8e326 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -22,6 +22,28 @@ export const calcDate = (date1, date2) => { } } +export const calcTime = (date3) => { + let days = Math.floor(date3 / (24 * 3600 * 1000)) + + let leave1 = date3 % (24 * 3600 * 1000) //计算天数后剩余的毫秒数 + let hours = Math.floor(leave1 / (3600 * 1000)) + + let leave2 = leave1 % (3600 * 1000) //计算小时数后剩余的毫秒数 + let minutes = Math.floor(leave2 / (60 * 1000)) + + let leave3 = leave2 % (60 * 1000) //计算分钟数后剩余的毫秒数 + let seconds = Math.round(date3 / 1000) + return { + leave1, + leave2, + leave3, + days: days, + hours: hours, + minutes: minutes, + seconds: seconds, + } +} + /** * 日期格式化 */ diff --git a/src/views/myExam.vue b/src/views/myExam.vue index 76493d6..e9ffa0a 100644 --- a/src/views/myExam.vue +++ b/src/views/myExam.vue @@ -14,7 +14,7 @@
-
{{ doDateFormatter(item.apmTime) }}
+
{{ doDateFormatter(item.apmDay) }}
{{ item.period + ' ' + item.timeFrame }}
@@ -25,14 +25,14 @@
{{ item.project }}
-
- {{ item.cuAddr }}
+
+ {{ item.apmStatus == 1 ? '您的体检项目已取消' : item.apmStatus == 3 ? '体检项目已完成' : item.limitTime }}
{{ item.apmStatus == 1 ? - '已取消' : item.apmStatus == 2 ? '未报到' : item.apmStatus == 3 ? '已报到' : '取消预约' + '已取消' : item.apmStatus == 2 ? '取消预约' : item.apmStatus == 3 ? '已完成' : '取消预约' }}
@@ -42,25 +42,39 @@