Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/hir_web
commit
aea319dc36
|
@ -920,11 +920,8 @@ export default {
|
||||||
if (this.readingTaskState >= 2) return
|
if (this.readingTaskState >= 2) return
|
||||||
var element = cornerstone.getEnabledElement(this.canvas)
|
var element = cornerstone.getEnabledElement(this.canvas)
|
||||||
var { imageId } = element.image
|
var { imageId } = element.image
|
||||||
var instanceId = imageId.split('/')[imageId.split('/').length - 1]
|
const imageInfo = this.getInstanceInfo(imageId)
|
||||||
if (instanceId.includes('?frame=')) {
|
var instanceId = imageInfo.instanceId
|
||||||
instanceId = instanceId.split('?frame=')[0]
|
|
||||||
}
|
|
||||||
instanceId = instanceId.split('.')[0]
|
|
||||||
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId && i.IsCurrentTask && i.ReadingTaskState < 2)
|
var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.stack.visitTaskId && i.IsCurrentTask && i.ReadingTaskState < 2)
|
||||||
if (idx === -1) return
|
if (idx === -1) return
|
||||||
this.measureData = this.visitTaskList[idx].MeasureData
|
this.measureData = this.visitTaskList[idx].MeasureData
|
||||||
|
|
|
@ -446,6 +446,7 @@
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
</viewer>
|
</viewer>
|
||||||
|
<div v-else-if="scope.row.DataType === 'Dialog'" v-html="scope.row.oldValue"></div>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
{{ scope.row.oldValue }}
|
{{ scope.row.oldValue }}
|
||||||
</span>
|
</span>
|
||||||
|
@ -537,6 +538,7 @@
|
||||||
/>
|
/>
|
||||||
<!-- <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
|
<!-- <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
|
||||||
</viewer>
|
</viewer>
|
||||||
|
<div v-else-if="scope.row.DataType === 'Dialog'" v-html="scope.row.newValue"></div>
|
||||||
<span v-else>{{ scope.row.newValue }}</span>
|
<span v-else>{{ scope.row.newValue }}</span>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
@ -966,6 +968,7 @@
|
||||||
alt=""
|
alt=""
|
||||||
/>
|
/>
|
||||||
</viewer>
|
</viewer>
|
||||||
|
<div v-else-if="scope.row.DataType === 'Dialog'" v-html="scope.row.oldValue"></div>
|
||||||
<span v-else>
|
<span v-else>
|
||||||
{{ scope.row.oldValue }}
|
{{ scope.row.oldValue }}
|
||||||
</span>
|
</span>
|
||||||
|
@ -1063,6 +1066,7 @@
|
||||||
/>
|
/>
|
||||||
<!-- <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
|
<!-- <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
|
||||||
</viewer>
|
</viewer>
|
||||||
|
<div v-else-if="scope.row.DataType === 'Dialog'" v-html="scope.row.newValue"></div>
|
||||||
<span v-else>{{ scope.row.newValue }}</span>
|
<span v-else>{{ scope.row.newValue }}</span>
|
||||||
</span>
|
</span>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue