From 6f6959627f68135ea5aff9999364998937763ed6 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 23 Oct 2024 18:00:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?ir=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=AE=80=E5=8E=86=E5=85=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/file/certificate.vue | 4 +- .../curriculumVitae/components/info/info.vue | 32 +- src/views/reviewers/curriculumVitae/index.vue | 28 +- .../reviewers/curriculumVitae/preview.vue | 702 ++++++++++++++---- src/views/trials/trials-myinfo/index.vue | 74 +- 5 files changed, 655 insertions(+), 185 deletions(-) diff --git a/src/views/reviewers/curriculumVitae/components/file/certificate.vue b/src/views/reviewers/curriculumVitae/components/file/certificate.vue index 9b473438..752f7fa7 100644 --- a/src/views/reviewers/curriculumVitae/components/file/certificate.vue +++ b/src/views/reviewers/curriculumVitae/components/file/certificate.vue @@ -269,7 +269,9 @@ export default { openBox() { this.model_cfg.visible = true }, - handleCancle() {}, + handleCancle() { + this.model_cfg.visible = false + }, handleRemoveFile(row) { this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), { type: 'warning', diff --git a/src/views/reviewers/curriculumVitae/components/info/info.vue b/src/views/reviewers/curriculumVitae/components/info/info.vue index 82d771ef..ff940e23 100644 --- a/src/views/reviewers/curriculumVitae/components/info/info.vue +++ b/src/views/reviewers/curriculumVitae/components/info/info.vue @@ -6,26 +6,22 @@ @@ -227,6 +227,7 @@ export default { SummarizeInfo: {}, TrialExperienceView: {}, }, + dom: null, } }, computed: { @@ -243,12 +244,14 @@ export default { } }, mounted() { + this.dom = document.getElementById('main') // 监听滚动事件 - window.addEventListener('scroll', this.onScroll) + this.dom.addEventListener('scroll', this.onScroll) }, destroy() { // 必须移除监听器，不然当该vue组件被销毁了，监听器还在就会出错 - window.removeEventListener('scroll', this.onScroll) + this.dom.removeEventListener('scroll', this.onScroll) + this.dom = null }, methods: { ...mapMutations({ setLanguage: 'lang/setLanguage' }), @@ -271,8 +274,8 @@ export default { const navContent = document.getElementById(key) if (navContent) { const scrollTop = navContent.offsetTop - document.body.scrollTop = scrollTop - document.documentElement.scrollTop = scrollTop + document.getElementById('main').scrollTop = scrollTop + // document.documentElement.scrollTop = scrollTop } }, onScroll() { @@ -281,11 +284,11 @@ export default { // 所有锚点元素的 offsetTop const offsetTopArr = [] navContents.forEach((item) => { + console.log(item.offsetTop) offsetTopArr.push(item.offsetTop) }) // 获取当前文档流的 scrollTop - const scrollTop = - document.documentElement.scrollTop || document.body.scrollTop + const scrollTop = document.getElementById('main').scrollTop // 定义当前点亮的导航下标 let navItem = null for (let n = 0; n < offsetTopArr.length; n++) { @@ -308,13 +311,17 @@ export default { } diff --git a/src/views/reviewers/components/Summarize.vue b/src/views/reviewers/components/Summarize.vue new file mode 100644 index 00000000..1647a81d --- /dev/null +++ b/src/views/reviewers/components/Summarize.vue @@ -0,0 +1,132 @@ + + + \ No newline at end of file diff --git a/src/views/reviewers/curriculumVitae/index.vue b/src/views/reviewers/curriculumVitae/index.vue index c8a8ffb3..ce5b30de 100644 --- a/src/views/reviewers/curriculumVitae/index.vue +++ b/src/views/reviewers/curriculumVitae/index.vue @@ -284,7 +284,6 @@ export default { // 所有锚点元素的 offsetTop const offsetTopArr = [] navContents.forEach((item) => { - console.log(item.offsetTop) offsetTopArr.push(item.offsetTop) }) // 获取当前文档流的 scrollTop diff --git a/src/views/reviewers/edit.vue b/src/views/reviewers/edit.vue index a901ce45..aa32a07c 100644 --- a/src/views/reviewers/edit.vue +++ b/src/views/reviewers/edit.vue @@ -13,6 +13,12 @@ > + + + + + + @@ -70,6 +79,7 @@ diff --git a/src/views/reviewers/curriculumVitae/index.vue b/src/views/reviewers/curriculumVitae/index.vue index ce5b30de..35685927 100644 --- a/src/views/reviewers/curriculumVitae/index.vue +++ b/src/views/reviewers/curriculumVitae/index.vue @@ -166,7 +166,9 @@ - +
+ +
@@ -241,6 +243,10 @@ export default { if (sessionStorage.getItem('reviewerId')) { this.reviewerId = sessionStorage.getItem('reviewerId') this.getDetail() + } else if (this.$route.query.id) { + this.reviewerId = this.$route.query.id + sessionStorage.setItem('reviewerId', this.reviewerId) + this.getDetail() } }, mounted() { diff --git a/src/views/reviewers/curriculumVitae/preview.vue b/src/views/reviewers/curriculumVitae/preview.vue index aa343ce8..7febb76d 100644 --- a/src/views/reviewers/curriculumVitae/preview.vue +++ b/src/views/reviewers/curriculumVitae/preview.vue @@ -224,7 +224,9 @@
-
{{ $t('curriculumVitae:continuingTraining:title') }}
+
+ {{ $t('curriculumVitae:continuingTraining:title') }} +
-
+
{{ $t('curriculumVitae:clinicalTrials:otherTitle') }}
- - + + +
+ +
+ diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue index cf993e8b..869f4ddb 100644 --- a/src/views/trials/trials-myinfo/index.vue +++ b/src/views/trials/trials-myinfo/index.vue @@ -41,7 +41,7 @@ import mine from './mine.vue' import account from './account.vue' import loginLog from '@/views/trials/trials-panel/trial-summary/login-log' -import { getUserTypeList, getUser } from '@/api/admin.js' +import { getUserTypeList, getUser, useUserIDGetDoctorID } from '@/api/admin.js' import store from '@/store' import { mapGetters } from 'vuex' @@ -66,19 +66,34 @@ export default { this.getUserTypeList() }, methods: { - handleSelect(index) { + async handleSelect(index) { if (index === '4') { if (this.open) { this.open.close() } + let id = await this.useUserIDGetDoctorID() const routeData = this.$router.resolve({ - path: `/curriculumVitae?lang=${this.$i18n.locale}`, + path: `/curriculumVitae?id=${id}&&lang=${this.$i18n.locale}`, }) this.open = window.open(routeData.href, '_blank') } else { this.activeIndex = index } }, + async useUserIDGetDoctorID() { + try { + let res = await useUserIDGetDoctorID({ + UserID: this.$store.state.user.userId, + }) + if (res.IsSuccess) { + return res.Result.DoctorID + } + return false + } catch (err) { + return false + console.log(err) + } + }, getUserInfo() { const loading = this.$loading({ fullscreen: false, diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue index 74cfc268..0958b4fd 100644 --- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue +++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue @@ -371,6 +371,7 @@ - + { return { TrialId: '', @@ -467,6 +475,10 @@ export default { this.$alert(this.$t('trials:researchRecord:message:copyFailed')) }) }, + beforeClose() { + this.getList() + this.visible = false + }, // 简历采集 resumeCollection() { this.shareLink = `${location.protocol}//${location.host}/ReviewersResearch?lang=${this.$store.getters.language}` @@ -474,8 +486,23 @@ export default { this.share_model.visible = true }, // 发送邮件 - sendEmail() { - this.$message.success('123') + async sendEmail() { + var pattern = + /^([A-Za-z0-9_\-\.\u4e00-\u9fa5])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,8})$/ + if (!pattern.test(this.email)) + return this.$message.warning(this.$t('rules:email')) + this.emailLoading = true + let res = await doctorSendEmail({ + Email: this.email, + Url: `ReviewersResearch?lang=${this.$store.getters.language}`, + }) + this.emailLoading = false + if (res.IsSuccess) { + this.$message.success( + this.$t('trials:researchStaff:message:sendEmalil') + ) + this.share_model.visible = false + } }, // 打开新增或修改简历弹框 openViewer(type, row) { diff --git a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue index de47099d..750d9467 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/resume/index.vue @@ -1,21 +1,33 @@ From 1422a6f4060b76016624e01e9705f761c9ad0623 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 24 Oct 2024 15:52:47 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E9=A1=B5=E8=83=8C=E6=99=AF=E5=9B=BE=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/error.html | 13 +- public/errorEN.html | 13 +- public/error_assets/login-bg.svg | 793 +++++++++++++++++++++++++++++++ 3 files changed, 811 insertions(+), 8 deletions(-) create mode 100644 public/error_assets/login-bg.svg diff --git a/public/error.html b/public/error.html index 155c50e2..4c05b498 100644 --- a/public/error.html +++ b/public/error.html @@ -23,8 +23,8 @@
- -