Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main
continuous-integration/drone/push Build is passing Details

main
caiyiling 2026-01-16 10:31:23 +08:00
commit d5acb0a27c
8 changed files with 194 additions and 203 deletions

View File

@ -42,8 +42,8 @@
<el-link v-if="!form.IsUpdate" type="primary" @click="form.IsUpdate = true">
{{ $t('trials:researchForm:button:updateQsForm') }}
</el-link>
<!-- 取消更新调研表 -->
<el-link v-else type="primary" @click="form.IsUpdate = false; form.ReplaceUserEmailOrPhone = ''">
<!-- 取消更新调研表 form.ReplaceUserEmailOrPhone = '' -->
<el-link v-else type="primary" @click="form.IsUpdate = false;">
{{ $t('trials:researchForm:button:cancelUpdateQsForm') }}
</el-link>
</el-form-item>
@ -214,7 +214,11 @@ export default {
let { email, oldEMail, trialSiteId } = this.$route.query
if (trialSiteId) this.form.TrialSiteId = trialSiteId
if (oldEMail) this.form.ReplaceUserEmailOrPhone = oldEMail
if (email) this.form.EmailOrPhone = email
if (email && email !== 'null') {
this.form.EmailOrPhone = email
} else {
this.form.EmailOrPhone = oldEMail
}
}
},
methods: {

View File

@ -313,6 +313,15 @@ const config = {
'isDisabled': false,
'disabledReason': ''
},
{
'name': '长短径测量工具',
'icon': 'bidirection',
'toolName': 'Bidirectional',
'props': ['length', 'width'],
'i18nKey': 'trials:reading:button:bidirectional',
'isDisabled': false,
'disabledReason': ''
},
{
'name': '矩形工具',
'icon': 'rectangle',
@ -322,15 +331,6 @@ const config = {
'isDisabled': false,
'disabledReason': ''
},
{
'name': '箭头工具',
'icon': 'arrow',
'toolName': 'ArrowAnnotate',
'props': [],
'i18nKey': 'trials:reading:button:arrowAnnotate',
'isDisabled': false,
'disabledReason': ''
},
{
'name': '圆形工具',
'icon': 'oval',
@ -349,6 +349,15 @@ const config = {
'isDisabled': false,
'disabledReason': ''
},
{
'name': '自由曲线',
'icon': 'polygon',
'toolName': 'PlanarFreehandROI',
'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
'i18nKey': 'trials:reading:button:planarFreehandROI',
'isDisabled': false,
'disabledReason': ''
},
{
'name': '角度工具',
'icon': 'angle',
@ -359,11 +368,11 @@ const config = {
'disabledReason': ''
},
{
'name': '自由曲线',
'icon': 'polygon',
'toolName': 'PlanarFreehandROI',
'props': ['area', 'mean', 'max', 'stdDev', 'perimeter'],
'i18nKey': 'trials:reading:button:planarFreehandROI',
'name': '箭头工具',
'icon': 'arrow',
'toolName': 'ArrowAnnotate',
'props': [],
'i18nKey': 'trials:reading:button:arrowAnnotate',
'isDisabled': false,
'disabledReason': ''
},

View File

@ -308,7 +308,8 @@ const {
LengthTool,
EllipticalROITool,
CircleROITool,
AngleTool
AngleTool,
BidirectionalTool,
// cursors
} = cornerstoneTools
const { MouseBindings, Events: toolsEvents } = csToolsEnums
@ -607,7 +608,7 @@ export default {
cornerstoneTools.addTool(EraserTool)
cornerstoneTools.addTool(LengthTool)
cornerstoneTools.addTool(LengthscaleTool)
cornerstoneTools.addTool(BidirectionalTool)
viewportIds.forEach((viewportId, i) => {
const toolGroupId = `canvas-${i}`
const toolGroup = ToolGroupManager.createToolGroup(toolGroupId)
@ -635,6 +636,10 @@ export default {
cachedStats: false,
getTextLines: this.getRectangleROIToolTextLines
})
toolGroup.addTool(BidirectionalTool.toolName, {
// cachedStats: true
getTextLines: this.getBidirectionalToolTextLines
})
toolGroup.addTool(EllipticalROITool.toolName, {
cachedStats: false,
getTextLines: this.getEllipticalROIToolTextLines
@ -684,6 +689,7 @@ export default {
toolGroup.setToolPassive(SplineROITool.toolName)
toolGroup.setToolPassive(LengthTool.toolName)
toolGroup.setToolPassive(LengthscaleTool.toolName)
toolGroup.setToolPassive(BidirectionalTool.toolName)
} else {
toolGroup.setToolEnabled(ArrowAnnotateTool.toolName)
toolGroup.setToolEnabled(RectangleROITool.toolName)
@ -694,6 +700,7 @@ export default {
toolGroup.setToolEnabled(SplineROITool.toolName)
toolGroup.setToolEnabled(LengthTool.toolName)
toolGroup.setToolEnabled(LengthscaleTool.toolName)
toolGroup.setToolEnabled(BidirectionalTool.toolName)
}
toolGroup.setToolPassive(EraserTool.toolName)
})
@ -1430,6 +1437,38 @@ export default {
}
return textLines
},
//
getBidirectionalToolTextLines(data, targetId) {
const { cachedStats, label } = data
const { length, width, unit } = cachedStats[targetId]
let ps = null
const path = targetId.split(`web:${this.OSSclientConfig.basePath}`)[1]
const i = this.psArr.findIndex(i => i.Path === path)
if (i > -1 && this.psArr[i].PS) {
ps = parseFloat(this.psArr[i].PS).toFixed(3)
}
const textLines = []
if (label) {
textLines.push(data.status ? `${label}(${data.status})` : label)
}
if (length === undefined) {
return textLines
}
if (ps) {
textLines.push(
`L: ${this.reRound(csUtils.roundNumber(length * ps), this.digitPlaces)} mm`,
`S: ${this.reRound(csUtils.roundNumber(width * ps), this.digitPlaces)} mm`
)
} else {
textLines.push(
`L: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit || unit}`,
`S: ${this.reRound(csUtils.roundNumber(length), this.digitPlaces)} ${unit}`
)
}
return textLines
},
// 线
getLengthToolTextLines(data, targetId) {
const cachedVolumeStats = data.cachedStats[targetId]

View File

@ -20,7 +20,7 @@
study.StudyName }}</span>
</div>
<div style="text-overflow: ellipsis;overflow: hidden;">
<span :title="study.BodyPart">{{ study.BodyPart }}</span>
<span :title="study.BodyPart">{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
<span style="margin-left: 5px;" :title="study.Modality">{{ study.Modality }}</span>
</div>
</div>
@ -74,18 +74,40 @@ export default {
activeFileIndex: -1,
taskInfo: null,
studyList: [],
pdf
pdf,
BodyPart: {}
}
},
mounted() {
async mounted() {
this.taskInfo = JSON.parse(localStorage.getItem('taskInfo'))
this.studyList = this.visitTaskInfo.StudyList
if (this.studyList.length === 0) return
this.$nextTick(() => {
this.activeStudy(this.studyList[0].Id)
})
this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
},
methods: {
getBodyPart(bodyPart, other) {
if (!bodyPart && !other) return ''
var separator = ','
if (bodyPart.indexOf('|') > -1) {
separator = '|'
} else if (bodyPart.indexOf(',') > -1) {
separator = ','
} else if (bodyPart.indexOf('') > -1) {
separator = ''
}
var arr = bodyPart.split(separator)
var newArr = arr.map((i) => {
return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
})
if (other) {
newArr.push(other)
}
newArr = newArr.filter(Boolean)
return newArr.join(' | ')
},
//
setInitActiveFile() {
if (this.studyList.length === 0) return

View File

@ -193,7 +193,7 @@
<el-button type="primary" @click="sendEMailTable" :loading="loading">
{{ $t('common:button:confirm') }}
</el-button>
<el-button @click="checkRemind_model.visible = false" :loading="loading">
<el-button @click="siteEmail_model.visible = false" :loading="loading">
{{ $t('common:button:cancel') }}
</el-button>
</template>

View File

@ -5,18 +5,9 @@
<el-form :inline="true">
<!-- Site -->
<el-form-item :label="$t('trials:studyList:table:site')">
<el-select
v-model="searchData.SiteId"
clearable
filterable
style="width: 150px"
>
<el-option
v-for="item of siteOptions"
:key="item.SiteId"
:label="item.TrialSiteCode"
:value="item.SiteId"
/>
<el-select v-model="searchData.SiteId" clearable filterable style="width: 150px">
<el-option v-for="item of siteOptions" :key="item.SiteId" :label="item.TrialSiteCode"
:value="item.SiteId" />
</el-select>
</el-form-item>
<!-- Subject -->
@ -25,19 +16,9 @@
</el-form-item>
<!-- Visit -->
<el-form-item :label="$t('trials:studyList:table:visit')">
<el-select
v-model="searchData.VisitPlanArray"
clearable
filterable
multiple
collapse-tags
>
<el-option
v-for="(item, index) of visitPlanOptions"
:key="index"
:label="item.VisitName"
:value="item.VisitNum"
>
<el-select v-model="searchData.VisitPlanArray" clearable filterable multiple collapse-tags>
<el-option v-for="(item, index) of visitPlanOptions" :key="index" :label="item.VisitName"
:value="item.VisitNum">
<span style="float: left">{{ item.VisitName }}</span>
</el-option>
<el-option key="Other" label="Out of Plan" value="1.11" />
@ -45,12 +26,7 @@
</el-form-item>
<el-form-item :label="$t('trials:studyList:table:isFromPacs')">
<el-select v-model="searchData.IsFromPACS" clearable>
<el-option
v-for="item of $d.UploadType"
:key="item.id"
:label="item.label"
:value="item.value"
>
<el-option v-for="item of $d.UploadType" :key="item.id" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
@ -60,11 +36,7 @@
{{ $t("common:button:search") }}
</el-button>
<!-- 重置 -->
<el-button
type="primary"
icon="el-icon-refresh-left"
@click="handleReset"
>
<el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
{{ $t("common:button:reset") }}
</el-button>
</el-form-item>
@ -73,42 +45,22 @@
<!-- 检查列表 -->
<template slot="main-container">
<el-table
v-loading="loading"
v-adaptive="{ bottomOffset: 60 }"
:data="list"
stripe
height="100"
@sort-change="handleSortByColumn"
>
<el-table v-loading="loading" v-adaptive="{ bottomOffset: 60 }" :data="list" stripe height="100"
@sort-change="handleSortByColumn">
<el-table-column type="index" width="40" />
<!-- Study ID -->
<el-table-column
prop="StudyCode"
:label="$t('trials:studyList:table:studyId')"
show-overflow-tooltip
sortable="custom"
min-width="100"
/>
<el-table-column prop="StudyCode" :label="$t('trials:studyList:table:studyId')" show-overflow-tooltip
sortable="custom" min-width="100" />
<!-- Image Type -->
<el-table-column
prop="IsDicom"
:label="$t('trials:studyList:table:imageType')"
sortable="custom"
min-width="100"
>
<el-table-column prop="IsDicom" :label="$t('trials:studyList:table:imageType')" sortable="custom"
min-width="100">
<template slot-scope="scope">
<el-tag v-if="scope.row.IsDicom" type="primary">DICOM</el-tag>
<el-tag v-else type="danger">Non-DICOM</el-tag>
</template>
</el-table-column>
<el-table-column
prop="StudyTime"
sortable="custom"
min-width="150"
show-overflow-tooltip
>
<el-table-column prop="StudyTime" sortable="custom" min-width="150" show-overflow-tooltip>
<template slot="header">
<el-tooltip placement="top">
<!-- Modality,Body Part Examined,Count,Study Date -->
@ -132,7 +84,7 @@
</div>
<div v-else style="color: #f44336">N/A,</div>
<div v-if="scope.row.Bodypart" style="margin: 0 3px">
{{ scope.row.Bodypart }},
{{ getBodyPart(scope.row.Bodypart, scope.row.BodyPartForEditOther) }},
</div>
<div v-else style="color: #f44336; margin: 0 3px">N/A,</div>
<div v-if="scope.row.StudyTime">
@ -179,21 +131,18 @@
{{ $t('trials:studyList:button:view') }}
</router-link>
</template>
</el-table-column>
</el-table>
<div slot="reference" class="name-wrapper">
</el-table-column>
</el-table>
<div slot="reference" class="name-wrapper">
<span style="color:#428bca;cursor:pointer;" @click="handleGetseriesList(scope.row)">
{{ `${scope.row.Count}` }}
</span>
</div>
</el-popover>
<el-button
v-else-if="scope.row.Count && !scope.row.IsDicom"
type="text"
@click.native.prevent="handlePreviewNonDicom(scope.row)"
>
</div>
</el-popover>
<el-button v-else-if="scope.row.Count && !scope.row.IsDicom" type="text"
@click.native.prevent="handlePreviewNonDicom(scope.row)">
{{ scope.row.Count }}
</el-button> -->
</el-button> -->
<!-- <span>({{ scope.row.Count }})</span> -->
<!-- <span v-else style="color:#f44336;">N/A</span> -->
</div>
@ -214,8 +163,7 @@
</el-tooltip>
</template>
<template slot-scope="scope">
<span v-if="scope.row.TrialSiteCode"
>{{ scope.row.TrialSiteCode }},
<span v-if="scope.row.TrialSiteCode">{{ scope.row.TrialSiteCode }},
</span>
<span v-else style="color: #f44336">N/A, </span>
<span v-if="scope.row.TrialSiteAliasName">{{
@ -224,12 +172,8 @@
<span v-else style="color: #f44336">N/A</span>
</template>
</el-table-column>
<el-table-column
prop="SubjectCode"
:label="$t('trials:studyList:table:subject')"
sortable="custom"
show-overflow-tooltip
/>
<el-table-column prop="SubjectCode" :label="$t('trials:studyList:table:subject')" sortable="custom"
show-overflow-tooltip />
<el-table-column min-width="90" show-overflow-tooltip>
<template slot="header">
<el-tooltip placement="top">
@ -249,68 +193,34 @@
<span>{{ scope.row.VisitNum }}</span>
</template>
</el-table-column>
<el-table-column
prop="Uploader"
:label="$t('trials:studyList:table:uploader')"
show-overflow-tooltip
sortable="custom"
min-width="80"
/>
<el-table-column
prop="UploadTime"
:label="$t('trials:studyList:table:uploadTime')"
show-overflow-tooltip
sortable="custom"
min-width="120"
/>
<el-table-column
prop="IsFromPACS"
:label="$t('trials:studyList:table:isFromPacs')"
show-overflow-tooltip
sortable="custom"
min-width="120"
>
<el-table-column prop="Uploader" :label="$t('trials:studyList:table:uploader')" show-overflow-tooltip
sortable="custom" min-width="80" />
<el-table-column prop="UploadTime" :label="$t('trials:studyList:table:uploadTime')" show-overflow-tooltip
sortable="custom" min-width="120" />
<el-table-column prop="IsFromPACS" :label="$t('trials:studyList:table:isFromPacs')" show-overflow-tooltip
sortable="custom" min-width="120">
<template slot-scope="scope">
<el-tag :type="scope.row.IsFromPACS ? 'warning' : ''">
{{ $fd("UploadType", scope.row.IsFromPACS) }}
</el-tag>
</template>
</el-table-column>
<el-table-column
:label="$t('common:action:action')"
min-width="100"
fixed="right"
>
<el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
<template slot-scope="scope">
<!-- 查看 -->
<el-button
:disabled="!scope.row.Count"
circle
:title="$t('trials:studyList:button:view')"
icon="el-icon-view"
@click="handleViewStudy(scope.row)"
/>
<el-button :disabled="!scope.row.Count" circle :title="$t('trials:studyList:button:view')"
icon="el-icon-view" @click="handleViewStudy(scope.row)" />
<!-- 分享检查 -->
<el-button
v-hasPermi="['trials:trials-panel:study:share']"
:disabled="!(scope.row.Count > 0 && scope.row.IsDicom)"
circle
:title="$t('trials:studyList:action:share')"
icon="el-icon-share"
@click="handleShareImage(scope.row)"
/>
<el-button v-hasPermi="['trials:trials-panel:study:share']"
:disabled="!(scope.row.Count > 0 && scope.row.IsDicom)" circle
:title="$t('trials:studyList:action:share')" icon="el-icon-share" @click="handleShareImage(scope.row)" />
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination
class="page"
:total="total"
:page.sync="searchData.PageIndex"
:limit.sync="searchData.PageSize"
@pagination="getList"
/>
<pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
@pagination="getList" />
</template>
<base-model :config="share_model">
@ -327,30 +237,17 @@
<el-input v-model="extractionCode" style="width: 100px" readonly />
</div>
<div>
<el-button type="primary" round @click="copyCode"
>复制链接及提取码</el-button
>
<el-button type="primary" round @click="copyCode"></el-button>
</div>
</template>
</base-model>
<!-- 预览非Dicom影像 -->
<el-dialog
v-if="previewNonDicomVisible"
:visible.sync="previewNonDicomVisible"
:title="$t('trials:studyList:dialogTitle:view')"
:fullscreen="true"
append-to-body
custom-class="base-dialog-wrapper"
>
<div
class="base-modal-body"
style="border: 2px solid #ccc; padding: 10px"
>
<NonDicomPreview
v-if="previewNonDicomVisible"
:none-dicom-id="rowData.Id"
/>
<el-dialog v-if="previewNonDicomVisible" :visible.sync="previewNonDicomVisible"
:title="$t('trials:studyList:dialogTitle:view')" :fullscreen="true" append-to-body
custom-class="base-dialog-wrapper">
<div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
<NonDicomPreview v-if="previewNonDicomVisible" :none-dicom-id="rowData.Id" />
</div>
</el-dialog>
</BaseContainer>
@ -411,16 +308,36 @@ export default {
trialId: this.$route.query.trialId,
tokenKey: getToken(),
openWindow: null,
bp: [],
BodyPart: {}
};
},
async mounted() {
this.bp = await this.$getBodyPart(this.$route.query.trialId);
this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
this.getSite();
this.getVisitPlanOptions();
this.getList();
},
methods: {
getBodyPart(bodyPart, other) {
if (!bodyPart && !other) return ''
var separator = ','
if (bodyPart.indexOf('|') > -1) {
separator = '|'
} else if (bodyPart.indexOf(',') > -1) {
separator = ','
} else if (bodyPart.indexOf('') > -1) {
separator = ''
}
var arr = bodyPart.split(separator)
var newArr = arr.map((i) => {
return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
})
if (other) {
newArr.push(other)
}
newArr = newArr.filter(Boolean)
return newArr.join(' | ')
},
//
getList() {
this.loading = true;
@ -550,28 +467,28 @@ export default {
this.loading = false;
});
},
getBodyPart(bodyPart) {
if (!bodyPart) return "";
var separator = ",";
if (bodyPart.indexOf("|") > -1) {
separator = "|";
} else if (bodyPart.indexOf(",") > -1) {
separator = ",";
} else if (bodyPart.indexOf("") > -1) {
separator = "";
}
var arr = bodyPart.split(separator);
var newArr = arr.map((i) => {
return this.$fd(
"Bodypart",
i.trim(),
"Code",
{ Bodypart: this.bp },
"Name"
);
});
return newArr.join(" | ");
},
// getBodyPart(bodyPart) {
// if (!bodyPart) return "";
// var separator = ",";
// if (bodyPart.indexOf("|") > -1) {
// separator = "|";
// } else if (bodyPart.indexOf(",") > -1) {
// separator = ",";
// } else if (bodyPart.indexOf("") > -1) {
// separator = "";
// }
// var arr = bodyPart.split(separator);
// var newArr = arr.map((i) => {
// return this.$fd(
// "Bodypart",
// i.trim(),
// "Code",
// { Bodypart: this.bp },
// "Name"
// );
// });
// return newArr.join(" | ");
// },
//
copyCode() {
this.$copyText(`链接: ${this.shareLink} 提取码: ${this.extractionCode}`)

View File

@ -141,7 +141,7 @@
:title="$t('trials:subject:title:report')" @click="handleMessage(scope.row)" />
<!-- 图表 -->
<el-button v-hasPermi="['trials:trials-panel:subject:chart']" v-if="isShowChart" icon="el-icon-s-data"
circle :title="$t('trials:subject:title:report')" @click="handleopenSubjectChart(scope.row)" />
circle :title="$t('trials:subject:title:chart')" @click="handleopenSubjectChart(scope.row)" />
</template>
</el-table-column>
</el-table>

View File

@ -423,7 +423,7 @@
</el-tabs>
<!-- 预览影像模态框 -->
<el-dialog v-if="previewVisible" :fullscreen="true" :show-close="true" :visible.sync="previewVisible"
append-to-body>
:title="$t('trials:uploadDicoms:title:previewLocalImage')" append-to-body>
<DicomPreview :uid="uid" :studyList="uploadQueues" />
</el-dialog>
<!--pet-ct临床数据上传-->