diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue index 183d3779..8ce46f1e 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -379,7 +379,7 @@ export default { isTumor() { let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.TrialReadingCriterionId) if (criterion) { - return [1, 18, 2, 3, 7].includes(Number(criterion.CriterionType)) + return [1, 18, 2, 3, 7, 17].includes(Number(criterion.CriterionType)) } else { return false } diff --git a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue index 44318f2f..e15b1b06 100644 --- a/src/views/trials/trials-panel/trial-summary/report-forms/index.vue +++ b/src/views/trials/trials-panel/trial-summary/report-forms/index.vue @@ -12,17 +12,18 @@
-
+
-
+
-
+
ORR: {{ ORR }}
-
+
@@ -76,22 +77,35 @@ export default { loading_bottom: false, chart_bottom: null, chart_bottom_right: null, + isHas_bottom_right: false, ORR: null } }, created() { this.getTrialCriterionList() }, + computed: { + isTumor() { + let criterion = this.trialCriterionList.find(item => item.TrialReadingCriterionId === this.searchData.TrialReadingCriterionId) + if (criterion) { + return [1, 18, 2, 3, 7, 17].includes(Number(criterion.CriterionType)) + } else { + return false + } + } + }, watch: { 'searchData.TrialReadingCriterionId': { handler() { if (this.searchData.TrialReadingCriterionId) { this.getTrialVisitFinishedStatList() this.getTrialQuestionStatList() - this.getTrialEfficacyEvaluationStatList() + if (this.isTumor) { + this.getTrialEfficacyEvaluationStatList() + } } } - } + }, }, methods: { getTrialCriterionList() { @@ -177,15 +191,20 @@ export default { gap: 2, label: { show: true, - position: 'inside' - }, - labelLine: { - length: 10, - lineStyle: { - width: 1, - type: 'solid' + position: 'inside', + textStyle: { + fontSize: 14, // 设置字体大小为 14px + color: '#000', // 设置字体颜色为白色 + // fontWeight: 'bold' // 设置字体加粗 } }, + // labelLine: { + // length: 10, + // lineStyle: { + // width: 1, + // type: 'solid' + // } + // }, itemStyle: { borderColor: '#fff', borderWidth: 1 @@ -201,6 +220,9 @@ export default { }; // 4. 使用配置项渲染图表 this.chart_left.setOption(option); + this.$nextTick(() => { + this.chart_left.resize() + }) }, // 获取质疑统计列表 async getTrialQuestionStatList() { @@ -282,6 +304,9 @@ export default { }; // 4. 使用配置项渲染图表 this.chart_right.setOption(option); + this.$nextTick(() => { + this.chart_right.resize() + }) }, // 获取疗效统计表 async getTrialEfficacyEvaluationStatList() { @@ -306,6 +331,9 @@ export default { obj.xAxisData.push(item.OverallTumorEvaluation) obj.seriesData.push(item.SubjectCount) }) + this.$nextTick(() => { + this.initChart_bottom(obj) + }) let obj2 = { xAxisData: [], seriesData: [], @@ -314,14 +342,19 @@ export default { titleText: this.$t("trials:reportForms:cjart:title:dataDistribution"), } if (OtherInfo.PDList && OtherInfo.PDList.length > 0) { + this.isHas_bottom_right = true OtherInfo.PDList.forEach(item => { obj2.xAxisData.push(item.SubjectCode) obj2.seriesData.push(item.DaysDiff) }) + obj2.medianValue = this.calculateMedian(obj2.seriesData) + this.$nextTick(() => { + this.initChart_bottom_right(obj2) + }) + } else { + this.isHas_bottom_right = false } - obj2.medianValue = this.calculateMedian(obj2.seriesData) - this.initChart_bottom(obj) - this.initChart_bottom_right(obj2) + } } catch (err) { console.log(err)