diff --git a/src/App.vue b/src/App.vue index 6e59715..4f0bc4e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -146,8 +146,8 @@ firstAidId } = this.patientData; if (!firstAidId) return; - this.queryMessage(); - await this.handMessageQuery(); + // this.queryMessage(); + // await this.handMessageQuery(); this.request = 0; this.utils.AnimationFrame.create( @@ -270,7 +270,7 @@ // 符合轮训条件 console.log('十秒'); this.request = n + 1; - // await this.handMessageQuery(); + await this.handMessageQuery(); } }, }, diff --git a/src/utils/index.js b/src/utils/index.js index 618ba54..a800d14 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -136,7 +136,7 @@ function format(date) { } /** * 身份证加密 -*/ + */ function maskIDCard(idCard) { // 判断身份证号是否有效 if (idCard.length === 18) { @@ -261,29 +261,30 @@ function calculateAge(idCard) { if (idCard && idCard.length === 18) { // 提取出生日期(前 6 位) let birthDate = idCard.substring(6, 14); - + // 从出生日期创建 Date 对象,格式为 YYYY-MM-DD let year = birthDate.substring(0, 4); let month = birthDate.substring(4, 6) - 1; // 月份从 0 开始 let day = birthDate.substring(6, 8); - + let birth = new Date(year, month, day); - + // 获取当前日期 let now = new Date(); - + // 计算年龄 let age = now.getFullYear() - birth.getFullYear(); - + // 如果生日还没过,年龄减一 - if (now.getMonth() < birth.getMonth() || (now.getMonth() === birth.getMonth() && now.getDate() < birth.getDate())) { - age--; + if (now.getMonth() < birth.getMonth() || (now.getMonth() === birth.getMonth() && now.getDate() < birth + .getDate())) { + age--; } - + patientAge = age; } return patientAge; - + } export default { diff --git a/src/views/Patient/components/patient-detail.vue b/src/views/Patient/components/patient-detail.vue index 31ad3c8..cfe3604 100644 --- a/src/views/Patient/components/patient-detail.vue +++ b/src/views/Patient/components/patient-detail.vue @@ -254,7 +254,17 @@ this.authEdit = false this.$message.success('更新成功'); // this.$router.push('/firstaid/thrombolysis') - this.getMessageQuery(0, data.firstAidId) + // this.getMessageQuery(0, data.firstAidId) + this.request = 0; + this.utils.AnimationFrame.create( + 'timerTask', + 10000, + true, + (min) => { + // console.log('min', min) + this.getMessageQuery(min); + } + ); this.$router.push({ name: 'Thrombolysis', query: {