From 8a47f23fe78b3dc536b057996ac9b4f3b079c029 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 25 Sep 2024 15:29:18 +0800
Subject: [PATCH] =?UTF-8?q?OCT=E6=A0=87=E5=87=86=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../dicoms/components/IVUS/QuestionList.vue | 34 ++++++++++++-------
.../components/IVUS/QuestionTableFormItem.vue | 12 +++++--
.../dicoms/components/OCT/QuestionList.vue | 29 +++++++++++-----
.../components/OCT/QuestionTableFormItem.vue | 12 +++++--
4 files changed, 60 insertions(+), 27 deletions(-)
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 c44ec605..090aa2ff 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 @@
+
@@ -82,17 +82,20 @@
>
- {{`${scope.row[q.Id]}${$fd('ValueUnit', parseInt(q.Unit))}`}}
+ {{ `${scope.row[q.Id]}${$fd('ValueUnit', parseInt(q.Unit))}` }}
+
+
+ {{ `${$fd(q.DictionaryCode, parseInt(scope.row[q.Id]))}` }}
- {{`${scope.row[q.Id]}`}}
+
@@ -278,7 +281,7 @@ export default {
formChanged: false,
digitPlaces: 2,
addOrEdit: { visible: false, title: '' },
- upload: { visible: false, title: '导入' },
+ upload: { visible: false, title: '' },
qsList: [],
answersList: [],
qsForm: {},
@@ -311,8 +314,7 @@ export default {
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
- var digitPlaces = Number(localStorage.getItem('digitPlaces'))
- this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+ this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
window.addEventListener('message', this.receiveMsg)
this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {
@@ -502,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}`
@@ -590,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))
}
}
},
@@ -694,7 +700,8 @@ export default {
console.log(e)
}
},
- uploadTpl() {
+ uploadTpl(lesionType) {
+ this.upload.title = `导入( ${this.$fd('LesionType', lesionType)} )`
this.upload.visible = true
},
async downloadTpl() {
@@ -861,6 +868,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 3ebfb297..0375e356 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
@@ -93,7 +93,7 @@
@@ -278,8 +278,8 @@ export default {
questionForm: {},
formChanged: false,
digitPlaces: 2,
- addOrEdit: { visible: false, title: '' },
- upload: { visible: false, title: '导入', lesionType: null },
+ addOrEdit: { visible: false, title: '', lesionType: null },
+ upload: { visible: false, title: '', lesionType: null },
qsList: [],
answersList: [],
qsForm: {},
@@ -313,8 +313,7 @@ export default {
mounted() {
// this.subjectCode = this.$router.currentRoute.query.subjectCode
this.subjectCode = localStorage.getItem('subjectCode')
- var digitPlaces = Number(localStorage.getItem('digitPlaces'))
- this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+ this.digitPlaces = Number(localStorage.getItem('digitPlaces'))
window.addEventListener('message', this.receiveMsg)
this.CriterionType = parseInt(localStorage.getItem('CriterionType'))
DicomEvent.$on('setCollapseActive', measureData => {
@@ -502,11 +501,15 @@ 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}`
@@ -590,7 +593,7 @@ export default {
this.$set(this.qsForm, this.avgId, null)
} else {
const avg = (parseFloat(m1) + parseFloat(m2) + parseFloat(m3)) / 3
- this.$set(this.qsForm, this.avgId, avg.toFixed(this.digitPlaces))
+ this.$set(this.qsForm, this.avgId, this.numberToFixed(avg))
}
}
},
@@ -628,6 +631,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()
@@ -652,6 +656,9 @@ export default {
trialId: this.trialId,
answerList: answers
}
+ if (this.addOrEdit.lesionType === 101) {
+ params.computationTrigger = 9
+ }
const res = await submitTableQuestion(params)
if (res.IsSuccess) {
// 保存成功!
@@ -699,6 +706,7 @@ export default {
},
uploadTpl(lesionType) {
this.upload.lesionType = lesionType
+ this.upload.title = `导入( ${this.$fd('LesionType', lesionType)} )`
this.upload.visible = true
},
async downloadTpl(lesionType) {
@@ -869,6 +877,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/OCT/QuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
index b0eafc69..a8dee2bb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/OCT/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)
},