diff --git a/src/components/readingChart/index.vue b/src/components/readingChart/index.vue index 08468337..60619e82 100644 --- a/src/components/readingChart/index.vue +++ b/src/components/readingChart/index.vue @@ -64,7 +64,7 @@ export default { }, async getInfo(data) { try { - let { VisitTaskId = null, TrialId = null, QuestionId = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data + let { VisitTaskId = null, TrialId = null, QuestionId = null, QuestionName = null, TableQuestionId = null, RowIndex = null, ReportChartTypeEnum = null } = data let params = { VisitTaskId, TrialId, QuestionId, TableQuestionId, RowIndex, ReportChartTypeEnum } @@ -72,16 +72,23 @@ export default { let res = await getReportsChartData(params) this.loading = false if (res.IsSuccess) { + let LatestScanDateList = res.Result.LatestScanDateList.map(item => item.split(" ")[0]) let obj = { - xAxisData: res.Result.LatestScanDateList || [], - series: [] + title: QuestionName, + xAxisData: LatestScanDateList || [], + series: [], + unit: this.$fd("ValueUnit", res.Result.Unit), + visitName: res.Result.VisitTaskNameList } - res.Result.ChartDataList.forEach(item => { + res.Result.ChartDataList.forEach((item) => { + let arr = [] + item.Value.forEach((d, index) => { + arr.push([LatestScanDateList[index], d]) + }) obj.series.push({ name: item.Name, - data: item.Value, + data: arr, type: 'line' - }) }); this.initChart(obj) @@ -100,11 +107,25 @@ export default { this.chart = echarts.init(this.$refs.chartContainer); // ...图表配置 const option = { - title: { text: '' }, + title: { + text: obj.title, + textStyle: { + color: "#fff" + } + }, tooltip: { - trigger: 'axis' + trigger: 'axis', + formatter: function (params) { + let index = obj.xAxisData.findIndex(item => item === params[0].value[0]) + let result = obj.visitName[index] + ' ' + params[0].value[0] + '
'; // 显示类目名(如日期) + params.forEach(function (item) { + result += item.marker + ' ' + item.seriesName + ': ' + item.value[1] + '
'; // 显示每个系列的图例、系列名和值 + }); + return result; + } }, xAxis: { + type: 'time', data: obj.xAxisData, axisLine: { // 设置 x 轴线颜色 lineStyle: { @@ -115,9 +136,13 @@ export default { textStyle: { color: '#fff' } - } + }, + splitLine: { + show: false // 隐藏网格线 + }, }, yAxis: { + name: obj.unit, type: 'value', axisLabel: { textStyle: { @@ -128,7 +153,7 @@ export default { lineStyle: { color: '#fff', } - } + }, }, series: obj.series }; @@ -164,8 +189,8 @@ export default { list-style-type: none; min-height: 300px; max-height: 80vh; - overflow: hidden; - overflow-y: auto; + // overflow: hidden; + // overflow-y: auto; box-sizing: border-box; } \ No newline at end of file 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 59d026c6..e37329fb 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue @@ -399,7 +399,7 @@
+ v-if="(isExistsManual || isHaveKeyFile) && readingTaskState < 2">
@@ -558,7 +558,7 @@
-
+
{{ $t('common:button:confirm') }} @@ -904,7 +904,9 @@ export default { fullScreenIndex: -1, fullScreenWidth: window.innerWidth - 570 + 'px', - fullScreenHeight: window.innerHeight - 130 + 'px' + fullScreenHeight: window.innerHeight - 130 + 'px', + + ManualsClose: false } }, @@ -1169,6 +1171,7 @@ export default { let res = await setReadKeyFile(data) if (res.IsSuccess) { this.manualsDialog.visible = false + this.ManualsClose = true } } catch (err) { console.log(err) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue index ef1b47d2..3de86373 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue @@ -50,7 +50,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue index 8bd4a380..6f9d65d7 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionList.vue @@ -42,7 +42,8 @@ class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({ e, data: { - ReportChartTypeEnum: 0 + ReportChartTypeEnum: 0, + QuestionName: item.QuestionName }, })" />
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 17c2b431..be8e7418 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 @@ -109,7 +109,8 @@ class="svg-icon svg-readingChart" @click.stop="(e) => handleReadingChart({ e, data: { - QuestionId: item.Id + QuestionId: item.Id, + QuestionName: item.QuestionName } })" />
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 fa6ee2be..eacf1a0d 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 @@ -111,7 +111,8 @@ e, data: { TableQuestionId: question.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: question.QuestionName } })" />
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 5e5ff1f7..2532eabe 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 @@ -49,7 +49,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" />
@@ -131,7 +132,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" />
@@ -169,7 +171,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" /> diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue index 36e7c707..a2c5e6d1 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue @@ -40,7 +40,8 @@ class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({ e, data: { - ReportChartTypeEnum: 0 + ReportChartTypeEnum: 0, + QuestionName: item.QuestionName }, })" /> diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue index 5e5ff1f7..2532eabe 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionForm.vue @@ -49,7 +49,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" /> @@ -131,7 +132,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" /> @@ -169,7 +171,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" /> diff --git a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue index 4badf78e..15b65e75 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/LuganoWithoutPET/QuestionList.vue @@ -40,7 +40,8 @@ class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({ e, data: { - ReportChartTypeEnum: 0 + ReportChartTypeEnum: 0, + QuestionName: item.QuestionName }, })" /> diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue index 43030d6c..8dc07374 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue @@ -71,7 +71,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" /> @@ -125,7 +126,8 @@ e, data: { TableQuestionId: qs.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: qs.QuestionName } })" /> 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 468502b9..5af06485 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 @@ -111,7 +111,8 @@ e, data: { TableQuestionId: question.Id, - RowIndex: questionForm.RowIndex + RowIndex: questionForm.RowIndex, + QuestionName: question.QuestionName } })" /> @@ -121,7 +122,7 @@ + @resetFormItemData="resetFormItemData" @handleReadingChart="handleReadingChart" />