From 115dae48c767d356e5f9877ec8aa4b81a2b87029 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 6 May 2024 14:27:30 +0800 Subject: [PATCH 001/173] 1 --- .env.usa | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.env.usa b/.env.usa index b1d35930..a510c10c 100644 --- a/.env.usa +++ b/.env.usa @@ -2,7 +2,7 @@ ENV = 'production' NODE_ENV = 'production' # base public path -VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-04-29/' +VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-04-30/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false From 16a5f4866d16f25fb9859883917fd9caf2d893d0 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 6 May 2024 14:29:37 +0800 Subject: [PATCH 002/173] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Fusion/js/initCornerstoneDICOMImageLoader.js | 2 +- vue.config.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js index 4af21a97..69f3f464 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js +++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js @@ -7,7 +7,7 @@ cornerstone.init({ gpuTier: intel, rendering: { // useCPURendering: false, - useNorm16Texture: true + useNorm16Texture: false } }) cornerstone.Settings.getRuntimeSettings().set('useCursors', false) diff --git a/vue.config.js b/vue.config.js index c25c05cb..f01862eb 100644 --- a/vue.config.js +++ b/vue.config.js @@ -64,7 +64,7 @@ module.exports = { // target: 'http://123.56.94.154:8079', // 国内测试环境2 // target: 'http://123.56.94.154:7000', // 国内测试环境2 // target: 'http://123.56.94.154:30668', - target: 'http://123.56.94.154:30000', + target: 'http://106.14.89.110:30000', // target: 'http://123.56.181.144:7000', changeOrigin: true, secure: false, From e868d50893da5003839ffde83368a2c20f1b06ec Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 6 May 2024 15:43:58 +0800 Subject: [PATCH 003/173] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/permission.js | 2 +- src/store/modules/user.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/permission.js b/src/permission.js index c1d1f2d5..db67208e 100644 --- a/src/permission.js +++ b/src/permission.js @@ -34,7 +34,7 @@ router.beforeEach(async(to, from, next) => { NProgress.done() } else { OSSclient() - const hasGetUserInfo = store.getters.name + const hasGetUserInfo = store.getters.userId if (hasGetUserInfo) { next() } else { diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cb033368..4055495a 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -107,6 +107,7 @@ const actions = { zzSessionStorage.setItem('userName', data.BasicInfo.UserName) commit('SET_TOKEN', data.JWTStr) commit('SET_NAME', data.BasicInfo.RealName) + zzSessionStorage.setItem('realName', data.BasicInfo.RealName) zzSessionStorage.setItem('isTestUser', data.BasicInfo.IsTestUser) commit('SET_ISTESTUSER', data.BasicInfo.IsTestUser) commit('SET_USERNAME', data.BasicInfo.UserName) @@ -161,7 +162,7 @@ const actions = { commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions'))) commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser')) const user = JSON.parse(userString) - commit('SET_NAME', user.realName) + commit('SET_NAME', zzSessionStorage.getItem('realName')) commit('SET_USERID', user.id) commit('SET_USERNAME', zzSessionStorage.getItem('userName')) commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))) From 75f8018fc8ae0d8a9c317579fbcc58207ed09d32 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Mon, 6 May 2024 15:57:58 +0800 Subject: [PATCH 004/173] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E6=89=93=E5=8C=85=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- irc_vue_drone.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/irc_vue_drone.yml b/irc_vue_drone.yml index 6dbcef8e..e62410c1 100644 --- a/irc_vue_drone.yml +++ b/irc_vue_drone.yml @@ -10,7 +10,7 @@ clone: disable: true #禁用默认克隆 server: - host: 192.168.3.68 + host: 106.14.89.110 user: root password: from_secret: local_pwd @@ -19,7 +19,7 @@ steps: - name: publish-test-irc-vue commands: - echo start publish test-irc-vue - - cd /opt/hang/vue/test-irc + - cd /opt/1panel/hang/vue/test-irc - sh test-irc.sh v${DRONE_BUILD_NUMBER} trigger: @@ -41,7 +41,7 @@ clone: disable: true #禁用默认克隆 server: - host: 123.56.94.154 + host: 106.14.89.110 user: root password: from_secret: local_pwd From 5cc38ada717a8929f2e1eefd2c69c49b7f5695e9 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 9 May 2024 10:13:26 +0800 Subject: [PATCH 005/173] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=B5=8F=E8=A7=88?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dicom/DicomViewer.vue | 4 +-- .../trials-panel/reading/dicoms/index.vue | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/components/Dicom/DicomViewer.vue b/src/components/Dicom/DicomViewer.vue index dc396c66..8a7e83e2 100644 --- a/src/components/Dicom/DicomViewer.vue +++ b/src/components/Dicom/DicomViewer.vue @@ -393,7 +393,7 @@ export default { this.customWwc = { visible: false, title: this.$t('DicomViewer:data:customWwc') } this.rotateList[0] = '1' this.colorList[0] = '' - this.wwwcList[0] = '1' + this.wwwcList[0] = '-1' this.colormapsList = cornerstone.colors.getColormapsList() this.currentDicomCanvas = this.$refs['dicomCanvas0'] }, @@ -444,7 +444,7 @@ export default { this.colorList[this.currentDicomCanvasIndex] = '' } if (!this.wwwcList[this.currentDicomCanvasIndex]) { - this.wwwcList[this.currentDicomCanvasIndex] = '1' + this.wwwcList[this.currentDicomCanvasIndex] = '-1' } } }, diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 32c6a026..9add7fb0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -301,19 +301,19 @@ export default { this.isShow = false this.visitTaskId = res.Result.VisitTaskId // DicomEvent.$emit('getCustomTableQuestionAnswer', res.Result.VisitTaskId) - if (this.subjectId !== res.Result.SubjectId) { - store.dispatch('reading/resetVisitTasks') - var token = getToken() - window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}&isNewSubject=1` - return - } else if (!this.isReadingTaskViewInOrder || res.Result.ReadingCategory !== 1) { - store.dispatch('reading/resetVisitTasks') - if (this.firstTaskReadingCategory) { - const token = getToken() - window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}` - return - } - } + // if (this.subjectId !== res.Result.SubjectId) { + // store.dispatch('reading/resetVisitTasks') + // var token = getToken() + // window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}&isNewSubject=1` + // return + // } else if (!this.isReadingTaskViewInOrder || res.Result.ReadingCategory !== 1) { + // store.dispatch('reading/resetVisitTasks') + // if (this.firstTaskReadingCategory) { + // const token = getToken() + // window.location.href = `/readingDicoms?TrialReadingCriterionId=${this.TrialReadingCriterionId}&trialId=${this.trialId}&subjectCode=${res.Result.SubjectCode}&subjectId=${res.Result.SubjectId}&isReadingTaskViewInOrder=${this.isReadingTaskViewInOrder}&criterionType=${this.criterionType}&readingTool=${this.readingTool}&TokenKey=${token}` + // return + // } + // } this.subjectId = res.Result.SubjectId this.subjectCode = res.Result.SubjectCode this.taskBlindName = res.Result.TaskBlindName From bd1ee8a520006bba351b5377f6423dc085ae3bbf Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 9 May 2024 11:27:30 +0800 Subject: [PATCH 006/173] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 +- src/views/trials/trials-myinfo/account.vue | 247 +++++++++ src/views/trials/trials-myinfo/index.vue | 505 ++++++------------ src/views/trials/trials-myinfo/mine.vue | 198 +++++++ src/views/trials/trials-myinfo/password.vue | 160 ++++++ .../trial-summary/login-log/index.vue | 177 +++--- src/views/user/editInfo.vue | 266 +-------- 7 files changed, 867 insertions(+), 688 deletions(-) create mode 100644 src/views/trials/trials-myinfo/account.vue create mode 100644 src/views/trials/trials-myinfo/mine.vue create mode 100644 src/views/trials/trials-myinfo/password.vue diff --git a/src/router/index.js b/src/router/index.js index 34f8e9ae..79497526 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -262,7 +262,7 @@ export const constantRoutes = [ children: [{ path: 'baiscInfo', name: 'BaiscInfo', - component: () => import('@/views/user/myInfo') + component: () => import('@/views/user/editInfo') } ] } diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue new file mode 100644 index 00000000..0c4fe747 --- /dev/null +++ b/src/views/trials/trials-myinfo/account.vue @@ -0,0 +1,247 @@ + + \ No newline at end of file diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue index 0933ba69..f95be96c 100644 --- a/src/views/trials/trials-myinfo/index.vue +++ b/src/views/trials/trials-myinfo/index.vue @@ -1,390 +1,187 @@ - diff --git a/src/views/trials/trials-myinfo/mine.vue b/src/views/trials/trials-myinfo/mine.vue new file mode 100644 index 00000000..5ad63bc1 --- /dev/null +++ b/src/views/trials/trials-myinfo/mine.vue @@ -0,0 +1,198 @@ + + \ No newline at end of file diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue new file mode 100644 index 00000000..4734c4da --- /dev/null +++ b/src/views/trials/trials-myinfo/password.vue @@ -0,0 +1,160 @@ + + \ No newline at end of file diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue index 52c5ac1a..23e2bfdf 100644 --- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue +++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue @@ -1,12 +1,16 @@ - + --> + + + + - + /> --> - + /> --> - + /> --> - + /> --> @@ -112,31 +112,31 @@ prop="NeedConfirmedUserTypes" :label="$t('trials:attachment:table:userType')" show-overflow-tooltip - width="160" + min-width="100" > - + /> --> - {{ $fd('EmailUrgent',scope.row.EmailUrgentEnum) }} - + --> @@ -161,7 +161,7 @@ - {{ $fd('YesOrNo', scope.row.IsReturnRequired) }} - + --> - {{ $fd('YesOrNo', scope.row.IsAutoSend) }} - + --> --> - + @@ -241,21 +242,6 @@ min-width="150" sortable="custom" /> - - - - + + + + - - - - - - {{ $fd('YesOrNo', scope.row.IsOverTime) }} + + {{ $fd('YesOrNo', scope.row.IsClosed) }} - - - + + + + + + diff --git a/src/views/trials/trials-panel/visit/qc-question/index.vue b/src/views/trials/trials-panel/visit/qc-question/index.vue index 9c65cd77..93d81d29 100644 --- a/src/views/trials/trials-panel/visit/qc-question/index.vue +++ b/src/views/trials/trials-panel/visit/qc-question/index.vue @@ -124,7 +124,7 @@ prop="TrialSiteCode" :label="$t('trials:qcQuality:table:siteId')" show-overflow-tooltip - min-width="100" + width="100" sortable="custom" /> @@ -132,7 +132,7 @@ prop="SubjectCode" :label="$t('trials:qcQuality:table:subjectId')" show-overflow-tooltip - min-width="120" + width="120" sortable="custom" /> @@ -140,14 +140,14 @@ prop="VisitName" :label="$t('trials:qcQuality:table:visitName')" show-overflow-tooltip - width="130" + width="120" sortable="custom" /> diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index 5c24fdd2..02862cd7 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -3,6 +3,18 @@ - + - - - - - + + + + + + + {{ $fd('ReadingCategory', scope.row.ReadingCategory) }} + + + + {{ $fd('ArmEnum', scope.row.ArmEnum) }} - - - - - + + + + + - + + + + + + + + + + + + + + + @@ -889,11 +931,13 @@ import { getTrialSiteSelect,setTaskUrgent } from '@/api/trials' import { getTrialCriterionList, PMSetTaskBack, getInfluencedTaskList, getReReadingOrBackInfluenceTaskList, getReadingTaskList, configTrialReadingTaskViewRule, getDoctorUserSelectList, applyReReading } from '@/api/trials/reading' import { getToken } from '@/utils/auth' +import { changeURLStatic } from '@/utils/history.js' import BaseContainer from '@/components/BaseContainer' import Pagination from '@/components/Pagination' import RefereeRules from './components/RefereeRules.vue' import exportList from './components/exportList.vue' -import ClinicalData from "../../subject/reading-period/components/ClinicalData"; +import ClinicalData from "../../subject/reading-period/components/ClinicalData" +import RecordList from './components/RecordList.vue' const searchDataDefault = () => { return { PageIndex: 1, @@ -915,12 +959,15 @@ const searchDataDefault = () => { ReadingTaskState: null, CompleteClinicalDataEnum: null, BeginSignTime: null, - EndSignTime: null + EndSignTime: null, + IsEffect: true, + TrialReadingCriterionId: null + // ArmEnum: null } } export default { name: 'TrialsNotice', - components: { BaseContainer, Pagination, RefereeRules, ClinicalData, exportList }, + components: { BaseContainer, Pagination, RefereeRules, ClinicalData, exportList, RecordList }, props: { AllocationReadingCategory: { type: String @@ -989,14 +1036,25 @@ export default { TrialReadingCriterionId: null, urgentVisible: false, urgentForm: { VisitTaskId: '', IsUrgent: null,TaskUrgentType:null,TaskUrgentRemake:null }, - dialogLoading:false, - openWindow:null + dialogLoading: false, + openWindow: null, + recordVisible: false } }, mounted() { this.searchData.ReadingCategory = this.AllocationReadingCategory this.searchData.SubjectCode = this.AllocationSubjectCode - console.log(this.searchData.SubjectCode, this.searchData.ReadingCategory) + if (this.$route.query.SubjectCode) { + this.searchData.SubjectCode = this.$route.query.SubjectCode + this.searchData.TrialReadingCriterionId = this.$route.query.TrialReadingCriterionId ? this.$route.query.TrialReadingCriterionId : null + this.searchData.DoctorUserId = this.$route.query.DoctorUserId ? this.$route.query.DoctorUserId : null + this.searchData.TaskName = this.$route.query.TaskName ? this.$route.query.TaskName : null + changeURLStatic('SubjectCode', '') + changeURLStatic('TrialReadingCriterionId', '') + changeURLStatic('TaskName', '') + changeURLStatic('DoctorUserId', '') + } + this.searchData.ReadingCategory = this.AllocationReadingCategory this.getList() this.getSite() this.getDoctorUserSelectList() @@ -1168,6 +1226,9 @@ export default { this.total = res.Result.TotalCount }).catch(() => { this.loading = false }) }, + handleViewRecord() { + this.recordVisible = true + }, handleSearch() { this.searchData.PageIndex = 1 this.getList() From 35abb4d5739239a5ef750726b1eca6bb4543af45 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 15 May 2024 14:17:05 +0800 Subject: [PATCH 013/173] =?UTF-8?q?PM=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/RecordList.vue | 517 ++++++++++++++++++ .../reading/pm-medical-feedback/index.vue | 34 +- .../reading/reading-tracking/index.vue | 2 +- 3 files changed, 545 insertions(+), 8 deletions(-) create mode 100644 src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue new file mode 100644 index 00000000..aae2d852 --- /dev/null +++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue @@ -0,0 +1,517 @@ +/* eslint-disable */ + + diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue index ee6e626c..8103c164 100644 --- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue +++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue @@ -88,11 +88,11 @@ - + - - {{$t('trials:pmMedicalReview:button:setInvalid')}} + + + {{$t('common:button:failureRecord')}} + @@ -466,6 +467,19 @@ > + + + + @@ -479,6 +493,7 @@ import AssignMedicalReviewTask from './components/AssignMedicalReviewTask' import ReAssignMedicalReviewTask from './components/ReAssignMedicalReviewTask' import GenerateMedicalReviewTaskList from './components/GenerateMedicalReviewTaskList' import MedicalAudit from '@/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit' +import RecordList from './components/RecordList.vue' const searchDataDefault = () => { return { PageIndex: 1, @@ -504,11 +519,12 @@ const searchDataDefault = () => { EndSignTime: null, AuditAdviceEnum: null, DoctorUserIdeaEnum: null, + IsEffect: true } } export default { name: 'TrialsNotice', - components: { BaseContainer, Pagination, AddOrEditFilter, AssignMedicalReviewTask, GenerateMedicalReviewTaskList, MedicalAudit, ReAssignMedicalReviewTask }, + components: { BaseContainer, Pagination, AddOrEditFilter, AssignMedicalReviewTask, GenerateMedicalReviewTaskList, MedicalAudit, ReAssignMedicalReviewTask, RecordList }, data() { return { auditVisible: null, @@ -536,7 +552,8 @@ export default { distributionInfo: {}, currentRow: {}, trialCriterionList:[], - timeList:[] + timeList:[], + recordVisible: false } }, mounted() { @@ -650,6 +667,9 @@ export default { return true } }, + handleViewRecord() { + this.recordVisible = true + }, generateMedicalReviewTask() { this.$confirm('确定要应用吗？').then(() => { this.loading = true diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index 02862cd7..350bbb06 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -111,7 +111,7 @@ {{ $t('common:button:export') }} - {{ $t('common:button:record') }} + {{ $t('common:button:failureRecord') }} From c3be34124794370ad1aa2b7ffdeef8660c97a472 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 15 May 2024 16:12:42 +0800 Subject: [PATCH 014/173] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 12 ++++++------ src/views/user/myInfo.vue | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 3fc0a4eb..3563527e 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -1,5 +1,5 @@ import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth' -import { login,loginOut,getUserMenuTree, getUserPermissions } from '@/api/user' +import { login, loginOut, getUserMenuTree, getUserPermissions } from '@/api/user' import { resetRouter } from '@/router' import md5 from 'js-md5' @@ -167,8 +167,8 @@ const actions = { commit('SET_USERNAME', zzSessionStorage.getItem('userName')) commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))) commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))) - console.log( zzSessionStorage.getItem('TotalNeedSignSystemDocCount')) - console.log( zzSessionStorage.getItem('TotalNeedSignTrialDocCount')) + console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')) + console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')) zzSessionStorage.setItem('userName', user.name) zzSessionStorage.setItem('userId', user.id) zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName) @@ -180,14 +180,14 @@ const actions = { }, // user logout async logout({ commit, state }) { - try{ + try { + await loginOut() removeToken() // must remove token first resetRouter() removeName() zzSessionStorage.clear() commit('RESET_STATE') - await loginOut() - }catch(e){ + } catch (e) { console.log(e) } }, diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue index 4496b4a5..2dfecd78 100644 --- a/src/views/user/myInfo.vue +++ b/src/views/user/myInfo.vue @@ -342,7 +342,7 @@ export default { } - diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue index 9b742f0f..9275155c 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue @@ -6,7 +6,7 @@ v-loading="loading" :model="form" label-width="280px" - style="width:800px;" + style="width: 800px" :rules="rules" size="small" > @@ -40,7 +40,7 @@ style="min-height: 90px" :disabled="form.IsTrialBasicLogicConfirmed && !isEdit" type="textarea" - :autosize="{ minRows: 4, maxRows: 6}" + :autosize="{ minRows: 4, maxRows: 6 }" maxlength="250" show-word-limit /> @@ -174,8 +174,8 @@ - {{ $t('common:button:save') }} + {{ $t("common:button:save") }} - {{ $t('trials:trialCfg:button:confirm') }} + {{ $t("trials:trialCfg:button:confirm") }} - {{ $t('trials:trialCfg:button:update') }} + {{ $t("trials:trialCfg:button:update") }} - {{ $t('trials:trialCfg:button:updateAndConfirm') }} + {{ $t("trials:trialCfg:button:updateAndConfirm") }} - {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} @@ -301,12 +319,7 @@ custom-class="base-dialog-wrapper" >
- +
-
- - {{ $t('trials:trialCfg:button:confirmCfg') }} +
+ + {{ $t("trials:trialCfg:button:confirmCfg") }}
@@ -336,12 +357,7 @@ custom-class="base-dialog-wrapper" >
- +
-
- - {{ $t('trials:trialCfg:button:confirmCfg') }} +
+ + {{ $t("trials:trialCfg:button:confirmCfg") }}
@@ -382,10 +413,16 @@ custom-class="base-dialog-wrapper" >
- {{ $t('common:dialogTitle:sign') }} - {{ `(${$t('common:label:sign')}${ currentUser })` }} + {{ $t("common:dialogTitle:sign") }} + {{ + `(${$t("common:label:sign")}${currentUser})` + }}
- + @@ -398,14 +435,14 @@ custom-class="base-dialog-wrapper" >
-
+
- {{ $t('common:button:new') }} + {{ $t("common:button:new") }}
- + 删除 -
-
- - {{ $t('common:button:cancel') }} +
+ + {{ $t("common:button:cancel") }} - - {{ $t('common:button:confirm') }} + + {{ $t("common:button:confirm") }}
@@ -551,18 +602,23 @@ prop="value" :label="$t('trials:logincCfg:form:bodypart')" > - +
-
+
- {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} - {{ $t('common:button:confirm') }} + {{ $t("common:button:confirm") }}
@@ -591,7 +647,7 @@ height="450" row-key="id" class="criterion-table" - @select="handleSelectionChange" + @selection-change="handleSelectionChange" >
-
+
- {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} - {{ $t('common:button:confirm') }} + {{ $t("common:button:confirm") }}
\ No newline at end of file diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js new file mode 100644 index 00000000..89f309ea --- /dev/null +++ b/src/utils/uploadZip.js @@ -0,0 +1,144 @@ +import JSZip from "jszip"; +import axios from "axios"; +import { saveAs } from "file-saver"; +import Vue from 'vue'; +import { + requestPackageAndAnonymizImage, +} from "@/api/load.js"; +let flag = {}; +export const downloadImage = async (id, id2) => { + if (flag[id2]) return + flag[id2] = true + try { + let params = { + TrialId: id, + SubjectVisitId: id2 + } + let res = await requestPackageAndAnonymizImage(params); + flag[id2] = false; + if (res.IsSuccess) { + 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); + let timer = setTimeout(() => { + a = null; + href = null; + timer = null; + }, 500) + return 2; + } else { + return false; + } + } catch (err) { + flag[id2] = false; + console.log(err); + } +}; +const setfolder = async (item) => { + const zip = new JSZip(); // 创建实例对象 + let patientIds = item.PatientList.map(i => i.PatientIdStr); + let zipName = `${item.SubjectCode}_${patientIds.join(',')}`; + let zipObj = {}; + const promises = []; + for (let visit of item.VisitList) { + if (!zipObj[`${visit.VisitName}`]) { + zipObj[`${visit.VisitName}`] = zip.folder(visit.VisitName); + } + for (let study of visit.StudyList) { + let date = study.StudyTime.split(" ")[0]; + for (let series of study.SeriesList) { + if ( + !zipObj[ + `${visit.VisitName}${series.Modality}` + ] + ) { + zipObj[ + `${visit.VisitName}${series.Modality}` + ] = zipObj[`${visit.VisitName}`].folder( + `${date}_${series.Modality}` + ); + } + for (let instance of series.InstancePathList) { + let obj = { + subjectCode: item.SubjectCode, + visitName: visit.VisitName, + date: study.StudyTime.split(" ")[0], + modality: series.Modality, + instancePath: instance.Path, + dicomName: instance.Path.split("/Dicom/")[1], + }; + const promise = handleBatchDown( + obj, + zipObj[ + `${visit.VisitName}${series.Modality}` + ], + ); + promises.push(promise); + } + } + } + } + // 生成 zip 文件 + Promise.all(promises) + .then(() => { + // 生成zip 文件 + zip + .generateAsync({ + type: "blob", + compression: "DEFLATE", // STORE: 默认不压缩， DEFLATE：需要压缩 + compressionOptions: { + level: 9, // 压缩等级 1~9 1 压缩速度最快， 9 最优压缩方式 + }, + }) + .then((res) => { + saveAs(res, zipName + ".zip"); // 使用FileSaver.saveAs保存文件，文件名可自定义 + flag[id2] = false; + zipObj = null; + }); + }) + .catch((reason) => { flag[id2] = false; }); +}; +const handleBatchDown = async (item, zip) => { + return new Promise((resolve) => { + getFileData( + Vue.prototype.OSSclientConfig.basePath + item.instancePath + ).then((res) => { + const fileName = item.dicomName + ".dcm"; + zip.file(fileName, res.data, { binary: true }); + resolve(); + }); + }); +}; +const getFileData = (fileUrl) => { + return new Promise((resolve, reject) => { + axios(fileUrl, { + method: "GET", + responseType: "blob", // 返回的数据会被强制转为blob类型 ，转换成arraybuffer 也行 + }) + .then((res) => { + resolve(res); + }) + .catch((error) => { + reject(error); + }); + }); +}; +export const fileDownload = (content, filename) => { + const eleLink = document.createElement("a"); + eleLink.download = filename; + eleLink.style.display = "none"; + const blob = new Blob([content]); + eleLink.href = URL.createObjectURL(blob); + document.body.appendChild(eleLink); + eleLink.click(); + document.body.removeChild(eleLink); +}; \ No newline at end of file diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue index 8de89eb8..5ed78073 100644 --- a/src/views/trials/trials-panel/reading/reading-task/index.vue +++ b/src/views/trials/trials-panel/reading/reading-task/index.vue @@ -1,34 +1,61 @@ - +
-
- +
+ - - {{ randomReadInfo.UnReadTaskCount }} + + {{ + randomReadInfo.UnReadTaskCount + }} - - {{ randomReadInfo.UnReadJudgeTaskCount }} + + {{ + randomReadInfo.UnReadJudgeTaskCount + }} - + {{ randomReadInfo.FinishTaskCount }} - - {{ randomReadInfo.FinishJudgeTaskCount }} + + {{ + randomReadInfo.FinishJudgeTaskCount + }} - {{ $t('trials:pendingReadingTasks:button:beginRandomReview') }} + {{ $t("trials:pendingReadingTasks:button:beginRandomReview") }} @@ -188,153 +293,195 @@ --> + diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue index 13a7ec99..0b6b618e 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue @@ -788,7 +788,9 @@ export default { this.form[k] = res.Result[k]; } } - this.CriterionModalitys = this.form.CriterionModalitys.split("|"); + this.CriterionModalitys = this.form.CriterionModalitys + ? this.form.CriterionModalitys.split("|") + : []; this.form.TrialCriterionAdditionalAssessmentTypeList.forEach((v) => { this.$set(v, "IsSelected", v.IsSelected || false); this.$set( From 77320ee13265730e54362ca7102ed0313cff3f03 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Mon, 20 May 2024 09:39:34 +0800 Subject: [PATCH 027/173] =?UTF-8?q?=E9=98=85=E7=89=87=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 3 ++- .../reading/dicoms/components/DicomCanvas.vue | 4 ++-- .../reading/dicoms/components/DicomViewer.vue | 6 +++--- .../reading/dicoms/components/ReadPage.vue | 2 +- .../reading/dicoms/components/StudyList.vue | 4 ++-- .../dicoms/customize/CustomizeDicomCanvas.vue | 4 ++-- .../dicoms/customize/CustomizeDicomViewer.vue | 6 +++--- .../dicoms/customize/CustomizeReadPage.vue | 2 +- .../dicoms/customize/CustomizeStudyList.vue | 2 +- .../trials/trials-panel/reading/dicoms/index.vue | 16 ++++++++-------- .../trials-panel/reading/reading-task/index.vue | 4 ++-- 11 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index c6e6dbb0..06a3042c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -264,7 +264,8 @@ export default { return }else if (res.BasicInfo.LoginState === 2) { // 本次登录的IP或设备与上次不一致，请确认' - this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning')) + // this.$alert(this.$t('login:message:login4'), this.$t('common:title:warning')) + this.$message.warning(this.$t('login:message:login4')) } this.$store.dispatch('permission/generateRoutes').then(res => { this.loading = false diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue index 1ad5f6ee..d6d7cc23 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue @@ -19,7 +19,7 @@
@@ -181,7 +181,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, customWwcTpl: { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index 0f619110..11e546d0 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -26,7 +26,7 @@ A
-
  • +
  • A
    @@ -669,7 +669,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, isExistsManual: { @@ -1364,7 +1364,7 @@ export default { var firstAddSeries = null var currentAddSeries = null - if (this.isReadingTaskViewInOrder) { + if (this.isReadingTaskViewInOrder === 1) { // 有序 // 获取病灶第一次出现的访视序列 var firstAddVisitTaskId = null diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue index 4fc6c6b7..a406553f 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue @@ -112,7 +112,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, isExistsManual: { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue index 886fc4c1..1db2d6cb 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue @@ -368,10 +368,10 @@ export default { async getInitSeries() { var seriesList = [] - var isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder) + var isReadingTaskViewInOrder = parseInt(this.$router.currentRoute.query.isReadingTaskViewInOrder) var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) this.studyList = this.visitTaskList[idx].StudyList - if (this.visitTaskList[idx].IsBaseLineTask || !isReadingTaskViewInOrder) { + if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) { // 基线 const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList]) if (Object.keys(obj).length !== 0) { diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue index 3a4bc8a1..3f8dedb8 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue @@ -19,7 +19,7 @@
    • @@ -180,7 +180,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, customWwcTpl: { diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue index 1dccd8d7..714acea8 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -26,7 +26,7 @@ A
    -
  • +
  • A
    @@ -466,7 +466,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, IseCRFShowInDicomReading: { @@ -995,7 +995,7 @@ export default { var firstAddSeries = null var currentAddSeries = null - if (this.isReadingTaskViewInOrder) { + if (this.isReadingTaskViewInOrder === 1) { // 有序 // 获取病灶第一次出现的访视序列 var firstAddVisitTaskId = null diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue index cf1ad0b1..786d6a07 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReadPage.vue @@ -118,7 +118,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue index 3b2fd7c6..616391dc 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue @@ -362,7 +362,7 @@ export default { var isReadingTaskViewInOrder = JSON.parse(this.$router.currentRoute.query.isReadingTaskViewInOrder) var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId) this.studyList = this.visitTaskList[idx].StudyList - if (this.visitTaskList[idx].IsBaseLineTask || !isReadingTaskViewInOrder) { + if (this.visitTaskList[idx].IsBaseLineTask || isReadingTaskViewInOrder !== 1) { // 基线 const obj = this.getFirstMarkedSeries(this.visitTaskList[idx].MeasureData, [...this.visitTaskList[idx].StudyList]) if (Object.keys(obj).length !== 0) { diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 9add7fb0..32978b6d 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -1,7 +1,7 @@ From eaba3520e93ba88323f28b011f8ac2dd46f51645 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 7 Jun 2024 15:09:27 +0800 Subject: [PATCH 112/173] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/none-dicom-show/index.vue | 11 +++++++---- .../reading/dicoms/none-dicoms.vue | 11 ++++++----- .../none-dicoms/components/VisitReview.vue | 11 ++++++----- src/views/trials/trials-panel/study/index.vue | 11 ++++++----- .../components/subjectStudy.vue | 9 +++++---- .../visit/qc-check/components/dicomFiles.vue | 19 +++++++++++++------ 6 files changed, 43 insertions(+), 29 deletions(-) diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue index baab5ae2..46e0cf9a 100644 --- a/src/views/none-dicom-show/index.vue +++ b/src/views/none-dicom-show/index.vue @@ -82,10 +82,14 @@ export default { studyList: [], subjectVisitId: '', sudyId: '', - loading: false + loading: false, + bp:[] } }, - mounted() { + async created(){ + this.bp = await this.$getBodyPart(this.$route.query.trialId); + }, + async mounted() { if (this.$router.currentRoute.query.TokenKey) { store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey) changeURLStatic('TokenKey', '') @@ -107,9 +111,8 @@ export default { separator = '，' } var arr = bodyPart.split(separator) - let bp = await this.$getBodyPart(this.$route.query.trialId) var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:bp},'Name') + return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name') }) return newArr.join(' | ') }, diff --git a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue index bb268d9d..fe4aac74 100644 --- a/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue +++ b/src/views/trials/trials-panel/reading/dicoms/none-dicoms.vue @@ -95,10 +95,12 @@ export default { subjectCode: '', visistTaskId: '', taskBlindName: '', - readingTaskState: 2 + readingTaskState: 2, + bp:[] } }, - mounted() { + async mounted() { + this.bp = await this.$getBodyPart(this.$route.query.trialId) if (this.$router.currentRoute.query.TokenKey) { store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey) changeURLStatic('TokenKey', '') @@ -174,7 +176,7 @@ export default { preview() { this.previewVisible = true }, - async getBodyPart(bodyPart) { + getBodyPart(bodyPart) { if (!bodyPart) return '' var separator = ',' if (bodyPart.indexOf('|') > -1) { @@ -185,9 +187,8 @@ export default { separator = '，' } var arr = bodyPart.split(separator) - let bp = await this.$getBodyPart(this.$route.query.trialId) var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:bp},'Name') + return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name') }) return newArr.join(' | ') } diff --git a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue index 3359a4cc..21282d84 100644 --- a/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue +++ b/src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue @@ -154,7 +154,8 @@ export default { associatedList: [], currentTaskId: '', otherInfo: null, - isReadingShowPreviousResults: false + isReadingShowPreviousResults: false, + bp:[] } }, computed: { @@ -162,7 +163,8 @@ export default { return this.otherInfo && this.otherInfo.IsReadingShowPreviousResults && this.isReadingShowPreviousResults } }, - mounted() { + async mounted() { + this.bp = await this.$getBodyPart(this.$route.query.trialId) this.isReadingShowPreviousResults = this.$router.currentRoute.query.isReadingShowPreviousResults !== undefined ? this.$router.currentRoute.query.isReadingShowPreviousResults : true this.getNoneDicomList(this.isReadingShowPreviousResults) @@ -267,7 +269,7 @@ export default { }) window.open(routeData.href, '_blank') }, - async getBodyPart(bodyPart) { + getBodyPart(bodyPart) { if (!bodyPart) return '' var separator = ',' if (bodyPart.indexOf('|') > -1) { @@ -278,9 +280,8 @@ export default { separator = '，' } var arr = bodyPart.split(separator) - let bp = await this.$getBodyPart(this.$route.query.trialId) var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:bp},'Name') + return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name') }) return newArr.join(' | ') } diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue index dcd94dcb..6931e8fc 100644 --- a/src/views/trials/trials-panel/study/index.vue +++ b/src/views/trials/trials-panel/study/index.vue @@ -349,10 +349,12 @@ export default { previewNonDicomVisible: false, trialId: this.$route.query.trialId, tokenKey: getToken(), - openWindow: null + openWindow: null, + bp:[] } }, - mounted() { + async mounted() { + this.bp = await this.$getBodyPart(this.$route.query.trialId) this.getSite() this.getVisitPlanOptions() this.getList() @@ -476,7 +478,7 @@ export default { } }).catch(() => { this.loading = false }) }, - async getBodyPart(bodyPart) { + getBodyPart(bodyPart) { if (!bodyPart) return '' var separator = ',' if (bodyPart.indexOf('|') > -1) { @@ -487,9 +489,8 @@ export default { separator = '，' } var arr = bodyPart.split(separator) - let bp = await this.$getBodyPart(this.$route.query.trialId) var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:bp},'Name') + return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name') }) return newArr.join(' | ') }, diff --git a/src/views/trials/trials-panel/subject/brain-metastasis/components/subjectStudy.vue b/src/views/trials/trials-panel/subject/brain-metastasis/components/subjectStudy.vue index 72b95b2f..762aeb42 100644 --- a/src/views/trials/trials-panel/subject/brain-metastasis/components/subjectStudy.vue +++ b/src/views/trials/trials-panel/subject/brain-metastasis/components/subjectStudy.vue @@ -190,9 +190,11 @@ export default { seriesList: [], moment, trialId: this.$route.query.trialId, + bp:[] } }, - mounted() { + async mounted() { + this.bp = await this.$getBodyPart(this.$route.query.trialId) this.getList() }, methods: { @@ -235,7 +237,7 @@ export default { }) this.open = window.open(routeData.href, '_blank') }, - async getBodyPart(bodyPart) { + getBodyPart(bodyPart) { if (!bodyPart) return '' var separator = ',' if (bodyPart.indexOf('|') > -1) { @@ -246,9 +248,8 @@ export default { separator = '，' } var arr = bodyPart.split(separator) - let bp = await this.$getBodyPart(this.$route.query.trialId) var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:bp},'Name') + return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name') }) return newArr.join(' | ') }, diff --git a/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue b/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue index d6375223..df0a66d8 100644 --- a/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue +++ b/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue @@ -174,10 +174,12 @@ export default { petVisible: false, rowData: {}, relationInfo: {}, + bp: [], }; }, - mounted() { + async mounted() { this.getStudyInfo(); + this.bp = await this.$getBodyPart(this.$route.query.trialId); }, methods: { // 预览临床数据 @@ -237,7 +239,7 @@ export default { }); window.open(routeData.href, "_blank"); }, - async getBodyPart(bodyPart) { + getBodyPart(bodyPart) { if (!bodyPart) return ""; var separator = ","; if (bodyPart.indexOf("|") > -1) { @@ -248,10 +250,15 @@ export default { separator = "，"; } var arr = bodyPart.split(separator); - let bp = await this.$getBodyPart(this.$route.query.trialId) - var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:bp},'Name') - }) + var newArr = arr.map((i) => { + return this.$fd( + "Bodypart", + i.trim(), + "Code", + { Bodypart: this.bp }, + "Name" + ); + }); return newArr.join(" | "); }, // 获取勾选项 From fff5a0fcf5a1064d1ec43122255bab81793da7d9 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 7 Jun 2024 16:05:47 +0800 Subject: [PATCH 113/173] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E5=BF=83=E8=BD=AC=E5=8F=98=E4=B8=BA?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/dictionary.js | 8 + .../institutions/components/Sites.vue | 421 ++++++++++++++---- 2 files changed, 346 insertions(+), 83 deletions(-) diff --git a/src/api/dictionary.js b/src/api/dictionary.js index 25897aff..2ea54499 100644 --- a/src/api/dictionary.js +++ b/src/api/dictionary.js @@ -1006,3 +1006,11 @@ export function deleteCommonDocument(commonDocumentId) { method: 'delete' }) } +//getTrialSiteList +export function getTrialSiteList(params) { + return request({ + url: `/site/getTrialSiteList`, + method: 'post', + data: params + }) +} \ No newline at end of file diff --git a/src/views/dictionary/institutions/components/Sites.vue b/src/views/dictionary/institutions/components/Sites.vue index cadc28d2..d1a57f19 100644 --- a/src/views/dictionary/institutions/components/Sites.vue +++ b/src/views/dictionary/institutions/components/Sites.vue @@ -3,33 +3,50 @@
    - + - + - + - + - Search - Reset + Search + Reset - New +
    + {{ $t("trial:dictionary:institutions:site:addSystemSite") }} + + New + +
    + From 134fba1e77a2b64289e7d20f8334725584c7c530 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Tue, 11 Jun 2024 18:04:11 +0800 Subject: [PATCH 114/173] =?UTF-8?q?=E6=92=AD=E6=94=BE=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Dicom/DicomViewer.vue | 14 ++++++++++---- .../reading/dicoms/components/DicomViewer.vue | 10 +++++++--- .../dicoms/customize/CustomizeDicomViewer.vue | 12 +++++------- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/src/components/Dicom/DicomViewer.vue b/src/components/Dicom/DicomViewer.vue index f5b20013..1af67276 100644 --- a/src/components/Dicom/DicomViewer.vue +++ b/src/components/Dicom/DicomViewer.vue @@ -247,7 +247,7 @@ - - - + + @@ -386,7 +387,8 @@ export default { wwwcList: [], layout: null, seriesList: [], - customWwc: { visible: false, title: null } + customWwc: { visible: false, title: null }, + fps: 15 } }, mounted() { @@ -566,6 +568,10 @@ export default { setDicomCanvasfps(event) { this.currentDicomCanvas.setFps(event.target.value) }, + clipPlay() { + this.currentDicomCanvas.setFps(this.fps) + this.currentDicomCanvas.toggleClipPlay() + }, fitToType(e, type) { const toolButtons = document.querySelectorAll('[data-tool]') Array.from(toolButtons).forEach((toolBtn) => { diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue index f1eab321..3eeac316 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -328,9 +328,9 @@ - - + @@ -838,7 +838,8 @@ export default { activeCanvasWW: null, activeCanvasWC: null, activeTaskInfo: {}, - clipPlaying: false + clipPlaying: false, + fps: 15 } }, @@ -902,6 +903,7 @@ export default { this.clipPlaying = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toolState.clipPlaying } else { this.clipPlaying = false + this.fps = 15 } } } @@ -1258,6 +1260,7 @@ export default { }, loadImageStack(dicomSeries) { this.clipPlaying = false + this.fps = 15 this.canvasObj[this.currentDicomCanvasIndex] = dicomSeries this.$nextTick(() => { this.activeSeries = dicomSeries @@ -1948,6 +1951,7 @@ export default { const isLoaded = this.getSeriesLoadStatus() if (!isLoaded) return this.clipPlaying = isPlay + this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setFps(this.fps) this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].toggleClipPlay(isPlay) }, getSeriesLoadStatus() { diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue index 9e1fc2b3..9856780e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -448,9 +448,8 @@ class="select-wrapper" :disabled="clipPlaying" @change="setDicomCanvasfps($event)" + v-model="fps" > - - @@ -857,7 +856,7 @@ export default { isFullscreen: false, manualsDialog: { visible: false }, clipPlaying: false, - + fps: 15, // 上传 uploadImageVisible: false, trialCriterion: {}, @@ -900,6 +899,7 @@ export default { ][0].toolState.clipPlaying; } else { this.clipPlaying = false; + this.fps = 15 } }, }, @@ -1358,6 +1358,7 @@ export default { }, loadImageStack(dicomSeries) { this.clipPlaying = false; + this.fps = 15 this.canvasObj[this.currentDicomCanvasIndex] = dicomSeries; if (this.activeTool) { if (dicomSeries.isCurrentTask && dicomSeries.readingTaskState < 2) { @@ -2053,7 +2054,6 @@ export default { dicomSeries.readingTaskState < 2 ) { if (this.activeTool && !type) { - console.log(1111122222); this.measuredTools.forEach((item) => { this.$refs[ `dicomCanvas${this.currentDicomCanvasIndex}` @@ -2068,7 +2068,6 @@ export default { `dicomCanvas${this.currentDicomCanvasIndex}` ][0].setToolActive(toolName); } else { - console.log(222233333); this.measuredTools.forEach((item) => { this.$refs[ `dicomCanvas${this.currentDicomCanvasIndex}` @@ -2080,7 +2079,6 @@ export default { ][0].setToolActive(toolName); } } else { - console.log(3333344444); if (!this.activeTool) return; this.measuredTools.forEach((item) => { this.$refs[ @@ -2093,7 +2091,6 @@ export default { this.activeTool = ""; } } else { - console.log(44445555); if (this.activeTool === toolName) { this.$refs[ `dicomCanvas${this.currentDicomCanvasIndex}` @@ -2160,6 +2157,7 @@ export default { const isLoaded = this.getSeriesLoadStatus(); if (!isLoaded) return; this.clipPlaying = isPlay; + this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].setFps(this.fps) this.$refs[ `dicomCanvas${this.currentDicomCanvasIndex}` ][0].toggleClipPlay(isPlay); From d91a24c154ecf782e99cdfc089cc434dd22ff6ec Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Wed, 12 Jun 2024 10:27:52 +0800 Subject: [PATCH 115/173] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85?= =?UTF-8?q?=E7=89=87=E5=88=87=E6=8D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-panel/reading/dicoms/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index e0062d53..71a54520 100644 --- a/src/views/trials/trials-panel/reading/dicoms/index.vue +++ b/src/views/trials/trials-panel/reading/dicoms/index.vue @@ -372,7 +372,7 @@ export default { this.$refs.reportPage.setScrollTop(1) }) } else { - this.isShow = false + // this.isShow = false } return Promise.resolve(true) }, From d4c5c517fbb55a095268e2830810b842c5e0dfde Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 12 Jun 2024 11:04:13 +0800 Subject: [PATCH 116/173] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A0=87=E5=87=86id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/uploadImage/components/upload-list.vue | 1 - src/components/uploadImage/index.vue | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/uploadImage/components/upload-list.vue b/src/components/uploadImage/components/upload-list.vue index 944e73ac..40c2efc3 100644 --- a/src/components/uploadImage/components/upload-list.vue +++ b/src/components/uploadImage/components/upload-list.vue @@ -257,7 +257,6 @@ export default { }, watch: { isLoad() { - console.log(this.isLoad); if (!this.isLoad) { this.$refs.file.value = null; if (this.dicomList.some((item) => item.isUpload === 3)) { diff --git a/src/components/uploadImage/index.vue b/src/components/uploadImage/index.vue index 05e1a81e..9a4154e6 100644 --- a/src/components/uploadImage/index.vue +++ b/src/components/uploadImage/index.vue @@ -179,6 +179,7 @@ export default { try { let params = { SubjectId: this.SubjectId, + TrialReadingCriterionId: this.Criterion.TrialReadingCriterionId, }; this.loading = true; let res = await getSubjectImageUploadList(params); From 28297aa9bac0f3c33f6c1fb51f03afdf77fd065f Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 12 Jun 2024 11:34:31 +0800 Subject: [PATCH 117/173] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8F=8A=E9=94=81?= =?UTF-8?q?=E5=AE=9A=E6=B7=BB=E5=8A=A0=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/user.js | 18 ++ src/components/MFA/fun.js | 26 +++ src/components/MFA/index.js | 7 + src/components/MFA/index.vue | 172 +++++++++++++++ src/main.js | 46 ++-- src/store/modules/user.js | 11 +- src/views/login/index.vue | 394 +++++++++++++++++++--------------- src/views/recompose/index.vue | 2 +- 8 files changed, 490 insertions(+), 186 deletions(-) create mode 100644 src/components/MFA/fun.js create mode 100644 src/components/MFA/index.js create mode 100644 src/components/MFA/index.vue diff --git a/src/api/user.js b/src/api/user.js index 92fe16f7..67027318 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -167,3 +167,21 @@ export function getTrialUserList(params) { params }) } + +// 验证MFA邮件 +export function verifyMFACode(params) { + return request({ + url: `/User/verifyMFACode`, + method: 'post', + params + }) +} + +// 发送MFA邮件 +export function sendMFAEmail(params) { + return request({ + url: `/User/sendMFAEmail`, + method: 'post', + params + }) +} diff --git a/src/components/MFA/fun.js b/src/components/MFA/fun.js new file mode 100644 index 00000000..f8192fe6 --- /dev/null +++ b/src/components/MFA/fun.js @@ -0,0 +1,26 @@ +import Vue from "vue"; +import MFACOMP from "./index.vue"; + +const MFAConstructor = Vue.extend(MFACOMP); + +const MFA = options => { + const { UserId, username, EMail, callBack, cancelBack, status = 'login' } = options; + if (!UserId) throw `UserId is requred.but ${UserId}` + const id = `MFA${new Date().getTime()}`; + const instance = new MFAConstructor(); + instance.id = id; + instance.vm = instance.$mount(); + if (instance.vm.visible) return; + document.body.appendChild(instance.vm.$el); + instance.vm.open({ UserId, username, EMail, status }); + instance.vm.$on("success", (Id) => { + if (callBack) callBack(Id) + }); + instance.vm.$on("closed", () => { + if (cancelBack) cancelBack(); + document.body.removeChild(instance.vm.$el); + instance.vm.$destroy(); + }); + return instance.vm; +} +export default MFA; \ No newline at end of file diff --git a/src/components/MFA/index.js b/src/components/MFA/index.js new file mode 100644 index 00000000..df785460 --- /dev/null +++ b/src/components/MFA/index.js @@ -0,0 +1,7 @@ +import MFACOMP from "./index.vue"; +import MFA from "./fun"; + +export default Vue => { + Vue.component(MFACOMP.name, MFACOMP); + Vue.prototype.$MFA = MFA; +}; \ No newline at end of file diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue new file mode 100644 index 00000000..b8089037 --- /dev/null +++ b/src/components/MFA/index.vue @@ -0,0 +1,172 @@ + + \ No newline at end of file diff --git a/src/main.js b/src/main.js index cc88f482..2c31c761 100644 --- a/src/main.js +++ b/src/main.js @@ -4,6 +4,7 @@ import 'normalize.css/normalize.css' // A modern alternative to CSS resets import ElementUI, { MessageBox } from 'element-ui' import { getBasicDataAllSelect, getFrontInternationalizationList } from '@/api/dictionary/dictionary' +import { sendMFAEmail } from "@/api/user.js"; import { resetReadingRestTime } from '@/api/trials/reading' // import 'element-ui/lib/theme-chalk/index.css' import './assets/css/theme-blue/index.css' // 浅绿色主题 @@ -58,6 +59,8 @@ import upload from '@/components/element-ui/upload' Vue.use(upload) import Preview from '@/components/Preview/index' Vue.use(Preview) +import MFA from '@/components/MFA/index' +Vue.use(MFA) import adaptive from '@/directive/adaptive/index' // 表格自适应指令 Vue.use(adaptive) @@ -406,24 +409,37 @@ async function VueInit() { } var my_username = zzSessionStorage.getItem('my_username') var my_password = zzSessionStorage.getItem('my_password') + let my_userid = zzSessionStorage.getItem('userId') + let my_EMail = zzSessionStorage.getItem('my_EMail') if (md5(_vm.unlock.my_password) === my_password && my_username === _vm.unlock.my_username) { resetReadingRestTime().then(() => { }) - _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.') - _vm.unlock = { - my_username: null, - my_password: null - } - isOpen = false - count = 0; - isLock = null - zzSessionStorage.removeItem('isLock') - localStorage.setItem('count', '0') - document.querySelector('#my_username').value = null - document.querySelector('#my_password').value = null - setTimeout(() => { - done() - }, 500) + sendMFAEmail({ UserId: my_userid }).then((res) => { + done(); + Vue.prototype.$MFA({ + status: "lock", + UserId: my_userid, + EMail: my_EMail, + username: my_username, + callBack: () => { + _vm.$message.success(lang === 'zh' ? '解锁成功，请继续操作' : 'Unlocked successfully. Please continue operation.') + _vm.unlock = { + my_username: null, + my_password: null + } + isOpen = false + count = 0; + isLock = null + zzSessionStorage.removeItem('isLock') + localStorage.setItem('count', '0') + document.querySelector('#my_username').value = null + document.querySelector('#my_password').value = null + setTimeout(() => { + done() + }, 500) + }, + }) + }) } else { // console.log(111) _vm.$message.error(lang === 'zh' ? '请输入正确用户名密码' : 'Please enter the correct password.') diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 21de24d4..70ef429f 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -83,13 +83,20 @@ const actions = { }, // user login login({ commit }, userInfo) { - const { username, password } = userInfo + const { username, password, UserId } = userInfo return new Promise((resolve, reject) => { - login({ UserName: username.trim(), Password: md5(password) }).then(async response => { + let data = { + UserName: username.trim(), Password: md5(password) + } + if (UserId) { + data.UserId = UserId; + } + login(data).then(async response => { if (response.IsSuccess) { zzSessionStorage.removeItem('lastWorkbench') zzSessionStorage.setItem('my_username', username.trim()) zzSessionStorage.setItem('my_password', md5(password)) + zzSessionStorage.setItem('my_EMail', response.Result.BasicInfo.EMail) const data = response.Result if (data.BasicInfo.IsFirstAdd || data.BasicInfo.LoginState === 1) { try { diff --git a/src/views/login/index.vue b/src/views/login/index.vue index ad164eeb..27c39894 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -6,17 +6,17 @@