@@ -327,7 +331,8 @@ export default {
isFromCRCUpload: false,
visitTaskId: null,
page: '',
- activeSeriesId: null
+ activeSeriesId: null,
+ activeInstanceId: null
}
},
mounted() {
@@ -346,20 +351,18 @@ export default {
this.isFromCRCUpload = !!this.$router.currentRoute.query.isFromCRCUpload
this.visitTaskId = this.$router.currentRoute.query.visitTaskId
this.page = this.$route.query.page
+ this.beforeUnloadHandler = () => {
+ cornerstone.imageCache.purgeCache()
+ requestPoolManager.resetRequestPool()
+ }
// cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
this.getStudiesInfo()
cornerstone.events.addEventListener('cornerstoneimageloadprogress', this.cornerstoneimageloadprogress)
- window.addEventListener('beforeunload', e => {
- cornerstone.imageCache.purgeCache()
- requestPoolManager.resetRequestPool()
- })
+ window.addEventListener('beforeunload', this.beforeUnloadHandler)
},
beforeDestroy() {
requestPoolManager.stopTaskTimer()
- window.removeEventListener('beforeunload', e => {
- cornerstone.imageCache.purgeCache()
- requestPoolManager.resetRequestPool()
- })
+ window.removeEventListener('beforeunload', this.beforeUnloadHandler)
workSpeedclose(true)
},
methods: {
@@ -489,14 +492,17 @@ export default {
data.SeriesList = seriesList
this.studyList.push(data)
})
- if (this.studyList.length > 0) {
- this.$refs.dicomViewer.loadImageStack(this.studyList[0].SeriesList[0])
- const imageId = this.studyList[0].SeriesList[0].imageIds[0]
+ const firstStudy = this.studyList.find(study => Array.isArray(study.SeriesList) && study.SeriesList.length > 0)
+ if (firstStudy) {
+ const firstSeries = firstStudy.SeriesList[0]
+ if (!Array.isArray(firstSeries.imageIds) || firstSeries.imageIds.length === 0) return
+ this.$refs.dicomViewer.loadImageStack(firstSeries)
+ const imageId = firstSeries.imageIds[0]
let instanceId = imageId.split('/')[imageId.split('/').length - 1]
instanceId = instanceId.split('.')[0]
this.firstInstanceId = instanceId
- this.activeNames = [this.studyList[0].StudyId]
- this.loadImages(this.studyList[0].SeriesList[0], 0)
+ this.activeNames = [firstStudy.StudyId]
+ this.loadImages(firstSeries, 0)
}
}
} catch (e) {
@@ -521,6 +527,7 @@ export default {
},
showSeriesImage(e, studyIndex, seriesIndex, series) {
this.activeSeriesId = series.seriesId
+ this.activeInstanceId = null
workSpeedclose(true)
const element = e.currentTarget
const elements = document.querySelectorAll('[series-type]')
@@ -562,6 +569,7 @@ export default {
},
showMultiFrames(studyIndex, series, seriesIndex, instanceInfo) {
this.currentSeriesIndex = seriesIndex
+ this.activeInstanceId = instanceInfo.Id
const imageIds = []
if (instanceInfo.NumberOfFrames && instanceInfo.NumberOfFrames > 1) {
for (let j = 0; j < instanceInfo.NumberOfFrames; j++) {
@@ -573,6 +581,7 @@ export default {
const seriesInfo = {
trialId: series.trialId,
subjectVisitId: series.subjectVisitId,
+ instanceInfoList: series.instanceInfoList,
studyId: series.studyId,
imageIds: imageIds,
seriesId: series.seriesId,
@@ -598,7 +607,11 @@ export default {
}
if (!isAddToTakPool) {
var priority = parseInt(new Date().getTime())
- if (series.isExistMutiFrames) {
+ if (series.isExistMutiFrames && imageIds.length > 1) {
+ imageIds.map(imageId => {
+ this.imageList.push({ imageId, seriesId: series.seriesId, priority })
+ })
+ } else if (series.isExistMutiFrames) {
series.instanceInfoList.map(image => {
this.imageList.push({ imageId: image.ImageId, seriesId: series.seriesId, priority })
})
@@ -880,6 +893,7 @@ export default {
},
showRelationSeriesImage(e, series, studyIndex, index) {
this.activeSeriesId = series.seriesId
+ this.activeInstanceId = null
workSpeedclose(true)
this.currentRelationIndex = index
const element = e.currentTarget
@@ -937,7 +951,7 @@ export default {
if (this.imageList.length > 0) {
requestPoolManager.startTaskTimer()
this.imageList.map(image => {
- requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority)
+ requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).catch(() => {})
})
requestPoolManager.sortTaskPool()
this.imageList = []
@@ -1099,6 +1113,7 @@ export default {
padding: 0;
margin-right: 2px;
color: #D0D0D0;
+ overflow-x: hidden;
overflow-y: auto;
}
@@ -1107,6 +1122,8 @@ export default {
word-break: break-all;
display: table;
width: 100%;
+ box-sizing: border-box;
+ overflow-x: hidden;
border: 1px solid #3e3f3a;
}
@@ -1135,14 +1152,20 @@ export default {
.viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper {
display: flex;
width: 220px;
- /* height: 84px; */
+ min-height: 85px;
padding: 1px 2px 1px 2px;
margin: 2px 0 1px 1px;
+ align-items: flex-start;
/* border-radius: 2px;
border: 1px solid #404040; */
}
+.viewerContainer .viewerLeftSidePanel .viewernavigatorwrapper .imageBox {
+ align-self: center;
+ flex-shrink: 0;
+}
+
.viewerContainer .viewernavigatorwrapper .el-progress__text {
display: none;
}
@@ -1165,9 +1188,19 @@ export default {
/* width: 120px;
height: 80px; */
flex: 1;
+ min-width: 0;
padding: 3px 1px 3px 4px;
vertical-align: top;
font-size: 12px;
+ line-height: 1.4;
+ overflow: hidden;
+}
+
+.viewerContainer .viewerLeftSidePanel .viewernavitextwrapper>div {
+ max-width: 100%;
+ white-space: normal;
+ word-break: break-word;
+ overflow-wrap: anywhere;
}
.viewerContainer .viewerLeftSidePanel .viewerlabelwrapper {
@@ -1197,12 +1230,24 @@ export default {
.viewerContainer .el-collapse {
border: none;
+ width: 100%;
+ min-width: 0;
+ box-sizing: border-box;
+ overflow-x: hidden;
}
.viewerContainer .el-collapse-item {
background-color: #585453 !important;
color: #ddd;
+ width: 100%;
+ min-width: 0;
+ box-sizing: border-box;
+}
+.viewerContainer .el-collapse-item__wrap {
+ width: 100%;
+ min-width: 0;
+ box-sizing: border-box;
}
.viewerContainer .el-collapse-item__content {
@@ -1215,9 +1260,42 @@ export default {
background-color: #585453 !important;
color: #ddd;
border-bottom-color: #5a5a5a;
+ width: 100%;
+ min-width: 0;
+ box-sizing: border-box;
padding-left: 5px;
- height: 40px;
+ height: auto;
+ min-height: 30px;
line-height: 20px;
+ align-items: flex-start;
+ padding-top: 4px;
+ padding-bottom: 4px;
+}
+
+.viewerContainer .collapse-title-wrapper {
+ display: flex;
+ flex: 1;
+ min-width: 0;
+ flex-wrap: wrap;
+ align-items: center;
+ column-gap: 6px;
+ row-gap: 2px;
+ line-height: 16px;
+ padding-right: 8px;
+}
+
+.viewerContainer .collapse-title-wrapper .text-desc {
+ flex: 0 1 auto;
+ min-width: 0;
+ max-width: 100%;
+ white-space: normal;
+ word-break: break-word;
+ overflow-wrap: anywhere;
+}
+
+.viewerContainer .collapse-title-wrapper .collapse-title-extra {
+ flex: 0 1 auto;
+ text-align: left;
}
.instance_frame_wrapper {
@@ -1260,6 +1338,10 @@ export default {
border-color: #213a54 !important;
background-color: #213a54;
}
+.frame_content_active {
+ border-color: #213a54 !important;
+ background-color: #213a54;
+}
/* .viewerRightSidePanel {
width: 300px;
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
index a0c70eab..b0b3746d 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/TemplateForm.vue
@@ -22,6 +22,11 @@
+
+
+
+
+
@@ -83,6 +88,7 @@ export default {
DocUserSignType: 0,
CurrentStaffTrainDays: 1,
NewStaffTrainDays: 14,
+ DocLanguageType: null
},
rules: {
FileTypeId: [
@@ -92,6 +98,13 @@ export default {
trigger: ['blur'],
},
],
+ DocLanguageType: [
+ {
+ required: true,
+ message: this.$t('common:ruleMessage:select'),
+ trigger: ['blur'],
+ },
+ ],
SignViewMinimumMinutes: [
{
required: true,
@@ -143,6 +156,9 @@ export default {
this.form.DocUserSignType = this.data.DocUserSignType
this.form.CurrentStaffTrainDays = this.data.CurrentStaffTrainDays
this.form.NewStaffTrainDays = this.data.NewStaffTrainDays
+ this.form.DocLanguageType = this.data.DocLanguageType
+ } else {
+ this.form.DocLanguageType = this.$i18n.locale !== 'zh' ? 1 : 0
}
this.loading = false
},
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 5b474e0d..ae86b049 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -26,6 +26,11 @@
+
+
+
+
+
+
+
+ {{ $fd('DocLanguageType', scope.row.DocLanguageType) }}
+
+
-
+
{
IsDeleted: null,
DocUserSignType: null,
UserTypeId: null,
+ DocLanguageType: null,
Name: '',
PageIndex: 1,
PageSize: 20,
diff --git a/src/views/dictionary/institutions/components/SiteForm.vue b/src/views/dictionary/institutions/components/SiteForm.vue
index 17e07d21..5b52188c 100644
--- a/src/views/dictionary/institutions/components/SiteForm.vue
+++ b/src/views/dictionary/institutions/components/SiteForm.vue
@@ -1,13 +1,6 @@
-
+
@@ -15,17 +8,11 @@
-
+
-
+
@@ -38,7 +25,9 @@
-->
-
+
+
+
@@ -50,17 +39,8 @@
-
-
+
+
@@ -82,20 +62,10 @@
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index 61a56157..433995a9 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -22,7 +22,7 @@
-->
-
+
@@ -77,7 +77,7 @@ export default {
callback(
lang === 'zh'
? new Error(
- '1）新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
+ '新建账号，用户名字符长度最小为4个字符，最大为16个字符，只可使用字母、数字、下划线；'
)
: new Error(
'For a new account, the username must have:1) At least 4 characters;2) At most 16 characters;3)Only letters, numbers, and underscores are allowed.'
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6b574472..41bae11a 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -150,12 +150,12 @@
-
+
+ :style="{ width: isEN ? '180px' : '200px', height: isEN ? '60px' : '65px' }" />
{{ $t('login:title:system') }}
-
+
V{{ $version.IsEnv_US ? $version.Version_US : $version.Version }}
diff --git a/src/views/research/components/BaseInfo.vue b/src/views/research/components/BaseInfo.vue
index c0b19c49..0624c28f 100644
--- a/src/views/research/components/BaseInfo.vue
+++ b/src/views/research/components/BaseInfo.vue
@@ -49,9 +49,52 @@
+
+
+
+ {{
+ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t('trials:researchForm:form:IsAuthorizeRadiologistsParticipate') }}
+ {{
+ $t('trials:researchForm:form:AssignFixedTechnologists') }}
+
+
+ :label="$t('trials:researchForm:form:isQualified')" prop="IsConfirmImagingTechnologist">
{{
@@ -60,7 +103,7 @@
+ :label="$t('trials:researchForm:form:notQualifiedReason')" prop="NotConfirmReson">
@@ -74,7 +117,7 @@
-
+
@@ -86,11 +129,28 @@
-
+
+
+
+
+
+ {{
+ item.label }}
+
+
+
+
+
+
+
{ !value ? callback(new Error(this.$t('trials:researchForm:formRule:specify'))) : callback() }, trigger: 'blur' },
{ min: 0, max: 50, message: this.$t('trials:researchForm:formRule:maxLength'), trigger: ['blur', 'change'] }
@@ -188,6 +281,11 @@ export default {
}
},
methods: {
+ handleIsAuthorizeInput(label) {
+ this.form.IsAuthorizeRadiologistsParticipate = false
+ this.form.AssignFixedTechnologists = false
+ this.form[label] = true
+ },
async viewManual() {
try {
let data = {
@@ -231,6 +329,14 @@ export default {
phone: this.form.Phone,
email: this.form.Email,
averageEngravingCycle: this.form.AverageEngravingCycle,
+ IsRoutineMRIPDEE: this.form.IsRoutineMRIPDEE,
+ MRIPDFFScanTime: this.form.MRIPDFFScanTime,
+ MRIPDFFLeadTime: this.form.MRIPDFFLeadTime,
+ MRIPDFFOther: this.form.MRIPDFFOther,
+ IsAuthorizeRadiologistsParticipate: this.form.IsAuthorizeRadiologistsParticipate,
+ AssignFixedTechnologists: this.form.AssignFixedTechnologists,
+ ISStrictManualBurnFlag: this.form.ISStrictManualBurnFlag,
+ NotStrictManualBurnFlagReason: this.form.NotStrictManualBurnFlagReason,
isConfirmImagingTechnologist: this.form.IsConfirmImagingTechnologist,
notConfirmReson: this.form.NotConfirmReson,
efficacyEvaluatorType: this.form.EfficacyEvaluatorType,
@@ -275,6 +381,16 @@ export default {
this.form.Phone = trialSiteSurvey.Phone // 联系人电话
this.form.Email = trialSiteSurvey.Email // 联系人邮箱
this.form.AverageEngravingCycle = trialSiteSurvey.AverageEngravingCycle
+ this.form.IsRoutineMRIPDEE = trialSiteSurvey.IsRoutineMRIPDEE
+ this.form.MRIPDFFScanTime = trialSiteSurvey.MRIPDFFScanTime
+ this.form.MRIPDFFLeadTime = trialSiteSurvey.MRIPDFFLeadTime
+ this.form.MRIPDFFOther = trialSiteSurvey.MRIPDFFOther
+ this.form.IsAuthorizeRadiologistsParticipate = trialSiteSurvey.IsAuthorizeRadiologistsParticipate
+ this.form.AssignFixedTechnologists = trialSiteSurvey.AssignFixedTechnologists
+ if (this.form.IsAuthorizeRadiologistsParticipate) this.form.IsAuthorize = 'IsAuthorizeRadiologistsParticipate'
+ if (this.form.AssignFixedTechnologists) this.form.IsAuthorize = 'AssignFixedTechnologists'
+ this.form.ISStrictManualBurnFlag = trialSiteSurvey.ISStrictManualBurnFlag
+ this.form.NotStrictManualBurnFlagReason = trialSiteSurvey.NotStrictManualBurnFlagReason
this.form.IsConfirmImagingTechnologist = trialSiteSurvey.IsConfirmImagingTechnologist
this.form.NotConfirmReson = trialSiteSurvey.NotConfirmReson
this.form.EfficacyEvaluatorType = trialSiteSurvey.EfficacyEvaluatorType
diff --git a/src/views/research/components/EquipmentForm.vue b/src/views/research/components/EquipmentForm.vue
index 676aa37b..2f645ebb 100644
--- a/src/views/research/components/EquipmentForm.vue
+++ b/src/views/research/components/EquipmentForm.vue
@@ -1,40 +1,98 @@
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
+
+ {{ scope.row.OtherEquipmentType ? scope.row.OtherEquipmentType :
+ $fd('SiteSurvey_ScanEquipmentType', scope.row.EquipmentTypeEnum) }}
+
+
-
+
-
+
+
+ {{ scope.row.ManufacturerName ? scope.row.ManufacturerName : $fd('ManufacturerType',
+ scope.row.ManufacturerType) }}
+
+
-
+
+
+
+
+ {{ $fd('MagneticFieldStrengthType', scope.row.MagneticFieldStrengthType) }}
+
+
+
+
+
+ {{ $fd('BodyCoilChannelCount', scope.row.BodyCoilChannelCount) }}
+
+
+
+
+
+ {{ $fd('YesOrNo', scope.row.HasDedicatedPdfFatQuantificationSequence) }}
+
+
+
+
+ {{ scope.row.OtherSequenceSpecification ? scope.row.OtherSequenceSpecification :
+ $fd('PdfFatQuantificationSequenceType', scope.row.PdfFatQuantificationSequenceType) }}
+
+
+
+
+
+ {{ $fd('YesOrNo', scope.row.HasT2R2Correction) }}
+
+
+
+
+
+ {{ $fd('YesOrNo', scope.row.CanFullyExportPdfParameterMapsAndRawDicom) }}
+
+
-
-
+
+
@@ -73,16 +98,10 @@
-
-
+
+
@@ -115,7 +134,7 @@ export default {
state: null,
trialSiteSurveyId: '',
trialId: '',
- isShowParameters: false
+ EquipmentControlFieldList: []
}
},
mounted() {
@@ -160,10 +179,14 @@ export default {
this.$message.success(this.$t('trials:equiptResearch:message:delSuccessfully'))
}
}).catch(() => { this.loading = false })
- }).catch(() => {})
+ }).catch(() => { })
},
- initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, isShowParameters) {
- this.isShowParameters = isShowParameters
+ initList(TrialSiteEquipmentSurveyList, trialSiteSurvey, EquipmentControlFieldList) {
+ this.EquipmentControlFieldList = []
+ EquipmentControlFieldList.forEach(item => {
+ this.EquipmentControlFieldList.push(item.FiledName)
+ })
+ console.log(this.EquipmentControlFieldList, 'this.EquipmentControlFieldList')
this.list = TrialSiteEquipmentSurveyList
this.state = trialSiteSurvey.State
this.$forceUpdate()
@@ -176,8 +199,8 @@ export default {
}
\ No newline at end of file
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 9296320b..163e55fc 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -1,42 +1,21 @@
-
+
{{ $t('system:userlist:title:Information') }}
-
+
-
+
-
+
-
+
-
-
-
+
+
+
{{ scope.row.Sex ? 'Male' : 'Female' }}
+
+ {{ $fd('UserWorkLanguage', scope.row.UserWorkLanguage) }}
+
{{
Array.isArray(scope.row.UserRoleList) &&
- scope.row.UserRoleList.length > 0
+ scope.row.UserRoleList.length > 0
? scope.row.UserRoleList.filter((item) => !item.IsUserRoleDisabled)
- .map((item) => item.UserTypeShortName)
- .join(', ')
+ .map((item) => item.UserTypeShortName)
+ .join(', ')
: ''
}}
- {{ scope.row.RoleNameList.map((role) => role.RoleName).join(', ') }}
+ {{scope.row.RoleNameList.map((role) => role.RoleName).join(', ')}}
{{
@@ -155,6 +130,14 @@ export default {
sortable: 'custom',
showOverflowTooltip: true,
},
+ {
+ // prop: 'UserWorkLanguage',
+ label: this.$t('system:userlist:table:UserWorkLanguage'),
+ minWidth: 120,
+ slot: 'UserWorkLanguageSlot',
+ sortable: 'custom',
+ showOverflowTooltip: true,
+ },
// {
// prop: 'Sex',
// label: this.$t('system:userlist:table:Gender'),
@@ -287,6 +270,15 @@ export default {
width: '120px',
placeholder: '',
},
+ {
+ type: 'Select',
+ label: this.$t('system:userlist:label:UserWorkLanguage'),
+ prop: 'UserWorkLanguage',
+ width: '100px',
+ options: [], // 下拉选项
+ props: { label: 'label', value: 'value' }, // 下拉选项配置信息，必填
+ placeholder: '',
+ },
{
type: 'Input',
label: this.$t('system:userlist:label:Phone'),
@@ -476,8 +468,10 @@ export default {
// 获取用户类型下拉选项信息
async getInfo() {
const res = await getUserTypeList()
- const index = this.findItemIndex('UserType')
+ let index = this.findItemIndex('UserType')
this.$set(this.searchForm[index], 'options', res.Result)
+ index = this.findItemIndex('UserWorkLanguage')
+ this.$set(this.searchForm[index], 'options', this.$d.UserWorkLanguage)
},
handleAddUser() {
this.$router.push({ path: '/system/user/add' })
diff --git a/src/views/test/index.vue b/src/views/test/index.vue
index 301b347c..36d518bf 100644
--- a/src/views/test/index.vue
+++ b/src/views/test/index.vue
@@ -1,25 +1,145 @@
-
-
+
+
+
+ 下载
\ No newline at end of file
diff --git a/src/views/trials/trials-myinfo/mine.vue b/src/views/trials/trials-myinfo/mine.vue
index 1745969e..bf6a728d 100644
--- a/src/views/trials/trials-myinfo/mine.vue
+++ b/src/views/trials/trials-myinfo/mine.vue
@@ -5,77 +5,42 @@
{{ $t("trials:trials-myinfo:title:basicInfo") }}