diff --git a/.env.development b/.env.development index 1795b787..1cd11a20 100644 --- a/.env.development +++ b/.env.development @@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = false # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = false diff --git a/.env.prod b/.env.prod index 49d97ae9..2f8d7ea6 100644 --- a/.env.prod +++ b/.env.prod @@ -8,6 +8,9 @@ VUE_APP_BASE_PATH = '/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = true diff --git a/.env.production b/.env.production index 00537958..38fd6f0d 100644 --- a/.env.production +++ b/.env.production @@ -9,6 +9,9 @@ VUE_APP_IS_TEST = true # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = false diff --git a/.env.prop b/.env.prop index 79660dba..20a7b9ee 100644 --- a/.env.prop +++ b/.env.prop @@ -5,6 +5,9 @@ NODE_ENV = 'prop' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = true diff --git a/.env.uat b/.env.uat index 1f04b231..b4586518 100644 --- a/.env.uat +++ b/.env.uat @@ -10,6 +10,9 @@ VUE_APP_BASE_PATH = '/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = true diff --git a/.env.usa b/.env.usa index b621b83e..0098dc79 100644 --- a/.env.usa +++ b/.env.usa @@ -1,12 +1,15 @@ # just a flag -ENV = 'production' -NODE_ENV = 'production' +ENV = 'usa' +NODE_ENV = 'usa' # base public path VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-05-31/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = true + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = false 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 diff --git a/src/App.vue b/src/App.vue index 1d5e9db3..a7d5c2b7 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,169 +1,213 @@ 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/api/dictionary/checkConfig.js b/src/api/dictionary/checkConfig.js index af74b938..771ca57e 100644 --- a/src/api/dictionary/checkConfig.js +++ b/src/api/dictionary/checkConfig.js @@ -76,3 +76,11 @@ export function fullyReplicated(param) { }) } +// 获取所有字典key +export function getDictionaryCodeList() { + return request({ + url: `/Dictionary/getAllDictionaryKey`, + method: 'post', + }) +} + diff --git a/src/api/global.js b/src/api/global.js index 6d0a4b58..a568bea3 100644 --- a/src/api/global.js +++ b/src/api/global.js @@ -14,17 +14,19 @@ export function getHospitalList() { }) } -export function getAllSponsorList() { +export function getAllSponsorList(params) { return request({ url: '/sponsor/getAllSponsorList', - method: 'get' + method: 'get', + params }) } -export function getAllCROList() { +export function getAllCROList(params) { return request({ url: '/cro/getAllCROList', - method: 'get' + method: 'get', + params }) } export function getAllSiteList() { diff --git a/src/api/load.js b/src/api/load.js new file mode 100644 index 00000000..cc23cc40 --- /dev/null +++ b/src/api/load.js @@ -0,0 +1,42 @@ +import request from '@/utils/request' +// 下载打包影像 +export function requestPackageAndAnonymizImage(params) { + return request({ + url: '/DownloadAndUpload/requestPackageAndAnonymizImage', + method: 'post', + params + }) +} +// 获取影像上传列表 +export function getSubjectImageUploadList(params) { + return request({ + url: '/DownloadAndUpload/getSubjectImageUploadList', + method: 'get', + params + }) +} +// 预上传 +export function preArchiveDicomStudy(data) { + return request({ + url: '/DownloadAndUpload/preArchiveDicomStudy', + method: 'post', + data + }) +} +// 归档 +export function addOrUpdateArchiveTaskStudy(data) { + return request({ + url: '/DownloadAndUpload/addOrUpdateArchiveTaskStudy', + method: 'post', + data + }) +} + +// 删除上传文件 +export function deleteTaskStudy(params) { + return request({ + url: '/DownloadAndUpload/deleteTaskStudy', + method: 'delete', + params + }) +} \ No newline at end of file diff --git a/src/api/trials.js b/src/api/trials.js index 1cdb1ff0..8d017e4a 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -1364,9 +1364,9 @@ export function getForwardList(param) { }) } -export function getNoneDicomStudyList(subjectVisitId, sudyId = '') { +export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false) { return request({ - url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}`, + url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}`, method: 'get' }) } @@ -3667,3 +3667,11 @@ export function getDicomSeriesInfo(param) { data: param }) } + +export function getTrialSiteSelectList(params) { + return request({ + url: `/trialMaintenance/getTrialSiteSelectList`, + method: 'get', + params + }) +} diff --git a/src/api/trials/reading.js b/src/api/trials/reading.js index 1d99fb1d..cebb8312 100644 --- a/src/api/trials/reading.js +++ b/src/api/trials/reading.js @@ -436,9 +436,9 @@ export function addSubjectCancelDoctorNote(params) { }) } -export function getSubjectCancelDoctorHistoryList(SubjectId) { +export function getSubjectCancelDoctorHistoryList(SubjectId, TrialReadingCriterionId) { return request({ - url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}`, + url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}&&TrialReadingCriterionId=${TrialReadingCriterionId}`, method: 'get' }) } diff --git a/src/api/trials/setting.js b/src/api/trials/setting.js index 1df89e8a..ad9bf3b9 100644 --- a/src/api/trials/setting.js +++ b/src/api/trials/setting.js @@ -94,4 +94,20 @@ export function getTrialJudgyInfo(params) { data: params }) } +// 获取检查部位列表 +export function getTrialBodyPartList(params) { + return request({ + url: `/TrialConfig/getTrialBodyPartList`, + method: 'get', + params + }) +} +// 新增检查部位 +export function addOrUpdateTrialBodyPart(data) { + return request({ + url: `/TrialConfig/addOrUpdateTrialBodyPart`, + method: 'post', + data + }) +} diff --git a/src/api/user.js b/src/api/user.js index aa9354c5..67027318 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -7,10 +7,11 @@ export function login(data) { data }) } -export function loginOut() { +export function loginOut(params) { return request({ url: `/User/loginOut`, - method: 'get' + method: 'get', + params }) } export function getAllDictionary() { @@ -157,3 +158,30 @@ export function getUserLogList(params) { data: params }) } + +// 获取登录用户 +export function getTrialUserList(params) { + return request({ + url: `/TrialMaintenance/getTrialUserList`, + method: 'get', + 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/assets/icons/svg/resetSuccess.svg b/src/assets/icons/svg/resetSuccess.svg new file mode 100644 index 00000000..96c094b7 --- /dev/null +++ b/src/assets/icons/svg/resetSuccess.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/zip.png b/src/assets/zip.png new file mode 100644 index 00000000..bf027c11 Binary files /dev/null and b/src/assets/zip.png differ diff --git a/src/assets/zzlogo-usa.png b/src/assets/zzlogo-usa.png new file mode 100644 index 00000000..bb4be037 Binary files /dev/null and b/src/assets/zzlogo-usa.png differ diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue index b05ef2b8..303307d6 100644 --- a/src/components/BaseForm/search-form.vue +++ b/src/components/BaseForm/search-form.vue @@ -2,18 +2,28 @@ diff --git a/src/views/none-dicom-show/components/image-viewer.vue b/src/views/none-dicom-show/components/image-viewer.vue index fd00a31c..a9718f07 100644 --- a/src/views/none-dicom-show/components/image-viewer.vue +++ b/src/views/none-dicom-show/components/image-viewer.vue @@ -50,7 +50,7 @@ :ref="`img${i}`" :key="item.Id" crossorigin="anonymous" - :src="`${OSSclientConfig.basePath}${item.Path}`" + :src="item.FileType&&item.FileType.indexOf('zip')>=0?zipImg:`${OSSclientConfig.basePath}${item.Path}`" :style="imgStyle" style="max-width:100%;max-height: 100%;" @load="handleImgLoad" @@ -68,7 +68,7 @@ + diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index f347279f..d32b1550 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -11,12 +11,6 @@ @reset="handleReset" @new="handleAddUser" /> - - - - - - { UserType: null, PageIndex: 1, PageSize: 20, - Asc: true, + Asc: false, RealName: '', - SortField: '' + BeginCreateTime: '', + EndCreateTime: '', + CreateTimeArr: [], + SortField: 'CreateTime' } } export default { @@ -163,6 +160,13 @@ export default { minWidth: 100, sortable: 'custom', showOverflowTooltip: true }, + { + prop: "CreateTime", + label: this.$t("system:userlist:table:createTime"), + minWidth: 200, + sortable: "custom", + showOverflowTooltip: true, + }, { type: 'operate', label: this.$t('common:action:action'), minWidth: 200, @@ -193,6 +197,13 @@ export default { width: '120px', placeholder: '' }, + { + type: "Input", + label: this.$t("system:userlist:label:EMail"), + prop: "EMail", + width: "120px", + placeholder: "", + }, { type: 'Input', label: this.$t('system:userlist:label:Organization'), @@ -247,7 +258,14 @@ export default { options: [], // 下拉选项 props: { label: 'UserType', value: 'Id' }, // 下拉选项配置信息，必填 placeholder: '' - } + }, + { + type: "Daterange", + label: this.$t("system:userlist:label:CreateTime"), + prop: "CreateTimeArr", + width: "400px", + placeholder: "", + }, ], searchHandle: [ { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' }, @@ -314,7 +332,14 @@ export default { handleReset() { this.searchData = searchDataDefault() this.getList() - } + }, + handleSearch() { + if (this.searchData.CreateTimeArr.length > 0) { + this.searchData.BeginCreateTime = this.searchData.CreateTimeArr[0] + this.searchData.EndCreateTime = this.searchData.CreateTimeArr[1] + } + this.getList() + }, } } diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index 082a8545..66754ce8 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -2,8 +2,13 @@
+ - + + + {{ $t('trials:trials:title:eics_title') }} + + {{ $t('trials:trials:title:eics') }} @@ -46,6 +51,12 @@ {{ $t('trials:trials-myinfo:title:accountInfo') }} + + {{ $t("trials:trials-myinfo:title:system") }} {{ $t('trials:trials-myinfo:button:loginout') }} @@ -68,7 +79,8 @@ export default { isReviewer: false, userTypeShortName: zzSessionStorage.getItem('userTypeShortName'), notice: '', - VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION + VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION, + NODE_ENV: process.env.NODE_ENV, } }, computed: { @@ -108,6 +120,9 @@ export default { case '4-3': this.logout() break + case "4-4": + this.go("/system"); + break; case '1': this.go('/trials/trials-workbench') break diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index b081bf3f..e3c252ed 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -12,29 +12,61 @@ > - - + + - - - {{ item.label }} + + + {{ item.label }} - - + + - + - + @@ -45,9 +77,18 @@ - + - + - + - + @@ -100,8 +156,14 @@ - - + + - + - + - + - + @@ -166,9 +242,12 @@ - + - @@ -193,14 +272,19 @@ - + - - - + - + - - + @@ -229,106 +319,95 @@ multiple clearable > - + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - {{ $t('trials:trials-list:form:cancel') }} + {{ $t("trials:trials-list:form:cancel") }} - {{ $t('trials:trials-list:form:save') }} + {{ $t("trials:trials-list:form:save") }} - diff --git a/src/views/trials/trials-myinfo/mine.vue b/src/views/trials/trials-myinfo/mine.vue new file mode 100644 index 00000000..455623f5 --- /dev/null +++ b/src/views/trials/trials-myinfo/mine.vue @@ -0,0 +1,199 @@ + + \ 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..28a4956c --- /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/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue index 75272c38..6039250c 100644 --- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue +++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue @@ -47,6 +47,7 @@ > - - - - + + + + + + + + + + + + + + + + {{ $fd('TaskState', scope.row.TaskState) }} - - - - - - - - - - - - {{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }} {{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }} - + --> - {{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }} {{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }} - + --> - {{$t('trials:consistencyAnalysis:title:impactInfluence')}} + : {{$t('trials:consistencyAnalysis:title:impactInfluence')}}
{ Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, TrialSiteCode: null, @@ -674,7 +701,9 @@ const searchDataDefault = () => { TaskAllocationState: null, BeginAllocateDate: null, EndAllocateDate: null, - TrialReadingCriterionId: null + TrialReadingCriterionId: null, + BeginSignTime: null, + EndSignTime: null } } export default { @@ -707,6 +736,7 @@ export default { ReaderRulesFormVisible: false, IsSelfAnalysis: true, timeList: [], + timeList2: [], ApplyforReasonVisible: false, ApplyforReasonForm: { Type: null, @@ -790,9 +820,18 @@ export default { this.searchData.EndAllocateDate = null } }, + changeTimeList2() { + if (this.timeList2) { + this.searchData.BeginSignTime = this.timeList2[0] + this.searchData.EndSignTime = this.timeList2[1] + } else { + this.searchData.BeginSignTime = null + this.searchData.EndSignTime = null + } + }, // 重阅历史 reReadingHistory(row) { - this.$router.push({ path: `/trials/trials-panel/reading/reReadingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&SiteId=${row.SiteId}&SubjectCode=${row.SubjectCode}&TaskName=${row.TaskName}&DoctorUserId=${row.DoctorUserId}` }) + this.$router.push({ path: `/trials/trials-panel/reading/reReadingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&TrialSiteId=${row.TrialSiteId}&SubjectCode=${row.SubjectCode}&TaskName=${row.TaskName}&DoctorUserId=${row.DoctorUserId}` }) }, // 申请重阅 applyReReading() { @@ -981,6 +1020,7 @@ export default { }, handleReset() { this.timeList = null + this.timeList2 = null this.searchData = searchDataDefault() this.getList() }, @@ -1004,12 +1044,17 @@ export default { } + 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 8323b4d2..94ca0017 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 @@
@@ -43,7 +43,7 @@
-
+

{{ subjectCode }} {{ stack.taskBlindName }}

Series: #{{ dicomInfo.series }}
Image: #{{ dicomInfo.frame }}
@@ -99,8 +99,8 @@
-
Location: {{ dicomInfo.location }}
-
Slice Thickness: {{ dicomInfo.thick }}mm
+
Location: {{ `${Number(dicomInfo.location).toFixed(digitPlaces)} mm` }}
+
Slice Thickness: {{ `${dicomInfo.thick} mm` }}
WW/WL: {{ dicomInfo.wwwc }}
@@ -180,7 +180,7 @@ export default { required: true }, isReadingTaskViewInOrder: { - type: Boolean, + type: Number, required: true }, customWwcTpl: { @@ -221,7 +221,7 @@ export default { taskBlindName: '', frame: null, imageRendered: false, - isExistsClinicalData:false + isExistsClinicalData: false // preventCache: true }, dicomInfo: { @@ -298,7 +298,7 @@ export default { ], scrollSyncInfo: { offset: 0 }, hideMeasureArr: [] - + } }, computed: { @@ -331,7 +331,9 @@ export default { }, mounted() { - this.subjectCode = this.$router.currentRoute.query.subjectCode + console.log(cornerstoneTools) + // this.subjectCode = this.$router.currentRoute.query.subjectCode + this.subjectCode = localStorage.getItem('subjectCode') document.addEventListener('mouseup', () => { this.sliderMouseup() }) @@ -374,10 +376,10 @@ export default { } ) - // this.canvas.addEventListener( - // 'cornerstonetoolsmeasurementremoved', - // this.onMeasurementremoved - // ) + this.canvas.addEventListener( + 'cornerstonetoolsmeasurementremoved', + this.onMeasurementremoved + ) // EVENTS.MOUSE_UP this.canvas.addEventListener('cornerstonetoolsmouseup', this.mouseUp) this.canvas.addEventListener('cornerstonetoolsmousedown', this.mouseDown) @@ -478,7 +480,6 @@ export default { }, methods: { goViewer(e) { - console.log('goViewer') console.log(this.$refs['sliderBox'].clientHeight) var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight this.height = height @@ -567,6 +568,7 @@ export default { showCancelButton: false, type: 'warning' }).then(() => { + }).catch(() => {}) e.stopImmediatePropagation() e.stopPropagation() @@ -652,7 +654,7 @@ export default { if (PX < 0) return if (PX > boxHeight) return var height = PX * 100 / boxHeight - var index = Math.trunc(this.stack.imageIds.length * this.height / 100) + var index = Math.trunc(this.stack.imageIds.length * height / 100) index = index > this.stack.imageIds.length ? this.stack.imageIds.length : index < 0 ? 0 : index // if (!cornerstone.imageCache.getImageLoadObject(this.stack.imageIds[index])) return this.height = height @@ -664,6 +666,7 @@ export default { this.sliderInfo.isMove = false }, getMeasureData() { + console.log('getMeasureData') var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId) this.measureData = this.visitTaskList[idx].MeasureData const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager @@ -737,14 +740,10 @@ export default { getToolStateInfo(e) { const { element, currentPoints, image, viewport } = e.detail var imageId = image.imageId - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager for (var m = 0; m < this.measuredTools.length; m++) { var toolType = this.measuredTools[m] @@ -772,6 +771,7 @@ export default { measureData.data = toolState.data[i] measureData.type = toolType measureData.thick = this.dicomInfo.thick + measureData.location = this.dicomInfo.location var uuid = toolState.data[i].uuid var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid) if (idx > -1) { @@ -800,7 +800,7 @@ export default { } }, stackScrollCallback(e) { - console.log('stackScrollCallback') + // console.log('stackScrollCallback') const { detail } = e if (this.isScrollSync && this.currentDicomCanvasIndex === this.canvasIndex) { this.scrollSyncInfo.canvasIndex = this.canvasIndex @@ -867,6 +867,7 @@ export default { renderMeasuredData(e) { this.stack.frame = !isNaN(parseInt(this.stack.frame)) ? parseInt(this.stack.frame) : 0 var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId) + if (idx === -1) return this.measureData = this.visitTaskList[idx].MeasureData const { element } = e.detail const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager @@ -905,11 +906,8 @@ export default { if (this.readingTaskState >= 2) return var element = cornerstone.getEnabledElement(this.canvas) var { imageId } = element.image - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - if (instanceId.includes('?frame=')) { - instanceId = instanceId.split('?frame=')[0] - } - instanceId = instanceId.split('.')[0] + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId && i.IsCurrentTask && i.ReadingTaskState < 2) if (idx === -1) return this.measureData = this.visitTaskList[idx].MeasureData @@ -969,18 +967,13 @@ export default { } } }, - async mouseClick(e) { + mouseClick(e) { const { element, currentPoints, image, viewport } = e.detail var imageId = image.imageId - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] - const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager for (let t = 0; t < this.measuredTools.length; t++) { var toolType = this.measuredTools[t] @@ -1011,6 +1004,7 @@ export default { measureData.data = toolState.data[i] measureData.type = toolType measureData.thick = this.dicomInfo.thick + measureData.location = this.dicomInfo.location measureData.ww = Math.round(viewport.voi.windowWidth) measureData.wc = Math.round(viewport.voi.windowCenter) measureData.data.active = false @@ -1060,22 +1054,19 @@ export default { } else { this.disabledMarks = [] } + this.maxVistNum = this.visitTaskList[this.visitTaskList.length - 1].VisitTaskNum this.minVistNum = this.visitTaskList[0].VisitTaskNum this.measureData = this.visitTaskList[idx].MeasureData const imageId = this.stack.imageIds[this.stack.currentImageIdIndex] - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] this.stack.instanceId = instanceId const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager ToolStateManager.clearImageIdToolState(dicomSeries.imageIds) - if (this.toolState.clipPlaying) this.toggleClipPlay() + this.toggleClipPlay(false) this.toolState.viewportInvert = false this.toolState.dicomInfoVisible = false @@ -1095,102 +1086,105 @@ export default { // } // resolve() // }) + this.loading = true cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex]) - .then(image => { - scope.onFirstImageLoaded(image) + .then(async image => { + if (this.stack.imageIds.indexOf(image.imageId) !== -1) { + await scope.onFirstImageLoaded(image) + } + scope.loading = false resolve() }) .catch((error) => { if (error.error && error.error.message) { this.$alert(error.error.message) } + scope.loading = false resolve() }) }) }, onFirstImageLoaded(image) { console.log('onFirstImageLoaded') + return new Promise(async resolve => { + const element = this.$refs.canvas + var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image) + cornerstone.displayImage(this.canvas, image, viewport) - const element = this.$refs.canvas - var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image) - cornerstone.displayImage(this.canvas, image, viewport) + if (!this.toolState.initialized) { + this.toolState.initialized = true + const toolButtons = document.querySelectorAll('[data-tool]') - if (!this.toolState.initialized) { - this.toolState.initialized = true - const toolButtons = document.querySelectorAll('[data-tool]') - - // const scope = this - Array.from(toolButtons).forEach((toolBtn) => { + // const scope = this + Array.from(toolButtons).forEach((toolBtn) => { // Add the tool - const toolName = toolBtn.getAttribute('data-tool') - const apiTool = cornerstoneTools[`${toolName}Tool`] - if (apiTool) { - const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool) + const toolName = toolBtn.getAttribute('data-tool') + const apiTool = cornerstoneTools[`${toolName}Tool`] + if (apiTool) { + const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool) - if (!toolAlreadyAddedToElement) { - if (toolName === 'Length') { - cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }}) - } else if (toolName === 'Bidirectional') { + if (!toolAlreadyAddedToElement) { + if (toolName === 'Length') { + cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }}) + } else if (toolName === 'Bidirectional') { // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces }) // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true - cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }}) - } else if (toolName === 'ArrowAnnotate') { - cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }}) - } else if (toolName === 'RectangleRoi') { - cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }}) - } else { - cornerstoneTools.addToolForElement(element, apiTool) + cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }}) + } else if (toolName === 'ArrowAnnotate') { + cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }}) + } else if (toolName === 'RectangleRoi') { + cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }}) + } else { + cornerstoneTools.addToolForElement(element, apiTool) + } } } + }) + if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) { + cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool) } - }) - if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) { - cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool) - } - if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) { - cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool) - } - cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {}) + if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) { + cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool) + } + cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {}) - if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) { - cornerstoneTools.addToolForElement(element, ScaleOverlayTool) - } - cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {}) - cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', { - mouseButtonMask: 2 - }) - cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', { - mouseButtonMask: 4 - }) + if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) { + cornerstoneTools.addToolForElement(element, ScaleOverlayTool) + } + cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {}) + cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', { + mouseButtonMask: 2 + }) + cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', { + mouseButtonMask: 4 + }) // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) { // cornerstoneTools.addToolForElement(element, OrientationMarkersTool) // } // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { }) - } + } - // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip']) - cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip']) - cornerstoneTools.addToolState(this.canvas, 'stack', this.stack) - // cornerstoneTools.stackPrefetch.enable(this.canvas) - cornerstone.updateImage(element, true) + // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip']) + cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip']) + cornerstoneTools.addToolState(this.canvas, 'stack', this.stack) + // cornerstoneTools.stackPrefetch.enable(this.canvas) + cornerstone.updateImage(element, true) - this.stack.firstImageLoading = false - this.toolState.dicomInfoVisible = true - var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } - this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] - this.stack.instanceId = instanceId - this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) - this.resetWwwc() + this.stack.firstImageLoading = false + this.toolState.dicomInfoVisible = true + const imageInfo = this.getInstanceInfo(image.imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame + this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 + this.stack.instanceId = instanceId + this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) + this.resetWwwc() + resolve() + }) }, onNewImage(e) { - console.log('cornerstonenewimage') + // console.log('cornerstonenewimage') if (this.isCurrentTask && this.readingTaskState < 2) { this.resetHideMeasureArr() } @@ -1227,6 +1221,12 @@ export default { if (this.dicomInfo.thick) { this.dicomInfo.thick = this.dicomInfo.thick.toFixed(2) } + let newImageIdIndex = this.stack.imageIds.findIndex(i=>i===imageId) + if(newImageIdIndex === -1) return + this.stack.currentImageIdIndex = newImageIdIndex + this.stack.imageIdIndex = newImageIdIndex + this.series.imageIdIndex = newImageIdIndex + this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1) }, getScreenshots() { const canvas = this.canvas.querySelector('canvas') @@ -1248,14 +1248,10 @@ export default { this.stack.imageRendered = true // const { element } = e.detail var imageId = e.detail.image.imageId - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] if (this.imageId !== instanceId) { this.getOrientationMarker(e.detail.element) // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值 @@ -1292,20 +1288,11 @@ export default { if (!imagePlane || !imagePlane.rowCosines || !imagePlane.columnCosines) { return } - const row = getOrientationString(imagePlane.rowCosines) const column = getOrientationString(imagePlane.columnCosines) const oppositeRow = invertOrientationString(row) const oppositeColumn = invertOrientationString(column) - const markers = { - top: oppositeColumn, - bottom: column, - left: oppositeRow, - right: row - } - if (!markers) { - return - } + this.orientationMarkers = [oppositeColumn, row, column, oppositeRow] this.originalMarkers = [oppositeColumn, row, column, oppositeRow] this.setMarkers() @@ -1320,14 +1307,10 @@ export default { this.activeTool = 1 this.activeToolName = '' var { imageId } = element.image - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') { const measureData = {} measureData.studyId = this.stack.studyId @@ -1337,6 +1320,7 @@ export default { measureData.data = e.detail.measurementData measureData.type = e.detail.toolName measureData.thick = this.dicomInfo.thick + measureData.location = this.dicomInfo.location measureData.ww = Math.round(viewport.voi.windowWidth) measureData.wc = Math.round(viewport.voi.windowCenter) @@ -1353,6 +1337,7 @@ export default { measureData.data = e.detail.measurementData measureData.type = e.detail.toolName measureData.thick = this.dicomInfo.thick + measureData.location = this.dicomInfo.location measureData.ww = Math.round(viewport.voi.windowWidth) measureData.wc = Math.round(viewport.voi.windowCenter) const canvas = this.canvas.querySelector('canvas') @@ -1404,9 +1389,9 @@ export default { var element = cornerstone.getEnabledElement(this.canvas) const { rowPixelSpacing, colPixelSpacing } = this.getPixelSpacing(element.image) const dx = - (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1) + (data.handles.end.x - data.handles.start.x) * (colPixelSpacing || 1) const dy = - (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1) + (data.handles.end.y - data.handles.start.y) * (rowPixelSpacing || 1) const length = Math.sqrt(dx * dx + dy * dy) return length.toFixed(this.digitPlaces) @@ -1420,9 +1405,9 @@ export default { if (imagePlane) { return { rowPixelSpacing: - imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing, + imagePlane.rowPixelSpacing || imagePlane.rowImagePixelSpacing, colPixelSpacing: - imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing + imagePlane.columnPixelSpacing || imagePlane.colImagePixelSpacing } } @@ -1432,7 +1417,7 @@ export default { } }, onMeasurementremoved(e) { - + console.log('================移除病灶=================', e) }, onMeasurementmodified(e) { // 移动 @@ -1442,14 +1427,10 @@ export default { var element = cornerstone.getEnabledElement(this.canvas) var viewport = element.viewport var { imageId } = element.image - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - var frame = null - if (instanceId.includes('?frame=')) { - frame = instanceId.split('?frame=')[1] - instanceId = instanceId.split('?frame=')[0] - } + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId + var frame = imageInfo.frame this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0 - instanceId = instanceId.split('.')[0] var uuid = measurementData.uuid var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid) @@ -1467,6 +1448,7 @@ export default { measureData.data = measurementData measureData.type = toolType measureData.thick = this.dicomInfo.thick + measureData.location = this.dicomInfo.location measureData.ww = Math.round(viewport.voi.windowWidth) measureData.wc = Math.round(viewport.voi.windowCenter) measureData.data.active = false @@ -1506,11 +1488,8 @@ export default { // 判断有没有标记 获取第一个标记 var element = cornerstone.getEnabledElement(this.canvas) var { imageId } = element.image - var instanceId = imageId.split('/')[imageId.split('/').length - 1] - if (instanceId.includes('?frame=')) { - instanceId = instanceId.split('?frame=')[0] - } - instanceId = instanceId.split('.')[0] + const imageInfo = this.getInstanceInfo(imageId) + var instanceId = imageInfo.instanceId var idx = this.measureData.findIndex(item => item.InstanceId === instanceId) var measureData = null if (idx > -1) { @@ -1628,18 +1607,19 @@ export default { } }, - toggleClipPlay() { - if (this.toolState.clipPlaying) { + toggleClipPlay(isPlay) { + if (isPlay) { + this.toolState.clipPlaying = true + cornerstoneTools.playClip(this.canvas, this.dicomInfo.fps) + cornerstoneTools.getToolState( + this.canvas, + 'playClip' + ).data[0].loop = false + } else { cornerstoneTools.stopClip(this.canvas) this.toolState.clipPlaying = false return } - this.toolState.clipPlaying = true - cornerstoneTools.playClip(this.canvas, this.dicomInfo.fps) - cornerstoneTools.getToolState( - this.canvas, - 'playClip' - ).data[0].loop = false }, setFps(fps) { this.dicomInfo.fps = fps @@ -1925,6 +1905,14 @@ export default { } } }, + getInstanceInfo(imageId) { + const params = {} + const searchParams = new URLSearchParams(imageId.split('?')[1]) + for (const [key, value] of searchParams.entries()) { + params[key] = value + } + return params + }, preventDefault(e) { e.stopImmediatePropagation() e.stopPropagation() @@ -1942,87 +1930,87 @@ export default { 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..9856780e 100644 --- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomViewer.vue @@ -2,56 +2,50 @@
- -
+ +
- +
-
    +
    • -
      - A -
      +
      A
    • -
      - A -
      -
      - A -
      +
      A
      +
      A
      • -
    • -
      - A -
      -
      - B -
      +
    • +
      A
      +
      B
    • - -
      -
      - A -
      -
      - A -
      +
      +
      A
      +
      A
      -
      -
      - A -
      -
      - A -
      +
      +
      A
      +
      A
    @@ -60,31 +54,45 @@
- -
+ +
- +
-
@@ -117,71 +129,103 @@
区域调窗
--> - +
-
- - - + +
- +
-
{{ $t('trials:reading:button:zoom') }}
+
{{ $t("trials:reading:button:zoom") }}
 - +
-
{{ $t('trials:reading:button:move') }}
+
{{ $t("trials:reading:button:move") }}
 - -
+ +
- +
-
{{ $t('trials:reading:button:rotate') }}
+
+ {{ $t("trials:reading:button:rotate") + }} +
-
@@ -189,31 +233,59 @@
- +
- +
-
{{ fitType===1?$t('trials:reading:button:fitWindow'):$t('trials:reading:button:fitImage') }}
+
+ {{ + fitType === 1 + ? $t("trials:reading:button:fitWindow") + : $t("trials:reading:button:fitImage") + }} +
- +
-
{{ $t('trials:reading:button:imageIndexSync') }}
+
+ {{ $t("trials:reading:button:imageIndexSync") }} +
- +
-
+
-
{{ $t('trials:reading:button:screenShot') }}
+
{{ $t("trials:reading:button:screenShot") }}
-
+
-

{{ tool.text }}

-
{{ tool.disabledReason }} +

{{ tool.text }}

+
{{ tool.disabledReason }}
{{ tool.text }}
-
@@ -280,62 +350,213 @@
{{ tool.text }}
-->
- + +
-
{{ $t('trials:dicom-show:Eraser') }}
+
{{ $t("trials:dicom-show:Eraser") }}
 - + +
+ +
+ + + +
+ +
+ + +
+ +
+
+ +
+ + + +
+ +
+ + + +
+ +
+ + + + + +
+ +
+
-
{{ $t('trials:reading:button:reset') }}
+
{{ $t("trials:reading:button:reset") }}
- --> + + +
+
+ +
+
{{ $t("trials:reading:button:upload") }}
+
+ + +
+
+ +
+
{{ $t("trials:reading:button:download") }}
+
+ -
-
- {{$t('trials:reading:button:handbooks')}} +
+
+ {{ $t("trials:reading:button:handbooks") }} - {{ $t('trials:reading:button:clinicalData') }} + {{ $t("trials:reading:button:clinicalData") }} - {{$t('trials:reading:button:customCfg')}} - - + {{ + $t("trials:reading:button:customCfg") + }}
-
-
+
@@ -357,7 +578,6 @@ :isReadingShowSubjectInfo="isReadingShowSubjectInfo" ref="measurementList" /> -
@@ -382,7 +602,11 @@ > - + @@ -391,55 +615,75 @@ - - {{$t('trials:reading:button:handbooks')}} - - - + {{ $t("trials:reading:button:handbooks") }} + + + -
+
- - - + + + +
+ diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue index 32c6a026..1c4cd72c 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 @@ - + --> + + + + + + + + @@ -407,6 +425,41 @@ {{ $fd('MedicalReviewDoctorUserIdea',scope.row.DoctorUserIdeaEnum) }} + + + + + + + + { PageIndex: 1, PageSize: 20, TrialId: '', - SiteId: '', + TrialSiteId: '', SubjectId: '', SubjectCode: '', TaskName: '', @@ -561,7 +614,10 @@ const searchDataDefault = () => { ReadingTaskState: null, AuditState: null, TaskState: null, - DoctorUserIdeaEnum: null + DoctorUserIdeaEnum: null, + BeginAllocateDate: null, + EndAllocateDate: null, + IsEffect: true } } export default { @@ -588,7 +644,8 @@ export default { signText: '', signCode: null, currentUser: zzSessionStorage.getItem('userName'), - signVisible: false + signVisible: false, + timeList: [] } }, watch: { @@ -682,6 +739,15 @@ export default { } }) }, + changeTimeList() { + if (this.timeList) { + this.searchData.BeginAllocateDate = this.timeList[0] + this.searchData.EndAllocateDate = this.timeList[1] + } else { + this.searchData.BeginAllocateDate = null + this.searchData.EndAllocateDate = null + } + }, handleView(row) { this.currentRow = { ...row } this.auditVisible = true @@ -759,6 +825,7 @@ export default { this.getList() }, handleReset() { + this.timeList = [] this.searchData = searchDataDefault() this.getList() }, 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 d14ce431..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') }, - getBodyPart(bodyPart) { + getBodyPart(bodyPart) { if (!bodyPart) return '' var separator = ',' if (bodyPart.indexOf('|') > -1) { @@ -279,7 +281,7 @@ export default { } var arr = bodyPart.split(separator) var newArr = arr.map(i => { - return this.$fd('Bodypart', i.trim()) + return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name') }) return newArr.join(' | ') } diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue index c6eaa25b..85637c9f 100644 --- a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue +++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue @@ -3,14 +3,20 @@ - + /> --> + > + + - + /> --> - + /> --> {{ $fd('ReadingCategory', scope.row.ReadingCategory) }} + + + + {{ $fd('ArmEnum', scope.row.ArmEnum) }} - - - - + + + + + - - - - - - - - - - - - - - - - - - - @@ -310,7 +318,7 @@ const searchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, IsUrgent: null, @@ -322,7 +330,9 @@ const searchDataDefault = () => { BeginAllocateDate: null, EndAllocateDate: null, RootReReadingTaskId: null, - IsGeneratedJudge: null + IsGeneratedJudge: null, + BeginSignTime: null, + EndSignTime: null } } export default { @@ -416,11 +426,11 @@ export default { }, changeTimeList() { if (this.timeList) { - this.searchData.BeginAllocateDate = this.timeList[0] - this.searchData.EndAllocateDate = this.timeList[1] + this.searchData.BeginSignTime = this.timeList[0] + this.searchData.EndSignTime = this.timeList[1] } else { - this.searchData.BeginAllocateDate = null - this.searchData.EndAllocateDate = null + this.searchData.BeginSignTime = null + this.searchData.EndSignTime = null } }, // 申请重阅 @@ -452,17 +462,21 @@ export default { getGenerateMedicalReviewTaskList(this.searchData).then(res => { this.loading = false this.OtherInfo = res.OtherInfo - this.$emit('getList') this.AssignMedicalReviewTaskVisible = false this.list = res.Result.CurrentPageData this.total = res.Result.TotalCount }).catch(() => { this.loading = false }) }, + refreshList() { + this.getList() + this.$emit('getList') + }, handleSearch() { this.searchData.PageIndex = 1 this.getList() }, handleReset() { + this.timeList = [] this.searchData = searchDataDefault() this.getList() }, 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..81ddbf3e --- /dev/null +++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/RecordList.vue @@ -0,0 +1,521 @@ +/* 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 b3319fc4..6fcbaca4 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 @@ -3,6 +3,12 @@ @@ -154,7 +175,14 @@ width="120" sortable="custom" show-overflow-tooltip - /> + > + + - + /> --> - {{ $fd('TaskState', scope.row.TaskState) }} {{ $fd('TaskState', scope.row.TaskState) }} + --> + + + {{$fd('ArmEnum', scope.row.ArmEnum)}} - - - - - - - - - - - - - - - {{$fd('MedicalReviewAuditState', scope.row.AuditState)}} + + + + @@ -328,6 +329,14 @@ {{$fd('MedicalReviewDoctorUserIdea', scope.row.DoctorUserIdeaEnum)}} + + + + + + + + + + + + + + + @@ -435,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, @@ -443,7 +502,7 @@ const searchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, IsUrgent: null, @@ -459,12 +518,14 @@ const searchDataDefault = () => { BeginSignTime: null, EndSignTime: null, AuditAdviceEnum: null, - DoctorUserIdeaEnum: null + DoctorUserIdeaEnum: null, + IsEffect: true, + IsHaveQuestion: null } } 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, @@ -492,7 +553,8 @@ export default { distributionInfo: {}, currentRow: {}, trialCriterionList:[], - timeList:[] + timeList:[], + recordVisible: false } }, mounted() { @@ -505,11 +567,11 @@ export default { methods: { changeTimeList() { if (this.timeList) { - this.searchData.BeginSignTime = this.timeList[0] - this.searchData.EndSignTime = this.timeList[1] + this.searchData.BeginAllocateDate = this.timeList[0] + this.searchData.EndAllocateDate = this.timeList[1] } else { - this.searchData.BeginSignTime = null - this.searchData.EndSignTime = null + this.searchData.BeginAllocateDate = null + this.searchData.EndAllocateDate = null } }, handleExport() { @@ -571,6 +633,10 @@ export default { this.currentRow = { ...row } this.auditVisible = true }, + viewMecialAudit(row) { + this.currentRow = { ...row } + this.auditVisible = true + }, assignMedicalReviewTask(row, type) { var params = { IdList: [ @@ -606,6 +672,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/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index dabde036..bbe0da67 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -3,6 +3,12 @@ - + --> {{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }} + + + + {{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }} - - - - + @@ -253,7 +285,7 @@ @@ -269,7 +301,7 @@ @@ -287,13 +319,13 @@ - + /> --> + + @@ -410,7 +450,14 @@ :label="$t('trials:reviewTrack:table:subjectCode')" min-width="120" show-overflow-tooltip - /> + > + + - + /> --> { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, TrialSiteCode: null, @@ -564,7 +614,11 @@ const searchDataDefault = () => { TrialReadingCriterionId: null, RequestReReadingType: null, ReReadingApplyState: null, - CompleteClinicalDataEnum: null + CompleteClinicalDataEnum: null, + ArmEnum: null, + BeginRequestReReadingTime: null, + EndRequestReReadingTime: null, + RequestReReadingReason: null } } export default { @@ -625,12 +679,12 @@ export default { } }, mounted() { - if (this.$route.query.SiteId) { - this.searchData.SiteId = this.$route.query.SiteId + if (this.$route.query.TrialSiteId) { + this.searchData.TrialSiteId = this.$route.query.TrialSiteId this.searchData.SubjectCode = this.$route.query.SubjectCode this.searchData.TaskName = this.$route.query.TaskName this.searchData.DoctorUserId = this.$route.query.DoctorUserId - changeURLStatic('SiteId', '') + changeURLStatic('TrialSiteId', '') changeURLStatic('SubjectCode', '') changeURLStatic('TaskName', '') changeURLStatic('DoctorUserId', '') @@ -1009,13 +1063,16 @@ export default { handleSubjectAssignListSelectChange(e) { this.SubjectAssignSelectList = e }, + getNewTaskList(row) { + this.$router.push({ path: `/trials/trials-panel/reading/readingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&TaskName=${row.OriginalReReadingTask.TaskName}&DoctorUserId=${row.OriginalReReadingTask.DoctorUserId}&TrialReadingCriterionId=${row.OriginalReReadingTask.TrialReadingCriterionId}&SubjectCode=${row.OriginalReReadingTask.SubjectCode}` }) + }, changeTimeList() { if (this.timeList) { - this.searchData.BeginAllocateDate = this.timeList[0] - this.searchData.EndAllocateDate = this.timeList[1] + this.searchData.BeginRequestReReadingTime = this.timeList[0] + this.searchData.EndRequestReReadingTime = this.timeList[1] } else { - this.searchData.BeginAllocateDate = null - this.searchData.EndAllocateDate = null + this.searchData.BeginRequestReReadingTime = null + this.searchData.EndRequestReReadingTime = null } }, handleCancel() { @@ -1111,6 +1168,7 @@ export default { this.getList() }, handleReset() { + this.timeList = [] this.searchData = searchDataDefault() this.getList() }, diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue index db244df7..5ecbff18 100644 --- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue +++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue @@ -7,12 +7,12 @@
- + @@ -502,7 +502,7 @@ const searchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, DoctorUserId: null, @@ -520,7 +520,7 @@ const taskSearchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, IsUrgent: null, @@ -626,7 +626,7 @@ export default { }).catch(() => {}) }, openSubjectCancelDoctorHistoryList(row) { - getSubjectCancelDoctorHistoryList(row.SubjectId).then((res) => { + getSubjectCancelDoctorHistoryList(row.SubjectId,this.TrialReadingCriterionId).then((res) => { this.SubjectCancelDoctorHistoryVisible = true this.SubjectCancelDoctorHistoryList = res.Result }) diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue index 4ee24afb..45894ad6 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -5,6 +5,12 @@
+ + + + + + - - - - - - + @@ -78,13 +79,13 @@ - + /> --> - + /> --> - - - -
+ + + +
- + - - {{ $t('common:button:search') }} + + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }}
@@ -57,7 +94,9 @@ @@ -69,40 +108,31 @@ sortable="custom" > - - - - - - - - - - - - - - - - - - - - - + + + + - +
-
- +
+ - - {{ randomReadInfo.UnReadTaskCount }} + + {{ + randomReadInfo.UnReadTaskCount + }} - - {{ randomReadInfo.UnReadJudgeTaskCount }} + + {{ + randomReadInfo.UnReadJudgeTaskCount + }} - + {{ randomReadInfo.FinishTaskCount }} - - {{ randomReadInfo.FinishJudgeTaskCount }} + + {{ + randomReadInfo.FinishJudgeTaskCount + }} - {{ $t('trials:pendingReadingTasks:button:beginRandomReview') }} + {{ $t("trials:pendingReadingTasks:button:beginRandomReview") }}
- + diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue new file mode 100644 index 00000000..b2ae4170 --- /dev/null +++ b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue @@ -0,0 +1,668 @@ +/* eslint-disable */ + + 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..e35c942c 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -3,14 +3,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + {{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }} + + + + + {{ $fd('TaskState', scope.row.TaskState) }} - - - - - - - - - - - - - - - - - - + + + + - {{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }} {{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }} - + --> @@ -673,7 +702,14 @@ :label="$t('trials:reviewTrack:table:subjectCode')" min-width="120" show-overflow-tooltip - /> + > + + - + /> --> + + + @@ -889,11 +940,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, @@ -901,7 +954,7 @@ const searchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, IsUrgent: null, @@ -915,12 +968,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 +1045,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() @@ -1120,7 +1187,7 @@ export default { }, // 重阅历史 reReadingHistory(row) { - this.$router.push({ path: `/trials/trials-panel/reading/reReadingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&SiteId=${row.SiteId}&SubjectCode=${row.SubjectCode}&TaskName=${row.TaskName}&DoctorUserId=${row.DoctorUserId}` }) + this.$router.push({ path: `/trials/trials-panel/reading/reReadingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&TrialSiteId=${row.TrialSiteId}&SubjectCode=${row.SubjectCode}&TaskName=${row.TaskName}&DoctorUserId=${row.DoctorUserId}` }) }, openRefereeAllocation() { this.RefereeAllocationVisible = true @@ -1168,6 +1235,9 @@ export default { this.total = res.Result.TotalCount }).catch(() => { this.loading = false }) }, + handleViewRecord() { + this.recordVisible = true + }, handleSearch() { this.searchData.PageIndex = 1 this.getList() diff --git a/src/views/trials/trials-panel/reading/referee-allocation/index.vue b/src/views/trials/trials-panel/reading/referee-allocation/index.vue index d96d5e1a..17abf247 100644 --- a/src/views/trials/trials-panel/reading/referee-allocation/index.vue +++ b/src/views/trials/trials-panel/reading/referee-allocation/index.vue @@ -5,12 +5,12 @@ - + @@ -488,12 +488,12 @@ 受试者阅片人最新关系表 - + @@ -1028,7 +1028,7 @@ const searchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, IsUrgent: null, @@ -1049,7 +1049,7 @@ const taskSearchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, DoctorUserId: null, diff --git a/src/views/trials/trials-panel/reading/reread-task/index.vue b/src/views/trials/trials-panel/reading/reread-task/index.vue index 637007b9..360be349 100644 --- a/src/views/trials/trials-panel/reading/reread-task/index.vue +++ b/src/views/trials/trials-panel/reading/reread-task/index.vue @@ -5,14 +5,32 @@
+ + + + + + - + @@ -28,13 +46,13 @@ /> --> - + @@ -78,7 +96,7 @@ :label="$t('trials:rereadTask:table:isUrgent')" show-overflow-tooltip sortable="custom" - min-width="100" + min-width="80" > - + /> --> - + /> --> @@ -168,7 +186,7 @@ - + /> --> @@ -283,6 +301,7 @@ import Pagination from '@/components/Pagination' import { changeURLStatic } from '@/utils/history.js' const searchDataDefault = () => { return { + IsUrgent: null, SubjectCode: '', TaskCode: '', PageIndex: 1, @@ -322,11 +341,11 @@ export default { } }, mounted() { - if (this.$route.query.SiteId) { - this.searchData.SiteId = this.$route.query.SiteId + if (this.$route.query.TrialSiteId) { + this.searchData.TrialSiteId = this.$route.query.TrialSiteId this.searchData.SubjectCode = this.$route.query.SubjectCode this.searchData.TaskName = this.$route.query.TaskName - changeURLStatic('SiteId', '') + changeURLStatic('TrialSiteId', '') changeURLStatic('SubjectCode', '') changeURLStatic('TaskName', '') } diff --git a/src/views/trials/trials-panel/reading/task-allocation/index.vue b/src/views/trials/trials-panel/reading/task-allocation/index.vue index da16ea85..42cd1d6d 100644 --- a/src/views/trials/trials-panel/reading/task-allocation/index.vue +++ b/src/views/trials/trials-panel/reading/task-allocation/index.vue @@ -5,12 +5,12 @@ - + @@ -496,12 +496,12 @@ 受试者阅片人最新关系表 - + @@ -1029,7 +1029,7 @@ const searchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, IsUrgent: null, @@ -1050,7 +1050,7 @@ const taskSearchDataDefault = () => { Asc: true, SortField: '', TrialId: null, - SiteId: null, + TrialSiteId: null, SubjectId: null, SubjectCode: null, DoctorUserId: null, diff --git a/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue b/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue index 4463216e..d70f0653 100644 --- a/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue +++ b/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue @@ -62,7 +62,7 @@ > + + + + + + {{ item.UserType }} + + + + + @@ -76,7 +96,7 @@ :label="$t('trials:attachment:table:fileType')" show-overflow-tooltip sortable="custom" - width="160" + min-width="160" /> @@ -112,31 +132,31 @@ prop="NeedConfirmedUserTypes" :label="$t('trials:attachment:table:userType')" show-overflow-tooltip - width="160" + min-width="100" > - + /> --> diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue index 7fccbceb..5fb31630 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue @@ -16,6 +16,7 @@ - - + + {{ item.label }} - +
{{ item.PageName }}Q{{ index + 1 }}：{{ item.QuestionName }}
- {{ $t('common:button:save') }} - {{ $t('common:button:reset') }} + {{ $t("common:button:save") }} + {{ $t("common:button:reset") }} - - - {{ item.label }} + + +
-
+
- {{ $t('trials:adRules:button:addRule') }} + {{ $t("trials:adRules:button:addRule") }}
@@ -69,7 +141,13 @@ min-width="100" >
-
- - {{ item.label }} +
+ + - {{ item }} + {{ item }} -
+
- {{ $t('trials:adRules:title:selectAnswerGroup') }} - {{ QuestionList[index].grouping.toString().replaceAll(',', '|') }} - {{ QuestionList[index].grouping.map(v => $d[QuestionList[index].DictionaryCode].find(v1 => v1.value === v).label).toString().replaceAll(',', '|') }} - + {{ $t("trials:adRules:title:selectAnswerGroup") }} + {{ + QuestionList[index].grouping.toString().replaceAll(",", "|") + }} + {{ + QuestionList[index].grouping + .map( + (v) => + $d[QuestionList[index].DictionaryCode].find( + (v1) => v1.value === v + ).label + ) + .toString() + .replaceAll(",", "|") + }} + - {{ $t('trials:adRules:title:addGroup') }} + {{ $t("trials:adRules:title:addGroup") }}
-
分组: {{ itemA }}
-
+
+ 分组: + {{ itemA }} +
+
- {{ $t('trials:adRules:title:group') }} - - {{ itemA.split('|').map(v => $fd(QuestionList[index].DictionaryCode, parseInt(v))).join('|') }} + {{ $t("trials:adRules:title:group") }} + + {{ + itemA + .split("|") + .map((v) => + $fd(QuestionList[index].DictionaryCode, parseInt(v)) + ) + .join("|") + }}
+
+ + + + + + + + + + + +
@@ -143,30 +364,105 @@ >
- + - {{ item }} - {{ item.label }} + + - + - {{ item }} - {{ item.label }} + +
-
+
- {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} - {{ $t('common:button:save') }} + {{ $t("common:button:save") }}
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 0bcb858b..f427170f 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 @@ -5,7 +5,7 @@ ref="readingRulesForm" v-loading="loading" :model="form" - style="width:800px;" + style="width: 800px" :rules="rules" label-width="340px" size="small" @@ -17,7 +17,10 @@ > + + + + + {{ item.label }} + + + + + + + {{ + item + }} + + {{ + $t("trials:readingUnit:readingRules:title:CriterionModalitysAll") + }} + @@ -100,16 +169,22 @@ + + + + + + {{ item.label }} + + + - - - - {{ item.label }} - - - + + + + + {{ item.label }} + + + + + + + + {{ item.label }} + + + {{ item.label }} @@ -261,21 +425,31 @@ {{ item.label }} @@ -284,12 +458,18 @@ - + - - + - - {{ item.label }} - - - - + + {{ item.label }} + + + + + - - {{ $t('common:button:save') }} + + {{ $t("common:button:save") }}
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..f91029ec 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 +287,7 @@ custom-class="base-dialog-wrapper" >
- +
-
- - {{ $t('trials:trialCfg:button:confirmCfg') }} +
+ + {{ $t("trials:trialCfg:button:confirmCfg") }}
@@ -336,12 +325,7 @@ custom-class="base-dialog-wrapper" >
- +
-
- - {{ $t('trials:trialCfg:button:confirmCfg') }} +
+ + {{ $t("trials:trialCfg:button:confirmCfg") }}
@@ -382,10 +381,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 +403,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") }}
@@ -531,15 +550,23 @@ custom-class="base-dialog-wrapper" width="400px" > -
+
+ + {{ $t("common:button:add") }} + - +
-
+
- {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} - {{ $t('common:button:confirm') }} + {{ $t("common:button:confirm") }}
@@ -581,17 +611,34 @@ :close-on-click-modal="false" :title="$t('trials:logincCfg:form:modality')" custom-class="base-dialog-wrapper" - width="400px" + width="900px" > -
- + + +
-
+
- {{ $t('common:button:cancel') }} + {{ $t("common:button:cancel") }} - {{ $t('common:button:confirm') }} + {{ $t("common:button:confirm") }}
+ + + +
diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue index 58abb819..eda57c3b 100644 --- a/src/views/trials/trials-panel/site/index.vue +++ b/src/views/trials/trials-panel/site/index.vue @@ -5,7 +5,7 @@ @@ -13,15 +13,15 @@ @@ -29,18 +29,22 @@ - {{ $t('common:button:search') }} + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }} diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue index 387c91f5..a7b58279 100644 --- a/src/views/trials/trials-panel/study/index.vue +++ b/src/views/trials/trials-panel/study/index.vue @@ -4,7 +4,7 @@