diff --git a/src/api/reading.js b/src/api/reading.js
index 94bfd803..d0697f26 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -217,3 +217,35 @@ export function uploadIVUSTemplate(param) {
})
}
+export function getOCTFCTTemplate(param) {
+ return requestDownload({
+ url: '/OCTCalculate/getOCTFCTTemplate',
+ method: 'post',
+ responseType: 'blob',
+ data: param
+ })
+}
+
+export function uploadOCTFCTTemplate(param) {
+ return request({
+ url: `/OCTCalculate/uploadOCTFCTTemplate`,
+ method: 'post',
+ data: param
+ })
+}
+
+export function getOCTLipidAngleTemplate(param) {
+ return requestDownload({
+ url: '/OCTCalculate/getOCTLipidAngleTemplate',
+ method: 'post',
+ responseType: 'blob',
+ data: param
+ })
+}
+export function uploadOCTLipidAngleTemplate(param) {
+ return request({
+ url: `/OCTCalculate/uploadOCTLipidAngleTemplate`,
+ method: 'post',
+ data: param
+ })
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index afa916ac..052c8563 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -497,6 +497,25 @@
Developing...
+
+
+
+
+ {{ $t('trials:readingReport:button:skip') }}
+
+
+
+ {{ $t('common:button:submit') }}
+
+
@@ -809,6 +828,10 @@ export default {
type: Boolean,
required: true
},
+ iseCRFShowInDicomReading: {
+ type: Boolean,
+ required: true
+ },
questionFormChangeState: {
type: Boolean,
default() {
@@ -2190,6 +2213,8 @@ export default {
this.isFullscreen = false
this.manualsDialog.visible = true
},
+ skipTask(){},
+ submit(){},
handleFusion() {
// https 或者 本地开发环境才是安全上下文
// if (!window.isSecureContext) {
@@ -2522,6 +2547,7 @@ export default {
width: 350px;
height: 100%;
border: 1px solid #727272;
+ position: relative;
// overflow-y: auto;
}
.viewer-container{
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
index cceebfd4..c971ef27 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue
@@ -49,7 +49,7 @@
-
+
@@ -62,17 +62,16 @@
v-if="item.Type === 'basicTable' && item.TableQuestions"
:ref="item.Id"
:data="item.TableQuestions.Answers"
- max-height="600"
>
-
+ /> -->
+ >
+
+
+ {{ `${scope.row[q.Id]}${$fd('ValueUnit', parseInt(q.Unit))}` }}
+
+
+ {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
+
+
+ {{`${scope.row[q.Id]}`}}
+
+
+
@@ -162,6 +173,7 @@
:is-qulity-issues="false"
:group-classify="5"
/>
+
{
@@ -493,12 +504,16 @@ export default {
} else if (valueType === 3) {
this.$set(this.questionForm, qId, parseFloat(value))
} else {
- this.$set(this.questionForm, qId, parseFloat(value).toFixed(this.digitPlaces))
+ this.$set(this.questionForm, qId, this.numberToFixed(value))
}
}
},
- numberToFixed(v, unit) {
- return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}${unit}`
+ numberToFixed(v) {
+ if (this.digitPlaces > -1) {
+ return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
+ } else {
+ return v
+ }
},
async handleSave(index) {
const refName = `questions${index}`
@@ -581,7 +596,7 @@ export default {
this.$set(this.qsForm, this.diffId, null)
} else {
const diff = parseFloat(eem) - parseFloat(lumen)
- this.$set(this.qsForm, this.diffId, diff.toFixed(this.digitPlaces))
+ this.$set(this.qsForm, this.diffId, this.numberToFixed(diff))
}
}
},
@@ -642,11 +657,15 @@ export default {
}
const res = await submitTableQuestion(params)
if (res.IsSuccess) {
- // 保存成功!
- this.$message.success(this.$t('common:message:savedSuccessfully'))
- this.addOrEdit.visible = false
- this.refreshQuestions()
+ // this.refreshQuestions()
+ await this.getReadingQuestionAndAnswer(this.visitTaskId)
+ this.$refs['ecrf'].getQuestions(this.visitTaskId, true)
+ this.$refs['ecrf2'].getQuestions(this.visitTaskId, true)
+ this.$refs['ecrf3'].getQuestions(this.visitTaskId, true)
DicomEvent.$emit('getReportInfo', true)
+ // 保存成功!
+ this.addOrEdit.visible = false
+ this.$message.success(this.$t('common:message:savedSuccessfully'))
}
loading.close()
} catch (e) {
@@ -685,7 +704,8 @@ export default {
console.log(e)
}
},
- uploadTpl() {
+ uploadTpl(lesionType) {
+ this.upload.title = `导入( ${this.$fd('LesionType', lesionType)} )`
this.upload.visible = true
},
async downloadTpl() {
@@ -707,7 +727,7 @@ export default {
const span = document.createElement('span')
span.innerText = column.label
document.body.appendChild(span)
- column.minWidth = span.getBoundingClientRect().width + 15
+ column.minWidth = span.getBoundingClientRect().width + 20
document.body.removeChild(span)
return h('span', column.label)
}
@@ -852,6 +872,9 @@ export default {
/deep/.el-table__fixed-body-wrapper tr:hover > td {
background-color: #000 !important;
}
+ /deep/.el-table--scrollable-x .el-table__body-wrapper {
+ z-index: 2;
+ }
}
}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
index b0eafc69..a8dee2bb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionTableFormItem.vue
@@ -211,8 +211,7 @@ export default {
...mapGetters(['language'])
},
mounted() {
- var digitPlaces = Number(localStorage.getItem('digitPlaces'))
- this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : parseInt(digitPlaces)
+ this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
},
methods: {
formItemChange(v, question) {
@@ -242,11 +241,18 @@ export default {
} else if (valueType === 3) {
value = parseFloat(value)
} else {
- value = parseFloat(value).toFixed(this.digitPlaces)
+ value = this.numberToFixed(value)
}
}
return value
},
+ numberToFixed(v) {
+ if (this.digitPlaces > -1) {
+ return isNaN(parseFloat(v)) ? null : `${parseFloat(v).toFixed(this.digitPlaces)}`
+ } else {
+ return v
+ }
+ },
resetFormItemData(v) {
this.$emit('resetFormItemData', v)
},
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
index 6aae7ef4..2d03e070 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue
@@ -45,11 +45,11 @@
{{ item.QuestionName }}
-
-
+
+
-
+
@@ -69,10 +69,10 @@
{{ getLesionName(item.OrderMark,scope.row.RowIndex) }}
-->
-
+ /> -->
+ >
+
+
+ {{ `${scope.row[q.Id]}${$fd('ValueUnit', parseInt(q.Unit))}` }}
+
+
+ {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
+
+
+ {{ `${scope.row[q.Id]}` }}
+
+
+
{{ $t('common:button:edit') }}
-
+
{{ $t('common:button:delete') }}
@@ -198,22 +210,38 @@
+
+
+
+
+
+
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
index 8c39f055..e95766d2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReadPage.vue
@@ -57,6 +57,7 @@
:is-reading-show-subject-info="isReadingShowSubjectInfo"
:is-reading-task-view-in-order="isReadingTaskViewInOrder"
:is-exists-manual="isExistsManual"
+ :iseCRFShowInDicomReading="iseCRFShowInDicomReading"
@previewCD="previewCD"
/>
@@ -136,6 +137,10 @@ export default {
type: Boolean,
required: true
},
+ iseCRFShowInDicomReading: {
+ type: Boolean,
+ required: true
+ },
questionFormChangeState: {
type: Boolean,
default() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 67269554..f9619d32 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -19,6 +19,7 @@
:is-exists-clinical-data="isExistsClinicalData"
:is-exists-no-dicom-file="isExistsNoDicomFile"
:is-exists-manual="isExistsManual"
+ :iseCRFShowInDicomReading="IseCRFShowInDicomReading"
@previewCD="previewCD"
/>