Compare commits

..

No commits in common. "50de867772df31a8255cdacde62f7d23e50ac8e9" and "13429f45ed8c34b6720535ea7a0179b9d8332f9e" have entirely different histories.

2 changed files with 12 additions and 23 deletions

View File

@ -3071,11 +3071,10 @@ export default {
const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series const series = this.$refs[`${this.viewportKey}-${this.activeViewportIndex}`][0].series
let index = series.SliceIndex let index = series.SliceIndex
const seriesArr = [] const seriesArr = []
let activeViewportIndex = 0
if (v === 1) { if (v === 1) {
this.rows = 1 this.rows = 1
this.cols = 1 this.cols = 1
activeViewportIndex = 0 this.activeViewportIndex = 0
series.curIndex = index series.curIndex = index
if (typeof series === 'object') { if (typeof series === 'object') {
seriesArr.push(series) seriesArr.push(series)
@ -3083,7 +3082,7 @@ export default {
} else if (v === 2) { } else if (v === 2) {
this.rows = 1 this.rows = 1
this.cols = 2 this.cols = 2
activeViewportIndex = 1 this.activeViewportIndex = 1
series.curIndex = index series.curIndex = index
if (typeof series === 'object') { if (typeof series === 'object') {
seriesArr.push(series) seriesArr.push(series)
@ -3130,7 +3129,7 @@ export default {
seriesArr.push(series) seriesArr.push(series)
} }
} }
activeViewportIndex = 1 this.activeViewportIndex = 1
} else if (v === 4) { } else if (v === 4) {
this.rows = 2 this.rows = 2
this.cols = 2 this.cols = 2
@ -3141,12 +3140,10 @@ export default {
seriesArr.push(series) seriesArr.push(series)
seriesArr.push(series) seriesArr.push(series)
} }
activeViewportIndex = 3 this.activeViewportIndex = 3
} }
seriesArr.map(async (i, index) => { seriesArr.map((i, index) => {
await this.$refs[`${this.viewportKey}-${index}`][0].setSeriesInfo(i) this.$refs[`${this.viewportKey}-${index}`][0].setSeriesInfo(i)
if (index === seriesArr.length - 1) this.activeViewportIndex = activeViewportIndex
}) })
this.$nextTick(() => { this.$nextTick(() => {
const renderingEngine = getRenderingEngine(renderingEngineId) const renderingEngine = getRenderingEngine(renderingEngineId)

View File

@ -27,15 +27,15 @@
<el-form-item v-if="readingTaskState < 2"> <el-form-item v-if="readingTaskState < 2">
<div style="text-align:center;"> <div style="text-align:center;">
<el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible || isSaved" <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible" type="primary"
type="primary" @click="skipTask"> @click="skipTask">
{{ $t('trials:readingReport:button:skip') }} {{ $t('trials:readingReport:button:skip') }}
</el-button> </el-button>
<el-button type="primary" :disabled="isTableVisible || isSaved" @click="handleSave"> <el-button type="primary" :disabled="isTableVisible" @click="handleSave">
{{ $t('common:button:save') }} {{ $t('common:button:save') }}
</el-button> </el-button>
<el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible || isSaved" <el-button v-if="taskInfo && taskInfo.IseCRFShowInDicomReading" :disabled="isTableVisible" type="primary"
type="primary" @click="handleSubmit"> @click="handleSubmit">
{{ $t('common:button:submit') }} {{ $t('common:button:submit') }}
</el-button> </el-button>
</div> </div>
@ -121,8 +121,7 @@ export default {
digitPlaces: 2, digitPlaces: 2,
questionImageToolAttributeInfo: {}, questionImageToolAttributeInfo: {},
unSaveTargets: [], unSaveTargets: [],
isTableVisible: false, isTableVisible: false
isSaved: false
} }
}, },
mounted() { mounted() {
@ -284,7 +283,6 @@ export default {
const res = await changeDicomReadingQuestionAnswer(params) const res = await changeDicomReadingQuestionAnswer(params)
if (res.IsSuccess) { if (res.IsSuccess) {
if (isMsg) { if (isMsg) {
this.isSaved = true
this.$message.success(this.$t('common:message:savedSuccessfully')) this.$message.success(this.$t('common:message:savedSuccessfully'))
} }
this.loading = false this.loading = false
@ -1446,12 +1444,6 @@ export default {
deep: true, deep: true,
immediate: true immediate: true
}, },
questionForm: {
handler() {
this.isSaved = false
},
deep: true
}
// questionMarkInfoList: { // questionMarkInfoList: {
// handler() { // handler() {
// console.log(this.questionMarkInfoList, 'questionMarkInfoList') // console.log(this.questionMarkInfoList, 'questionMarkInfoList')