diff --git a/src/permission.js b/src/permission.js index 42a12db4..a387445f 100644 --- a/src/permission.js +++ b/src/permission.js @@ -10,7 +10,7 @@ import { OSSclient } from './utils/oss' NProgress.configure({ showSpinner: false }) -const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/researchDetail_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms'] +const whiteList = ['/ReviewersResearch', '/login', '/error', '/resetpassword', '/recompose', '/email-recompose', '/trialStats', '/showdicom', '/imagesShare', '/audit', '/preview', '/researchLogin', '/researchLogin_m', '/blindResumeInfo', '/trialsResume', '/joinVerify', '/showNoneDicoms', '/noneDicomReading', '/clinicalData', '/readingDicoms', '/readingPage', '/visitDicomReview', '/visitNondicomReview', '/globalReview', '/adReview', '/oncologyReview', '/nonedicoms'] router.beforeEach(async(to, from, next) => { NProgress.start() @@ -56,9 +56,10 @@ router.beforeEach(async(to, from, next) => { /* has no token*/ if (whiteList.indexOf(to.path) !== -1) { if (to.path === '/researchLogin') { + console.log(to) const flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i) if (flag) { - next(`/researchLogin_m`) + next(`/researchLogin_m?trialId=${to.query.trialId}&lang=${to.query.lang}`) } else { next() } diff --git a/src/views/research-mobile/components/BasicInfo.vue b/src/views/research-mobile/components/BasicInfo.vue index ef3d49a7..2c0b8047 100644 --- a/src/views/research-mobile/components/BasicInfo.vue +++ b/src/views/research-mobile/components/BasicInfo.vue @@ -1,80 +1,271 @@ diff --git a/src/views/research-mobile/components/Equipments.vue b/src/views/research-mobile/components/Equipments.vue index 32789cfb..a9840fa0 100644 --- a/src/views/research-mobile/components/Equipments.vue +++ b/src/views/research-mobile/components/Equipments.vue @@ -1,10 +1,14 @@ @@ -112,7 +167,7 @@ export default { align-items: center; margin-bottom: 10px; } - .participant_info{ + .equipment_info{ display: flex; flex-direction: row; justify-content: space-around; diff --git a/src/views/research-mobile/components/HistoricalParticipantForm.vue b/src/views/research-mobile/components/HistoricalParticipantForm.vue new file mode 100644 index 00000000..38bbdb96 --- /dev/null +++ b/src/views/research-mobile/components/HistoricalParticipantForm.vue @@ -0,0 +1,304 @@ + + + diff --git a/src/views/research-mobile/components/HistoricalParticipants.vue b/src/views/research-mobile/components/HistoricalParticipants.vue index 5901ec2e..9e67c196 100644 --- a/src/views/research-mobile/components/HistoricalParticipants.vue +++ b/src/views/research-mobile/components/HistoricalParticipants.vue @@ -1,10 +1,198 @@ + diff --git a/src/views/research-mobile/components/Notes.vue b/src/views/research-mobile/components/Notes.vue index 0177579a..2b63d32f 100644 --- a/src/views/research-mobile/components/Notes.vue +++ b/src/views/research-mobile/components/Notes.vue @@ -1,9 +1,13 @@ diff --git a/src/views/research-mobile/components/Participants.vue b/src/views/research-mobile/components/Participants.vue index 873a6678..6ceb1898 100644 --- a/src/views/research-mobile/components/Participants.vue +++ b/src/views/research-mobile/components/Participants.vue @@ -1,111 +1,188 @@ diff --git a/src/views/research-mobile/detail.vue b/src/views/research-mobile/detail.vue index c3cab3c8..41477911 100644 --- a/src/views/research-mobile/detail.vue +++ b/src/views/research-mobile/detail.vue @@ -1,22 +1,46 @@ diff --git a/src/views/research-mobile/login.vue b/src/views/research-mobile/login.vue index 7faf1399..fc06cff2 100644 --- a/src/views/research-mobile/login.vue +++ b/src/views/research-mobile/login.vue @@ -1,65 +1,355 @@