Merge branch 'uat'
continuous-integration/drone/push Build is failing Details

# Conflicts:
#	src/api/reading.js
#	src/api/trials.js
#	src/components/PreviewFile/index.vue
#	src/views/dictionary/template/components/CriterionQuestionForm.vue
#	src/views/dictionary/template/components/TableQsForm.vue
#	src/views/dictionary/template/email/components/EmailList.vue
#	src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
#	src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
#	src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
#	src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
#	src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
#	src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
#	src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionList.vue
#	src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/Recist/TableQuestionFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionList.vue
#	src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue
#	src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
#	src/views/trials/trials-panel/reading/reading-task/index.vue
#	src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
#	src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
main
wangxiaoshuang 2025-12-26 17:09:35 +08:00
commit abb224a8fb
57 changed files with 2059 additions and 1107 deletions

View File

@ -239,6 +239,14 @@ export function getPatientList_Export(data) {
data
})
}
export function getTumor_CDISC_Export(data) {
return requestDownload({
url: `/IVUS_OCTExport/getTumor_CDISC_Export`,
responseType: 'blob',
method: 'post',
data
})
}
export function getCommonEvaluationList_Export(data) {
return requestDownload({
url: `/ExcelExport/getCommonEvaluationList_Export`,

View File

@ -318,4 +318,4 @@ export function getReportsChartData(param) {
method: 'post',
data: param
})
}
}

View File

@ -1411,9 +1411,9 @@ export function getForwardList(param) {
})
}
export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false) {
export function getNoneDicomStudyList(subjectVisitId, sudyId = '', isFilterZip = false, visitTaskId = '', IsReading = false, isImageSegmentLabel = '') {
return request({
url: `/NoneDicomStudy/getNoneDicomStudyList?subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
url: `/NoneDicomStudy/getNoneDicomStudyList?isImageSegmentLabel=${isImageSegmentLabel}&subjectVisitId=${subjectVisitId}&nonedicomStudyId=${sudyId}&isFilterZip=${isFilterZip}&visitTaskId=${visitTaskId}&IsReading=${IsReading}`,
method: 'get'
})
}
@ -4406,4 +4406,12 @@ export function getTrialEfficacyEvaluationStatList(data) {
method: 'post',
data
})
}
// 靶段标注列表
export function getTrialSubjectVisitMarkList(data) {
return request({
url: `/DownloadAndUpload/getTrialSubjectVisitMarkList`,
method: 'post',
data
})
}

View File

@ -34,9 +34,11 @@
<!--受试者-->
<el-table-column :label="$t('download:table:subjectCode')" min-width="130" prop="SubjectCode"
show-overflow-tooltip />
<!--访视名称-->
<el-table-column prop="VisitName" :label="$t('download:table:VisitName')" sortable v-if="IsImageSegment" />
<!--任务名称-->
<el-table-column :label="$t('download:table:taskName')" min-width="130" show-overflow-tooltip prop="TaskBlindName"
sortable />
sortable v-else />
<!--检查类型-->
<el-table-column :label="$t('download:table:studyType')" min-width="130" show-overflow-tooltip prop="IsDicom"
sortable>
@ -75,7 +77,8 @@
</el-table-column>
</el-table>
<study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :modelList="modelList" :bodyPart="bodyPart"
:IsDicom="IsDicom" :visitTaskId="modelTaskId" />
:subjectVisitId="modelSubjectVisitId" :IsDicom="IsDicom" :isDownload="true" :visitTaskId="modelTaskId"
:IsImageSegment="IsImageSegment" :Criterion="Criterion" />
</el-dialog>
</template>
<script>
@ -126,6 +129,10 @@ export default {
return {}
},
},
IsImageSegment: {
type: Boolean,
default: false,
}
},
data() {
return {
@ -151,12 +158,14 @@ export default {
IsReadingTaskViewInOrder: 0, //
bodyPart: {},
modelTaskId: null,
modelSubjectVisitId: null,
}
},
async mounted() {
this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
this.getList()
this.title = `Download Images${this.SubjectCode}${this.Criterion.TrialReadingCriterionName}`
if (this.IsImageSegment) this.title = `Download Images${this.SubjectCode}`
},
beforeDestroy() {
store.dispatch('trials/setUnLock', false)
@ -175,6 +184,12 @@ export default {
if (this.TaskId) {
this.searchData.VisitTaskId = this.TaskId
}
if (this.IsImageSegment) {
this.searchData.IsImageSegmentLabel = true
}
else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
this.searchData.IsImageSegmentLabel = false
}
this.loading = true
let res = await getSubjectImageDownloadSelectList(this.searchData)
this.loading = false
@ -257,6 +272,12 @@ export default {
data.NoneDicomStudyIdList = [...data.NoneDicomStudyIdList, ...arr]
}
}
if (this.IsImageSegment) {
data.IsImageSegmentLabel = true
}
else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
data.IsImageSegmentLabel = false
}
this.btnLoading = true
let res = await getIRReadingDownloadStudyInfo(data)
this.btnLoading = false
@ -286,13 +307,18 @@ export default {
formatDownloadFile(list) {
let files = [],
name = `${list[0].SubjectCode}_${new Date().getTime()}.zip`
if (this.IsReadingTaskViewInOrder === 1) {
name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
}
if (this.IsReadingTaskViewInOrder === 0) {
// name = `${list[0].TaskBlindName}.zip`
name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
if (this.IsImageSegment) {
name = `${list[0].SubjectCode}.zip`
} else {
if (this.IsReadingTaskViewInOrder === 1) {
name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
}
if (this.IsReadingTaskViewInOrder === 0) {
// name = `${list[0].TaskBlindName}.zip`
name = `${list[0].SubjectCode}_${list[0].TaskBlindName}.zip`
}
}
list.forEach((data) => {
if (data.StudyList && data.StudyList.length > 0) {
let StudyList = data.StudyList
@ -304,7 +330,14 @@ export default {
}/DICOMDIR`,
url: this.OSSclientConfig.basePath + study.StudyDIRPath,
}
if (this.IsReadingTaskViewInOrder === 0) {
if (this.IsImageSegment) {
obj = {
name: `${data.SubjectCode}/${data.VisitName
}/${this.$fd('IsDicom', true)}/${study.StudyCode
}/DICOMDIR`,
url: this.OSSclientConfig.basePath + study.StudyDIRPath,
}
} else if (this.IsReadingTaskViewInOrder === 0) {
obj = {
name: `${data.TaskBlindName}/${this.$fd(
'IsDicom',
@ -330,7 +363,15 @@ export default {
url: this.OSSclientConfig.basePath + instance.Path,
IsEncapsulated: instance.IsEncapsulated
}
if (this.IsReadingTaskViewInOrder === 0) {
if (this.IsImageSegment) {
obj = {
name: `${data.SubjectCode}/${data.VisitName
}/${this.$fd('IsDicom', true)}/${study.StudyCode
}/IMAGE/${fileName}`,
url: this.OSSclientConfig.basePath + instance.Path,
IsEncapsulated: instance.IsEncapsulated
}
} else if (this.IsReadingTaskViewInOrder === 0) {
obj = {
name: `${data.TaskBlindName}/${this.$fd(
'IsDicom',
@ -360,7 +401,16 @@ export default {
)}/${study.StudyCode}/${item.FileName}`,
url: this.OSSclientConfig.basePath + item.Path,
}
if (this.IsReadingTaskViewInOrder === 0) {
if (this.IsImageSegment) {
obj = {
name: `${data.SubjectCode}/${data.VisitName}/${this.$fd(
'IsDicom',
false
)}/${study.StudyCode}/${item.FileName}`,
url: this.OSSclientConfig.basePath + item.Path,
}
}
else if (this.IsReadingTaskViewInOrder === 0) {
obj = {
name: `${data.TaskBlindName}/${this.$fd(
'IsDicom',
@ -390,6 +440,9 @@ export default {
},
handleOpenDialog(item) {
this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
if (this.IsImageSegment) {
this.model_cfg.title = `${item.SubjectCode || ''} > ${item.VisitName}`
}
if (item.IsDicom) {
this.modelList = item.DicomStudyList
} else {
@ -399,6 +452,7 @@ export default {
})
}
this.modelTaskId = item.VisitTaskId
this.modelSubjectVisitId = item.SourceSubjectVisitId
this.IsDicom = item.IsDicom
this.model_cfg.visible = true
},
@ -427,9 +481,16 @@ export default {
}
let trialId = this.$route.query.trialId
var token = getToken()
const routeData = this.$router.resolve({
path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
})
let routeData = null
if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
routeData = this.$router.resolve({
path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
})
} else {
routeData = this.$router.resolve({
path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&TokenKey=${token}&isReading=true`,
})
}
this.open = window.open(routeData.href, '_blank')
},
//

View File

@ -10,9 +10,11 @@
<!--检查列表-->
<el-table :data="list" style="width: 100%" height="300" :loading="loading">
<!--受试者-->
<el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" />
<el-table-column prop="SubjectCode" :label="$t('upload:dicom:table:subjectCode')" sortable />
<!--访视名称-->
<el-table-column prop="VisitName" :label="$t('download:table:VisitName')" v-if="IsImageSegment" sortable />
<!--任务名称-->
<el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" />
<el-table-column prop="TaskBlindName" :label="$t('upload:dicom:table:taskBlindName')" v-else sortable />
<!--原始检查数-->
<el-table-column prop="OrginalStudyList" :label="$t('upload:dicom:table:orginalStudyListNum')">
<template slot-scope="scope">
@ -299,7 +301,8 @@
</el-table-column>
</el-table>
<study-view v-if="model_cfg.visible" :model_cfg="model_cfg" :IsDicom="true" :bodyPart="bodyPart"
:modelList="modelList" :isUpload="openIsUpload" :TrialModality="TrialModality" @getList="getList" />
:subjectVisitId="openSubjectVisitId" :modelList="modelList" :isUpload="openIsUpload"
:visitTaskId="openVisitTaskId" :TrialModality="TrialModality" @getList="getList" />
</div>
</template>
<script>
@ -363,12 +366,17 @@ export default {
type: Number,
default: 0,
},
IsImageSegment: {
type: Boolean,
default: false,
}
},
components: {
'study-view': studyView,
},
data() {
return {
loading: false,
list: [],
StudyInstanceUidList: [],
SopInstanceUidList: [],
@ -408,6 +416,8 @@ export default {
open: null,
bodyPart: {},
openIsUpload: false,
openSubjectVisitId: null,
openVisitTaskId: null,
TrialModality: [],
}
},
@ -439,6 +449,12 @@ export default {
if (this.TaskId) {
params.VisitTaskId = this.TaskId
}
if (this.IsImageSegment) {
params.IsImageSegmentLabel = true
}
else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
params.IsImageSegmentLabel = false
}
this.loading = true
let res = await getSubjectImageUploadList(params)
this.loading = false
@ -454,7 +470,7 @@ export default {
data.SubjectId = item.SubejctId
data.VisitTaskId = item.VisitTaskId
data.SourceSubjectVisitId = item.SourceSubjectVisitId
this.subjectVisitId = item.SourceSubjectVisitId
// this.subjectVisitId = item.SourceSubjectVisitId
this.StudyInstanceUidList.push(data)
})
}
@ -488,6 +504,7 @@ export default {
if (confirm !== 'confirm') return
let params = {
VisitTaskId: item.VisitTaskId,
SubjectVisitId: item.SourceSubjectVisitId || item.SubjectVisitId,
IsDicom: true,
}
let res = await deleteTaskStudy(params)
@ -520,7 +537,9 @@ export default {
//
handleOpenDialog(item, list, isUpload = false) {
this.openIsUpload = isUpload
this.model_cfg.title = `${item.SubjectCode || ''} > ${item.TaskBlindName}`
this.openSubjectVisitId = item.SubjectVisitId || item.SourceSubjectVisitId
this.openVisitTaskId = item.VisitTaskId
this.model_cfg.title = `${item.SubjectCode || ''} > ${this.IsImageSegment ? item.VisitName : item.TaskBlindName}`
this.modelList = item[list]
this.model_cfg.visible = true
},
@ -536,6 +555,9 @@ export default {
if (this.VisitTaskId) {
data.VisitTaskId = this.VisitTaskId
}
if (this.IsImageSegment) {
data.IsImageSegmentLabel = true
}
let res = await verifyIRStudyAllowUpload(data)
if (res.IsSuccess) {
return res.Result
@ -562,8 +584,9 @@ export default {
confirmMessage = null
for (let i = 0; i < checkFiles.length; i++) {
let item = checkFiles[i]
var dicom = await parseDicom(item, 'StudyInstanceUid')
var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
if (!dicom.StudyInstanceUid) continue
if (this.IsImageSegment && dicom.Modality !== 'IVUS') continue
let has = true,
has2 = false,
has3 = false
@ -617,8 +640,8 @@ export default {
if (this.errStudyUidList && this.errStudyUidList.length > 0) {
for (let i = 0; i < checkFiles.length; i++) {
let item = checkFiles[i]
var dicom = await parseDicom(item, 'StudyInstanceUid')
if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid)) {
var dicom = await parseDicom(item, ['StudyInstanceUid', 'Modality'])
if (!!~this.errStudyUidList.indexOf(dicom.StudyInstanceUid) || (this.IsImageSegment && dicom.Modality !== 'IVUS')) {
this.hasOtherStudy = true
checkFiles.splice(i, 1)
i--
@ -1058,10 +1081,25 @@ export default {
var scope = this
return new Promise(function (resolve, reject) {
try {
let subjectVisitId = null;
if (scope.VisitTaskId) {
scope.StudyInstanceUidList.forEach(item => {
if (item.VisitTaskId === scope.VisitTaskId) {
subjectVisitId = item.SourceSubjectVisitId
}
})
} else {
scope.StudyInstanceUidList.forEach(item => {
if (item.StudyInstanceUid === scope.uploadQueues[index].dicomInfo.studyUid) {
subjectVisitId = item.SourceSubjectVisitId
}
})
}
if (!subjectVisitId) return reject('subjectVisitId is notFind')
preArchiveDicomStudy({
trialId: scope.trialId,
subjectId: scope.SubjectId,
subjectVisitId: scope.subjectVisitId,
subjectVisitId: subjectVisitId,
fileSize: scope.uploadQueues[index].dicomInfo.fileSize,
fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
IsDicomReUpload:
@ -1077,7 +1115,7 @@ export default {
dicomInfo.seriesNum = seriesNum
dicomInfo.fileNum = fileNum
dicomInfo.subjectId = scope.SubjectId
dicomInfo.subjectVisitId = scope.subjectVisitId
dicomInfo.subjectVisitId = subjectVisitId
let t = setInterval(() => {
dicomUploadInProgress({
trialId: scope.trialId,
@ -1097,7 +1135,7 @@ export default {
let params = {
trialId: scope.trialId,
subjectId: scope.SubjectId,
subjectVisitId: scope.subjectVisitId,
subjectVisitId: subjectVisitId,
studyMonitorId: res.Result,
failedFileCount: 0,
RecordPath: null,
@ -1198,6 +1236,16 @@ export default {
o.instanceUid +
params.trialId
)}`
if (scope.IsImageSegment) {
path = `/${params.trialId}/Image/${params.subjectId
}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId
}/${scope.getGuid(
dicomInfo.studyUid +
v.seriesUid +
o.instanceUid +
params.trialId
)}`
}
if (scope.isClose) return
let res = await dcmUpload(
{
@ -1231,6 +1279,9 @@ export default {
o.imageRows
)
let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
if (scope.IsImageSegment) {
thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
}
let OSSclient = scope.OSSclient
let seriesRes = await OSSclient.put(
thumbnailPath,
@ -1339,6 +1390,9 @@ export default {
let text = JSON.stringify(Record)
let logJsonBlob = scope.generateTxtFile(text)
let logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
if (scope.IsImageSegment) {
logJsonObjectName = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.visitTaskId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
}
let logRes
try {
logRes = await scope.OSSclient.put(
@ -1367,6 +1421,9 @@ export default {
v.instanceList[0].imageRows
)
let thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
if (scope.IsImageSegment) {
thumbnailPath = `/${params.trialId}/Image/${params.subjectId}/${params.subjectVisitId}/AnnotationImage/${dicomInfo.studyUid}/${v.seriesUid}.jpg`
}
let OSSclient = scope.OSSclient
try {
let seriesRes = await OSSclient.put(thumbnailPath, blob)
@ -1384,6 +1441,9 @@ export default {
if (scope.isClose) return false
console.log(params)
params.VisitTaskId = dicomInfo.visitTaskId
if (scope.IsImageSegment) {
params.IsImageSegmentLabel = true
}
addOrUpdateArchiveTaskStudy(params)
.then((res) => {
if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
@ -1478,7 +1538,7 @@ export default {
var token = getToken()
let trialId = this.$route.query.trialId
const routeData = this.$router.resolve({
path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
path: `/showvisitdicoms?page=upload&trialId=${trialId}&visitTaskId=${this.IsImageSegment ? 'undefined' : row.VisitTaskId}&subjectVisitId=${row.SourceSubjectVisitId}&isReading=1&TokenKey=${token}`,
})
this.open = window.open(routeData.href, '_blank')
},

View File

@ -1,40 +1,17 @@
<template>
<el-dialog
:visible.sync="visible"
:fullscreen="true"
:close-on-click-modal="false"
:before-close="beforeClose"
:append-to-body="true"
class="uploadDicomAndNonedicom"
>
<el-dialog :visible.sync="visible" :fullscreen="true" :close-on-click-modal="false" :before-close="beforeClose"
:append-to-body="true" class="uploadDicomAndNonedicom">
<span slot="title">{{ title }}</span>
<el-tabs type="border-card" v-model="activeName">
<el-tab-pane
:label="$t('uploadDicomAndNonedicom:label:dicom')"
name="dicom"
>
<dicomFile
v-if="activeName === 'dicom'"
:SubjectId="SubjectId"
:SubjectCode="SubjectCode"
:Criterion="Criterion"
:TaskId="VisitTaskId"
:isUpload.sync="isUpload"
:isReadingTaskViewInOrder="isReadingTaskViewInOrder"
/>
<el-tab-pane :label="$t('uploadDicomAndNonedicom:label:dicom')" name="dicom">
<dicomFile v-if="activeName === 'dicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
:Criterion="Criterion" :TaskId="VisitTaskId" :isUpload.sync="isUpload"
:isReadingTaskViewInOrder="isReadingTaskViewInOrder" :IsImageSegment="IsImageSegment" />
</el-tab-pane>
<el-tab-pane
:label="$t('uploadDicomAndNonedicom:label:nonedicom')"
name="nonedicom"
>
<nonedicomFile
v-if="activeName === 'nonedicom'"
:SubjectId="SubjectId"
:SubjectCode="SubjectCode"
:Criterion="Criterion"
:VisitTaskId="VisitTaskId"
:isUpload.sync="isUpload"
/>
<el-tab-pane :label="$t('uploadDicomAndNonedicom:label:nonedicom')" name="nonedicom">
<nonedicomFile v-if="activeName === 'nonedicom'" :SubjectId="SubjectId" :SubjectCode="SubjectCode"
:Criterion="Criterion" :VisitTaskId="VisitTaskId" :isUpload.sync="isUpload"
:IsImageSegment="IsImageSegment" />
</el-tab-pane>
</el-tabs>
</el-dialog>
@ -74,6 +51,10 @@ export default {
type: Number,
default: 0,
},
IsImageSegment: {
type: Boolean,
default: false,
}
},
data() {
return {
@ -84,6 +65,7 @@ export default {
},
mounted() {
this.title = `Upload Images${this.SubjectCode}${this.Criterion.TrialReadingCriterionName}`
if (this.IsImageSegment) this.title = `Upload Images${this.SubjectCode}`
store.dispatch('trials/setUnLock', true)
},
methods: {
@ -103,11 +85,13 @@ export default {
::v-deep.el-tabs--left .el-tabs__header.is-left {
margin-right: 0;
}
.uploadDicomAndNonedicom {
::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item {
::v-deep.el-tabs--border-card>.el-tabs__header .el-tabs__item {
color: #909399;
}
::v-deep.el-tabs--border-card > .el-tabs__header .el-tabs__item.is-active {
::v-deep.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
color: #428bca;
background-color: #fff;
border-right-color: #dcdfe6;

View File

@ -4,21 +4,27 @@
<span>{{ $t('upload:nonedicom:title') }}</span>
<div class="tip">
<i class="el-icon-warning-outline"></i>
<div v-html="$t('upload:nonedicom:tip:message')"></div>
<div v-html="$t('upload:nonedicom:tip:message').replace(
'xxx',
relationInfo.ImageFormatList.join('、')
)"></div>
</div>
</div>
<!--检查列表-->
<!--检查列表 @sort-change="handleSortByColumn"-->
<el-table :data="list" style="width: 100%" v-adaptive="{ bottomOffset: 60 }" :loading="loading"
@sort-change="handleSortByColumn" :default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
<!--受试者-->
:default-sort="{ prop: 'TaskBlindName', order: 'descending' }">
<!--受试者 sortable="custom"-->
<el-table-column prop="SubjectCode" :label="$t('upload:nonedicom:table:subject')" />
<!--访视名称-->
<el-table-column prop="VisitName" :label="$t('upload:nonedicom:table:VisitName')" sortable
v-if="IsImageSegment" />
<!--任务名称-->
<el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable="custom" />
<el-table-column prop="TaskBlindName" :label="$t('upload:nonedicom:table:taskName')" sortable v-else />
<!--检查类型-->
<el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
<el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable>
</el-table-column>
<!--检查部位-->
<el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom">
<el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable>
<template slot-scope="scope">
<span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
</template>
@ -128,7 +134,10 @@
<!-- 多文件上传 -->
<form id="inputForm" ref="uploadForm">
<el-divider content-position="left">{{
$t('trials:uploadNonDicoms:label:fileType')
$t('trials:uploadNonDicoms:label:fileType').replace(
'xxx',
relationInfo.ImageFormatList.join('、')
)
}}</el-divider>
<div class="form-group">
<div class="upload" style="margin-right: 10px">
@ -219,8 +228,8 @@ let defaultSearchData = () => {
SubjectId: null,
TrialReadingCriterionId: null,
SubjectCode: null,
Asc: false,
SortField: 'TaskBlindName',
// Asc: false,
// SortField: 'TaskBlindName',
}
}
export default {
@ -248,6 +257,10 @@ export default {
type: Boolean,
default: false,
},
IsImageSegment: {
type: Boolean,
default: false,
},
},
data() {
return {
@ -266,7 +279,10 @@ export default {
currentRow: {},
studyMonitorId: null,
open: null,
BodyPart: {}
BodyPart: {},
relationInfo: {
ImageFormatList: []
}
}
},
watch: {
@ -311,11 +327,22 @@ export default {
if (this.VisitTaskId) {
this.searchData.VisitTaskId = this.VisitTaskId
}
if (this.IsImageSegment) {
this.searchData.IsImageSegmentLabel = true
}
else if (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20) {
this.searchData.IsImageSegmentLabel = false
}
this.loading = true
let res = await getIRUploadTaskNoneDicomStudyList(this.searchData)
this.loading = false
if (res.IsSuccess) {
this.list = res.Result
this.relationInfo = res.OtherInfo
this.faccept = []
this.relationInfo.ImageFormatList.forEach((item) => {
this.faccept.push(`.${item}`)
})
}
} catch (err) {
this.loading = false
@ -479,16 +506,16 @@ export default {
}
},
//
handleSortByColumn(column) {
if (column.order === 'ascending') {
this.searchData.Asc = true
} else {
this.searchData.Asc = false
}
this.searchData.SortField = column.prop
this.searchData.PageIndex = 1
this.getList()
},
// handleSortByColumn(column) {
// if (column.order === 'ascending') {
// this.searchData.Asc = true
// } else {
// this.searchData.Asc = false
// }
// this.searchData.SortField = column.prop
// this.searchData.PageIndex = 1
// this.getList()
// },
//
handleSelectionChange(selection) {
this.selectArr = selection
@ -534,9 +561,15 @@ export default {
let file = this.fileList.filter((item) => item.id === arr[index].id)[0]
file.status = 1
let path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
}/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
}/${this.currentRow.SourceSubjectVisitId}/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
.substring(file.name.lastIndexOf('.'))
.toLocaleLowerCase()}`
if (this.IsImageSegment) {
path = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId
}/${this.currentRow.SourceSubjectVisitId}/AnnotationImage/${this.currentRow.VisitTaskId}/${this.$guid()}${file.name
.substring(file.name.lastIndexOf('.'))
.toLocaleLowerCase()}`
}
file.curPath = path
const fileData = await this.fileToBlob(file.file)
let res = await this.fileToOss(path, fileData, file)
@ -620,6 +653,9 @@ export default {
params.RecordPath = RecordPath.path
params.FailedFileCount = RecordPath.Record.Failed.length
}
if (this.IsImageSegment) {
params.IsImageSegmentLabel = true
}
uploadNoneDicomFile(params)
.then((res) => {
if (!isReLoad) {
@ -658,7 +694,10 @@ export default {
})
let text = JSON.stringify(Record)
let logJsonBlob = this.generateTxtFile(text)
let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
let logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.SourceSubjectVisitId}/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
if (this.IsImageSegment) {
logJsonObjectName = `/${this.$route.query.trialId}/TaskImage/${this.currentRow.SubjectId}/${this.currentRow.SourceSubjectVisitId}/AnnotationImage/${this.currentRow.VisitTaskId}/${this.studyMonitorId}.txt`
}
let logRes
try {
logRes = await this.OSSclient.put(logJsonObjectName, logJsonBlob)

View File

@ -2,6 +2,9 @@
<div v-if="model_cfg.visible">
<base-model :config="model_cfg">
<div slot="dialog-body">
<el-button v-if="!isUpload && !isDownload" type='primary' size="small" style="float:right;" @click="preview">
{{ $t("common:button:preview") }}
</el-button>
<el-table :data="modelList" style="width: 100%" height="300">
<!--检查编号-->
<el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
@ -39,13 +42,13 @@
<!--检查时间-->
<el-table-column prop="ImageDate" :label="$t('trials:uploadImage:table:StudyTime')" v-if="!IsDicom"
min-width="130" />
<el-table-column :label="$t('common:action:action')" fixed="right" width="80">
<el-table-column :label="$t('common:action:action')" fixed="right" width="80" v-if="isUpload">
<template slot-scope="scope">
<!--预览--->
<el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
@click.stop="preview(scope.row)" />
<!-- <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
@click.stop="preview(scope.row)" /> -->
<!--编辑--->
<el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')" v-else
<el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')"
@click.stop="openEdit(scope.row)" />
</template>
</el-table-column>
@ -109,6 +112,10 @@ export default {
visitTaskId: {
type: String,
},
subjectVisitId: {
type: String,
default: ''
},
IsDicom: {
required: true,
type: Boolean,
@ -118,6 +125,20 @@ export default {
type: Boolean,
default: false,
},
IsImageSegment: {
type: Boolean,
default: false,
},
isDownload: {
type: Boolean,
default: false,
},
Criterion: {
type: Object,
default: () => {
return {}
},
},
},
components: {
'base-model': baseModel,
@ -153,15 +174,23 @@ export default {
let routeData = null
if (this.IsDicom) {
var token = getToken()
let trialId = this.$route.query.trialId
routeData = this.$router.resolve({
path: `/showdicom?studyId=${row.Id}&TokenKey=${token}&type=Study&visitTaskId=${this.visitTaskId}&isReading=true`,
path: `/showvisitdicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&isReading=1&TokenKey=${token}`,
})
} else {
let trialId = this.$route.query.trialId
var token = getToken()
routeData = this.$router.resolve({
path: `/showNoneDicoms?trialId=${trialId}&subjectVisitId=${row.SourceSubjectVisitId}&studyId=${row.Id}&TokenKey=${token}&isReading=true`,
})
if (!this.IsImageSegment && (this.Criterion.CriterionType == 19 || this.Criterion.CriterionType == 20)) {
routeData = this.$router.resolve({
path: `/showNoneDicoms?trialId=${trialId}&isImageSegmentLabel=${false}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
})
} else {
routeData = this.$router.resolve({
path: `/showNoneDicoms?trialId=${trialId}&visitTaskId=${this.visitTaskId}&subjectVisitId=${this.subjectVisitId}&TokenKey=${token}&isReading=true`,
})
}
}
window.open(routeData.href, '_blank')
},

View File

@ -40,6 +40,13 @@ function getQuestions(questions) {
const criterionType = parseInt(localStorage.getItem('CriterionType'))
questions.forEach(item => {
if ((item.Type === 'table' || item.Type === 'basicTable') && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
item.TableQuestions.Questions.forEach(question => {
if (question.Type === 'select' && question.OptionTypeEnum === 1) {
item.TableQuestions.Answers.forEach((answer) => {
answer[question.Id] = answer[question.Id] ? JSON.parse(answer[question.Id]) : []
})
}
})
item.TableQuestions.Answers.forEach(answerObj => {
answerObj.isDicomReading = answerObj.IsDicomReading === 'True'

346
src/utils/customSort.js Normal file
View File

@ -0,0 +1,346 @@
class FileNameSorter {
/**
* 判断是否为纯数字字符串
* @param {any} value - 要检查的值
* @returns {boolean} 是否为纯数字
*/
static isPureNumber(value) {
if (typeof value !== 'string') return false;
return /^\d+$/.test(value);
}
/**
* 获取排序键值
* @param {any} item - 要排序的项目
* @returns {Array} 排序键值数组
*/
static getSortKey(item) {
const str = String(item);
const isNumber = this.isPureNumber(str);
// 排序优先级: [类型优先级, 数字值/字符串值]
if (isNumber) {
// 纯数字: 类型优先级为0, 使用数字值排序
return [0, BigInt(str)];
} else {
// 非纯数字: 类型优先级为1, 使用字符串排序
return [1, str.toLowerCase()];
}
}
/**
* 文件名排序
* @param {Array} arr - 要排序的数组
* @param {Object} options - 排序选项
* @returns {Array} 排序后的数组
*/
static sortFileNames(arr, options = {}) {
if (!Array.isArray(arr)) {
throw new TypeError('输入必须是一个数组');
}
const {
direction = 'asc', // 'asc' 升序, 'desc' 降序
caseSensitive = false, // 是否区分大小写
trim = true, // 是否去除前后空格
key = null
} = options;
// 创建数组的副本
const result = [...arr];
return result.sort((a, b) => {
let aStr = key ? String(a[key]).split(".")[0] : String(a);
let bStr = key ? String(b[key]).split(".")[0] : String(b);
// 处理空格
if (trim) {
aStr = aStr.trim();
bStr = bStr.trim();
}
// 处理大小写
if (!caseSensitive) {
aStr = aStr.toLowerCase();
bStr = bStr.toLowerCase();
}
// 获取排序键值
const aKey = this.getSortKey(aStr);
const bKey = this.getSortKey(bStr);
// 比较类型优先级
if (aKey[0] !== bKey[0]) {
// 纯数字(0) < 非纯数字(1)
return direction === 'asc' ? aKey[0] - bKey[0] : bKey[0] - aKey[0];
}
// 相同类型下的比较
if (aKey[0] === 0) {
// 都是纯数字,按数字大小比较
if (aKey[1] < bKey[1]) return direction === 'asc' ? -1 : 1;
if (aKey[1] > bKey[1]) return direction === 'asc' ? 1 : -1;
return 0;
} else {
// 都是非纯数字,按字符串比较
if (aStr < bStr) return direction === 'asc' ? -1 : 1;
if (aStr > bStr) return direction === 'asc' ? 1 : -1;
return 0;
}
});
}
/**
* 自然排序 - 处理文件名中的数字序列
* 例如: file1, file2, file10
* @param {Array} arr - 要排序的数组
* @param {Object} options - 排序选项
* @returns {Array} 排序后的数组
*/
static naturalSort(arr, options = {}) {
const {
direction = 'asc',
caseSensitive = false
} = options;
return [...arr].sort((a, b) => {
const aStr = String(a);
const bStr = String(b);
// 检查是否都是纯数字
const aIsPureNumber = this.isPureNumber(aStr);
const bIsPureNumber = this.isPureNumber(bStr);
// 如果一个纯数字,一个非纯数字
if (aIsPureNumber && !bIsPureNumber) {
return direction === 'asc' ? -1 : 1;
}
if (!aIsPureNumber && bIsPureNumber) {
return direction === 'asc' ? 1 : -1;
}
// 都是纯数字,按数字比较
if (aIsPureNumber && bIsPureNumber) {
const aNum = BigInt(aStr);
const bNum = BigInt(bStr);
if (aNum < bNum) return direction === 'asc' ? -1 : 1;
if (aNum > bNum) return direction === 'asc' ? 1 : -1;
return 0;
}
// 都是非纯数字,使用自然排序算法
return this.naturalCompare(aStr, bStr, direction, caseSensitive);
});
}
/**
* 自然比较算法
* @private
*/
static naturalCompare(a, b, direction = 'asc', caseSensitive = false) {
let aStr = caseSensitive ? a : a.toLowerCase();
let bStr = caseSensitive ? b : b.toLowerCase();
const regex = /(\d+|\D+)/g;
const aParts = aStr.match(regex) || [];
const bParts = bStr.match(regex) || [];
const maxLength = Math.max(aParts.length, bParts.length);
for (let i = 0; i < maxLength; i++) {
const aPart = aParts[i] || '';
const bPart = bParts[i] || '';
const aIsNumber = /^\d+$/.test(aPart);
const bIsNumber = /^\d+$/.test(bPart);
// 如果都是数字,按数字比较
if (aIsNumber && bIsNumber) {
const aNum = BigInt(aPart);
const bNum = BigInt(bPart);
if (aNum < bNum) return direction === 'asc' ? -1 : 1;
if (aNum > bNum) return direction === 'asc' ? 1 : -1;
continue;
}
// 都是文本,按字符串比较
if (aPart < bPart) return direction === 'asc' ? -1 : 1;
if (aPart > bPart) return direction === 'asc' ? 1 : -1;
}
return 0;
}
/**
* 分组排序 - 将纯数字和非纯数字分开显示
* @param {Array} arr - 要排序的数组
* @param {Object} options - 排序选项
* @returns {Array} 排序后的数组
*/
static groupSort(arr, options = {}) {
const {
direction = 'asc',
groupOrder = 'numbers-first' // 'numbers-first' 或 'names-first'
} = options;
// 分组
const numbers = [];
const names = [];
arr.forEach(item => {
const str = String(item);
if (this.isPureNumber(str)) {
numbers.push(item);
} else {
names.push(item);
}
});
// 对各组排序
const sortedNumbers = this.sortFileNames(numbers, { direction });
const sortedNames = this.sortFileNames(names, { direction });
// 按指定顺序合并
if (groupOrder === 'numbers-first') {
return [...sortedNumbers, ...sortedNames];
} else {
return [...sortedNames, ...sortedNumbers];
}
}
/**
* 文件扩展名排序 - 先按扩展名排序再按文件名排序
* @param {Array} arr - 要排序的数组
* @param {Object} options - 排序选项
* @returns {Array} 排序后的数组
*/
static sortByExtension(arr, options = {}) {
const {
direction = 'asc',
extensionsFirst = false // 扩展名优先还是文件名优先
} = options;
return [...arr].sort((a, b) => {
const aStr = String(a);
const bStr = String(b);
// 分离文件名和扩展名
const getFileParts = (str) => {
const lastDotIndex = str.lastIndexOf('.');
if (lastDotIndex > 0) {
return {
name: str.substring(0, lastDotIndex),
ext: str.substring(lastDotIndex + 1)
};
}
return { name: str, ext: '' };
};
const aParts = getFileParts(aStr);
const bParts = getFileParts(bStr);
let compareResult;
if (extensionsFirst) {
// 先比较扩展名
compareResult = this.sortFileNames([aParts.ext, bParts.ext], { direction })[0] === aParts.ext ? -1 : 1;
if (compareResult !== 0) return compareResult;
// 扩展名相同,再比较文件名
return this.sortFileNames([aParts.name, bParts.name], { direction })[0] === aParts.name ? -1 : 1;
} else {
// 先比较文件名
compareResult = this.sortFileNames([aParts.name, bParts.name], { direction })[0] === aParts.name ? -1 : 1;
if (compareResult !== 0) return compareResult;
// 文件名相同,再比较扩展名
return this.sortFileNames([aParts.ext, bParts.ext], { direction })[0] === aParts.ext ? -1 : 1;
}
});
}
/**
* 测试和演示函数
*/
static demonstrate() {
const testData = [
'100',
'23',
'1',
'003',
'file.txt',
'10',
'5',
'alpha',
'beta',
'gamma',
'00100',
'zebra',
'apple',
'banana',
'123',
'file10.txt',
'file2.txt',
'File1.txt',
'file20.txt',
'image.jpg',
'document.pdf',
'data.xlsx'
];
console.log('=== 文件名排序演示 ===\n');
console.log('原始数据:');
console.log(testData);
console.log('\n1. 基本排序 (纯数字 < 非纯数字):');
const basicSorted = this.sortFileNames(testData);
console.log(basicSorted);
console.log('\n2. 自然排序 (智能数字识别):');
const naturalSorted = this.naturalSort(testData);
console.log(naturalSorted);
console.log('\n3. 分组排序 (数字组和文件组):');
const groupSorted = this.groupSort(testData);
console.log(groupSorted);
console.log('\n4. 降序排序:');
const descSorted = this.sortFileNames(testData, { direction: 'desc' });
console.log(descSorted);
console.log('\n5. 按扩展名排序:');
const extSorted = this.sortByExtension(testData);
console.log(extSorted);
console.log('\n6. 大小写敏感排序:');
const caseSensitiveSorted = this.sortFileNames(testData, { caseSensitive: true });
console.log(caseSensitiveSorted);
// 验证排序规则
console.log('\n=== 排序规则验证 ===');
const validationData = ['100', '23', 'file.txt', '1', 'alpha', '003', '10'];
console.log('验证数据:', validationData);
console.log('排序结果:', this.sortFileNames(validationData));
console.log('规则验证:');
console.log(' - 纯数字: 1, 3(003), 10, 23, 100 (按数字大小)');
console.log(' - 非纯数字: alpha, file.txt (按字母顺序)');
console.log(' - 非纯数字 > 纯数字');
return {
basic: basicSorted,
natural: naturalSorted,
group: groupSorted,
descending: descSorted,
byExtension: extSorted,
caseSensitive: caseSensitiveSorted
};
}
}
if (typeof module !== 'undefined' && module.exports) {
module.exports = FileNameSorter;
} else if (typeof window !== 'undefined') {
window.FileNameSorter = FileNameSorter;
}

View File

@ -8508,6 +8508,8 @@
var binaryStream;
var _writeOptions$fragmen = writeOptions.fragmentMultiframe,
fragmentMultiframe = _writeOptions$fragmen === void 0 ? true : _writeOptions$fragmen;
var _writeOptions$offset = writeOptions.startOffset,
isNeedStartOffset = _writeOptions$offset === void 0 ? true : _writeOptions$offset;
value = value === null || value === undefined ? [] : value;
if (isEncapsulated) {
@ -8535,7 +8537,9 @@
for (i = 0; i < frames; i++) {
var _needsPadding = Boolean(value[i].byteLength & 1);
startOffset.push(binaryStream.size);
if (isNeedStartOffset) {
startOffset.push(binaryStream.size);
}
var frameBuffer = value[i],
frameStream = new ReadBufferStream(frameBuffer);
var fragmentsLength = 1;

View File

@ -112,7 +112,7 @@ function downloadFileToUrl(url) {
xhr.onload = function () {
const arraybuffer = xhr.response;
let dataset = dcmjs.data.DicomMessage.readFile(arraybuffer)
let newDicomFile = dataset.write({ fragmentMultiframe: false }) // fragmentMultiframe 原始数据是否进行分割
let newDicomFile = dataset.write({ fragmentMultiframe: false, startOffset: false }) // fragmentMultiframe 原始数据是否进行分割
const bufferArray = new Uint8Array(newDicomFile)
const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
const href = URL.createObjectURL(blob)

View File

@ -364,11 +364,14 @@ export default {
try {
let res = null
if (this.page === 'upload') {
res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId })
} else if (this.page === 'download') {
res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
} else {
res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
res = await getTaskUploadedDicomStudyList({ visitTaskId: this.visitTaskId !== 'undefined' ? this.visitTaskId : null, subjectVisitId: this.subjectVisitId })
}
// else if (this.page === 'download') {
// res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId)
// }
else {
// res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading)
res = await getVisitStudyList(this.trialId, this.subjectVisitId, this.isReading, this.visitTaskId !== 'undefined' ? this.visitTaskId : null)
}
if (res.IsSuccess) {
res.Result.forEach((study, studyIndex) => {

View File

@ -237,6 +237,17 @@
</el-form-item>
<!-- 私有属性 -->
<el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
<!-- 下拉框单选或多选 -->
<el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
prop="OptionTypeEnum" :rules="[
{ required: true, message: this.$t('common:ruleMessage:specify') }
]">
<el-radio-group v-model="form.OptionTypeEnum">
<el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 选项类型 -->
<el-form-item v-if="
form.Type === 'select' ||
@ -548,7 +559,8 @@ export default {
FileType: [],
ClassifyQuestionId: null,
ClassifyAlgorithms: null,
ShowChartTypeEnum: 0
ShowChartTypeEnum: 0,
OptionTypeEnum: 0
},
rules: {
Type: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@ -879,6 +891,7 @@ export default {
data.FileType = []
data.ClassifyQuestionId = null
data.ClassifyAlgorithms = null
data.OptionTypeEnum = 0
},
isShowQuestionChange(val, form) {

View File

@ -154,6 +154,17 @@
</el-form-item>
<!-- 私有属性 -->
<el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
<!-- 下拉框单选或多选 -->
<el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
prop="OptionTypeEnum" :rules="[
{ required: true, message: this.$t('common:ruleMessage:specify') }
]">
<el-radio-group v-model="form.OptionTypeEnum">
<el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 选项类型 -->
<el-form-item v-if="form.Type === 'select' || form.Type === 'radio' || form.Type === 'input'"
:label="$t('trials:readingUnit:label:QuestionGenre')" prop="TableQuestionType" :rules="[
@ -438,7 +449,8 @@ export default {
// ExportIdentification: 0,
ExportResult: [],
DefaultValue: null,
ShowChartTypeEnum: 0
ShowChartTypeEnum: 0,
OptionTypeEnum: 0
// IsEnable: true
},
rules: {
@ -766,6 +778,7 @@ export default {
form.ExportResult = []
form.DefaultValue = null
form.ShowChartTypeEnum = 0
form.OptionTypeEnum = 0
},
close() {
this.$emit('close')

View File

@ -2,13 +2,8 @@
<template>
<div style="width: 100%; height: 100%">
<transition name="viewer-fade">
<div
v-show="urlList.length > 0"
ref="image-viewer__wrapper"
tabindex="-1"
class="image-viewer__wrapper"
:style="{ 'z-index': 5 }"
>
<div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper"
:style="{ 'z-index': 5 }">
<span class="image-viewer_desc">
<!-- <span v-if="studyCode">NST00006</span>
<span v-if="modality">CT</span>
@ -21,18 +16,12 @@
</span>
<!-- Arrow -->
<template v-if="!isSingle">
<span
class="image-viewer__btn image-viewer__prev"
:class="{ 'is-disabled': !infinite && isFirst }"
@click="prev"
>
<span class="image-viewer__btn image-viewer__prev" :class="{ 'is-disabled': !infinite && isFirst }"
@click="prev">
<i class="el-icon-arrow-left" />
</span>
<span
class="el-image-viewer__btn el-image-viewer__next"
:class="{ 'is-disabled': !infinite && isLast }"
@click="next"
>
<span class="el-image-viewer__btn el-image-viewer__next" :class="{ 'is-disabled': !infinite && isLast }"
@click="next">
<i class="el-icon-arrow-right" />
</span>
</template>
@ -44,36 +33,19 @@
<i class="el-image-viewer__actions__divider" />
<i class="el-icon-c-scale-to-original" @click="toggleMode" />
<i class="el-image-viewer__actions__divider" />
<i
class="el-icon-refresh-left"
@click="handleActions('anticlocelise')"
/>
<i
class="el-icon-refresh-right"
@click="handleActions('clocelise')"
/>
<i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
<i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
</div>
</div>
<!-- 图片 -->
<div id="image-viewer__canvas" class="image-viewer__canvas">
<template v-for="(item, i) in urlList">
<img
v-if="!~item.FileType.indexOf('pdf')"
v-show="i === index"
:ref="`img${i}`"
:key="item.Id"
crossorigin="anonymous"
:src="
item.FileType && item.FileType.indexOf('zip') >= 0
? zipImg
: `${OSSclientConfig.basePath}${item.Path}`
"
:style="imgStyle"
style="max-width: 100%; max-height: 100%"
@load="handleImgLoad"
@error="handleImgError"
@mousedown="handleMouseDown"
/>
<img v-if="!~item.FileType.indexOf('pdf')" v-show="i === index" :ref="`img${i}`" :key="item.Id"
crossorigin="anonymous" :src="item.FileType && item.FileType.indexOf('zip') >= 0
? zipImg
: `${OSSclientConfig.basePath}${item.Path}`
" :style="imgStyle" style="max-width: 100%; max-height: 100%" @load="handleImgLoad"
@error="handleImgError" @mousedown="handleMouseDown" />
</template>
</div>
</div>
@ -108,11 +80,11 @@ export default {
},
onSwitch: {
type: Function,
default: () => {},
default: () => { },
},
onClose: {
type: Function,
default: () => {},
default: () => { },
},
initialIndex: {
type: Number,
@ -172,7 +144,9 @@ export default {
immediate: true,
handler(val) {
this.reset()
this.onSwitch(val)
if (val >= 0) {
this.onSwitch(this.urlList[val].Id)
}
},
},
},
@ -349,6 +323,7 @@ export default {
width: 100%;
height: 100%;
}
.image-viewer__btn {
position: absolute;
z-index: 1;
@ -370,6 +345,7 @@ export default {
height: 40px;
font-size: 40px;
}
.image-viewer_desc {
position: absolute;
top: 40px;
@ -387,6 +363,7 @@ export default {
border-radius: 17px;
// border-radius: 2%;
}
.image-viewer__canvas {
position: absolute;
top: 50%;
@ -397,6 +374,7 @@ export default {
justify-content: center;
align-items: center;
}
.image-viewer__actions {
left: 50%;
bottom: 30px;
@ -408,6 +386,7 @@ export default {
border-color: #fff;
border-radius: 22px;
}
.image-viewer__actions__inner {
width: 100%;
height: 100%;
@ -419,6 +398,7 @@ export default {
align-items: center;
justify-content: space-around;
}
.image-viewer__next,
.image-viewer__prev {
top: 50%;
@ -429,15 +409,18 @@ export default {
background-color: #606266;
border-color: #fff;
}
.image-viewer__prev {
transform: translateY(-50%);
left: 40px;
}
.image-viewer__next {
transform: translateY(-50%);
right: 40px;
text-indent: 2px;
}
.image-viewer__mask {
position: absolute;
width: 100%;
@ -447,9 +430,11 @@ export default {
opacity: 0.5;
// background:#000
}
.viewer-fade-enter-active {
animation: viewer-fade-in 0.3s;
}
.viewer-fade-leave-active {
animation: viewer-fade-out 0.3s;
}
@ -459,6 +444,7 @@ export default {
transform: translate3d(0, -20px, 0);
opacity: 0;
}
100% {
transform: translate3d(0, 0, 0);
opacity: 1;
@ -470,6 +456,7 @@ export default {
transform: translate3d(0, 0, 0);
opacity: 1;
}
100% {
transform: translate3d(0, -20px, 0);
opacity: 0;

View File

@ -2,56 +2,29 @@
<div class="none-dicom_preview-wrapper">
<div class="image-viewer-wrapper">
<!-- 预览图像 -->
<ImageViewer
v-if="previewVisible"
:on-switch="
(index) => {
selected(index)
}
"
:initial-index="previewImage.index"
:url-list="previewImage.imgList"
:study-code="previewImage.studyCode"
:body-part="previewImage.bodyPart"
:modality="previewImage.modality"
:zip-img="zipImg"
/>
<ImageViewer v-if="previewVisible" :on-switch="(index) => {
selected(index)
}
" :initial-index="previewImage.index" :url-list="previewImage.imgList" :study-code="previewImage.studyCode"
:body-part="previewImage.bodyPart" :modality="previewImage.modality" :zip-img="zipImg" />
</div>
<div class="thumbnail-wrapper" style="z-index: 999; background-color: #fff">
<div class="">
<div class="img-wrapper">
<el-button
icon="el-icon-d-arrow-left"
plain
class="left to"
:disabled="disabledPrev"
@click="toRight"
/>
<el-button icon="el-icon-d-arrow-left" plain class="left to" :disabled="disabledPrev" @click="toRight" />
<div ref="imagesWrapper" class="images">
<div v-if="noData" class="empty-text">
<slot name="empty">暂无数据</slot>
</div>
<div v-show="!noData" class="items" :style="itemsStyle">
<template v-for="(item, index) in previewImage.imgList">
<div
v-if="!~item.FileType.indexOf('pdf')"
:key="index"
class="item-img"
:style="imgSize"
:class="{
'is-active': index === currentIndex,
}"
@click="selected(index)"
>
<img
:title="item.FileName"
crossorigin="anonymous"
:src="
item.FileType && item.FileType.indexOf('zip') >= 0
? zipImg
: `${OSSclientConfig.basePath}${item.Path}`
"
/>
<div v-if="!~item.FileType.indexOf('pdf')" :key="index" class="item-img" :style="imgSize" :class="{
'is-active': item.Id === currentFileId,
}" @click="selected(item.Id)">
<img :title="item.FileName" crossorigin="anonymous" :src="item.FileType && item.FileType.indexOf('zip') >= 0
? zipImg
: `${OSSclientConfig.basePath}${item.Path}`
" />
<p v-if="item.FileName" class="item-date">
{{ `${index + 1}` }}
</p>
@ -59,13 +32,7 @@
</template>
</div>
</div>
<el-button
icon="el-icon-d-arrow-right"
:disabled="disabledNext"
plain
class="right to"
@click="Left"
/>
<el-button icon="el-icon-d-arrow-right" :disabled="disabledNext" plain class="right to" @click="Left" />
</div>
</div>
</div>
@ -93,6 +60,10 @@ export default {
type: Number,
default: null,
},
currentFileId: {
type: String,
default: ''
},
previewImage: {
type: Object,
default: () => {
@ -167,7 +138,7 @@ export default {
const scope = this
window.onresize = function () {
scope.pageSize = scope.wrapperWidth() / scope.itemWidth
scope.selected(scope.currentIndex)
scope.selected(scope.currentFileId)
}
},
methods: {
@ -185,7 +156,8 @@ export default {
this.translateX = maxTrans
}
},
selected(index) {
selected(id) {
let index = this.previewImage.imgList.findIndex(item => item.Id === id)
const center = this.pageSize >> 1
//
const lastCenter = this.dataLength - center
@ -202,7 +174,7 @@ export default {
if (this.currentIndex !== index) {
this.currentIndex = index
}
this.$emit('selectedImg', index)
this.$emit('selectedImg', id)
},
wrapperWidth() {
if (this.$refs.imagesWrapper) {
@ -224,25 +196,30 @@ export default {
.image-viewer-wrapper {
flex: 1;
}
.thumbnail-wrapper {
height: 130px;
}
.img-content {
position: absolute;
left: 0;
bottom: 10px;
width: 100%;
}
.img-wrapper {
display: flex;
position: relative;
margin: 0 20px;
height: 120px;
.to {
width: 32px;
height: 100%;
padding: 0;
}
.images::before {
position: absolute;
z-index: 5;
@ -251,16 +228,15 @@ export default {
width: 84px;
content: '';
pointer-events: none;
background: -webkit-gradient(
linear,
left top,
right top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0))
);
background: -webkit-gradient(linear,
left top,
right top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0)));
background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
}
.images::after {
position: absolute;
z-index: 5;
@ -270,22 +246,22 @@ export default {
width: 84px;
content: '';
pointer-events: none;
background: -webkit-gradient(
linear,
right top,
left top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0))
);
background: -webkit-gradient(linear,
right top,
left top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0)));
background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
}
.images {
position: relative;
overflow: hidden;
width: 100%;
height: 100%;
margin: 0 2px;
.empty-text {
color: rgb(158, 158, 158);
height: 100%;
@ -293,6 +269,7 @@ export default {
align-items: center;
justify-content: center;
}
.items {
position: absolute;
top: 0;
@ -302,6 +279,7 @@ export default {
height: 100%;
align-items: center;
transition: transform 0.25s ease;
.item-img {
display: inline-block;
box-sizing: border-box;
@ -309,6 +287,7 @@ export default {
margin-right: 8px;
border: 2px solid rgba(0, 0, 0, 0);
cursor: pointer;
.item-date {
bottom: 0px;
position: absolute;
@ -319,15 +298,18 @@ export default {
line-height: 24px;
color: white;
}
img {
width: 100%;
height: 100%;
}
}
.item-img:hover::after {
// border-color: #409EFF;
opacity: 0;
}
.item-img::after {
position: absolute;
top: 0;
@ -342,9 +324,11 @@ export default {
transition: opacity 0.3s ease;
background-color: #fff;
}
.is-active {
border-color: #409eff;
}
.is-active:after {
opacity: 0;
}

View File

@ -1,7 +1,13 @@
<template>
<div v-loading="loading" class="img-container">
<el-card class="box-card left">
<div class="title">
<div class="title" style="display: flex;align-items: center;">
<div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
<i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
style="display: block;margin-bottom: -5px;"></i>
<i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
style="display: block; margin-top: -5px;"></i>
</div>
{{ $t('trials:none-dicom-show:fileList') }}
</div>
<div class="left-content">
@ -77,7 +83,8 @@
<el-card class="box-card right">
<div style="width: 100%; height: 100%" v-if="!showPDF">
<Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width: 100%"
:preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
:preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg"
:currentFileId="currentFileId" />
</div>
<div style="width: 100%; height: 100%" v-else>
<PreviewFile :file-path="pdfFile.path" :file-type="pdfFile.type" />
@ -98,6 +105,7 @@ import zip from '@/assets/zip.jpg'
import { changeURLStatic } from '@/utils/history.js'
import Preview from './components/preview'
import PreviewFile from '@/components/PreviewFile'
import FileNameSorter from "@/utils/customSort";
// import CheckForm from './components/form'
export default {
name: 'Notice',
@ -140,6 +148,7 @@ export default {
isAudit: false,
activeNames: [],
Asc: false
}
},
async created() {
@ -156,7 +165,30 @@ export default {
this.getNoneDicomList()
//
},
computed: {
CriterionType() {
return this.OtherInfo.CriterionType ? this.OtherInfo.CriterionType : 0
}
},
methods: {
sortFile() {
if (this.Asc) {
this.Asc = false
} else {
this.Asc = true
}
console.log(this.Asc, 'this.Asc')
this.studyList.forEach(study => {
if (study.NoneDicomStudyFileList.length > 0) {
study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
direction: this.Asc ? 'asc' : 'desc',
key: 'FileName'
})
}
})
this.previewImage.imgList = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList
this.previewImage.index = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === this.currentFileId)
},
handleChange() { },
changeReadingStatus(callback, row, file) {
let statusStr = ''
@ -278,7 +310,8 @@ export default {
this.studyId,
false,
this.$route.query.visitTaskId,
!!this.$route.query.isReading
!!this.$route.query.isReading,
this.$route.query.isImageSegmentLabel,
)
.then((res) => {
this.studyList = res.Result
@ -289,11 +322,13 @@ export default {
return item.NoneDicomStudyFileList.length > 0
})
this.activeNames = this.studyList.map((item) => item.CodeView)
console.log(this.activeNames)
if (studyIndex > -1) {
var fileObj = this.studyList[studyIndex]['NoneDicomStudyFileList']
this.selected(fileObj[0], studyIndex, 0, true)
}
if (this.CriterionType === 19 || this.CriterionType === 20) {
this.sortFile()
}
})
.catch(() => {
this.loading = false
@ -320,12 +355,13 @@ export default {
this.previewImage.modality = this.studyList[studyIndex].Modality
this.$nextTick(() => {
if (isChangeSub) {
this.$refs['previewImage'].selected(fileIndex)
this.$refs['previewImage'].selected(this.currentFileId)
}
})
},
selectedImg(fileIndex) {
selectedImg(id) {
if (this.studyList.length > 0) {
let fileIndex = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === id)
this.currentStudyFileIndex = fileIndex
this.currentFileId =
this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[
@ -353,6 +389,10 @@ export default {
</script>
<style lang="scss" scoped>
.icon_check {
color: #409EFF;
}
.img-container {
position: relative;
width: 100%;

View File

@ -65,20 +65,25 @@
{{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
</span>
<span v-else-if="q.DictionaryCode">
{{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
{{`${scope.row[q.Id] instanceof Array ? scope.row[q.Id].map(item => $fd(q.DictionaryCode,
parseInt(item))).join(',') : $fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}`}}
</span>
<span v-else-if="q.OptionTypeEnum === 1">
{{ `${scope.row[q.Id] instanceof Array ? scope.row[q.Id].join(',') : scope.row[q.Id]}` }}
</span>
<span v-else>
{{ `${scope.row[q.Id]}` }}
</span>
</template>
</el-table-column>
<el-table-column v-if="readingTaskState < 2 && item.LesionType === 102"
<el-table-column v-if="readingTaskState < 2 && (item.LesionType === 102 || item.LesionType === 103)"
:label="$t('common:action:action')" width="90px" fixed="right">
<template slot-scope="scope">
<el-button type="text" size="mini" @click="handleAddOrEdit('edit', item, scope.$index)">
{{ $t('common:button:edit') }}
</el-button>
<el-button type="text" size="mini" @click="handleDelete(item, scope.$index)">
<el-button type="text" size="mini" @click="handleDelete(item, scope.$index)"
v-if="item.LesionType === 102">
{{ $t('common:button:delete') }}
</el-button>
</template>
@ -117,7 +122,7 @@
</template>
<template v-if="item.Type === 'select'">
<el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
@change="((val) => { formItemChange(val, item) })">
:multiple="item.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, item) })">
<el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
:label="dict.label" />
</el-select>
@ -126,10 +131,10 @@
<template v-if="item.Childrens && item.Childrens.length > 0">
<template v-for="child in item.Childrens">
<el-form-item :key="child.Id"
v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
v-if="(child.ShowQuestion === 1 && (child.ParentTriggerValueList.includes(String(questionForm[item.Id])) || (Array.isArray(questionForm[item.Id]) && child.ParentTriggerValueList.some(da => questionForm[item.Id].includes(da))))) || child.ShowQuestion === 0"
:label="`${child.QuestionName}`" :prop="child.Id" :rules="[
{
required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && ((child.RelevanceValue.includes(questionForm[child.RelevanceId])) || (Array.isArray(questionForm[child.RelevanceId]) && child.RelevanceValueList.some(da => questionForm[child.RelevanceId].includes(da)))))) && child.Type !== 'group' && child.Type !== 'summary',
message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
},
]">
@ -185,7 +190,8 @@
<!-- 导入 -->
<el-dialog v-if="upload.visible" :visible.sync="upload.visible" :close-on-click-modal="false"
:title="upload.title" width="500px">
<UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" @close="uploadDlgClose" />
<UploadExcel :visit-task-id="visitTaskId" :TableName="upload.TableName" :lesion-type="upload.lesionType"
@close="uploadDlgClose" />
</el-dialog>
</div>
</div>
@ -243,8 +249,8 @@ export default {
questionForm: {},
formChanged: false,
digitPlaces: 2,
addOrEdit: { visible: false, title: '' },
upload: { visible: false, title: '', TableName: '' },
addOrEdit: { visible: false, title: '', lesionType: null },
upload: { visible: false, title: '', TableName: '', lesionType: null },
qsList: [],
answersList: [],
qsForm: {},
@ -337,7 +343,7 @@ export default {
const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
questions.forEach(item => {
if (type.includes(item.Type)) {
const answer = item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
this.$set(this.questionForm, item.Id, answer)
}
if (item.Childrens.length > 0) {
@ -497,7 +503,7 @@ export default {
const loading = this.$loading({ fullscreen: true })
var answers = []
for (const k in this.questionForm) {
answers.push({ id: k, answer: this.questionForm[k] })
answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
}
var params = {
visitTaskId: this.visitTaskId,
@ -609,6 +615,7 @@ export default {
this.$set(this.qsForm, i.Id, v)
})
this.addOrEdit.visible = true
this.addOrEdit.lesionType = row.LesionType
},
async saveFormData() {
const valid = await this.$refs.tableQsForm.validate()
@ -620,7 +627,7 @@ export default {
for (const k in this.qsForm) {
if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
answers.push({ tableQuestionId: k, answer: Array.isArray(this.qsForm[k]) ? JSON.stringify(this.qsForm[k]) : this.qsForm[k] })
}
}
}
@ -633,6 +640,9 @@ export default {
trialId: this.trialId,
answerList: answers
}
if (this.addOrEdit.lesionType === 103) {
params.computationTrigger = 9
}
const res = await submitTableQuestion(params)
if (res.IsSuccess) {
// this.refreshQuestions()
@ -683,6 +693,7 @@ export default {
}
},
uploadTpl(lesionType, TableName) {
this.upload.lesionType = lesionType
this.upload.TableName = TableName
this.upload.title = `导入( ${this.$fd('LesionType', lesionType)} `
this.upload.visible = true

View File

@ -25,7 +25,7 @@
<!-- 下拉框 -->
<el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
:disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
clearable @change="((val) => { formItemChange(val, question) })">
clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1">
<el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
:value="item[question.DataTableColumn]" />

View File

@ -1,30 +1,15 @@
<template>
<el-form
ref="uploadExcel"
class="upload-excel-file"
>
<el-form ref="uploadExcel" class="upload-excel-file">
<!-- 文件 -->
<el-form-item :label="$t('trials:consistencyCheck:label:file2')">
<div class="upload-container">
<el-upload
class="upload-demo"
action
accept=".xlsx,.xls,.csv"
:before-upload="beforeUpload"
:http-request="handleUploadFile"
:on-preview="handlePreview"
:show-file-list="true"
:limit="1"
:on-exceed="handleExceed"
>
<el-upload class="upload-demo" action accept=".xlsx,.xls,.csv" :before-upload="beforeUpload"
:http-request="handleUploadFile" :on-preview="handlePreview" :show-file-list="true" :limit="1"
:on-exceed="handleExceed">
<el-button size="small" type="primary">
{{ $t('trials:consistencyCheck:dialogButton:upload') }}
</el-button>
<span
slot="tip"
style="margin-left:10px;"
class="el-upload__tip"
>
<span slot="tip" style="margin-left:10px;" class="el-upload__tip">
({{ $t('trials:consistencyCheck:message:excelFileOnly') }})
</span>
</el-upload>
@ -40,6 +25,10 @@ export default {
type: String,
required: true
},
lesionType: {
type: Number,
required: true
},
TableName: {
type: String,
default: ''
@ -101,21 +90,24 @@ export default {
</script>
<style lang="scss">
.upload-excel-file{
.upload-excel-file {
.upload-container .el-upload--text {
border: none;
width: 80px;
height: 40px;
}
.upload-container .el-input--small {
margin-bottom: 5px;
}
.upload-container .el-icon-circle-check {
color: #428bca;
font-size: 13px;
}
.account_item_clear{
.el-tag__close{
.account_item_clear {
.el-tag__close {
display: none !important;
}
}

View File

@ -2,12 +2,13 @@
<template>
<div v-loading="loading" style="width:100%;height:100%;">
<transition name="viewer-fade">
<div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper" :style="{ 'z-index':5 }">
<div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper"
:style="{ 'z-index': 5 }">
<span class="image-viewer_desc">
<!-- <span v-if="studyCode">NST00006</span>
<span v-if="modality">CT</span>
<span v-if="bodyPart">/</span><br> -->
{{ `${index+1} / ${urlList.length}` }}
{{ `${index + 1} / ${urlList.length}` }}
</span>
<!-- 关闭 -->
<span class="image-viewer__btn image-viewer__close" @click="hide">
@ -15,18 +16,12 @@
</span>
<!-- Arrow -->
<template v-if="!isSingle">
<span
class="image-viewer__btn image-viewer__prev"
:class="{ 'is-disabled': !infinite && isFirst }"
@click="prev"
>
<span class="image-viewer__btn image-viewer__prev" :class="{ 'is-disabled': !infinite && isFirst }"
@click="prev">
<i class="el-icon-arrow-left" />
</span>
<span
class="el-image-viewer__btn el-image-viewer__next"
:class="{ 'is-disabled': !infinite && isLast }"
@click="next"
>
<span class="el-image-viewer__btn el-image-viewer__next" :class="{ 'is-disabled': !infinite && isLast }"
@click="next">
<i class="el-icon-arrow-right" />
</span>
</template>
@ -40,34 +35,25 @@
<i class="el-image-viewer__actions__divider" />
<i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
<i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
<i
v-if="readingTaskState < 2"
class="el-icon-bottom-right"
:style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}"
@click="handleDrawArrow"
/>
<i v-if="readingTaskState < 2" class="el-icon-bottom-right"
:style="{ cursor: isToolDisabled || readingTaskState >= 2 ? 'not-allowed' : 'pointer' }"
@click="handleDrawArrow" />
<!-- <i
class="rectangle"
:style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}"
@click="handleDrawRectangle"
/> -->
<svg-icon v-if="readingTaskState < 2" icon-class="rectangle" class="svg-icon" :style="{cursor:isToolDisabled || readingTaskState >=2 ?'not-allowed':'pointer'}" @click="handleDrawRectangle" />
<svg-icon v-if="readingTaskState < 2" icon-class="rectangle" class="svg-icon"
:style="{ cursor: isToolDisabled || readingTaskState >= 2 ? 'not-allowed' : 'pointer' }"
@click="handleDrawRectangle" />
</div>
</div>
<!-- 图片 -->
<div id="image-viewer__canvas" class="image-viewer__canvas">
<canvas
v-if="canvasSize.width && canvasPosition.y"
id="canvas"
:height="canvasSize.height"
:width="canvasSize.width"
:style="imgStyle"
@mousedown="handleMouseDown"
@mousemove="handleMouseMove"
@mouseup="handleMouseUp"
@contextmenu="handleContextmenu"
/>
<canvas v-if="canvasSize.width && canvasPosition.y" id="canvas" :height="canvasSize.height"
:width="canvasSize.width" :style="imgStyle" @mousedown="handleMouseDown" @mousemove="handleMouseMove"
@mouseup="handleMouseUp" @contextmenu="handleContextmenu" />
</div>
</div>
@ -111,11 +97,11 @@ export default {
},
onSwitch: {
type: Function,
default: () => {}
default: () => { }
},
onClose: {
type: Function,
default: () => {}
default: () => { }
},
initialIndex: {
type: Number,
@ -191,11 +177,15 @@ export default {
immediate: true,
handler(val) {
this.reset()
this.onSwitch(val)
if (val >= 0) {
this.imgId = this.urlList[val].Id
this.onSwitch(this.imgId)
this.imgUrl = this.urlList[val].Path
this.loadImage()
}
this.imgUrl = this.urlList[val].Path
this.imgId = this.urlList[val].Id
this.loadImage()
}
}
},
@ -359,7 +349,7 @@ export default {
y: canvasDiv.offsetHeight / 2 - img.height / 2 - 25
} //
this.$nextTick(async() => {
this.$nextTick(async () => {
ctx = document.getElementById('canvas').getContext('2d') //
await ctx.drawImage(img, 0, 0, img.width, img.height) // canvas()
this.drawToArr()
@ -779,42 +769,43 @@ export default {
}
</script>
<style lang="scss" scoped>
.image-viewer__wrapper{
position: relative;
top:0;
right:0;
bottom:0;
left:0;
width: 100%;
height: 100%;
}
.image-viewer__btn{
position:absolute;
z-index:1;
display:flex;
align-items:center;
justify-content:center;
border-radius:50%;
opacity:.8;
cursor:pointer;
box-sizing:border-box;
user-select:none
.image-viewer__wrapper {
position: relative;
top: 0;
right: 0;
bottom: 0;
left: 0;
width: 100%;
height: 100%;
}
.image-viewer__close{
.image-viewer__btn {
position: absolute;
z-index: 1;
display: flex;
align-items: center;
justify-content: center;
border-radius: 50%;
opacity: .8;
cursor: pointer;
box-sizing: border-box;
user-select: none
}
.image-viewer__close {
display: none;
top:40px;
right:40px;
width:40px;
height:40px;
font-size:40px
top: 40px;
right: 40px;
width: 40px;
height: 40px;
font-size: 40px
}
.image-viewer_desc{
position:absolute;
top:40px;
left:40px;
font-size:15px;
.image-viewer_desc {
position: absolute;
top: 40px;
left: 40px;
font-size: 15px;
padding: 5px;
height: 30px;
width: 70px;
@ -827,92 +818,104 @@ export default {
border-radius: 17px;
// border-radius: 2%;
}
.image-viewer__canvas{
position: absolute;
top: 50%;
transform: translateY(-50%);
width:100%;
height:100%;
display:flex;
justify-content:center;
align-items:center
}
.image-viewer__actions{
left:50%;
bottom:30px;
transform:translateX(-50%);
width:282px;
height:44px;
padding:0 23px;
background-color:#606266;
border-color:#fff;
border-radius:22px
}
.image-viewer__actions__inner{
width:100%;
height:100%;
text-align:justify;
cursor:default;
font-size:23px;
color:#fff;
display:flex;
align-items:center;
justify-content:space-around
}
.image-viewer__next,.image-viewer__prev{
top:50%;
width:44px;
height:44px;
font-size:24px;
color:#fff;
background-color:#606266;
border-color:#fff
}
.image-viewer__prev{
transform:translateY(-50%);
left:40px
}
.image-viewer__next{
transform:translateY(-50%);
right:40px;
text-indent:2px
}
.image-viewer__mask{
position:absolute;
width:100%;
height:100%;
top:0;
left:0;
opacity:.5;
// background:#000
}
.viewer-fade-enter-active{
animation:viewer-fade-in .3s
}
.viewer-fade-leave-active{
animation:viewer-fade-out .3s
.image-viewer__canvas {
position: absolute;
top: 50%;
transform: translateY(-50%);
width: 100%;
height: 100%;
display: flex;
justify-content: center;
align-items: center
}
@keyframes viewer-fade-in{
0%{
transform:translate3d(0,-20px,0);
opacity:0
}
100%{
transform:translate3d(0,0,0);
opacity:1
}
.image-viewer__actions {
left: 50%;
bottom: 30px;
transform: translateX(-50%);
width: 282px;
height: 44px;
padding: 0 23px;
background-color: #606266;
border-color: #fff;
border-radius: 22px
}
@keyframes viewer-fade-out{
0%{
transform:translate3d(0,0,0);
opacity:1
}
100%{
transform:translate3d(0,-20px,0);
opacity:0
}
.image-viewer__actions__inner {
width: 100%;
height: 100%;
text-align: justify;
cursor: default;
font-size: 23px;
color: #fff;
display: flex;
align-items: center;
justify-content: space-around
}
.image-viewer__next,
.image-viewer__prev {
top: 50%;
width: 44px;
height: 44px;
font-size: 24px;
color: #fff;
background-color: #606266;
border-color: #fff
}
.image-viewer__prev {
transform: translateY(-50%);
left: 40px
}
.image-viewer__next {
transform: translateY(-50%);
right: 40px;
text-indent: 2px
}
.image-viewer__mask {
position: absolute;
width: 100%;
height: 100%;
top: 0;
left: 0;
opacity: .5;
// background:#000
}
.viewer-fade-enter-active {
animation: viewer-fade-in .3s
}
.viewer-fade-leave-active {
animation: viewer-fade-out .3s
}
@keyframes viewer-fade-in {
0% {
transform: translate3d(0, -20px, 0);
opacity: 0
}
100% {
transform: translate3d(0, 0, 0);
opacity: 1
}
}
@keyframes viewer-fade-out {
0% {
transform: translate3d(0, 0, 0);
opacity: 1
}
100% {
transform: translate3d(0, -20px, 0);
opacity: 0
}
}
</style>

View File

@ -3,61 +3,33 @@
<div class="image-viewer-wrapper">
<!-- 预览图像 -->
<NoneDicomsCanvas
v-if="previewVisible"
:on-switch="
(index) => {
selected(index)
}
"
:initial-index="previewImage.index"
:url-list="previewImage.imgList"
:study-code="previewImage.studyCode"
:body-part="previewImage.bodyPart"
:modality="previewImage.modality"
:study-id="previewImage.studyId"
:reading-task-state="readingTaskState"
/>
<NoneDicomsCanvas v-if="previewVisible" :on-switch="(index) => {
selected(index)
}
" :initial-index="previewImage.index" :url-list="previewImage.imgList" :study-code="previewImage.studyCode"
:body-part="previewImage.bodyPart" :modality="previewImage.modality" :study-id="previewImage.studyId"
:reading-task-state="readingTaskState" />
</div>
<div class="thumbnail-wrapper" style="z-index:999;background-color:#fff;">
<div class="">
<div class="img-wrapper">
<el-button
icon="el-icon-d-arrow-left"
plain
class="left to"
:disabled="disabledPrev"
@click="toRight"
/>
<el-button icon="el-icon-d-arrow-left" plain class="left to" :disabled="disabledPrev" @click="toRight" />
<div ref="imagesWrapper" class="images">
<div v-if="noData" class="empty-text">
<slot name="empty">{{ $t('trial:reading:noneDicoms:noData') }}</slot>
</div>
<div v-show="!noData" class="items" :style="itemsStyle">
<div
v-for="(item, index) in previewImage.imgList"
:key="index"
class="item-img"
:style="imgSize"
:class="{
'is-active': index === currentIndex
}"
@click="selected(index)"
>
<div v-for="(item, index) in previewImage.imgList" :key="index" class="item-img" :style="imgSize" :class="{
'is-active': item.Id === currentFileId
}" @click="selected(item.Id)">
<img :title="item.FileName" :src="`${OSSclientConfig.basePath + item.Path}`" crossorigin="anonymous">
<p v-if="item.FileName" class="item-date">
{{ `${index+1}` }}
{{ `${index + 1}` }}
</p>
</div>
</div>
</div>
<el-button
icon="el-icon-d-arrow-right"
:disabled="disabledNext"
plain
class="right to"
@click="Left"
/>
<el-button icon="el-icon-d-arrow-right" :disabled="disabledNext" plain class="right to" @click="Left" />
</div>
</div>
</div>
@ -88,6 +60,10 @@ export default {
type: Number,
default: null
},
currentFileId: {
type: String,
default: ''
},
previewImage: {
type: Object,
default: () => {
@ -161,9 +137,9 @@ export default {
this.pageSize = this.wrapperWidth() / this.itemWidth
this.urlList = this.previewImage
const scope = this
window.onresize = function() {
window.onresize = function () {
scope.pageSize = scope.wrapperWidth() / scope.itemWidth
scope.selected(scope.currentIndex)
scope.selected(scope.currentFileId)
}
},
methods: {
@ -181,7 +157,8 @@ export default {
this.translateX = maxTrans
}
},
selected(index) {
selected(id) {
let index = this.previewImage.imgList.findIndex(item => item.Id === id)
const center = this.pageSize >> 1
//
const lastCenter = this.dataLength - center
@ -198,7 +175,7 @@ export default {
if (this.currentIndex !== index) {
this.currentIndex = index
}
this.$emit('selectedImg', index)
this.$emit('selectedImg', id)
},
wrapperWidth() {
if (this.$refs.imagesWrapper) {
@ -212,35 +189,40 @@ export default {
</script>
<style lang="scss" scoped>
.preview-wrapper{
.preview-wrapper {
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.image-viewer-wrapper{
.image-viewer-wrapper {
flex: 1;
}
.thumbnail-wrapper{
.thumbnail-wrapper {
height: 130px;
}
.img-content{
.img-content {
position: absolute;
left: 0;
bottom: 10px;
width: 100%;
}
.img-wrapper {
display: flex;
position: relative;
margin: 0 20px;
height: 120px;
.to {
width: 32px;
height: 100%;
padding: 0;
}
.images::before {
position: absolute;
z-index: 5;
@ -249,16 +231,15 @@ export default {
width: 84px;
content: '';
pointer-events: none;
background: -webkit-gradient(
linear,
left top,
right top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0))
);
background: -webkit-gradient(linear,
left top,
right top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0)));
background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
}
.images::after {
position: absolute;
z-index: 5;
@ -268,22 +249,22 @@ export default {
width: 84px;
content: '';
pointer-events: none;
background: -webkit-gradient(
linear,
right top,
left top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0))
);
background: -webkit-gradient(linear,
right top,
left top,
from(#fff),
color-stop(50%, rgba(0, 0, 0, 0)));
background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
}
.images {
position: relative;
overflow: hidden;
width: 100%;
height: 100%;
margin: 0 2px;
.empty-text {
color: rgb(158, 158, 158);
height: 100%;
@ -291,6 +272,7 @@ export default {
align-items: center;
justify-content: center;
}
.items {
position: absolute;
top: 0;
@ -300,6 +282,7 @@ export default {
height: 100%;
align-items: center;
transition: transform 0.25s ease;
.item-img {
display: inline-block;
box-sizing: border-box;
@ -307,6 +290,7 @@ export default {
margin-right: 8px;
border: 2px solid rgba(0, 0, 0, 0);
cursor: pointer;
.item-date {
bottom: 0px;
position: absolute;
@ -317,15 +301,18 @@ export default {
line-height: 24px;
color: white;
}
img {
width: 100%;
height: 100%;
}
}
.item-img:hover::after {
// border-color: #409EFF;
opacity: 0;
}
.item-img::after {
position: absolute;
top: 0;
@ -340,9 +327,11 @@ export default {
transition: opacity 0.3s ease;
background-color: #fff;
}
.is-active {
border-color: #409eff;
}
.is-active:after {
opacity: 0;
}

View File

@ -65,7 +65,11 @@
{{ `${scope.row[q.Id]} ${$fd('ValueUnit', parseInt(q.Unit))}` }}
</span>
<span v-else-if="q.DictionaryCode">
{{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
{{`${scope.row[q.Id] instanceof Array ? scope.row[q.Id].map(item => $fd(q.DictionaryCode,
parseInt(item))).join(',') : $fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}`}}
</span>
<span v-else-if="q.OptionTypeEnum === 1">
{{ `${scope.row[q.Id] instanceof Array ? scope.row[q.Id].join(',') : scope.row[q.Id]}` }}
</span>
<span v-else>
{{ `${scope.row[q.Id]}` }}
@ -103,7 +107,7 @@
</template>
<template v-if="item.Type === 'select'">
<el-select v-model="questionForm[item.Id]" :disabled="!isCurrentTask || readingTaskState >= 2"
@change="((val) => { formItemChange(val, item) })">
:multiple="item.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, item) })">
<el-option v-for="dict of $d[item.DictionaryCode]" :key="dict.id" :value="String(dict.value)"
:label="dict.label" />
</el-select>
@ -112,10 +116,10 @@
<template v-if="item.Childrens && item.Childrens.length > 0">
<template v-for="child in item.Childrens">
<el-form-item :key="child.Id"
v-if="(child.ShowQuestion === 1 && child.ParentTriggerValueList.includes(String(questionForm[item.Id]))) || child.ShowQuestion === 0"
v-if="(child.ShowQuestion === 1 && (child.ParentTriggerValueList.includes(String(questionForm[item.Id])) || (Array.isArray(questionForm[item.Id]) && child.ParentTriggerValueList.some(da => questionForm[item.Id].includes(da))))) || child.ShowQuestion === 0"
:label="`${child.QuestionName}`" :prop="child.Id" :rules="[
{
required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && (child.RelevanceValue.includes(questionForm[child.RelevanceId])))) && child.Type !== 'group' && child.Type !== 'summary',
required: (child.IsRequired === 0 || (child.IsRequired === 1 && child.RelevanceId && ((child.RelevanceValue.includes(questionForm[child.RelevanceId])) || (Array.isArray(questionForm[child.RelevanceId]) && child.RelevanceValueList.some(da => questionForm[child.RelevanceId].includes(da)))))) && child.Type !== 'group' && child.Type !== 'summary',
message: ['radio', 'select', 'checkbox'].includes(child.Type) ? $t('common:ruleMessage:select') : $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
},
]">
@ -324,7 +328,7 @@ export default {
const type = ['number', 'radio', 'select', 'input', 'textarea', 'calculation']
questions.forEach(item => {
if (type.includes(item.Type)) {
const answer = item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
const answer = item.Type === 'select' && item.OptionTypeEnum === 1 && item.Answer ? JSON.parse(item.Answer) : item.Type === 'number' || item.Type === 'calculation' ? isNaN(parseFloat(item.Answer)) ? null : parseFloat(item.Answer) : item.Answer
this.$set(this.questionForm, item.Id, answer)
}
if (item.Childrens.length > 0) {
@ -481,7 +485,7 @@ export default {
const loading = this.$loading({ fullscreen: true })
var answers = []
for (const k in this.questionForm) {
answers.push({ id: k, answer: this.questionForm[k] })
answers.push({ id: k, answer: Array.isArray(this.questionForm[k]) ? JSON.stringify(this.questionForm[k]) : this.questionForm[k] })
}
var params = {
visitTaskId: this.visitTaskId,
@ -609,7 +613,7 @@ export default {
for (const k in this.qsForm) {
if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.qsForm[k] })
answers.push({ tableQuestionId: k, answer: Array.isArray(this.qsForm[k]) ? JSON.stringify(this.qsForm[k]) : this.qsForm[k] })
}
}
}

View File

@ -25,7 +25,7 @@
<!-- 下拉框 -->
<el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
:disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
clearable @change="((val) => { formItemChange(val, question) })">
clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1">
<el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
:value="item[question.DataTableColumn]" />
@ -142,6 +142,12 @@ export default {
return []
}
},
questions: {
type: Array,
default() {
return []
}
},
readingTaskState: {
type: Number,
required: true
@ -171,6 +177,7 @@ export default {
}
this.$emit('setFormItemData', { key: question.Id, val: v })
}
this.resetChildValue(question, this.questions)
},
resetChild(obj) {
obj.forEach(i => {
@ -180,6 +187,17 @@ export default {
}
})
},
resetChildValue(obj, arr) {
arr.some(item => {
if (item.ParentId === obj.Id) {
this.$emit('resetFormItemData', item.Id)
}
if (item.Childrens && item.Childrens.length > 0) {
this.resetChildValue(obj, item.Childrens)
}
return item.ParentId === obj.Id
})
},
limitBlur(valueType, value) {
if (isNaN(parseInt(value))) {
value = null

View File

@ -41,7 +41,6 @@
}
})" />
</div>
<!-- 测量 -->
<el-button v-if="!questionForm[question.Id] && readingTaskState !== 2" size="mini" type="text"
@click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
@ -80,7 +79,6 @@
}
})" />
</div>
</template>
<!-- 输入框 -->
@ -94,7 +92,7 @@
<!-- 下拉框 -->
<el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
:disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode) || isFirstChangeTask || question.QuestionType === 50 || question.QuestionType === 55"
clearable @change="((val) => { formItemChange(val, question) })">
clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1">
<el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
:value="item[question.DataTableColumn]" />
@ -193,7 +191,6 @@
}
})" />
</div>
<!-- 上传图像 -->
<el-upload v-else-if="question.Type === 'upload'" action :accept="accept" :limit="question.ImageCount"
:on-preview="handlePictureCardPreview" :before-upload="handleBeforeUpload" :http-request="uploadScreenshot"

View File

@ -61,7 +61,6 @@
})" />
</div>
<!-- {{ ((qs.QuestionMark === 6 && isCurrentTaskAdd === 'False') || (qs.QuestionMark === 6 && isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition)) }} -->
</template>
<!-- 多行文本输入框 -->
<el-input v-if="qs.Type === 'textarea'" v-model="questionForm[qs.Id]" type="textarea"

View File

@ -355,7 +355,7 @@ export default {
this.dialogVisible = true
this.cdVisitTaskId = this.visitTaskId
}
if ((this.CriterionType === 19 || this.CriterionType === 20) && !this.IsViewStudyPart) {
if ((this.CriterionType === 19 || this.CriterionType === 20) && !this.IsViewStudyPart && this.readingCategory !== 4) {
this.isFullscreen = false
this.dialogBodyPartVisible = true
}

View File

@ -1,7 +1,14 @@
<template>
<div v-loading="loading" class="img-container">
<el-card class="box-card left">
<div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title" style="text-align:center">
<div v-if="otherInfo && otherInfo.IsReadingShowSubjectInfo" class="title"
style="display: flex;align-items: center;flex-wrap: wrap;">
<div style="margin-right: 5px;cursor: pointer;display: inline-block" @click.stop="sortFile">
<i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
style="display: block;margin-bottom: -5px;"></i>
<i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
style="display: block; margin-top: -5px;"></i>
</div>
<span>{{ otherInfo.SubjectCode }} </span>
<span>({{ otherInfo.TaskBlindName }})</span>
</div>
@ -40,8 +47,8 @@
<el-card class="box-card right">
<div style="width:100%;height: 100%;">
<NoneDicomsViewer v-if="previewImage.imgList.length > 0" ref="previewImage" style="width:100%;"
:preview-image="previewImage" :value="currentStudyFileIndex" :reading-task-state="readingTaskState"
@selectedImg="selectedImg" />
:preview-image="previewImage" :value="currentStudyFileIndex" :currentFileId="currentFileId"
:reading-task-state="readingTaskState" @selectedImg="selectedImg" />
</div>
</el-card>
@ -54,6 +61,7 @@ import { getReadingImageFile } from '@/api/trials'
import { changeURLStatic } from '@/utils/history.js'
import store from '@/store'
import NoneDicomsViewer from './components/NoneDicomsViewer'
import FileNameSorter from "@/utils/customSort";
export default {
name: 'VisitReview',
components: {
@ -90,7 +98,13 @@ export default {
visistTaskId: '',
taskBlindName: '',
readingTaskState: 2,
BodyPart: {}
BodyPart: {},
Asc: null
}
},
computed: {
CriterionType() {
return this.otherInfo.CriterionType ? this.otherInfo.CriterionType : 0
}
},
async mounted() {
@ -113,6 +127,24 @@ export default {
this.getNoneDicomList()
},
methods: {
sortFile() {
if (this.Asc) {
this.Asc = false
} else {
this.Asc = true
}
this.studyList.forEach(study => {
if (study.NoneDicomStudyFileList.length > 0) {
study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
direction: this.Asc ? 'asc' : 'desc',
key: 'FileName'
})
}
})
this.previewImage.imgList = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList
this.previewImage.index = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === this.currentFileId)
},
// Dicom
getNoneDicomList() {
this.loading = true
@ -134,6 +166,9 @@ export default {
}
}
this.loading = false
if (this.CriterionType === 19 || this.CriterionType === 20) {
this.sortFile()
}
}).catch(() => { this.loading = false })
},
selected(file, studyIndex, fileIndex, isChangeSub = false) {
@ -148,12 +183,14 @@ export default {
this.previewImage.studyId = this.studyList[studyIndex].Id
this.$nextTick(() => {
if (isChangeSub) {
this.$refs['previewImage'].selected(fileIndex)
this.$refs['previewImage'].selected(this.currentFileId)
}
})
},
selectedImg(fileIndex) {
selectedImg(id) {
if (this.studyList.length > 0) {
let fileIndex = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList.findIndex(item => item.Id === id)
console.log(fileIndex, id)
this.currentStudyFileIndex = fileIndex
this.currentFileId = this.studyList[this.currentStudyIndex].NoneDicomStudyFileList[fileIndex].Id
this.previewImage.index = fileIndex
@ -195,6 +232,10 @@ export default {
</script>
<style lang="scss" scoped>
.icon_check {
color: #409EFF;
}
.img-container {
flex: 1;
width: 100%;
@ -236,7 +277,7 @@ export default {
}
.title {
height: 40px;
// height: 40px;
line-height: 40px;
border: 1ppx solid;
border: 1px solid #ebe7e7;

View File

@ -785,6 +785,7 @@ export default {
this.loadRelatedTasks()
this.initLoader()
this.getWwcTpl()
this.getHotKeys()
})
this.getTrialCriterion()
DicomEvent.$on('isCanActiveNoneDicomTool', data => {

View File

@ -26,7 +26,7 @@
<!-- 下拉框 -->
<el-select v-else-if="question.Type === 'select'" v-model="questionForm[question.Id]"
:disabled="readingTaskState >= 2 || ((question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode)"
clearable @change="((val) => { formItemChange(val, question) })">
clearable :multiple="question.OptionTypeEnum === 1" @change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1">
<el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
:value="item[question.DataTableColumn]" />
@ -90,7 +90,6 @@
}
})" />
</div>
<!-- 上传图像 -->
<el-upload v-else-if="question.Type === 'upload'" action :accept="accept" :limit="question.ImageCount"
:on-preview="handlePictureCardPreview" :before-upload="handleBeforeUpload" :http-request="uploadScreenshot"

View File

@ -419,7 +419,7 @@ export default {
getOuterFormData(childrens, formData = {}) {
childrens.forEach(item => {
if (item.Type !== 'group' && item.Type !== 'summary') {
formData[item.Id] = item.Answer || ''
formData[item.Id] = item.Answer ? item.OptionTypeEnum === 1 ? JSON.parse(item.Answer) : item.Answer : ''
if (item.QuestionType === 44) {
//
this.imageQualityId = item.Id

View File

@ -49,7 +49,6 @@
}
})" />
</div>
</template>
<!-- 多行文本输入框 -->
<el-input v-if="qs.Type === 'textarea'" v-model="qsForm[qs.Id]" type="textarea"

View File

@ -38,18 +38,16 @@
:tree-props="{ children: 'Childrens', hasChildren: 'hasChildren' }" size="mini">
<el-table-column prop="" label="" show-overflow-tooltip width="350px">
<template slot-scope="scope">
<span v-if="scope.row.QuestionName"
:style="{ color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff' }">{{
scope.row.QuestionName }}
<span v-if="scope.row.QuestionName" :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">{{ scope.row.QuestionName }}
<svg-icon
v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1)"
v-if="scope.row.ShowChartTypeEnum > 0 || (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1)"
icon-class="readingChart" class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({
e,
data: {
QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId,
TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null,
RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null,
ReportChartTypeEnum: scope.row.LesionType === 0 && scope.row.ReportLayType === 1 ? 0 : null,
ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) ? 0 : (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 1 : null,
QuestionName: scope.row.QuestionName
}
})" />

View File

@ -27,6 +27,10 @@
<span v-else-if="item.Type === 'number'">
{{ scope.row[item.Id] ? parseFloat(scope.row[item.Id]).toFixed(digitPlaces) : null }}
</span>
<span v-else-if="item.Type === 'select' && item.OptionTypeEnum === 1">
{{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
scope.row[item.Id].join(',') : scope.row[item.Id] }}
</span>
<span v-else>
{{ scope.row[item.Id] }}
</span>
@ -93,6 +97,7 @@
:autosize="{ minRows: 2, maxRows: 4 }" :disabled="readingTaskState === 2" />
<!-- 下拉框 -->
<el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
:multiple="question.OptionTypeEnum === 1"
:disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode || readingTaskState === 2"
@change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1">
@ -527,8 +532,8 @@ export default {
this.handleCancel()
})
DicomEvent.$on('operateImageMarker', (data) => {
let { operateStateEnum, QuestionId, picturePath } = data
if (this.question.Id === QuestionId) {
let { operateStateEnum, QuestionId, picturePath, visitTaskId } = data
if (this.question.Id === QuestionId && visitTaskId === this.visitTaskId) {
this.operateImageMarker({ operateStateEnum, question: this.question, picturePath })
}
})
@ -685,7 +690,7 @@ export default {
for (const k in this.QuestionsForm) {
if (reg.test(k)) {
if (answers.findIndex(i => i.tableQuestionId === k) === -1) {
answers.push({ tableQuestionId: k, answer: this.QuestionsForm[k] })
answers.push({ tableQuestionId: k, answer: Array.isArray(this.QuestionsForm[k]) ? JSON.stringify(this.QuestionsForm[k]) : this.QuestionsForm[k] })
}
}
}
@ -793,7 +798,7 @@ export default {
}
},
logic(rules, num = 0) {
let isNE = false
let isNE = false, isNAN = false
try {
if (rules.CalculateQuestionList.length === 0) {
return false
@ -811,6 +816,8 @@ export default {
} else {
num *= parseFloat(q[o.TableQuestionId])
}
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
@ -826,6 +833,8 @@ export default {
} else {
num += parseFloat(q[o.TableQuestionId])
}
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
@ -841,6 +850,8 @@ export default {
} else {
num += parseFloat(q[o.TableQuestionId])
}
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
@ -854,6 +865,8 @@ export default {
this.questionForm[o.QuestionId].forEach(q => {
if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
arr.push(q[o.TableQuestionId])
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
@ -867,6 +880,8 @@ export default {
this.questionForm[o.QuestionId].forEach(q => {
if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
arr.push(q[o.TableQuestionId])
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
isNE = true
@ -876,15 +891,33 @@ export default {
break;
}
} else {
if (this.questionForm[o.TableQuestionId] === 'NE') {
isNE = true
}
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = parseFloat(this.questionForm[o.TableQuestionId])
}
if (!isNaN(num)) {
dataArr.push(num)
switch (rules.CustomCalculateMark) {
case 15:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = Math.abs(this.questionForm[o.TableQuestionId])
}
else {
isNAN = true
}
if (this.questionForm[o.TableQuestionId] === 'NE') {
isNE = true
}
break;
default:
if (this.questionForm[o.TableQuestionId] === 'NE') {
isNE = true
}
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
if (!isNaN(num)) {
dataArr.push(num)
}
break;
}
}
} else {
if (this.questionForm[o.TableQuestionId] === 'NE') {
@ -894,18 +927,24 @@ export default {
case 1:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num += parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
break;
case 2:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num -= parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
break;
case 3:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num *= parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
break;
@ -916,12 +955,16 @@ export default {
} else {
num /= parseFloat(this.questionForm[o.TableQuestionId])
}
} else {
isNAN = true
}
break;
case 10:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
return acc + (typeof curr === "number" ? curr : 0);
@ -930,27 +973,43 @@ export default {
case 11:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = Math.max(...dataArr);
break;
case 12:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = Math.min(...dataArr);
break;
case 13:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
break;
case 14:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
break;
case 15:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = Math.abs(this.questionForm[o.TableQuestionId])
}
else {
isNAN = true
}
break;
}
}
})
@ -960,7 +1019,7 @@ export default {
if (isNE) {
return 'NE'
}
if (isNaN(num)) {
if (isNAN) {
return null
}
if (rules.ValueType === 2) {
@ -1013,7 +1072,7 @@ export default {
var CalculateQuestions = JSON.parse(v.CalculateQuestions);
var num,
arr = [];
let isNE = false
let isNE = false, isNAN = false
CalculateQuestions.forEach((o, i) => {
if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
isNE = true
@ -1022,6 +1081,8 @@ export default {
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
num = parseFloat(this.QuestionsForm[o.TableQuestionId]);
arr = [num];
} else {
isNAN = true
}
} else {
@ -1029,24 +1090,32 @@ export default {
case 1:
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
num += parseFloat(this.QuestionsForm[o.TableQuestionId]);
} else {
isNAN = true
}
break;
case 2:
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
num -= parseFloat(this.QuestionsForm[o.TableQuestionId]);
} else {
isNAN = true
}
break;
case 3:
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
num *= parseFloat(this.QuestionsForm[o.TableQuestionId]);
} else {
isNAN = true
}
break;
case 4:
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
num /= parseFloat(this.QuestionsForm[o.TableQuestionId]);
} else {
isNAN = true
}
break;
@ -1055,6 +1124,9 @@ export default {
arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]));
}
else {
isNAN = true
}
num =
arr.length === 0
? 0
@ -1065,6 +1137,8 @@ export default {
case 8:
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]));
} else {
isNAN = true
}
num = arr.length === 0 ? 0 : Math.max(...arr);
@ -1072,6 +1146,8 @@ export default {
case 9:
if (!isNaN(parseFloat(this.QuestionsForm[o.TableQuestionId]))) {
arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]));
} else {
isNAN = true
}
num = arr.length === 0 ? 0 : Math.min(...arr);
@ -1083,6 +1159,9 @@ export default {
if (isNE) {
num = 'NE'
}
if (isNAN) {
num = ''
}
this.$set(this.QuestionsForm, v.Id, num.toString());
}
});
@ -1253,11 +1332,12 @@ export default {
}
if (!referencedImageId) return null
const cacheKey = annotation.from ? `volumeId:${referencedImageId}` : `imageId:${referencedImageId}`
const cachedStats = annotation.data?.cachedStats?.[cacheKey]
const points = ['x', 'y', 'z'];
const cachedStats = annotation.markTool === "ArrowAnnotate" ? annotation.data?.handles?.points[0] : annotation.data?.cachedStats?.[cacheKey]
const hasProp = cachedStats
&& Object.prototype.hasOwnProperty.call(cachedStats, prop)
&& (Object.prototype.hasOwnProperty.call(cachedStats, prop) || cachedStats[points.indexOf(prop)])
if (!hasProp) return null
let value = cachedStats[prop]
let value = annotation.markTool === "ArrowAnnotate" ? cachedStats[points.indexOf(prop)] : cachedStats[prop]
if (this.isNoneDicom && annotation.ps && value !== null) {
let ps = annotation.ps
if (prop === 'area') {

View File

@ -197,6 +197,9 @@ export default {
if (i.Type !== 'group' && i.Type !== 'summary' && i.Id && i.Type !== 'table' && i.Type !== 'basicTable') {
this.$set(this.questionForm, i.Id, i.Answer)
}
if (i.Type === 'select' && i.OptionTypeEnum === 1) {
this.$set(this.questionForm, i.Id, i.Answer ? JSON.parse(i.Answer) : [])
}
if (i.Type === 'table' || i.Type === 'basicTable') {
i.TableQuestions.Questions.forEach(o => {
if (o.Type === 'number') {
@ -205,6 +208,11 @@ export default {
})
this.$set(this.questionImageToolAttributeInfo, o.Id, o.ImageToolAttribute)
}
if (o.Type === 'select' && o.OptionTypeEnum === 1) {
i.TableQuestions.Answers.forEach((ite, index) => {
this.$set(i.TableQuestions.Answers[index], o.Id, i.TableQuestions.Answers[index][o.Id] ? JSON.parse(i.TableQuestions.Answers[index][o.Id]) : [])
})
}
})
this.$set(this.questionForm, i.Id, i.TableQuestions.Answers)
}
@ -237,7 +245,11 @@ export default {
try {
var answers = []
for (const k in this.questionForm) {
if (this.questionForm[k] instanceof Array) { } else {
if (this.questionForm[k] instanceof Array) {
if (this.questionForm[k].length > 0 && Object.prototype.toString.call(this.questionForm[k][0]) === '[object String]') {
answers.push({ id: k, answer: JSON.stringify(this.questionForm[k]) })
}
} else {
answers.push({ id: k, answer: this.questionForm[k] })
}
}
@ -278,7 +290,11 @@ export default {
this.loading = true
var answers = []
for (const k in this.questionForm) {
if (this.questionForm[k] instanceof Array) { } else {
if (this.questionForm[k] instanceof Array) {
if (this.questionForm[k].length > 0 && Object.prototype.toString.call(this.questionForm[k][0]) === '[object String]') {
answers.push({ id: k, answer: JSON.stringify(this.questionForm[k]) })
}
} else {
answers.push({ readingQuestionTrialId: k, answer: this.questionForm[k] })
}
}
@ -559,7 +575,7 @@ export default {
if (!item.MeasureData || item.MeasureData.annotationUID !== annotation.annotationUID) continue
const isTableMode = item.TableQuestionId
if (!isTableMode && this.questionsMarkStatus[item.QuestionId] && !this.questionsMarkStatus[item.QuestionId].isSaved && this.questionsMarkStatus[item.QuestionId].isMarked) {
DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath })
DicomEvent.$emit('operateImageMarker', { QuestionId: item.QuestionId, operateStateEnum: 5, picturePath, visitTaskId: this.visitTaskId })
break
}
}
@ -983,11 +999,12 @@ export default {
}
if (!referencedImageId) return null
const cacheKey = annotation.from ? `volumeId:${referencedImageId}` : `imageId:${referencedImageId}`
const cachedStats = annotation.data?.cachedStats?.[cacheKey]
const points = ['x', 'y', 'z']
const cachedStats = annotation.markTool === "ArrowAnnotate" ? annotation.data?.handles?.points[0] : annotation.data?.cachedStats?.[cacheKey]
const hasProp = cachedStats
&& Object.prototype.hasOwnProperty.call(cachedStats, prop)
&& (Object.prototype.hasOwnProperty.call(cachedStats, prop) || cachedStats[points.indexOf(prop)])
if (!hasProp) return null
let value = cachedStats[prop]
let value = annotation.markTool === "ArrowAnnotate" ? cachedStats[points.indexOf(prop)] : cachedStats[prop]
if (this.isNoneDicom && annotation.ps && value !== null) {
let ps = annotation.ps
if (prop === 'area') {

View File

@ -22,7 +22,8 @@
:autosize="{ minRows: 2, maxRows: 4 }" />
<!-- 下拉框 -->
<el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
:disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
:multiple="question.OptionTypeEnum === 1"
:disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
@change="((val) => { formItemChange(val, question) })">
<template v-if="question.TableQuestionType === 1">
<el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"

View File

@ -81,24 +81,35 @@
<el-select
v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
v-model="questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]"
size="mini" clearable>
size="mini" clearable :multiple="scope.row.OptionTypeEnum === 1">
<template>
<el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
</template>
</el-select>
<span
v-else-if="questionForm[scope.row.QuestionId] instanceof Array && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
{{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
v-else-if="questionForm[scope.row.QuestionId] instanceof Array && questionForm[scope.row.QuestionId][scope.row.xfIndex] && questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] && (scope.row.Type === 'select' || scope.row.Type === 'radio')">
{{
Array.isArray(questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId])
?
questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId].join(',') :
questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId]
}}
</span>
<el-select
v-else-if="(scope.row.Type === 'select' || scope.row.Type === 'radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
v-model="questionForm[scope.row.QuestionId]" size="mini" clearable>
v-model="questionForm[scope.row.QuestionId]" size="mini" clearable
:multiple="scope.row.OptionTypeEnum === 1">
<template>
<el-option v-for="val in scope.row.TypeValue.split('|')" :key="val" :label="val" :value="val" />
</template>
</el-select>
<span v-else-if="scope.row.Type === 'select' || scope.row.Type === 'radio'">
{{ questionForm[scope.row.QuestionId] }}
{{
questionForm[scope.row.QuestionId] && Array.isArray(questionForm[scope.row.QuestionId]) ?
questionForm[scope.row.QuestionId].join(',') :
questionForm[scope.row.QuestionId]
}}
</span>
<el-input
v-else-if="scope.row.DataSource !== 1 && questionForm[scope.row.QuestionId] instanceof Array && scope.row.Type === 'number' && (scope.row.xfIndex || scope.row.xfIndex === 0) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
@ -173,7 +184,10 @@
</span>
</template>
<template v-else-if="scope.row.DictionaryCode">
{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
{{scope.row.Answers[task.VisitTaskId] instanceof Array
? scope.row.Answers[task.VisitTaskId].map(item => $fd(scope.row.DictionaryCode,
item)).join(",") : $fd(scope.row.DictionaryCode,
scope.row.Answers[task.VisitTaskId])}}
</template>
<template v-else-if="criterionType === 10">
{{
@ -459,7 +473,7 @@ export default {
})
},
logic(rules, num = 0) {
let isNE = false
let isNE = false, isNAN = false
try {
if (rules.CalculateQuestionList.length === 0) {
return false
@ -480,6 +494,8 @@ export default {
} else {
num *= parseFloat(q[o.TableQuestionId])
}
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
@ -495,6 +511,8 @@ export default {
} else {
num += isNaN(parseFloat(q[o.TableQuestionId])) ? null : parseFloat(q[o.TableQuestionId])
}
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
isNE = true
@ -509,6 +527,8 @@ export default {
} else {
num += parseFloat(q[o.TableQuestionId])
}
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
isNE = true
@ -521,6 +541,8 @@ export default {
this.questionForm[o.QuestionId].forEach(q => {
if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
arr.push(q[o.TableQuestionId])
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
@ -534,17 +556,29 @@ export default {
this.questionForm[o.QuestionId].forEach(q => {
if (!isNaN(parseFloat(q[o.TableQuestionId]))) {
arr.push(q[o.TableQuestionId])
} else {
isNAN = true
}
if (q[o.TableQuestionId] === 'NE') {
isNE = true
}
})
num = arr1.length === 0 ? 0 : Math.min(...arr1)
break
break;
case 15:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = Math.abs(this.questionForm[o.TableQuestionId])
}
else {
isNAN = true
}
break;
}
} else {
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
}
@ -553,24 +587,32 @@ export default {
case 1:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num += parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
break
case 2:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num -= parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
break
case 3:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num *= parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
break
case 4:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num /= parseFloat(this.questionForm[o.TableQuestionId])
} else {
isNAN = true
}
// num /= parseFloat(this.questionForm[o.TableQuestionId])
@ -578,6 +620,8 @@ export default {
case 10:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => {
return acc + (typeof curr === "number" ? curr : 0);
@ -586,27 +630,40 @@ export default {
case 11:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = Math.max(...dataArr);
break;
case 12:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = Math.min(...dataArr);
break;
case 13:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc && curr) ? 1 : 0
break;
case 14:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
} else {
isNAN = true
}
num = dataArr.length === 0 ? 0 : dataArr.reduce((acc, curr) => acc || curr, 0) ? 1 : 0;
break;
case 15:
if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
num = Math.abs(this.questionForm[o.TableQuestionId])
}
break;
}
}
})
@ -616,6 +673,9 @@ export default {
if (isNE) {
return 'NE'
}
if (isNAN) {
return false
}
if (rules.ValueType === 2) {
num = num * 100
}
@ -643,39 +703,54 @@ export default {
}).catch(() => { this.loading = false })
},
getQuestions(questions) {
const arr = []
if (questions.length !== 0) {
questions.forEach((item) => {
const obj = item
this.$set(obj, 'Answers', {})
item.Answer.forEach(i => {
if (item.DictionaryCode) {
this.$set(obj.Answers, i.VisitTaskId, i.Answer ? parseInt(i.Answer) : null)
// obj.Answers[i.VisitTaskId] = i.Answer ? parseInt(i.Answer) : null
} else {
if (item.Type === 'number') {
let val = null
if (item.ValueType === 0) {
val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseInt(i.Answer)
} else if (item.ValueType === 3) {
val = i.Answer
try {
const arr = []
if (questions.length !== 0) {
questions.forEach((item) => {
const obj = item
this.$set(obj, 'Answers', {})
item.Answer.forEach(i => {
if (item.DictionaryCode) {
if (item.Type === 'select' && item.OptionTypeEnum === 1) {
let val = i.Answer ? JSON.parse(i.Answer) : []
this.$set(obj.Answers, i.VisitTaskId, val)
} else {
val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces)
this.$set(obj.Answers, i.VisitTaskId, i.Answer ? parseInt(i.Answer) : null)
}
this.$set(obj.Answers, i.VisitTaskId, val)
// obj.Answers[i.VisitTaskId] = i.Answer ? parseInt(i.Answer) : null
} else {
this.$set(obj.Answers, i.VisitTaskId, i.Answer)
if (item.Type === 'number') {
let val = null
if (item.ValueType === 0) {
val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseInt(i.Answer)
} else if (item.ValueType === 3) {
val = i.Answer
} else {
val = isNaN(parseFloat(i.Answer)) ? i.Answer : parseFloat(i.Answer).toFixed(this.digitPlaces)
}
this.$set(obj.Answers, i.VisitTaskId, val)
} else if (item.Type === 'select' && item.OptionTypeEnum === 1) {
let val = i.Answer ? JSON.parse(i.Answer) : []
this.$set(obj.Answers, i.VisitTaskId, val)
} else {
this.$set(obj.Answers, i.VisitTaskId, i.Answer)
}
// obj.Answers[i.VisitTaskId] = i.Answer
}
// obj.Answers[i.VisitTaskId] = i.Answer
})
if (item.Childrens.length >= 1) {
obj.Childrens = this.getQuestions(item.Childrens)
}
arr.push(obj)
})
if (item.Childrens.length >= 1) {
obj.Childrens = this.getQuestions(item.Childrens)
}
arr.push(obj)
})
}
return arr
} catch (err) {
console.log(err)
}
return arr
},
handleShowDetail(val) {
this.getReportInfo()

View File

@ -261,7 +261,7 @@ const config = {
'name': '箭头工具',
'icon': 'arrow',
'toolName': 'ArrowAnnotate',
'props': [],
'props': ['x', 'y', 'z'],
'i18nKey': 'trials:reading:button:arrowAnnotate',
'isDisabled': false,
'disabledReason': ''

View File

@ -1,82 +1,53 @@
<template>
<div class="ad_review_wrapper">
<div style="text-align: left">
<el-button
v-if="auditInfo.IsExistsClinicalData"
type="text"
@click="previewCD"
>
<el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
{{ $t("trials:adReview:title:clinicalData") }}
</el-button>
</div>
<el-table :data="adInfo.VisitInfoList" style="width: 100%">
<!-- 访视名称 -->
<el-table-column
prop="VisitName"
:label="$t('trials:adReview:table:visitName')"
show-overflow-tooltip
width="150"
/>
<el-table-column prop="VisitName" :label="$t('trials:adReview:table:visitName')" show-overflow-tooltip
width="150" />
<!-- 评估结果 -->
<el-table-column
v-for="j in judgeQuestion"
:key="j.armEnum"
:label="$fd('ArmEnum', j.armEnum)"
align="center"
prop=""
show-overflow-tooltip
>
<el-table-column v-for="j in judgeQuestion" :key="j.armEnum" :label="$fd('ArmEnum', j.armEnum)" align="center"
prop="" show-overflow-tooltip>
<template>
<el-table-column
v-for="(qs, i) in j.judgeQuestionList"
:key="i"
prop=""
:label="qs"
show-overflow-tooltip
width="150"
>
<el-table-column v-for="(qs, i) in j.judgeQuestionList" :key="i" prop="" :label="qs" show-overflow-tooltip
width="150">
<template slot-scope="scope">
<div
v-if="
<span v-if="
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.QuestionType === 1
">
<span v-if="
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.QuestionType === 1
"
>
<span
v-if="
.DictionaryCode
">{{
$fd(
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.DictionaryCode
"
>{{
$fd(
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.DictionaryCode,
parseInt(
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
i
].Answer
)
.DictionaryCode,
parseInt(
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[
i
].Answer
)
}}</span
>
)
}}</span>
<span v-else>{{
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.Answer
}}</span>
</div>
<div
v-else-if="
</span>
<span v-else-if="
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.QuestionType === 2
">
<div v-if="
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.QuestionType === 2
"
>
<div
v-if="
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.Answer
"
>
.Answer
">
<span>{{
$fd(
"YesOrNo",
@ -85,15 +56,11 @@
)
}}</span>
<!-- 查看详情 -->
<el-button
type="text"
style="margin-left: 5px"
@click="
handleViewDetail(
scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
)
"
>
<el-button type="text" style="margin-left: 5px" @click="
handleViewDetail(
scope.row.VisitTaskInfoList[j.index].GlobalVisitTaskId
)
">
{{ $t("trials:adReview:table:view") }}
</el-button>
</div>
@ -107,115 +74,70 @@
)
}}
</div>
</div>
<div v-else>
</span>
<span v-else>
{{
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i]
.Answer
}}
</div>
</span>
<span>
{{
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].ValueType == 2 ? '%' :
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].CustomUnit ?
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].CustomUnit :
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit ? $fd("Unit",
scope.row.VisitTaskInfoList[j.index].JudgeQuestionList[i].Unit) : ''
}}
</span>
</template>
</el-table-column>
</template>
</el-table-column>
<!-- 查看详情 -->
<el-table-column
:label="$t('trials:adReview:table:view')"
width="200"
:fixed="isFixed ? 'right' : false"
>
<el-table-column :label="$t('trials:adReview:table:view')" width="200" :fixed="isFixed ? 'right' : false">
<template slot-scope="scope">
<!-- 查看R1详情 -->
<el-button
type="text"
:title="$t('trials:adReview:table:viewR1')"
@click="handleView(scope.row, 1)"
>
<el-button type="text" :title="$t('trials:adReview:table:viewR1')" @click="handleView(scope.row, 1)">
R1
</el-button>
<!-- 查看R2详情 -->
<el-button
type="text"
:title="$t('trials:adReview:table:viewR2')"
@click="handleView(scope.row, 2)"
>
<el-button type="text" :title="$t('trials:adReview:table:viewR2')" @click="handleView(scope.row, 2)">
R2
</el-button>
</template>
</el-table-column>
</el-table>
<h3>{{ $t("trials:adReview:title:adResult") }}</h3>
<el-form
ref="adForm"
:model="adForm"
style="width: 800px"
label-width="100"
>
<el-form ref="adForm" :model="adForm" style="width: 800px" label-width="100">
<!-- 选择阅片人 -->
<el-form-item
:label="$t('trials:adReview:title:choseReader')"
prop="judgeResultTaskId"
>
<el-form-item :label="$t('trials:adReview:title:choseReader')" prop="judgeResultTaskId">
<el-radio-group v-model="adForm.judgeResultTaskId" disabled>
<el-radio
v-for="t in visitTaskArmList"
:key="t.VisitTaskId"
:label="t.VisitTaskId"
>
<el-radio v-for="t in visitTaskArmList" :key="t.VisitTaskId" :label="t.VisitTaskId">
{{ $fd("ArmEnum", t.ArmEnum) }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 裁判原因 -->
<el-form-item
:label="$t('trials:adReview:title:adReason')"
prop="judgeResultRemark"
>
<el-input
v-model="adForm.judgeResultRemark"
type="textarea"
:autosize="{ minRows: 4, maxRows: 6 }"
disabled
/>
<el-form-item :label="$t('trials:adReview:title:adReason')" prop="judgeResultRemark">
<el-input v-model="adForm.judgeResultRemark" type="textarea" :autosize="{ minRows: 4, maxRows: 6 }" disabled />
</el-form-item>
<!-- 截图说明 -->
<el-form-item :label="$t('trials:adReview:title:screenShot')">
<el-upload
action=".png,.jpg,.jpeg"
list-type="picture-card"
:file-list="fileList"
disabled
class="disabled"
>
<el-upload action=".png,.jpg,.jpeg" list-type="picture-card" :file-list="fileList" disabled class="disabled">
<i slot="default" class="el-icon-plus" />
<div
slot="file"
slot-scope="{ file }"
style="width: 100%; height: 100%"
>
<viewer
:ref="file.url"
:images="images"
style="
<div slot="file" slot-scope="{ file }" style="width: 100%; height: 100%">
<viewer :ref="file.url" :images="images" style="
display: flex;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
"
>
<img
class="el-upload-list__item-thumbnail"
:src="OSSclientConfig.basePath + file.url"
alt=""
crossorigin="anonymous"
style="max-width: 100%; max-height: 100%"
/>
">
<img class="el-upload-list__item-thumbnail" :src="OSSclientConfig.basePath + file.url" alt=""
crossorigin="anonymous" style="max-width: 100%; max-height: 100%" />
<span class="el-upload-list__item-actions">
<span
class="el-upload-list__item-preview"
@click="handlePictureCardPreview(file)"
>
<span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
<i class="el-icon-zoom-in" />
</span>
</span>
@ -329,17 +251,13 @@ export default {
var path = "";
if (readingTool === 0 || readingTool === 2) {
path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
this.rowData.SubjectCode
}&subjectId=${
this.rowData.SubjectId
}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
}&subjectId=${this.rowData.SubjectId
}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
} else {
path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
this.rowData.SubjectCode
}&subjectId=${
this.rowData.SubjectId
}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
}&subjectId=${this.rowData.SubjectId
}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
}
var routeData = this.$router.resolve({ path });
window.open(routeData.href, "_blank");
@ -356,17 +274,13 @@ export default {
var path = "";
if (readingTool === 0 || readingTool === 2) {
path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
this.rowData.SubjectCode
}&subjectId=${this.rowData.SubjectId}&visitTaskId=${
task.VisitTaskId
}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
}&subjectId=${this.rowData.SubjectId}&visitTaskId=${task.VisitTaskId
}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
} else {
path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${
this.rowData.SubjectCode
}&subjectId=${this.rowData.SubjectId}&visitTaskId=${
task.VisitTaskId
}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode
}&subjectId=${this.rowData.SubjectId}&visitTaskId=${task.VisitTaskId
}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`;
}
var routeData = this.$router.resolve({ path });
window.open(routeData.href, "_blank");
@ -389,9 +303,11 @@ export default {
display: none;
}
}
::v-deep .el-upload-list__item {
transition: none !important;
}
::v-deep .el-upload-list__item-thumbnail {
/* 图片在方框内显示长边 */
object-fit: scale-down !important;

View File

@ -27,12 +27,18 @@
<el-table-column :label="$t('trials:medicalFeedback:table:visitPointCount')" align="center" prop=""
show-overflow-tooltip>
<template>
<<<<<<< HEAD
<el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
width="150">
=======
<el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
show-overflow-tooltip width="150">
>>>>>>> uat
<template slot-scope="scope">
<div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
<span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
{{
<<<<<<< HEAD
$fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
}}
</span>
@ -40,7 +46,24 @@
scope.row.BeforeQuestionList[index].Answer === '-2' ? "NA" : scope.row.BeforeQuestionList[index].Answer
=== '-1' ? $t('trials:medicalFeedback:table:unKnow') : scope.row.BeforeQuestionList[index].Answer
}}</span>
=======
$fd(scope.row.BeforeQuestionList[index].DictionaryCode,
parseInt(scope.row.BeforeQuestionList[index].Answer))
}}
</span>
<span v-else-if="scope.row.BeforeQuestionList[index].QuestionType === 22">{{
scope.row.BeforeQuestionList[index].Answer === '-1' ? $t('trials:medicalFeedback:table:unKnow') :
scope.row.BeforeQuestionList[index].Answer }}</span>
>>>>>>> uat
<span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
<span>
{{
scope.row.BeforeQuestionList[index].ValueType == 2 ? '%' :
scope.row.BeforeQuestionList[index].CustomUnit ?
scope.row.BeforeQuestionList[index].CustomUnit :
scope.row.BeforeQuestionList[index].Unit ? $fd("Unit", scope.row.BeforeQuestionList[index].Unit) : ''
}}
</span>
</div>
</template>
</el-table-column>
@ -75,7 +98,12 @@
</span>
<span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
{{
<<<<<<< HEAD
$fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
=======
$fd(scope.row.AfterQuestionList[index].DictionaryCode,
parseInt(scope.row.AfterQuestionList[index].Answer))
>>>>>>> uat
}}
</span>
<span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
@ -106,13 +134,23 @@
<!-- 评估结果 -->
<el-table-column :label="$t('trials:globalReview:table:evaluationRes')" align="center" prop="">
<template>
<<<<<<< HEAD
<el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs" show-overflow-tooltip
width="150">
=======
<el-table-column v-for="(qs, index) in evaluationQsList" :key="index" prop="" :label="qs"
show-overflow-tooltip width="150">
>>>>>>> uat
<template slot-scope="scope">
<div v-if="scope.row.BeforeQuestionList.length > index && scope.row.BeforeQuestionList[index].Answer">
<span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
{{
<<<<<<< HEAD
$fd(scope.row.BeforeQuestionList[index].DictionaryCode, parseInt(scope.row.BeforeQuestionList[index].Answer))
=======
$fd(scope.row.BeforeQuestionList[index].DictionaryCode,
parseInt(scope.row.BeforeQuestionList[index].Answer))
>>>>>>> uat
}}
</span>
<span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
@ -147,7 +185,12 @@
</span>
<span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
{{
<<<<<<< HEAD
$fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].Answer))
=======
$fd(scope.row.AfterQuestionList[index].DictionaryCode,
parseInt(scope.row.AfterQuestionList[index].Answer))
>>>>>>> uat
}}
</span>
<span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>

View File

@ -5,109 +5,65 @@
{{ $t('trials:adReview:title:clinicalData') }}
</el-button>
</div>
<el-table
:data="oncologyInfo.OncologyVisits"
style="width: 100%"
>
<el-table :data="oncologyInfo.OncologyVisits" style="width: 100%">
<!-- 访视名称 -->
<el-table-column
prop="VisitName"
:label="$t('trials:oncologyReview:title:visitName')"
show-overflow-tooltip
width="150"
/>
<el-table-column prop="VisitName" :label="$t('trials:oncologyReview:title:visitName')" show-overflow-tooltip
width="150" />
<!-- 影像学阅片结果 -->
<el-table-column
:label="$t('trials:oncologyReview:title:readingRes')"
align="center"
prop=""
show-overflow-tooltip
>
<el-table-column :label="$t('trials:oncologyReview:title:readingRes')" align="center" prop=""
show-overflow-tooltip>
<template>
<el-table-column
v-for="(qs,index) in questionCols"
:key="qs"
prop=""
:label="qs"
show-overflow-tooltip
width="150"
>
<el-table-column v-for="(qs, index) in questionCols" :key="qs" prop="" :label="qs" show-overflow-tooltip
width="150">
<template slot-scope="scope">
<span v-if="scope.row.QuestionList[index].DictionaryCode">
{{ $fd(scope.row.QuestionList[index].DictionaryCode,parseInt(scope.row.QuestionList[index].Answer)) }}
{{ $fd(scope.row.QuestionList[index].DictionaryCode, parseInt(scope.row.QuestionList[index].Answer))
}}
</span>
<span v-else>
{{ scope.row.QuestionList.length>index?scope.row.QuestionList[index].Answer:'' }}
{{ scope.row.QuestionList.length > index ? scope.row.QuestionList[index].Answer : '' }}
</span>
<span>
{{
scope.row.QuestionList[index].ValueType == 2 ? '%' : scope.row.QuestionList[index].CustomUnit ?
scope.row.QuestionList[index].CustomUnit :
scope.row.QuestionList[index].Unit ? $fd("Unit", scope.row.QuestionList[index].Unit) : ''
}}
</span>
</template>
</el-table-column>
<!-- 全局是否有更新 -->
<el-table-column
v-if="oncologyInfo.IsShowDetail"
prop="IsHaveChange"
:label="$t('trials:oncologyReview:title:isGlobalUpdate')"
show-overflow-tooltip
width="150"
>
<el-table-column v-if="oncologyInfo.IsShowDetail" prop="IsHaveChange"
:label="$t('trials:oncologyReview:title:isGlobalUpdate')" show-overflow-tooltip width="150">
<template slot-scope="scope">
<span>{{ $fd('YesOrNo', scope.row.IsHaveChange ) }}</span>
<span>{{ $fd('YesOrNo', scope.row.IsHaveChange) }}</span>
<!-- 查看详情 -->
<el-button
v-if="scope.row.IsHaveChange && !!oncologyInfo.GlobalTaskId"
type="text"
style="margin-left:5px;"
@click="handleViewDetail(oncologyInfo.GlobalTaskId)"
>
<el-button v-if="scope.row.IsHaveChange && !!oncologyInfo.GlobalTaskId" type="text"
style="margin-left:5px;" @click="handleViewDetail(oncologyInfo.GlobalTaskId)">
{{ $t('trials:oncologyReview:title:view') }}
</el-button>
</template>
</el-table-column>
<!-- 访视点注释 -->
<el-table-column
v-if="oncologyInfo.IsShowDetail"
prop="VisitRemark"
:label="$t('trials:oncologyReview:title:visitRemark')"
show-overflow-tooltip
width="150"
/>
<el-table-column v-if="oncologyInfo.IsShowDetail" prop="VisitRemark"
:label="$t('trials:oncologyReview:title:visitRemark')" show-overflow-tooltip width="150" />
</template>
</el-table-column>
<!-- 肿瘤学阅片结果 -->
<el-table-column
:label="$t('trials:oncologyReview:title:oReviewRes')"
align="center"
prop=""
>
<el-table-column :label="$t('trials:oncologyReview:title:oReviewRes')" align="center" prop="">
<template>
<!-- 结论 -->
<el-table-column
prop="EvaluationResult"
:label="$t('trials:oncologyReview:title:findings')"
show-overflow-tooltip
width="150"
>
<el-table-column prop="EvaluationResult" :label="$t('trials:oncologyReview:title:findings')"
show-overflow-tooltip width="150">
<template slot-scope="scope">
<el-select
v-if="oncologyInfo.ReadingTaskState < 2"
v-model="scope.row.EvaluationResult"
:placeholder="$t('common:ruleMessage:select')"
>
<el-option
v-for="item in assessTypeList"
:key="item.Id"
:label="item.Value"
:value="item.Code"
/>
<el-select v-if="oncologyInfo.ReadingTaskState < 2" v-model="scope.row.EvaluationResult"
:placeholder="$t('common:ruleMessage:select')">
<el-option v-for="item in assessTypeList" :key="item.Id" :label="item.Value" :value="item.Code" />
</el-select>
<span v-else>{{ getAssessType(scope.row.EvaluationResult) }}</span>
</template>
</el-table-column>
<el-table-column
prop="EvaluationReason"
show-overflow-tooltip
width="250"
>
<el-table-column prop="EvaluationReason" show-overflow-tooltip width="250">
<template slot="header">
<el-tooltip placement="top">
@ -123,29 +79,18 @@
</el-tooltip>
</template>
<template slot-scope="scope">
<el-input
v-if="oncologyInfo.ReadingTaskState < 2"
v-model="scope.row.EvaluationReason"
/>
<el-input v-if="oncologyInfo.ReadingTaskState < 2" v-model="scope.row.EvaluationReason" />
<span v-else>{{ scope.row.EvaluationReason }}</span>
</template>
</el-table-column>
</template>
</el-table-column>
<el-table-column
v-if="oncologyInfo.IsShowDetail"
:label="$t('common:action:action')"
width="120"
>
<el-table-column v-if="oncologyInfo.IsShowDetail" :label="$t('common:action:action')" width="120">
<template slot-scope="scope">
<!-- 查看详情 -->
<el-button
circle
:title="$t('trials:oncologyReview:title:view')"
icon="el-icon-view"
@click="handleViewDetail(scope.row.VisitTaskId)"
/>
<el-button circle :title="$t('trials:oncologyReview:title:view')" icon="el-icon-view"
@click="handleViewDetail(scope.row.VisitTaskId)" />
</template>
</el-table-column>
</el-table>
@ -201,7 +146,7 @@ export default {
var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
var path = ''
if (readingTool === 0 || readingTool === 2 ) {
if (readingTool === 0 || readingTool === 2) {
path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
} else {
path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`

View File

@ -1,48 +1,42 @@
<template>
<el-table
ref="taskTbl"
:data="taskList"
:row-class-name="rowClass"
class="historicAssess_wrapper"
>
<el-table ref="taskTbl" :data="taskList" :row-class-name="rowClass" class="historicAssess_wrapper">
<!-- 访视/阅片期名称 -->
<el-table-column
prop="VisitTaskNum"
:label="$t('trials:medicalFeedback:table:taskName')"
width="200"
sortable="custom"
show-overflow-tooltip
>
<el-table-column prop="VisitTaskNum" :label="$t('trials:medicalFeedback:table:taskName')" width="200"
sortable="custom" show-overflow-tooltip>
<template slot-scope="scope">
{{ scope.row.TaskName }}
</template>
</el-table-column>
<!-- 盲态任务标识 -->
<el-table-column
prop="TaskBlindName"
:label="$t('trials:medicalFeedback:table:taskBlindName')"
width="200"
sortable="custom"
show-overflow-tooltip
/>
<el-table-column prop="TaskBlindName" :label="$t('trials:medicalFeedback:table:taskBlindName')" width="200"
sortable="custom" show-overflow-tooltip />
<template v-if="judgeQuestion && judgeQuestion.length > 0">
<el-table-column
v-for="(qs,index) in judgeQuestion"
:key="qs"
prop=""
:label="qs"
show-overflow-tooltip
width="150"
>
<el-table-column v-for="(qs, index) in judgeQuestion" :key="qs" prop="" :label="qs" show-overflow-tooltip
width="150">
<template slot-scope="scope">
<span v-if="scope.row.JudgeQuestionAnswerInfoList[index] && scope.row.JudgeQuestionAnswerInfoList[index].QuestionGenre === 3 && scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode">
{{ scope.row.JudgeQuestionAnswerInfoList[index].Answer?$fd(scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode,parseInt(scope.row.JudgeQuestionAnswerInfoList[index].Answer)):'' }}
<span
v-if="scope.row.JudgeQuestionAnswerInfoList[index] && scope.row.JudgeQuestionAnswerInfoList[index].QuestionGenre === 3 && scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode">
{{
scope.row.JudgeQuestionAnswerInfoList[index].Answer ?
$fd(scope.row.JudgeQuestionAnswerInfoList[index].DictionaryCode,
parseInt(scope.row.JudgeQuestionAnswerInfoList[index].Answer)):''
}}
</span>
<span v-else>
{{ scope.row.JudgeQuestionAnswerInfoList.length>index?scope.row.JudgeQuestionAnswerInfoList[index].Answer:'' }}
{{ scope.row.JudgeQuestionAnswerInfoList.length > index ?
scope.row.JudgeQuestionAnswerInfoList[index].Answer : ''
}}
</span>
<span>
{{
scope.row.JudgeQuestionAnswerInfoList[index].ValueType == 2 ? '%' :
scope.row.JudgeQuestionAnswerInfoList[index].CustomUnit ?
scope.row.JudgeQuestionAnswerInfoList[index].CustomUnit :
scope.row.JudgeQuestionAnswerInfoList[index].Unit ? $fd("Unit",
scope.row.JudgeQuestionAnswerInfoList[index].Unit) : ''
}}
</span>
</template>
</el-table-column>
</template>
@ -59,73 +53,65 @@
</template>
</el-table-column> -->
<!-- 当前阅片人 -->
<el-table-column
prop="ArmEnum"
:label="$t('trials:medicalFeedback:title:currentReader')"
show-overflow-tooltip
width="120"
>
<el-table-column prop="ArmEnum" :label="$t('trials:medicalFeedback:title:currentReader')" show-overflow-tooltip
width="120">
<template slot-scope="scope">
<el-button
v-if="scope.row.TaskId"
type="text"
@click="handleView(scope.row,scope.row.TaskId)"
>
<el-button v-if="scope.row.TaskId" type="text" @click="handleView(scope.row, scope.row.TaskId)">
{{ $fd('ArmEnum', scope.row.ArmEnum) }}
</el-button>
</template>
</el-table-column>
<!-- 关联阅片人 -->
<!-- <el-table-column-->
<!-- prop="OtherArmEnum"-->
<!-- :label="$t('trials:medicalFeedback:title:otherReader')"-->
<!-- show-overflow-tooltip-->
<!-- width="100"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-if="scope.row.OtherTaskId"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row,scope.row.OtherTaskId)"-->
<!-- >-->
<!-- {{ $fd('ArmEnum', scope.row.OtherArmEnum) }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; 关联全局任务 &ndash;&gt;-->
<!-- <el-table-column-->
<!-- prop="GlobalTaskName"-->
<!-- :label="$t('trials:medicalFeedback:title:relatedGlobalTask')"-->
<!-- show-overflow-tooltip-->
<!-- width="120"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-if="scope.row.GlobalTaskId"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row,scope.row.GlobalTaskId)"-->
<!-- >-->
<!-- {{ scope.row.GlobalTaskName }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; 关联裁判任务 &ndash;&gt;-->
<!-- <el-table-column-->
<!-- prop="JudgeTaskName"-->
<!-- :label="$t('trials:medicalFeedback:title:relatedadjudicationTask')"-->
<!-- show-overflow-tooltip-->
<!-- width="120"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-if="scope.row.JudgeTaskId"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row,scope.row.JudgeTaskId)"-->
<!-- >-->
<!-- {{ scope.row.JudgeTaskName }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column-->
<!-- prop="OtherArmEnum"-->
<!-- :label="$t('trials:medicalFeedback:title:otherReader')"-->
<!-- show-overflow-tooltip-->
<!-- width="100"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-if="scope.row.OtherTaskId"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row,scope.row.OtherTaskId)"-->
<!-- >-->
<!-- {{ $fd('ArmEnum', scope.row.OtherArmEnum) }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; 关联全局任务 &ndash;&gt;-->
<!-- <el-table-column-->
<!-- prop="GlobalTaskName"-->
<!-- :label="$t('trials:medicalFeedback:title:relatedGlobalTask')"-->
<!-- show-overflow-tooltip-->
<!-- width="120"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-if="scope.row.GlobalTaskId"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row,scope.row.GlobalTaskId)"-->
<!-- >-->
<!-- {{ scope.row.GlobalTaskName }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- &lt;!&ndash; 关联裁判任务 &ndash;&gt;-->
<!-- <el-table-column-->
<!-- prop="JudgeTaskName"-->
<!-- :label="$t('trials:medicalFeedback:title:relatedadjudicationTask')"-->
<!-- show-overflow-tooltip-->
<!-- width="120"-->
<!-- >-->
<!-- <template slot-scope="scope">-->
<!-- <el-button-->
<!-- v-if="scope.row.JudgeTaskId"-->
<!-- type="text"-->
<!-- @click="handleView(scope.row,scope.row.JudgeTaskId)"-->
<!-- >-->
<!-- {{ scope.row.JudgeTaskName }}-->
<!-- </el-button>-->
<!-- </template>-->
<!-- </el-table-column>-->
</el-table>
</template>
<script>
@ -178,7 +164,7 @@ export default {
var trialReadingCriterionId = this.rowData.TrialReadingCriterionId
var path = ''
if (readingTool === 0 || readingTool === 2 ) {
if (readingTool === 0 || readingTool === 2) {
path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
} else {
path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${this.rowData.SubjectCode}&subjectId=${this.rowData.SubjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}&key=${new Date().getTime()}`
@ -195,11 +181,12 @@ export default {
}
</script>
<style lang="scss">
.historicAssess_wrapper{
.highlight_row{
.historicAssess_wrapper {
.highlight_row {
color: #000;
background-color: #ffde7b;
}
.highlight_row:hover>td {
background-color: #ffde7b !important;
}

View File

@ -1,7 +1,13 @@
<template>
<div class="img-container">
<el-card v-loading="loading" class="box-card left">
<div v-if="isReadingShowSubjectInfo" class="title">
<div v-if="isReadingShowSubjectInfo" class="title" style="display: flex;align-items: center;">
<div style="margin-right: 5px;cursor: pointer;" @click.stop="sortFile">
<i :class="['el-icon-caret-top', Asc === false || Asc === null ? '' : 'icon_check']"
style="display: block;margin-bottom: -5px;"></i>
<i :class="['el-icon-caret-bottom', Asc === true || Asc === null ? '' : 'icon_check']"
style="display: block; margin-top: -5px;"></i>
</div>
<h4>{{ subjectCode }} </h4>
<h4>{{ taskBlindName }}</h4>
</div>
@ -98,6 +104,7 @@ import { getReadingImageFile, getReadingPastResultList } from '@/api/trials'
import { getToken } from '@/utils/auth'
import Preview from '@/views/none-dicom-show/components/preview'
import Criterions from './Criterions'
import FileNameSorter from "@/utils/customSort";
export default {
name: 'VisitReview',
components: {
@ -179,18 +186,21 @@ export default {
otherInfo: null,
isReadingShowPreviousResults: false,
BodyPart: {},
openWindow: null
openWindow: null,
Asc: null
}
},
computed: {
showOtherTask() {
return this.otherInfo && this.otherInfo.IsReadingShowPreviousResults && this.isReadingShowPreviousResults
},
CriterionType() {
return this.otherInfo.CriterionType ? this.otherInfo.CriterionType : 0
}
},
async mounted() {
this.BodyPart.Bodypart = 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)
},
beforeDestroy() {
@ -199,6 +209,22 @@ export default {
}
},
methods: {
sortFile() {
if (this.Asc) {
this.Asc = false
} else {
this.Asc = true
}
console.log(this.Asc, 'this.Asc')
this.studyList.forEach(study => {
if (study.NoneDicomStudyFileList.length > 0) {
study.NoneDicomStudyFileList = FileNameSorter.sortFileNames(study.NoneDicomStudyFileList, {
direction: this.Asc ? 'asc' : 'desc',
key: 'FileName'
})
}
})
},
// Dicom
getNoneDicomList() {
this.loading = true
@ -222,6 +248,9 @@ export default {
// this.$alert('PM')
}
this.loading = false
if (this.CriterionType === 19 || this.CriterionType === 20) {
this.sortFile()
}
}).catch(() => { this.loading = false })
},
selected(file, studyIndex, fileIndex, isChangeSub = false) {
@ -327,6 +356,10 @@ export default {
</script>
<style lang="scss" scoped>
.icon_check {
color: #409EFF;
}
.img-container {
flex: 1;
width: 100%;

View File

@ -0,0 +1,205 @@
<template>
<BaseContainer>
<div slot="search-container">
<el-form :inline="true">
<!-- 受试者编号 -->
<el-form-item :label="$t('trials:pendingReadingTasks:table:subjectCode')">
<el-input v-model="searchData.SubjectCode" style="width: 130px" clearable />
</el-form-item>
<el-form-item>
<!-- 查询 -->
<el-button type="primary" icon="el-icon-search" @click="handleSearch">
{{ $t('common:button:search') }}
</el-button>
<!-- 重置 -->
<el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
{{ $t('common:button:reset') }}
</el-button>
</el-form-item>
</el-form>
</div>
<div slot="main-container">
<el-table v-adaptive="{ bottomOffset: 75 }" :data="list" stripe height="100" @sort-change="handleSortChange"
v-loading="loading">
<el-table-column type="index" width="40" align="left" />
<el-table-column prop="IsUrgent" :label="$t('trials:consistencyCheck:table:isUrgent')"
show-overflow-tooltip min-width="100">
<template slot-scope="scope">
<el-tag :type="scope.row.IsUrgent
? 'danger' : 'primary'
">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
</template>
</el-table-column>
<!-- 受试者编号 -->
<el-table-column prop="SubjectCode" min-width="100"
:label="$t('trials:pendingReadingTasks:table:subjectCode')" show-overflow-tooltip
sortable="custom" />
<!-- 访视数量 -->
<el-table-column prop="VisitCount" :label="$t('trials:pendingReadingTasks:table:VisitCount')"
show-overflow-tooltip sortable="custom" />
<!-- dicom检查数量 -->
<!-- <el-table-column prop="DicomStudyCount" :label="$t('trials:pendingReadingTasks:table:DicomStudyCount')"
show-overflow-tooltip sortable="custom" /> -->
<!-- 非dicom检查数量 -->
<!-- <el-table-column prop="NoneDicomStudyCount"
:label="$t('trials:pendingReadingTasks:table:NoneDicomStudyCount')" show-overflow-tooltip
sortable="custom" /> -->
<!-- 标记访视数量 -->
<el-table-column prop="MarkVisitCount" :label="$t('trials:pendingReadingTasks:table:MarkVisitCount')"
show-overflow-tooltip>
<template slot-scope="scope">
<span>{{ `${scope.row.MarkIVUSVisitCount || 0}/${scope.row.MarkOCTVisitCount || 0}` }}</span>
</template>
</el-table-column>
<!-- 标记dicom检查数量 -->
<!-- <el-table-column prop="MarkDicomStudyCount"
:label="$t('trials:pendingReadingTasks:table:MarkDicomStudyCount')" show-overflow-tooltip
sortable="custom" /> -->
<!-- 标记非dicom检查数量 -->
<!-- <el-table-column prop="MarkNoneDicomStudyCount"
:label="$t('trials:pendingReadingTasks:table:MarkNoneDicomStudyCount')" show-overflow-tooltip
sortable="custom" /> -->
<el-table-column :label="$t('common:action:action')" width="100" fixed="right">
<template slot-scope="scope">
<!-- 阅片 -->
<!-- <el-button :disabled="scope.row.ExistReadingApply" circle :title="scope.row.ExistReadingApply
? $t(
'trials:pendingReadingTasks:button:ExistReadingApply'
)
: $t('trials:pendingReadingTasks:button:review')
" icon="el-icon-edit-outline" @click="handleReadImage(scope.row)" /> -->
<!-- 上传 -->
<el-button v-hasPermi="['role:ir']" circle icon="el-icon-upload2"
:title="$t('trials:pendingReadingTasks:button:upload')"
@click="openUploadImage(scope.row, 'upload')" />
<!-- 下载 -->
<el-button v-hasPermi="['role:ir']" circle icon="el-icon-download"
:title="$t('trials:pendingReadingTasks:button:download')"
@click="openUploadImage(scope.row, 'download')" />
</template>
</el-table-column>
</el-table>
<pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
@pagination="getList" />
</div>
<upload-dicom-and-nonedicom v-if="uploadImageVisible" :SubjectId="uploadSubjectId"
:SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="uploadImageVisible"
:IsImageSegment="true" />
<download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
:SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible"
:IsImageSegment="true" />
</BaseContainer>
</template>
<script>
import BaseContainer from '@/components/BaseContainer'
import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
import Pagination from '@/components/Pagination'
import { getTrialSubjectVisitMarkList } from "@/api/trials"
const searchDataDefault = () => {
return {
SubjectCode: '',
PageIndex: 1,
PageSize: 20,
}
}
export default {
name: "TargetSection",
components: {
BaseContainer,
Pagination,
'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
},
props: {
TrialReadingCriterionId: {
type: String,
default: ''
},
trialCriterionList: {
type: Array,
default: () => {
return []
}
}
},
data() {
return {
searchData: searchDataDefault(),
loading: false,
list: [],
total: 0,
//
downloadImageVisible: false,
uploadImageVisible: false,
uploadSubjectId: null,
uploadSubjectCode: null,
uploadTrialCriterion: {},
uploadStatus: 'upload',
}
},
watch: {
downloadImageVisible(v) {
if (!v) {
this.getList()
}
},
uploadImageVisible(v) {
if (!v) {
this.getList()
}
}
},
mounted() {
this.getList()
},
methods: {
handleSearch() {
this.searchData.PageIndex = 1
this.getList()
},
handleReset() {
this.searchData = searchDataDefault()
this.getList()
},
async getList() {
try {
this.searchData.TrialId = this.$route.query.trialId
this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
this.loading = true
let res = await getTrialSubjectVisitMarkList(this.searchData)
this.loading = false
if (res.IsSuccess) {
this.list = res.Result.CurrentPageData
this.total = res.Result.TotalCount
}
} catch (err) {
this.loading = false
console.log(err)
}
},
//
handleSortChange(column) {
if (column.order === 'ascending') {
this.searchData.Asc = true
} else {
this.searchData.Asc = false
}
this.searchData.SortField = column.prop
this.searchData.PageIndex = 1
this.getList()
},
//
openUploadImage(item, status) {
this.uploadSubjectCode = item.SubjectCode
this.uploadSubjectId = item.SubjectId
let trialCriterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId)
this.uploadTrialCriterion = trialCriterion
this.uploadStatus = status
this[`${status}ImageVisible`] = true
},
}
}
</script>
<style lang="scss" scoped></style>

View File

@ -24,6 +24,11 @@
<el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
{{ $t('common:button:reset') }}
</el-button>
<!-- 靶段标注 -->
<el-button type="primary" @click="() => TargetSection_visible = true"
v-if="item.CriterionType === 19 || item.CriterionType === 20">
{{ $t('trials:pendingReadingTasks:button:TargetSection') }}
</el-button>
</el-form-item>
</el-form>
</div>
@ -162,6 +167,12 @@
:visible.sync="uploadImageVisible" />
<download-dicom-and-nonedicom v-if="downloadImageVisible" :SubjectId="uploadSubjectId"
:SubjectCode="uploadSubjectCode" :Criterion="uploadTrialCriterion" :visible.sync="downloadImageVisible" />
<el-dialog :title="$t('trials:pendingReadingTasks:button:TargetSection')" :visible.sync="TargetSection_visible"
:fullscreen="true">
<TargetSection v-if="TargetSection_visible" :TrialReadingCriterionId="TrialReadingCriterionId"
:trialCriterionList="trialCriterionList" />
</el-dialog>
</BaseContainer>
</template>
<script>
@ -173,8 +184,12 @@ import uploadDicomAndNonedicom from '@/components/uploadDicomAndNonedicom'
import downloadDicomAndNonedicom from '@/components/downloadDicomAndNonedicom'
import Pagination from '@/components/Pagination'
import { getToken } from '@/utils/auth'
<<<<<<< HEAD
import { getAutoCutNextTask } from '@/api/user'
import { openWindow } from "@/utils/splitScreen";
=======
import TargetSection from "./components/TargetSection"
>>>>>>> uat
const searchDataDefault = () => {
return {
SubjectCode: '',
@ -189,6 +204,7 @@ export default {
Pagination,
'upload-dicom-and-nonedicom': uploadDicomAndNonedicom,
'download-dicom-and-nonedicom': downloadDicomAndNonedicom,
TargetSection
},
data() {
return {
@ -214,6 +230,8 @@ export default {
uploadSubjectCode: null,
uploadTrialCriterion: {},
uploadStatus: 'upload',
TargetSection_visible: false
}
},
watch: {
@ -222,6 +240,11 @@ export default {
this.getList()
}
},
TargetSection_visible(v) {
if (!v) {
this.getList()
}
}
},
mounted() {
window.addEventListener('message', this.receiveMsg)

View File

@ -155,6 +155,22 @@ export default {
this.loading = false
})
break
case 21:
searchData.ReadingExportType = 21
getTumor_CDISC_Export(searchData)
.then((res) => { })
.catch(() => {
this.loading = false
})
break
case 22:
searchData.ReadingExportType = 22
getTumor_CDISC_Export(searchData)
.then((res) => { })
.catch(() => {
this.loading = false
})
break
}
},
},

View File

@ -125,14 +125,14 @@
<el-table-column v-if="$i18n.locale === 'zh' && isDistinguishCriteria" prop="AttachNameCN"
:label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
<template slot-scope="scope">
<span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row.AttachCNPath)"
<span v-if="scope.row.AttachCNPath" @click="handlePreview(scope.row)"
style="cursor: pointer; color: #428bca">{{ scope.row.AttachNameCN }}</span>
</template>
</el-table-column>
<el-table-column v-if="$i18n.locale === 'en' && isDistinguishCriteria" prop="AttachName"
:label="$t('trials:emailManageCfg:title:fileName')" show-overflow-tooltip min-width="140">
<template slot-scope="scope">
<span v-if="scope.row.AttachPath" @click="handlePreview(scope.row.AttachPath)"
<span v-if="scope.row.AttachPath" @click="handlePreview(scope.row)"
style="cursor: pointer; color: #428bca">{{ scope.row.AttachName }}</span>
</template>
</el-table-column>
@ -276,6 +276,9 @@ export default {
(item) => ![4, 7, 8, 31, 32, 21, 26, 27].includes(item.value)
)
},
isEN() {
return this.$i18n.locale !== 'zh'
},
},
mounted() {
this.trialId = this.$route.query.trialId
@ -362,10 +365,26 @@ export default {
this.currentRow = { ...row }
this.editDialog.visible = true
},
handlePreview(filePath) {
if (filePath) {
window.open(this.OSSclientConfig.basePath + filePath, '_blank')
handlePreview(row) {
let name = null, FilePath = null
if (this.isEN) {
name = row.AttachName;
FilePath = row.AttachPath;
} else {
name = row.AttachNameCN;
FilePath = row.AttachCNPath;
}
this.$preview({
path: FilePath,
type: 'docx',
title: name,
isLocal: true
})
// if (filePath) {
// let path = row.Path || row.FullPath || row.FilePath
// window.open(this.OSSclientConfig.basePath + filePath, '_blank')
// }
},
handleSearch() {
this.searchData.PageIndex = 1

View File

@ -225,6 +225,17 @@
</el-form-item>
<!-- 私有属性 -->
<el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
<!-- 下拉框单选或多选 -->
<el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
prop="OptionTypeEnum" :rules="[
{ required: true, message: this.$t('common:ruleMessage:specify') }
]">
<el-radio-group v-model="form.OptionTypeEnum">
<el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 数值类型 -->
<el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:valueType')"
prop="ValueType" :rules="[
@ -378,7 +389,7 @@
@change="(v) => CustomCalculateMarkChange(v)">
<div>
<el-radio v-for="item of $d.CustomCalculateMark"
v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12 || item.value === 13 || item.value === 14"
v-show="item.value <= 4 || item.value === 10 || item.value === 11 || item.value === 12 || item.value === 13 || item.value === 14 || item.value === 15"
:key="`CustomCalculateMark${item.value}`" :label="item.value">
{{ item.label }}
</el-radio>
@ -440,9 +451,10 @@
<template slot-scope="scope">
<!-- 添加 -->
<el-button icon="el-icon-plus" size="mini" circle :title="$t('trials:readingUnit:qsList:title:add')"
@click="addCustomCalculateMark(scope.$index)" />
@click="addCustomCalculateMark(scope.$index)" :disabled="form.CustomCalculateMark === 15" />
<!-- 删除 -->
<el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
<el-button icon="el-icon-minus" size="mini" circle
:disabled="(form.CustomCalculateMark !== 15 && form.CalculateQuestions.length <= 2) || (form.CustomCalculateMark === 15 && form.CalculateQuestions.length <= 1)"
:title="$t('trials:readingUnit:qsList:title:delete')"
@click="deleteCustomCalculateMark(scope.$index)" />
</template>
@ -745,7 +757,8 @@ export default {
ShowChartTypeEnum: 0,
ImageTool: '',
ImageToolAttribute: '',
ExcludeShowVisitList: []
ExcludeShowVisitList: [],
OptionTypeEnum: 0
// IsEnable: true
},
@ -890,7 +903,7 @@ export default {
},
CustomCalculateMarkChange() {
this.isShow = false
if (this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) {
if ((this.form.CustomCalculateMark <= 4 || this.form.CustomCalculateMark >= 10) && this.form.CustomCalculateMark < 15) {
this.form.CalculateQuestions = [
{
IsTable: false,
@ -1255,6 +1268,7 @@ export default {
form.ShowChartTypeEnum = 0
form.ImageTool = ''
form.ImageToolAttribute = ''
form.OptionTypeEnum = 0
this.imageToolAttributes = []
},
getLesionType() {

View File

@ -145,6 +145,17 @@
<!-- 私有属性 -->
<el-divider content-position="left">{{ $t('trials:readingUnit:title:privateProperties') }}</el-divider>
<!-- 下拉框单选或多选 -->
<el-form-item v-if="form.Type === 'select'" :label="$t('trials:readingUnit:qsList:title:MultipleSelect')"
prop="OptionTypeEnum" :rules="[
{ required: true, message: this.$t('common:ruleMessage:specify') }
]">
<el-radio-group v-model="form.OptionTypeEnum">
<el-radio v-for="item of $d.OptionType" :key="item.id" :label="item.value">
{{ item.label }}
</el-radio>
</el-radio-group>
</el-form-item>
<!-- 问题数据来源 -->
<el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
prop="DataSource" :rules="[
@ -201,7 +212,7 @@
<el-radio-group v-model="form.CustomCalculateMark" style="line-height: 40px;"
@change="(v) => CustomCalculateMarkChange(v)">
<div>
<el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4"
<el-radio v-for="item of $d.CustomCalculateMark" v-show="item.value <= 4 || item.value >= 15"
:key="`CustomCalculateMark${item.value}`" :label="item.value">
{{ item.label }}
</el-radio>
@ -239,8 +250,9 @@
<el-table-column :label="$t('common:action:action')" prop="TableQuestionId" show-overflow-tooltip>
<template slot-scope="scope">
<el-button icon="el-icon-plus" size="mini" circle :title="$t('common:button:add')"
@click="addCustomCalculateMark(scope.$index)" />
<el-button icon="el-icon-minus" size="mini" circle :disabled="form.CalculateQuestions.length <= 2"
@click="addCustomCalculateMark(scope.$index)" :disabled="form.CustomCalculateMark === 15" />
<el-button icon="el-icon-minus" size="mini" circle
::disabled="(form.CustomCalculateMark !== 15 && form.CalculateQuestions.length <= 2) || (form.CustomCalculateMark === 15 && form.CalculateQuestions.length <= 1)"
:title="$t('common:button:delete')" @click="deleteCustomCalculateMark(scope.$index)" />
</template>
</el-table-column>
@ -608,6 +620,7 @@ export default {
ShowChartTypeEnum: 0,
ImageTool: '',
ImageToolAttribute: '',
OptionTypeEnum: 0
// IsEnable: true
},
imageToolAttributes: [],
@ -1119,6 +1132,7 @@ export default {
form.ShowChartTypeEnum = 0
form.ImageTool = ''
form.ImageToolAttribute = ''
form.OptionTypeEnum = 0
this.imageToolAttributes = []
},
close() {

View File

@ -70,10 +70,10 @@
<template slot-scope="scope">
<el-tag v-if="scope.row.IsHaveDicom" type="primary">{{
$fd('IsDicom', true)
}}</el-tag>
}}</el-tag>
<el-tag v-if="scope.row.IsHaveNoneDicom" type="primary">{{
$fd('IsDicom', false)
}}</el-tag>
}}</el-tag>
</template>
</el-table-column>
<!-- 影像数量 -->

View File

@ -4,41 +4,20 @@
<el-tab-pane v-for="(item, index) in list" :key="item.Id">
<span slot="label">
{{ item.ChallengeCode }}
<i
v-show="!item.IsClosed"
class="el-icon-message-solid"
style="color: red"
/>
<i v-show="!item.IsClosed" class="el-icon-message-solid" style="color: red" />
</span>
<div class="chat-wrapper">
<div class="chat-content">
<div v-for="record in item.DialogList" :key="record.Id">
<div v-if="!record.IsCurrentUser" class="word">
<!-- <img :src="record.headUrl"> -->
<img
v-if="record.UserTypeEnum * 1 === 8"
:src="adminAvatar"
alt="Admin"
/>
<img
v-else-if="record.UserTypeEnum * 1 === 1"
:src="pmAvatar"
alt="PM"
/>
<img
v-else-if="record.UserTypeEnum * 1 === 2"
:src="crcAvatar"
alt="CRC"
/>
<img
v-else-if="record.UserTypeEnum * 1 === 3"
:src="qcAvatar"
alt="QC"
/>
<img v-if="record.UserTypeEnum * 1 === 8" :src="adminAvatar" alt="Admin" />
<img v-else-if="record.UserTypeEnum * 1 === 1" :src="pmAvatar" alt="PM" />
<img v-else-if="record.UserTypeEnum * 1 === 2" :src="crcAvatar" alt="CRC" />
<img v-else-if="record.UserTypeEnum * 1 === 3" :src="qcAvatar" alt="QC" />
<div class="info">
<p class="user-info">
<span style="font-weight: 700"
>{{ record.CreateUserFullName || record.CreateUserName }}
<span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }}
</span>
<span>({{ record.CreateTime }}) </span>
</p>
@ -49,88 +28,48 @@
<div v-else class="word-my">
<div class="info">
<p class="user-info">
<span style="font-weight: 700"
>{{ record.CreateUserFullName || record.CreateUserName }}
<span style="font-weight: 700">{{ record.CreateUserFullName || record.CreateUserName }}
</span>
<span>({{ record.CreateTime }}) </span>
</p>
<div class="info-content" v-html="record.TalkContent" />
</div>
<!-- <img :src="record.headUrl"> -->
<img
v-if="record.UserTypeEnum * 1 === 8"
:src="adminAvatar"
alt="Admin"
/>
<img
v-else-if="record.UserTypeEnum * 1 === 1"
:src="pmAvatar"
alt="PM"
/>
<img
v-else-if="record.UserTypeEnum * 1 === 2"
:src="crcAvatar"
alt="CRC"
/>
<img
v-else-if="record.UserTypeEnum * 1 === 3"
:src="qcAvatar"
alt="QC"
/>
<img v-if="record.UserTypeEnum * 1 === 8" :src="adminAvatar" alt="Admin" />
<img v-else-if="record.UserTypeEnum * 1 === 1" :src="pmAvatar" alt="PM" />
<img v-else-if="record.UserTypeEnum * 1 === 2" :src="crcAvatar" alt="CRC" />
<img v-else-if="record.UserTypeEnum * 1 === 3" :src="qcAvatar" alt="QC" />
</div>
</div>
</div>
<div v-if="!item.IsClosed" class="chat-message">
<div
class="message"
v-if="hasPermi(['trials:trials-panel:visit:crc-upload:send'])"
>
<div class="message" v-if="hasPermi(['trials:trials-panel:visit:crc-upload:send'])">
<el-input v-model="newMessage" type="textarea" :rows="2" />
</div>
<div class="function">
<!-- 申请重传 -->
<el-button
v-show="(item.ReuploadEnum === 0 || item.ReuploadEnum === 3) && item.SecondReviewState !== 1"
<el-button v-show="(item.ReuploadEnum === 0 || item.ReuploadEnum === 3) && item.SecondReviewState !== 1"
v-hasPermi="[
'trials:trials-panel:visit:crc-upload:apply-reupload',
]"
type="primary"
:loading="applyBtnLoading"
@click="handleCRCApplyReupload(item)"
>
]" type="primary" :loading="applyBtnLoading" @click="handleCRCApplyReupload(item)">
{{ $t('trials:reuploadDicoms:button:applyReupload') }}
</el-button>
<!-- 重传 -->
<el-button
v-show="item.ReuploadEnum === 2 && item.SecondReviewState !== 1"
v-hasPermi="['trials:trials-panel:visit:crc-upload:reupload']"
type="primary"
:loading="uploadBtnLoading"
@click="openUploadDialog(index)"
>
<el-button v-show="item.ReuploadEnum === 2 && item.SecondReviewState !== 1"
v-hasPermi="['trials:trials-panel:visit:crc-upload:reupload']" type="primary"
:loading="uploadBtnLoading" @click="openUploadDialog(index)">
{{ $t('trials:reuploadDicoms:button:reupload') }}
</el-button>
<!-- 确认重传完成 -->
<el-button
v-show="item.ReuploadEnum === 2"
v-hasPermi="[
'trials:trials-panel:visit:crc-upload:set-reupload-finished',
]"
type="primary"
:disabled="item.IsReuploaded"
:loading="reuploadedFinishbtnLoading"
@click="handleSetUploadFinished(index)"
>
<el-button v-show="item.ReuploadEnum === 2" v-hasPermi="[
'trials:trials-panel:visit:crc-upload:set-reupload-finished',
]" type="primary" :disabled="item.IsReuploaded" :loading="reuploadedFinishbtnLoading"
@click="handleSetUploadFinished(index)">
{{ $t('trials:reuploadDicoms:button:reuploadFinished') }}
</el-button>
<!-- 发送 -->
<el-button
v-hasPermi="['trials:trials-panel:visit:crc-upload:send']"
:disabled="newMessage === ''"
type="primary"
:loading="btnLoading"
@click="handleReply(item.Id, index)"
>
<el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:send']" :disabled="newMessage === ''"
type="primary" :loading="btnLoading" @click="handleReply(item.Id, index)">
{{ $t('trials:reuploadDicoms:button:send') }}
</el-button>
</div>
@ -139,13 +78,8 @@
</el-tab-pane>
</el-tabs>
<!-- 上传Dicom/非Dicom文件 -->
<el-dialog
v-if="uploadVisible"
:visible.sync="uploadVisible"
:fullscreen="true"
append-to-body
custom-class="upload-dialog"
>
<el-dialog v-if="uploadVisible" :visible.sync="uploadVisible" :fullscreen="true" append-to-body
custom-class="upload-dialog">
<span slot="title">
<el-breadcrumb separator-class="el-icon-arrow-right">
<label style="float: left; margin-right: 10px">Upload: </label>
@ -163,100 +97,51 @@
}}</el-breadcrumb-item>
</el-breadcrumb>
</span>
<div
class="base-modal-body"
style="display: flex; flex-direction: column"
>
<div class="base-modal-body" style="display: flex; flex-direction: column">
<el-tabs v-model="activeName" type="border-card" style="flex: 1">
<!-- DICOM影像上传 -->
<el-tab-pane
:label="$t('trials:uploadedDicoms:tab:uploadDicoms')"
name="dicom"
v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)"
>
<upload-dicom-files
:data="data"
:subject-id="data.SubjectId"
:subject-visit-id="data.Id"
@close="closeUpload"
@getList="reFreshList"
/>
<el-tab-pane :label="$t('trials:uploadedDicoms:tab:uploadDicoms')" name="dicom"
v-if="[0, 1].includes($store.state.trials.config.CollectImagesEnum)">
<upload-dicom-files :data="data" :isAfresh="true" :subject-id="data.SubjectId" :subject-visit-id="data.Id"
@close="closeUpload" @getList="reFreshList" />
</el-tab-pane>
<!-- 非DICOM影像上传 -->
<el-tab-pane
:label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')"
name="non-dicom"
v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)"
>
<upload-non-dicom-files
v-if="activeName === 'non-dicom'"
:data="data"
:allow-add-or-edit="true"
:body-parts="bodyParts"
:modalities="modalities"
:subject-visit-id="data.Id"
@getList="reFreshList"
/>
<el-tab-pane :label="$t('trials:uploadNonDicoms:tab:uploadNonDicoms')" name="non-dicom"
v-if="[0, 2].includes($store.state.trials.config.CollectImagesEnum)">
<upload-non-dicom-files v-if="activeName === 'non-dicom'" :data="data" :allow-add-or-edit="true"
:body-parts="bodyParts" :modalities="modalities" :subject-visit-id="data.Id" @getList="reFreshList" />
</el-tab-pane>
<!-- 临床数据采集data.IsBaseLine && -->
<el-tab-pane
v-if="
data.IsBaseLine &&
(otherInfo.IsHaveSubjectClinicalData ||
otherInfo.IsHaveVisitClinicalData)
"
:label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
name="clinical-data"
>
<upload-clinical-data
v-if="activeName === 'clinical-data'"
:subject-visit-id="data.Id"
:data="data"
:enum-type="otherInfo.ClinicalInformationTransmissionEnum"
:allow-add-or-edit="true"
@getList="reFreshList"
/>
<el-tab-pane v-if="
data.IsBaseLine &&
(otherInfo.IsHaveSubjectClinicalData ||
otherInfo.IsHaveVisitClinicalData)
" :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data">
<upload-clinical-data v-if="activeName === 'clinical-data'" :subject-visit-id="data.Id" :data="data"
:enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true"
@getList="reFreshList" />
</el-tab-pane>
<el-tab-pane
v-if="!data.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
:label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
name="clinical-data"
>
<upload-clinical-data
v-if="activeName === 'clinical-data'"
:subject-visit-id="data.Id"
:data="data"
:enum-type="otherInfo.ClinicalInformationTransmissionEnum"
:allow-add-or-edit="true"
@getList="reFreshList"
/>
<el-tab-pane v-if="!data.IsBaseLine && otherInfo.IsHaveVisitClinicalData"
:label="$t('trials:uploadClinicalData:tab:uploadClinicalData')" name="clinical-data">
<upload-clinical-data v-if="activeName === 'clinical-data'" :subject-visit-id="data.Id" :data="data"
:enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="true"
@getList="reFreshList" />
</el-tab-pane>
</el-tabs>
</div>
</el-dialog>
<!-- 临床数据签名框 -->
<el-dialog
v-if="signVisible"
:visible.sync="signVisible"
:close-on-click-modal="false"
width="600px"
append-to-body
custom-class="base-dialog-wrapper"
>
<el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px" append-to-body
custom-class="base-dialog-wrapper">
<div slot="title">
<span style="font-size: 18px">{{ $t('common:dialogTitle:sign') }}</span>
<span style="font-size: 12px; margin-left: 5px">{{
`(${$t('common:label:sign')}${currentUser})`
}}</span>
</div>
<SignForm
ref="signForm"
:sign-code-enum="signCode"
:signReplaceText="signReplaceText"
:subject-visit-id="data.Id"
@closeDialog="closeClinicalDataSignDialog"
/>
<SignForm ref="signForm" :sign-code-enum="signCode" :signReplaceText="signReplaceText" :subject-visit-id="data.Id"
@closeDialog="closeClinicalDataSignDialog" />
</el-dialog>
</div>
</template>
@ -371,12 +256,11 @@ export default {
${this.$t('trials:qcQuality:dialogTips:tip')}
</p>
<p style='color:red'>${this.$t(
'trials:qcQuality:dialog:deadline'
)}: ${
item.DeadlineTime
'trials:qcQuality:dialog:deadline'
)}: ${item.DeadlineTime
? item.DeadlineTime
: this.$t('trials:qcQuality:dialog:none')
}</p>`
}</p>`
const userId = zzSessionStorage.getItem('userId')
var recordContent = []
recordContent.push({
@ -494,7 +378,7 @@ export default {
this.currentChallengeIndex = index
this.setReuploadFinished()
})
.catch(() => {})
.catch(() => { })
}
},
setReuploadFinished(signInfo) {
@ -562,7 +446,7 @@ export default {
this.applyBtnLoading = false
})
})
.catch(() => {})
.catch(() => { })
},
},
}
@ -570,14 +454,17 @@ export default {
<style lang="scss" scoped>
.history-chat {
height: 500px;
::-webkit-scrollbar {
width: 7px;
height: 7px;
}
::-webkit-scrollbar-thumb {
border-radius: 10px;
background: #d0d0d0;
}
::v-deep .el-tabs {
::v-deep .el-tabs__header {
width: 100px;
@ -585,34 +472,41 @@ export default {
height: 500px;
overflow-y: auto;
}
::v-deep .el-tabs__content {
margin-right: 10px;
height: 500px;
width: calc(100% - 120px);
overflow-y: auto;
}
.chat-wrapper {
background-color: #f5f7fa;
height: 500px;
display: flex;
flex-direction: column !important;
overflow: hidden;
.chat-content {
width: 100%;
padding: 20px;
// height: 400px;
overflow-y: auto;
flex: 1;
.word {
display: flex;
margin-bottom: 20px;
img {
width: 40px;
height: 40px;
border-radius: 50%;
}
.info {
margin-left: 10px;
.user-info {
font-size: 12px;
color: rgba(51, 51, 51, 0.8);
@ -621,6 +515,7 @@ export default {
line-height: 20px;
margin-top: -5px;
}
.info-content {
padding: 10px;
font-size: 14px;
@ -628,6 +523,7 @@ export default {
position: relative;
margin-top: 8px;
}
.info-content::before {
position: absolute;
left: -8px;
@ -639,19 +535,23 @@ export default {
}
}
}
.word-my {
display: flex;
justify-content: flex-end;
margin-bottom: 20px;
img {
width: 40px;
height: 40px;
border-radius: 50%;
}
.info {
width: 90%;
margin-left: 10px;
text-align: right;
.user-info {
font-size: 12px;
color: rgba(51, 51, 51, 0.8);
@ -661,6 +561,7 @@ export default {
margin-top: -5px;
margin-right: 10px;
}
.info-content {
position: relative;
max-width: 70%;
@ -673,6 +574,7 @@ export default {
color: #fff;
text-align: left;
}
.info-content::after {
position: absolute;
right: -8px;
@ -685,14 +587,17 @@ export default {
}
}
}
.chat-message {
height: 100px;
padding: 0 50px;
.function {
margin-top: 10px;
text-align: right;
}
}
ol {
margin: 5px;
padding: 0px 10px;

View File

@ -5,8 +5,8 @@
<el-button v-if="
data.SubmitState * 1 < 2 ||
(data.SubmitState === 2 && data.IsQCConfirmedReupload)
" v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']" :disabled="deleteArr.length === 0"
type="primary" size="small" icon="el-icon-delete" @click="handleBatchDelete">
" v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']" :disabled="deleteArr.length === 0" type="primary"
size="small" icon="el-icon-delete" @click="handleBatchDelete">
{{ $t('trials:uploadedDicoms:action:delete') }}
</el-button>
<!-- 预览 -->
@ -112,7 +112,7 @@
<!-- 检查部位 -->
<el-form-item :label="$t('trials:audit:table:bodyPart')" prop="BodyPartForEdit" :rules="[
{
required: true,
required: studyForm.BodyPartForEditOther ? false : true,
message: $t('common:ruleMessage:specify'),
trigger: 'blur',
},
@ -121,6 +121,8 @@
<el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
$fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
}}</el-checkbox>
<el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
v-model.trim="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
</el-checkbox-group>
</el-form-item>
<!-- 序列数量 -->
@ -183,6 +185,7 @@ export default {
BodyPartForEdit: [],
SeriesCount: null,
StudyTime: '',
BodyPartForEditOther: ''
},
deleteArr: [],
studyLoading: false,
@ -236,6 +239,7 @@ export default {
type: 1,
modality: this.studyForm.Modality,
bodyPart: this.studyForm.BodyPart,
BodyPartForEditOther: this.studyForm.BodyPartForEditOther
}
updateModality(this.data.TrialId, params)
.then((res) => {

View File

@ -22,7 +22,7 @@
<el-table v-loading="studyLoading" :data="studyList" style="width: 100%" :row-class-name="tableRowClassName"
max-height="250" @selection-change="handleUploadedSelectionChange"
:default-sort="{ prop: 'UploadedTime', order: 'ascending' }">
<el-table-column type="selection" width="55" />
<el-table-column type="selection" width="55" :selectable="handleSelectable2" />
<!-- 检查编号 -->
<el-table-column prop="StudyCode" :label="$t('trials:uploadedDicoms:table:studyId')" min-width="80"
show-overflow-tooltip sortable>
@ -105,12 +105,16 @@
<el-button icon="el-icon-upload2" v-if="
['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
relationInfo.IsHaveStudyClinicalData
" :title="$t('trials:workbench:title:UploadClinicalData')" circle @click="handleUploadPetData(scope.row)" />
" :disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
:title="$t('trials:workbench:title:UploadClinicalData')" circle @click="handleUploadPetData(scope.row)" />
<!-- 编辑 -->
<el-button icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
:title="$t('common:button:edit')" circle @click="handleEditStudy(scope.row)" />
:title="$t('common:button:edit')"
:disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
circle @click="handleEditStudy(scope.row)" />
<!-- 删除 :disabled="scope.row.IsDeleted"-->
<el-button icon="el-icon-delete" :title="$t('trials:uploadedDicoms:action:delete')" circle
:disabled="!isAfresh && data.SubmitState === 2 && data.SubmitTime && moment(data.SubmitTime).isAfter(moment(scope.row.UploadedTime))"
@click="handleDeleteStudy(scope.row)" />
<!-- <el-button-->
<!-- icon="el-icon-toilet-paper"-->
@ -597,6 +601,10 @@ export default {
type: String,
required: true,
},
isAfresh: {
type: Boolean,
default: false
}
},
data() {
return {
@ -1885,6 +1893,13 @@ export default {
return true
}
},
handleSelectable2(row) {
if (!this.isAfresh && this.data.SubmitState === 2 && this.data.SubmitTime && moment(this.data.SubmitTime).isAfter(moment(row.UploadedTime))) {
return false
} else {
return true
}
},
//
handleUploadedSelectionChange(selection) {
this.deleteArr = []

View File

@ -314,14 +314,14 @@
" :label="$t('common:action:action')" width="250" fixed="right">
<template slot-scope="scope">
<!-- 上传 -->
<el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']" icon="el-icon-upload2" :disabled="scope.row.SubmitState * 1 === 2 ||
<el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']" icon="el-icon-upload2" :disabled="!isOCTorIVUS && (scope.row.SubmitState * 1 === 2 ||
scope.row.VisitExecuted === 2 ||
scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2)
scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2))
" circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload(scope.row)" />
<!-- 上传2 -->
<el-button icon="el-icon-upload2" v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']" :disabled="scope.row.SubmitState * 1 === 2 ||
<el-button icon="el-icon-upload2" v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']" :disabled="!isOCTorIVUS && (scope.row.SubmitState * 1 === 2 ||
scope.row.VisitExecuted === 2 ||
scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2)
scope.row.IsLostVisit || (scope.row.IsSubjectQuit && scope.row.SubmitState * 1 !== 2))
" circle :title="$t('trials:crcUpload:action:upload')" @click="CRChandleUpload2(scope.row)" />
<!-- 提交 -->
<el-button v-hasPermi="['trials:trials-panel:visit:crc-upload:submit']" icon="el-icon-check" :disabled="scope.row.AuditState * 1 > 0 ||
@ -975,6 +975,7 @@ export default {
},
TrialReadingCriterionName: null,
TrialCode: null,
isOCTorIVUS: false
}
},
watch: {
@ -1067,6 +1068,7 @@ export default {
this.trialCriterionList = res.Result
this.TrialReadingCriterionId =
this.trialCriterionList[0].TrialReadingCriterionId
this.isOCTorIVUS = this.trialCriterionList.some(item => item.CriterionType === 19 || item.CriterionType === 20)
// this.handleUpload2(this.subjectRowData)
})
.catch(() => { })

View File

@ -2312,7 +2312,8 @@ export default {
ModifyReason: this.noneDicomForm.ModifyReason,
Modality: this.noneDicomForm.Modality,
BodyPart: this.noneDicomForm.BodyParts.join(', '),
ImageDate: this.noneDicomForm.ImageDate
ImageDate: this.noneDicomForm.ImageDate,
BodyPartForEditOther: this.noneDicomForm.BodyPartForEditOther,
},
signInfo
}

View File

@ -52,8 +52,8 @@ module.exports = defineConfig({
},
'/api': {
target: 'http://106.14.89.110:30000',
// target: 'http://101.132.253.119:7010', // uat
// target: 'http://106.14.89.110:30000',
target: 'http://101.132.253.119:7010', // uat
changeOrigin: true,
secure: false,
pathRewrite: {