diff --git a/src/assets/image/defined.png b/src/assets/image/defined.png index 7ba10b3cd283b08000151a7dacd48826207e883d..63175ad0ed40318f1db9cbad5027b544651ad4ad 100644 Binary files a/src/assets/image/defined.png and b/src/assets/image/defined.png differ diff --git a/src/assets/image/defined1.png b/src/assets/image/defined1.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba10b3cd283b08000151a7dacd48826207e883d Binary files /dev/null and b/src/assets/image/defined1.png differ diff --git a/src/assets/image/top-left-btn.png b/src/assets/image/top-left-btn.png new file mode 100644 index 0000000000000000000000000000000000000000..0ae7266f937377aae3adef459e93234b06b88770 Binary files /dev/null and b/src/assets/image/top-left-btn.png differ diff --git a/src/assets/image/top-left.png b/src/assets/image/top-left.png index 89c449df781a1398f5e2af726fdb82224eb63c7b..340f8faa91d6d58ab2aec5b0f9ec789063ad8884 100644 Binary files a/src/assets/image/top-left.png and b/src/assets/image/top-left.png differ diff --git a/src/assets/image/top-left1.png b/src/assets/image/top-left1.png new file mode 100644 index 0000000000000000000000000000000000000000..89c449df781a1398f5e2af726fdb82224eb63c7b Binary files /dev/null and b/src/assets/image/top-left1.png differ diff --git a/src/assets/image/top-right-btn.png b/src/assets/image/top-right-btn.png new file mode 100644 index 0000000000000000000000000000000000000000..18a380f90d100940724028f1fd94f8cb83e93ee5 Binary files /dev/null and b/src/assets/image/top-right-btn.png differ diff --git a/src/components/feature/AccumulativeStatistics/AccuItem.vue b/src/components/feature/AccumulativeStatistics/AccuItem.vue index e875bb29d0926b411e2322579b198f4488360d52..bb9f58a6b549e70dc6e4f8949528d3a14e11284c 100644 --- a/src/components/feature/AccumulativeStatistics/AccuItem.vue +++ b/src/components/feature/AccumulativeStatistics/AccuItem.vue @@ -67,7 +67,7 @@ export default class AccuItem extends Vue { this.$emit('contentOpen', row); } private getDetail(index: number, row: any) { - if (row.idNo) { + if (row.idNo && /[0-9]+/.test(row.idNo)) { this.$router.push(`/PatientPortrayal?id=${row.idNo}`); } else { this.$message.error('该患者暂时无法进行追溯'); diff --git a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue index ffb9e4bcb738af95c2379f7c585ee60a3f32f4db..d42596fa72e4fafeacdae552fcbc3854a5ec78b4 100644 --- a/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoFeverClinic/DiseaseList.vue @@ -362,7 +362,7 @@ export default class DiseasDeList extends Vue { // 追溯 private getDetail(index: number, row: any) { - if (row.idNo) { + if (row.idNo && /[0-9]+/.test(row.idNo)) { this.$router.push(`/PatientPortrayal?id=${row.idNo}`); } else { this.$message.error('该患者暂时无法进行追溯'); diff --git a/src/components/feature/DiseaseInfoGL/DiseaseList.vue b/src/components/feature/DiseaseInfoGL/DiseaseList.vue index 5dbaa65ddfcd223b1647a274e4b507a8ee61216a..13e1c12838277e83a576bb1d4f5ab9c1bbd30787 100644 --- a/src/components/feature/DiseaseInfoGL/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoGL/DiseaseList.vue @@ -381,7 +381,7 @@ export default class DiseasDeList extends Vue { // 追溯 private getDetail(index: number, row: any) { - if (row.suffererCard) { + if (row.suffererCard && /[0-9]+/.test(row.suffererCard)) { this.$router.push(`/PatientPortrayal?id=${row.suffererCard}`); } else { this.$message.error('该患者暂时无法进行追溯'); diff --git a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue index 977cbf562b48f8aa2938f30c64a19da2e6eb706c..8baf84b2baea5285322845e648520544c6f9487c 100644 --- a/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoHospitalDD/DiseaseList.vue @@ -351,7 +351,7 @@ export default class DiseasDeList extends Vue { // 追溯 private getDetail(index: number, row: any) { - if (row.idNo) { + if (row.idNo && /[0-9]+/.test(row.idNo)) { this.$router.push(`/PatientPortrayal?id=${row.idNo}`); } else { this.$message.error('该患者暂时无法进行追溯'); diff --git a/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue b/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue index 46286cbcca182e1fa8ecccd3adae6a8f9c0e0a15..7ffc5ed4edb5e2e55e78ccfa8ecdd2a18538e746 100644 --- a/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoHospitalFC/DiseaseList.vue @@ -327,7 +327,7 @@ export default class DiseasDeList extends Vue { // 追溯 private getDetail(index: number, row: any) { - if (row.idNo) { + if (row.idNo && /[0-9]+/.test(row.idNo)) { this.$router.push(`/PatientPortrayal?id=${row.idNo}`); } else { this.$message.error('该患者暂时无法进行追溯'); diff --git a/src/components/feature/DiseaseInfoYQ/DiseaseList.vue b/src/components/feature/DiseaseInfoYQ/DiseaseList.vue index 2f5b0e17ff3b33aac8f62670c86b6d2a2dc1d3a6..517b8ac863f9e2cb6b1e082a132177cdc30817a8 100644 --- a/src/components/feature/DiseaseInfoYQ/DiseaseList.vue +++ b/src/components/feature/DiseaseInfoYQ/DiseaseList.vue @@ -362,7 +362,7 @@ export default class DiseasDeList extends Vue { // 追溯 private getDetail(index: number, row: any) { - if (row.idNo) { + if (row.idNo && /[0-9]+/.test(row.idNo)) { this.$router.push(`/PatientPortrayal?id=${row.idNo}`); } else { this.$message.error('该患者暂时无法进行追溯'); diff --git a/src/router/router.ts b/src/router/router.ts index 2710f5091bf5c918e21197f361389ac8ae345841..6257c372e28676e72b38abdc45da3e72cfae65e3 100644 --- a/src/router/router.ts +++ b/src/router/router.ts @@ -222,9 +222,15 @@ const router = new Router({ }, ], }); -// router.beforeEach((to, from, next) => { -// // 登录校验 -// console.log(to); -// next(); -// }); +router.beforeEach((to, from, next) => { + if ( + to.path === '/login' || + to.path === '/dataCompare' || + localStorage.getItem('token') + ) { + next(); + } else { + next('/login'); + } +}); export default router; diff --git a/src/views/LayoutHome.vue b/src/views/LayoutHome.vue index f505d8f1e391989e9c7c5695eaeb9ba17ce31432..11bff424cc17c0f8cf019c97e353c34922d48a47 100644 --- a/src/views/LayoutHome.vue +++ b/src/views/LayoutHome.vue @@ -32,8 +32,10 @@ import MenuList from '@/views/MenuList.vue'; export default class LayoutHome extends Vue { private userName: string | null = localStorage.getItem('username'); private loginOut() { + loginServer.loginOut().then((res: any) => { + localStorage.setItem('token', ''); + }); this.$router.push('/login'); - loginServer.loginOut(); } } diff --git a/src/views/PatientPortrayal.vue b/src/views/PatientPortrayal.vue index b25848147f29483c844a57f6d1e2c368327ea37c..5a6acfcda2257abd3f6dde2a88029edaf8286571 100644 --- a/src/views/PatientPortrayal.vue +++ b/src/views/PatientPortrayal.vue @@ -1,128 +1,177 @@