diff --git a/src/api/trials/visit.js b/src/api/trials/visit.js index e8394f7..1f843e1 100644 --- a/src/api/trials/visit.js +++ b/src/api/trials/visit.js @@ -298,10 +298,11 @@ export function getPatientSubejctVisitList(param) { } // 下载影像 -export function getSubjectImageZipInfo(id, id2) { +export function requestPackageAndAnonymizImage(params) { return request({ - url: `/Patient/getSubjectImageZipInfo/${id}/${id2}`, - method: 'get', + url: `/Patient/requestPackageAndAnonymizImage`, + method: 'post', + params }) } diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js index e7e2793..5b01b3e 100644 --- a/src/utils/uploadZip.js +++ b/src/utils/uploadZip.js @@ -3,20 +3,41 @@ import axios from "axios"; import { saveAs } from "file-saver"; import Vue from 'vue'; import { - getSubjectImageZipInfo, + requestPackageAndAnonymizImage, } from "@/api/trials/visit.js"; -let flag = false; +let flag = {}; export const downloadImage = async (id, id2) => { - if (flag) return - flag = true + if (flag[id2]) return + flag[id2] = true try { - let res = await getSubjectImageZipInfo(id, id2); + let params = { + TrialId: id, + SubjectVisitId: id2 + } + let res = await requestPackageAndAnonymizImage(params); if (res.IsSuccess) { - let item = res.Result; - await setfolder(item); + if (!res.Result) { + Vue.prototype.$message.warning(Vue.prototype.$t("trials:upload:message:not")) + return 1; + } + let a = document.createElement("a"); + let href = Vue.prototype.OSSclientConfig.basePath + res.Result; + let fileName = + res.Result.split("/")[res.Result.split("/").length - 1]; + a.download = fileName; + a.href = href; + a.click(); + URL.revokeObjectURL(href); + this.$nextTick(() => { + a = null; + href = null; + }); + return 2; + } else { + return false; } } catch (err) { - flag = false; + flag[id2] = false; console.log(err); } }; @@ -78,11 +99,11 @@ const setfolder = async (item) => { }) .then((res) => { saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义 - flag = false; + flag[id2] = false; zipObj = null; }); }) - .catch((reason) => { flag = false; }); + .catch((reason) => { flag[id2] = false; }); }; const handleBatchDown = async (item, zip) => { return new Promise((resolve) => { diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue index 6c9462a..53edce4 100644 --- a/src/views/forgetpassword/index.vue +++ b/src/views/forgetpassword/index.vue @@ -12,13 +12,6 @@ class="demo-ruleForm" size="small" > - - - - + {{ + $t("passwordReset:tip:verifySuccess") + }} @@ -128,6 +124,13 @@ + + + + @@ -341,6 +344,8 @@ export default { .catch(() => { this.formLoading = false; this.isVerify = false; + this.users = []; + this.form.UserId = null; }); }, handleEmailChange() { diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue index d395083..0327fe1 100644 --- a/src/views/trials/trials-myinfo/account.vue +++ b/src/views/trials/trials-myinfo/account.vue @@ -200,6 +200,16 @@ export default { }, async setNewUserName() { try { + let confirm = await this.$confirm( + this.$t("trials:trials-myInfo:confirmMessage:updateUserName"), + { + type: "warning", + distinguishCancelAndClose: true, + confirmButtonText: this.$t("common:button:confirm"), + cancelButtonText: this.$t("common:button:cancel"), + } + ); + if (confirm !== "confirm") return; let res = await setNewUserName(this.userForm.UserName); if (res.IsSuccess) { this.userForm.UserName = ""; @@ -208,18 +218,6 @@ export default { ); this.$emit("getUserInfo"); removeToken(); - let confirm = await this.$confirm( - this.$t("trials:trials-myInfo:confirmMessage:updateUserName"), - { - type: "warning", - showClose: false, - showCancelButton: false, - distinguishCancelAndClose: true, - confirmButtonText: this.$t("common:button:confirm"), - cancelButtonText: this.$t("common:button:cancel"), - } - ); - if (confirm !== "confirm") return; this.logout(); } } catch (err) { diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue index a840d0b..4734c4d 100644 --- a/src/views/trials/trials-myinfo/password.vue +++ b/src/views/trials/trials-myinfo/password.vue @@ -114,6 +114,16 @@ export default { this.$alert(this.$t("passwordReset:formRule:passwordsDiffer")); return; } + let confirm = await this.$confirm( + this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"), + { + type: "warning", + distinguishCancelAndClose: true, + confirmButtonText: this.$t("common:button:confirm"), + cancelButtonText: this.$t("common:button:cancel"), + } + ); + if (confirm !== "confirm") return; const param = { UserId: this.userId, NewPassWord: md5(this.password.NewPassWord), @@ -126,18 +136,6 @@ export default { this.$t("trials:trials-myinfo:message:modifyPWSuccessfully") ); removeToken(); - let confirm = await this.$confirm( - this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"), - { - type: "warning", - showClose: false, - showCancelButton: false, - distinguishCancelAndClose: true, - confirmButtonText: this.$t("common:button:confirm"), - cancelButtonText: this.$t("common:button:cancel"), - } - ); - if (confirm !== "confirm") return; this.logout(); } } catch (err) { diff --git a/src/views/trials/trials-panel/hirVisit/components/current-study.vue b/src/views/trials/trials-panel/hirVisit/components/current-study.vue index df284ec..c893d33 100644 --- a/src/views/trials/trials-panel/hirVisit/components/current-study.vue +++ b/src/views/trials/trials-panel/hirVisit/components/current-study.vue @@ -38,6 +38,14 @@ min-width="80" show-overflow-tooltip /> + + - + - - + min-width="100" + > + + + + + + + +