diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index e11fe70d..73b98b7f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -17,8 +17,9 @@
class="icon"
:class="[activeTool==='WindowLevel'?'tool_active':'']"
data-tool="WindowLevel"
+ @click.prevent="setBasicToolActive('WindowLevel')"
>
-
+
@@ -60,8 +61,9 @@
-
+
{{ $t('trials:reading:button:reverseColor') }}
@@ -74,8 +76,9 @@
class="icon"
:class="[activeTool==='Zoom'?'tool_active':'']"
data-tool="Zoom"
+ @click.prevent="setBasicToolActive('Zoom')"
>
-
+
{{ $t('trials:reading:button:zoom') }}
@@ -88,8 +91,9 @@
class="icon"
:class="[activeTool==='Pan'?'tool_active':'']"
data-tool="Pan"
+ @click.prevent="setBasicToolActive('Pan')"
>
-
+
{{ $t('trials:reading:button:move') }}
@@ -103,8 +107,9 @@
class="icon"
:class="[activeTool==='Rotate'?'tool_active':'']"
data-tool="Pan"
+ @click.prevent="setBasicToolActive('TrackballRotate')"
>
-
+
@@ -135,8 +140,9 @@
class="icon"
:class="[activeTool===tool.toolName?'tool_active':'']"
@mouseenter="enter($event,tool.toolName)"
+ @click.prevent="setMeasureToolActive(tool.toolName)"
>
-
+
{{ tool.text }}
@@ -2075,14 +2081,13 @@ export default {
align-items: center;
margin-right: 30px;
.icon{
- padding: 0px;
+ padding: 5px;
border: 1px solid #404040;
cursor: pointer;
text-align: center;
.svg-icon{
- font-size:30px;
+ font-size:25px;
color:#ddd;
- padding: 2px;
}
}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 0879d23c..97e4c7a8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -53,8 +53,8 @@ export default {
measurements: [],
currentQsId: '',
pet5PSId: '',
- pet5PSCommentsId:'',
- calculatePet5PS:null,
+ pet5PSCommentsId: '',
+ calculatePet5PS: null,
liverSuvmaxId: '',
lungSuvmaxId: '',
suvmaxId: '',
@@ -284,7 +284,7 @@ export default {
}
this.$emit('setNonTargetMeasurementStatus', { status: true, toolName: 'CircleROI' })
},
-
+
removeAnnotation(obj) {
console.log('question_removeAnnotation')
const { Id } = obj
@@ -397,18 +397,18 @@ export default {
},
setFormItemData(obj) {
this.questionForm[obj.key] = obj.val
- if(obj.key === this.pet5PSId){
+ if (obj.key === this.pet5PSId) {
this.setPet5PSCommentDisplay()
}
},
- setPet5PSCommentDisplay(){
- if( this.pet5PSCommentsId && this.pet5PSId ){
+ setPet5PSCommentDisplay() {
+ if (this.pet5PSCommentsId && this.pet5PSId) {
for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
- if(this.calculatePet5PS && this.calculatePet5PS !== this.questionForm[this.pet5PSId]){
+ if (this.calculatePet5PS && this.calculatePet5PS !== this.questionForm[this.pet5PSId]) {
this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 0
this.questions[0].Childrens[0].Childrens[i].IsRequired = 0
- }else{
+ } else {
this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
this.questionForm[this.pet5PSCommentsId] = ''
@@ -443,7 +443,7 @@ export default {
// 本访视点病灶的SUVmax(所有病灶中最大的)<纵隔血池SUVmax 2分
// this.questionForm[this.pet5PSId] = '2'
return '2'
- }else{
+ } else {
// this.questionForm[this.pet5PSId] = ''
return ''
}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 9387578c..2faf5440 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -31,8 +31,8 @@
v-model="questionForm.LesionType"
filterable
:disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask"
- @change="((val)=>{lesionTypeChange(val)})"
:popper-append-to-body="false"
+ @change="((val)=>{lesionTypeChange(val)})"
>
{formItemChange(val, qs)})"
:popper-append-to-body="false"
+ @change="((val)=>{formItemChange(val, qs)})"
>
@@ -189,43 +189,51 @@
-
-
+ label="SUV测量截图"
+ />
+
+
![Image]()
+
-
+
@@ -234,6 +242,7 @@ import { submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
// import { uploadPrintscreen } from '@/api/reading'
import DicomEvent from './../DicomEvent'
import store from '@/store'
+import Viewer from 'v-viewer'
export default {
name: 'MeasurementForm',
props: {
@@ -303,10 +312,11 @@ export default {
pictureBaseStr: '',
currentMarkTool: '',
digitPlaces: 2,
- stateDisabled: false,
+ stateDisabled: false
}
},
mounted() {
+ this.initializeViewer()
this.trialId = this.$route.query.trialId
this.initForm()
DicomEvent.$on('handleImageQualityAbnormal', () => {
@@ -319,6 +329,11 @@ export default {
DicomEvent.$off('handleImageQualityAbnormal')
},
methods: {
+ initializeViewer() {
+ Viewer.setDefaults({
+ toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }
+ })
+ },
async initForm() {
const loading = this.$loading({ fullscreen: true })
this.questions.forEach(item => {