From a1eb957677a3fe839b715b1ede2dbe4287153505 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 21:49:50 +0900 Subject: [PATCH 01/41] =?UTF-8?q?components/TimeBarChart.vue:=20displayOpt?= =?UTF-8?q?ionHeader=20=E3=81=AB=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 報告日別による陽性者数の推移，発症日別による陽性者数の推移，確定日別による陽性者数の推移，新型コロナコールセンター相談件数 --- components/TimeBarChart.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index afcbcd5df1ffc..4142d190cb288 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -408,7 +408,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -421,14 +421,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', callback: (label: string) => { const monthStringArry = [ @@ -460,13 +460,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では設定なし + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', + // displayOption では suggestedMax の設定あり }, }, ], From 419630415b8d86ed215ef50827b144205a71a873 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Tue, 19 Jan 2021 16:20:44 +0900 Subject: [PATCH 02/41] =?UTF-8?q?components/TimeBarChart.vue:=20displayOpt?= =?UTF-8?q?ionHeader=20=E3=82=92=20displayOption=20=E3=81=AB=E5=90=88?= =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 報告日別による陽性者数の推移，発症日別による陽性者数の推移，確定日別による陽性者数の推移，新型コロナコールセンター相談件数 --- components/TimeBarChart.vue | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 4142d190cb288..9aab66efbb04c 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -392,11 +392,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -410,7 +410,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -430,28 +429,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< fontColor: 'transparent', // displayOption では '#808080' padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', - callback: (label: string) => { - const monthStringArry = [ - 'Jan', - 'Feb', - 'Mar', - 'Apr', - 'May', - 'Jun', - 'Jul', - 'Aug', - 'Sep', - 'Oct', - 'Nov', - 'Dec', - ] - const month = monthStringArry.indexOf(label.split(' ')[0]) + 1 - return month + '月' - }, }, type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], From 28765c906653c8ad5afe114e10ba700da0d6fad2 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Tue, 19 Jan 2021 16:54:41 +0900 Subject: [PATCH 03/41] =?UTF-8?q?components/TimeBarChart.vue:=20displayOpt?= =?UTF-8?q?ion=20=E3=81=AE=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7=E3=83=B3?= =?UTF-8?q?=E3=82=92=E6=98=8E=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 報告日別による陽性者数の推移，発症日別による陽性者数の推移，確定日別による陽性者数の推移，新型コロナコールセンター相談件数 --- components/TimeBarChart.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 9aab66efbb04c..1bdab4420e75e 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -349,6 +349,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, + drawOnChartArea: true, color: '#E5E5E5', }, ticks: { @@ -444,7 +445,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, // displayOption では設定なし + drawOnChartArea: false, // displayOption では true color: '#E5E5E5', }, ticks: { From 2e0008e48a7e9a2fa8916079c30b8cc84f1502de Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Tue, 19 Jan 2021 16:29:16 +0900 Subject: [PATCH 04/41] =?UTF-8?q?components/TimeBarChart.vue:=20X=E8=BB=B8?= =?UTF-8?q?=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC=E3=83=9E?= =?UTF-8?q?=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 報告日別による陽性者数の推移，発症日別による陽性者数の推移，確定日別による陽性者数の推移，新型コロナコールセンター相談件数 --- components/TimeBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 1bdab4420e75e..65c001b3afa72 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -339,7 +339,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -435,7 +435,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 06bf238696418fd76be42afbee0e15172266f992 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 21:39:36 +0900 Subject: [PATCH 05/41] =?UTF-8?q?components/TimeBarChart.vue:=20displayOpt?= =?UTF-8?q?ion,=20displayOptionHeader=20=E3=81=A7Y=E8=BB=B8=E3=81=AE=20pos?= =?UTF-8?q?ition=20=E3=82=92=E6=98=8E=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 報告日別による陽性者数の推移，発症日別による陽性者数の推移，確定日別による陽性者数の推移，新型コロナコールセンター相談件数 --- components/TimeBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 65c001b3afa72..c18471629144f 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -346,7 +346,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: true, @@ -442,7 +442,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: false, // displayOption では true From d6751f10986a564107082e5544ec6d82dfe4fc69 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 21:48:57 +0900 Subject: [PATCH 06/41] =?UTF-8?q?components/TimeBarChart.vue:=20displayOpt?= =?UTF-8?q?ion,=20displayOptionHeader=20=E3=81=A7=20scaledTicksYAxisMax=20?= =?UTF-8?q?=E3=82=92=E6=98=8E=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 報告日別による陽性者数の推移，発症日別による陽性者数の推移，確定日別による陽性者数の推移，新型コロナコールセンター相談件数 --- components/TimeBarChart.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index c18471629144f..7fead7389ae40 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -392,6 +392,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -452,7 +454,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - // displayOption では suggestedMax の設定あり + suggestedMax: scaledTicksYAxisMax, }, }, ], From c1a266c577aad122fc8bde8e07befa32726776a4 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:00:27 +0900 Subject: [PATCH 07/41] =?UTF-8?q?components/MonitoringConfirmedCasesChart.?= =?UTF-8?q?vue:=20displayOption,=20displayOptionHeader=20=E3=81=AB?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新規陽性者数 --- components/MonitoringConfirmedCasesChart.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/MonitoringConfirmedCasesChart.vue b/components/MonitoringConfirmedCasesChart.vue index 18490d4233dec..4f1664d85fb71 100644 --- a/components/MonitoringConfirmedCasesChart.vue +++ b/components/MonitoringConfirmedCasesChart.vue @@ -381,12 +381,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: true, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -426,7 +426,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => dayjs(label).format('D'), @@ -437,14 +437,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -459,13 +459,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< position: 'left', gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では true + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, From a5d0aceea6512eff0ee6bdeb186556343295645d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 21:31:25 +0900 Subject: [PATCH 08/41] =?UTF-8?q?components/MonitoringConfirmedCasesChart.?= =?UTF-8?q?vue:=20displayOptionHeader=20=E3=82=92=20displayOption=20?= =?UTF-8?q?=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新規陽性者数 --- components/MonitoringConfirmedCasesChart.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/components/MonitoringConfirmedCasesChart.vue b/components/MonitoringConfirmedCasesChart.vue index 4f1664d85fb71..f96493f40fdec 100644 --- a/components/MonitoringConfirmedCasesChart.vue +++ b/components/MonitoringConfirmedCasesChart.vue @@ -410,11 +410,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -428,8 +428,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, - callback: (label: string) => dayjs(label).format('D'), + callback: (label: string) => { + return dayjs(label).format('D') + }, }, }, { @@ -450,12 +451,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], yAxes: [ { - type: 'linear', position: 'left', gridLines: { display: true, From 4c38464987ef9ef0cd6bc2b9faddd350e490e7ca Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 21:53:18 +0900 Subject: [PATCH 09/41] =?UTF-8?q?components/MonitoringConfirmedCasesChart.?= =?UTF-8?q?vue:=20X=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新規陽性者数 --- components/MonitoringConfirmedCasesChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/MonitoringConfirmedCasesChart.vue b/components/MonitoringConfirmedCasesChart.vue index f96493f40fdec..73e1a1afc4fe4 100644 --- a/components/MonitoringConfirmedCasesChart.vue +++ b/components/MonitoringConfirmedCasesChart.vue @@ -370,7 +370,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -452,7 +452,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 90000b70d51e29a72709d8e9fe81b3460a6af8f3 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:04:14 +0900 Subject: [PATCH 10/41] =?UTF-8?q?components/MixedBarAndLineChart.vue:=20di?= =?UTF-8?q?splayOption,=20displayOptionHeader=20=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7119における発熱等相談件数，救急医療の東京ルールの適用件数 --- components/MixedBarAndLineChart.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/MixedBarAndLineChart.vue b/components/MixedBarAndLineChart.vue index 127a0a1d19d13..ab00d21d3bd2b 100644 --- a/components/MixedBarAndLineChart.vue +++ b/components/MixedBarAndLineChart.vue @@ -380,12 +380,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: true, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -425,7 +425,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -438,14 +438,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -460,13 +460,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< position: 'left', gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では true + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, From 958965ccde26f1b11ce2b697a8d094b85cad9708 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 22:07:48 +0900 Subject: [PATCH 11/41] =?UTF-8?q?components/MixedBarAndLineChart.vue:=20di?= =?UTF-8?q?splayOptionHeader=20=E3=82=92=20displayOption=20=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7119における発熱等相談件数，救急医療の東京ルールの適用件数 --- components/MixedBarAndLineChart.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/MixedBarAndLineChart.vue b/components/MixedBarAndLineChart.vue index ab00d21d3bd2b..6c4679cc303ec 100644 --- a/components/MixedBarAndLineChart.vue +++ b/components/MixedBarAndLineChart.vue @@ -409,11 +409,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -427,7 +427,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -451,12 +450,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], yAxes: [ { - type: 'linear', position: 'left', gridLines: { display: true, From 5c45dfed3e42735def2aa0928981060f8ba02092 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 22:08:44 +0900 Subject: [PATCH 12/41] =?UTF-8?q?components/MixedBarAndLineChart.vue:=20X?= =?UTF-8?q?=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7119における発熱等相談件数，救急医療の東京ルールの適用件数 --- components/MixedBarAndLineChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/MixedBarAndLineChart.vue b/components/MixedBarAndLineChart.vue index 6c4679cc303ec..e016ec2fb2375 100644 --- a/components/MixedBarAndLineChart.vue +++ b/components/MixedBarAndLineChart.vue @@ -369,7 +369,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -451,7 +451,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 26d6f5378b94d3920c167ee65f8959730330e4bd Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:09:38 +0900 Subject: [PATCH 13/41] =?UTF-8?q?components/UntrackedRateMixedChart.vue:?= =?UTF-8?q?=20displayOption,=20displayOptionHeader=20=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新規陽性者における接触歴等不明者数 --- components/UntrackedRateMixedChart.vue | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/components/UntrackedRateMixedChart.vue b/components/UntrackedRateMixedChart.vue index d9adf7bb809bc..a638fa103f277 100644 --- a/components/UntrackedRateMixedChart.vue +++ b/components/UntrackedRateMixedChart.vue @@ -465,12 +465,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: true, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -480,12 +480,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMaxRight, callback(value) { return `${value}%` @@ -555,7 +555,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -568,14 +568,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -592,13 +592,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では true + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -609,12 +609,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMaxRight, callback(value) { return `${value}%` From 95c899e71be8f708f367e1a8186fb637288b9d8d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 22:28:53 +0900 Subject: [PATCH 14/41] =?UTF-8?q?components/UntrackedRateMixedChart.vue:?= =?UTF-8?q?=20displayOptionHeader=20=E3=82=92=20displayOption=20=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新規陽性者における接触歴等不明者数 --- components/UntrackedRateMixedChart.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/UntrackedRateMixedChart.vue b/components/UntrackedRateMixedChart.vue index a638fa103f277..657fda968db0b 100644 --- a/components/UntrackedRateMixedChart.vue +++ b/components/UntrackedRateMixedChart.vue @@ -539,11 +539,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -557,7 +557,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -581,13 +580,15 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], yAxes: [ { id: 'y-axis-1', - type: 'linear', position: 'left', stacked: true, gridLines: { @@ -604,7 +605,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, { id: 'y-axis-2', - type: 'linear', position: 'right', gridLines: { display: true, From 60170f6bbead6dac86e8b4da6be81f8235af420a Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 22:29:43 +0900 Subject: [PATCH 15/41] =?UTF-8?q?components/UntrackedRateMixedChart.vue:?= =?UTF-8?q?=20X=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新規陽性者における接触歴等不明者数 --- components/UntrackedRateMixedChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/UntrackedRateMixedChart.vue b/components/UntrackedRateMixedChart.vue index 657fda968db0b..6c666c35d4692 100644 --- a/components/UntrackedRateMixedChart.vue +++ b/components/UntrackedRateMixedChart.vue @@ -452,7 +452,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -581,7 +581,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 1adfa247ec5745964ab92bfb2b171fa0420ff24d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:17:43 +0900 Subject: [PATCH 16/41] =?UTF-8?q?components/PositiveRateMixedChart.vue:=20?= =?UTF-8?q?displayOption,=20displayOptionHeader=20=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査の陽性率 --- components/PositiveRateMixedChart.vue | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/components/PositiveRateMixedChart.vue b/components/PositiveRateMixedChart.vue index a7b8a467b30a6..1ed69486705c3 100644 --- a/components/PositiveRateMixedChart.vue +++ b/components/PositiveRateMixedChart.vue @@ -479,12 +479,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: true, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -494,12 +494,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMaxRight, callback(value) { return `${value}%` @@ -584,7 +584,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -597,14 +597,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -621,13 +621,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では true + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -639,12 +639,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMaxRight, callback(value) { return `${value}%` From 3377c76b8c72cea8ee3ea067087c501765fb6c7d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 22:54:34 +0900 Subject: [PATCH 17/41] =?UTF-8?q?components/PositiveRateMixedChart.vue:=20?= =?UTF-8?q?displayOptionHeader=20=E3=82=92=20displayOption=20=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査の陽性率 --- components/PositiveRateMixedChart.vue | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/components/PositiveRateMixedChart.vue b/components/PositiveRateMixedChart.vue index 1ed69486705c3..c7fcd29b47fa6 100644 --- a/components/PositiveRateMixedChart.vue +++ b/components/PositiveRateMixedChart.vue @@ -568,11 +568,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -586,7 +586,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -610,13 +609,15 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], yAxes: [ { id: 'y-axis-1', - type: 'linear', position: 'left', stacked: true, gridLines: { @@ -633,9 +634,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, { id: 'y-axis-2', - type: 'linear', position: 'right', - stacked: true, gridLines: { display: true, drawOnChartArea: false, From 30fa4a7d8b37c27ce271895e8990614f7dc5af52 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 22:57:38 +0900 Subject: [PATCH 18/41] =?UTF-8?q?components/PositiveRateMixedChart.vue:=20?= =?UTF-8?q?X=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査の陽性率 --- components/PositiveRateMixedChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/PositiveRateMixedChart.vue b/components/PositiveRateMixedChart.vue index c7fcd29b47fa6..1634792ea7652 100644 --- a/components/PositiveRateMixedChart.vue +++ b/components/PositiveRateMixedChart.vue @@ -466,7 +466,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -610,7 +610,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 51fb96617c7bb6679c8367c1f87f993230464026 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:24:26 +0900 Subject: [PATCH 19/41] =?UTF-8?q?components/DashedRectangleTimeBarChart.vu?= =?UTF-8?q?e:=20displayOption,=20displayOptionHeader=20=E3=81=AB=E3=82=B3?= =?UTF-8?q?=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C?= =?UTF-8?q?=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 入院患者数 --- components/DashedRectangleTimeBarChart.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/components/DashedRectangleTimeBarChart.vue b/components/DashedRectangleTimeBarChart.vue index 2c3bf0fe6a008..524f1ac31326c 100644 --- a/components/DashedRectangleTimeBarChart.vue +++ b/components/DashedRectangleTimeBarChart.vue @@ -331,7 +331,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -373,7 +373,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -386,14 +386,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -407,13 +407,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では設定なし + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, From fd7d740bd8cd16a8701f4030286b6fe0bae7cb48 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 23:31:09 +0900 Subject: [PATCH 20/41] =?UTF-8?q?components/DashedRectangleTimeBarChart.vu?= =?UTF-8?q?e:=20displayOptionHeader=20=E3=82=92=20displayOption=20?= =?UTF-8?q?=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 入院患者数 --- components/DashedRectangleTimeBarChart.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/components/DashedRectangleTimeBarChart.vue b/components/DashedRectangleTimeBarChart.vue index 524f1ac31326c..f845a268841e3 100644 --- a/components/DashedRectangleTimeBarChart.vue +++ b/components/DashedRectangleTimeBarChart.vue @@ -357,11 +357,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -375,7 +375,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -399,6 +398,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], From 5f188917a72fd711996ac69b20f64db86d6c02ba Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 23:32:28 +0900 Subject: [PATCH 21/41] =?UTF-8?q?components/DashedRectangleTimeBarChart.vu?= =?UTF-8?q?e:=20displayOption=20=E3=81=AE=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E6=98=8E=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 入院患者数 --- components/DashedRectangleTimeBarChart.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/DashedRectangleTimeBarChart.vue b/components/DashedRectangleTimeBarChart.vue index f845a268841e3..a8fe48649f4a3 100644 --- a/components/DashedRectangleTimeBarChart.vue +++ b/components/DashedRectangleTimeBarChart.vue @@ -326,6 +326,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, + drawOnChartArea: true, color: '#E5E5E5', }, ticks: { @@ -409,7 +410,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, // displayOption では設定なし + drawOnChartArea: false, // displayOption では true color: '#E5E5E5', }, ticks: { From fc8aa4868c98a43e642e266860f1e05f1e8ff062 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 02:43:06 +0900 Subject: [PATCH 22/41] =?UTF-8?q?components/DashedRectangleTimeBarChart.vu?= =?UTF-8?q?e:=20displayOption,=20displayOptionHeader=20=E3=82=92=E4=BB=96?= =?UTF-8?q?=E3=81=AE=20component=20=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B?= =?UTF-8?q?=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 入院患者数 --- components/DashedRectangleTimeBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/DashedRectangleTimeBarChart.vue b/components/DashedRectangleTimeBarChart.vue index a8fe48649f4a3..414b7bfbce854 100644 --- a/components/DashedRectangleTimeBarChart.vue +++ b/components/DashedRectangleTimeBarChart.vue @@ -323,7 +323,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: true, @@ -407,7 +407,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: false, // displayOption では true From 87501f540e865646dfdc5815717259c99b95ac54 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Wed, 20 Jan 2021 23:33:21 +0900 Subject: [PATCH 23/41] =?UTF-8?q?components/DashedRectangleTimeBarChart.vu?= =?UTF-8?q?e:=20X=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 入院患者数 --- components/DashedRectangleTimeBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/DashedRectangleTimeBarChart.vue b/components/DashedRectangleTimeBarChart.vue index 414b7bfbce854..705f794d5b8a0 100644 --- a/components/DashedRectangleTimeBarChart.vue +++ b/components/DashedRectangleTimeBarChart.vue @@ -316,7 +316,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -400,7 +400,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From a31775ab1cdfc36e7fe35e4c4c1ee845b4d602a0 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:28:09 +0900 Subject: [PATCH 24/41] =?UTF-8?q?components/SevereCaseBarChart.vue:=20disp?= =?UTF-8?q?layOptionHeader=20=E3=81=AB=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C=E4=B8=8D=E8=A6=81=E3=81=AA?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重症患者数 --- components/SevereCaseBarChart.vue | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/components/SevereCaseBarChart.vue b/components/SevereCaseBarChart.vue index 7ea948aa8201c..f2cfd130d0425 100644 --- a/components/SevereCaseBarChart.vue +++ b/components/SevereCaseBarChart.vue @@ -306,7 +306,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -319,14 +319,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', callback: (label: string) => { const monthStringArry = [ @@ -358,13 +358,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では設定なし + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', + // displayOption では suggestedMax の設定あり }, }, ], From d4c9a47b60b04e74f350713d5923b393325bc76b Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 00:27:45 +0900 Subject: [PATCH 25/41] =?UTF-8?q?components/SevereCaseBarChart.vue:=20disp?= =?UTF-8?q?layOptionHeader=20=E3=82=92=20displayOption=20=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重症患者数 --- components/SevereCaseBarChart.vue | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/components/SevereCaseBarChart.vue b/components/SevereCaseBarChart.vue index f2cfd130d0425..7976e1754fcbe 100644 --- a/components/SevereCaseBarChart.vue +++ b/components/SevereCaseBarChart.vue @@ -290,11 +290,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -308,7 +308,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -328,28 +327,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< fontColor: 'transparent', // displayOption では '#808080' padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', - callback: (label: string) => { - const monthStringArry = [ - 'Jan', - 'Feb', - 'Mar', - 'Apr', - 'May', - 'Jun', - 'Jul', - 'Aug', - 'Sep', - 'Oct', - 'Nov', - 'Dec', - ] - const month = monthStringArry.indexOf(label.split(' ')[0]) + 1 - return month + '月' - }, }, type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], From d10e4aa99a73d53c6ab6362b36199acda4e638f5 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 02:50:30 +0900 Subject: [PATCH 26/41] =?UTF-8?q?components/SevereCaseBarChart.vue:=20disp?= =?UTF-8?q?layOption,=20displayOptionHeader=20=E3=81=AE=E3=82=AA=E3=83=97?= =?UTF-8?q?=E3=82=B7=E3=83=A7=E3=83=B3=E3=82=92=E6=98=8E=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重症患者数 --- components/SevereCaseBarChart.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/components/SevereCaseBarChart.vue b/components/SevereCaseBarChart.vue index 7976e1754fcbe..f7070a0bfd3b0 100644 --- a/components/SevereCaseBarChart.vue +++ b/components/SevereCaseBarChart.vue @@ -256,6 +256,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, + drawOnChartArea: true, color: '#E5E5E5', }, ticks: { @@ -342,14 +343,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, // displayOption では設定なし + drawOnChartArea: false, // displayOption では true color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - // displayOption では suggestedMax の設定あり + suggestedMax: this.scaledTicksYAxisMax, }, }, ], From 61c8c8264aaea920b0116f5252a6e301ee0cfc8d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 00:31:49 +0900 Subject: [PATCH 27/41] =?UTF-8?q?components/SevereCaseBarChart.vue:=20X?= =?UTF-8?q?=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重症患者数 --- components/SevereCaseBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/SevereCaseBarChart.vue b/components/SevereCaseBarChart.vue index f7070a0bfd3b0..00d8ad16c3fd9 100644 --- a/components/SevereCaseBarChart.vue +++ b/components/SevereCaseBarChart.vue @@ -246,7 +246,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -333,7 +333,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From d68fc227397b6b5c7d74fb1a11f1e91efb9db078 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 02:54:53 +0900 Subject: [PATCH 28/41] =?UTF-8?q?components/SevereCaseBarChart.vue:=20disp?= =?UTF-8?q?layOption,=20displayOptionHeader=20=E3=82=92=E4=BB=96=E3=81=AE?= =?UTF-8?q?=20component=20=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重症患者数 --- components/SevereCaseBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/SevereCaseBarChart.vue b/components/SevereCaseBarChart.vue index 00d8ad16c3fd9..bb43fd29d43b0 100644 --- a/components/SevereCaseBarChart.vue +++ b/components/SevereCaseBarChart.vue @@ -253,7 +253,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: true, @@ -340,7 +340,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: false, // displayOption では true From ba1c764bc9228f601dfab23c31c5c0c6bf36a8b5 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:40:43 +0900 Subject: [PATCH 29/41] =?UTF-8?q?components/TimeStackedBarChart.vue:=20dis?= =?UTF-8?q?playOptionHeader=20=E3=81=AB=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C=E4=B8=8D=E8=A6=81?= =?UTF-8?q?=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E9=99=A4?= =?UTF-8?q?=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査実施件数 --- components/TimeStackedBarChart.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/components/TimeStackedBarChart.vue b/components/TimeStackedBarChart.vue index 2c891b3a18e24..d7ab1742a1bca 100644 --- a/components/TimeStackedBarChart.vue +++ b/components/TimeStackedBarChart.vue @@ -469,7 +469,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -482,14 +482,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', callback: (label: string) => { const monthStringArry = [ @@ -521,13 +521,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では設定なし + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, From c1a6c7df48b06f5b8633d8481bc5af1a6fc169cc Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 00:52:23 +0900 Subject: [PATCH 30/41] =?UTF-8?q?components/TimeStackedBarChart.vue:=20dis?= =?UTF-8?q?playOptionHeader=20=E3=82=92=20displayOption=20=E3=81=AB?= =?UTF-8?q?=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査実施件数 --- components/TimeStackedBarChart.vue | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/components/TimeStackedBarChart.vue b/components/TimeStackedBarChart.vue index d7ab1742a1bca..fb3820ac804e0 100644 --- a/components/TimeStackedBarChart.vue +++ b/components/TimeStackedBarChart.vue @@ -453,11 +453,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -471,7 +471,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -491,28 +490,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< fontColor: 'transparent', // displayOption では '#808080' padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', - callback: (label: string) => { - const monthStringArry = [ - 'Jan', - 'Feb', - 'Mar', - 'Apr', - 'May', - 'Jun', - 'Jul', - 'Aug', - 'Sep', - 'Oct', - 'Nov', - 'Dec', - ] - const month = monthStringArry.indexOf(label.split(' ')[0]) + 1 - return `${month}月` - }, }, type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], From 55e5adc21f5e86e5beee873928e21b858ba6eab1 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 00:54:34 +0900 Subject: [PATCH 31/41] =?UTF-8?q?components/TimeStackedBarChart.vue:=20dis?= =?UTF-8?q?playOptionHeader=20=E3=81=AE=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=82=92=E6=98=8E=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査実施件数 --- components/TimeStackedBarChart.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/components/TimeStackedBarChart.vue b/components/TimeStackedBarChart.vue index fb3820ac804e0..7dcf567cd11f2 100644 --- a/components/TimeStackedBarChart.vue +++ b/components/TimeStackedBarChart.vue @@ -406,6 +406,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, + drawOnChartArea: true, color: '#E5E5E5', }, ticks: { @@ -505,7 +506,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { display: true, - drawOnChartArea: false, // displayOption では設定なし + drawOnChartArea: false, // displayOption では true color: '#E5E5E5', }, ticks: { From 12843bd761f3ad4f33af07080c8a19bc584ed05f Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 01:03:41 +0900 Subject: [PATCH 32/41] =?UTF-8?q?components/TimeStackedBarChart.vue:=20X?= =?UTF-8?q?=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 検査実施件数 --- components/TimeStackedBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/TimeStackedBarChart.vue b/components/TimeStackedBarChart.vue index 7dcf567cd11f2..91946e61a8c5c 100644 --- a/components/TimeStackedBarChart.vue +++ b/components/TimeStackedBarChart.vue @@ -396,7 +396,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -496,7 +496,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 609bebf6aafecf5b992648eec9ae8788da72f5e0 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 02:55:35 +0900 Subject: [PATCH 33/41] =?UTF-8?q?components/TimeStackedBarChart.vue:=20dis?= =?UTF-8?q?playOption,=20displayOptionHeader=20=E3=82=92=E4=BB=96=E3=81=AE?= =?UTF-8?q?=20component=20=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 重症患者数 --- components/TimeStackedBarChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/TimeStackedBarChart.vue b/components/TimeStackedBarChart.vue index 91946e61a8c5c..9aaaed100c937 100644 --- a/components/TimeStackedBarChart.vue +++ b/components/TimeStackedBarChart.vue @@ -403,7 +403,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: true, @@ -503,7 +503,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: false, // displayOption では true From 04912d68f8bc9fcb10b919d8e95ec80401f159b8 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 01:23:39 +0900 Subject: [PATCH 34/41] =?UTF-8?q?components/FeverMixedChart.vue:=20display?= =?UTF-8?q?OptionHeader=20=E3=82=92=20displayOption=20=E3=81=AB=E5=90=88?= =?UTF-8?q?=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 東京都発熱相談センターにおける相談件数 --- components/FeverMixedChart.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/components/FeverMixedChart.vue b/components/FeverMixedChart.vue index c0219f1da72f1..387a99fe9dfb4 100644 --- a/components/FeverMixedChart.vue +++ b/components/FeverMixedChart.vue @@ -437,11 +437,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -455,7 +455,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -479,13 +478,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], yAxes: [ { - type: 'linear', - position: 'left', stacked: true, gridLines: { display: true, From 4d0268a9c9e014e315e649d017c6436a390e782d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 02:43:37 +0900 Subject: [PATCH 35/41] =?UTF-8?q?components/FeverMixedChart.vue:=20display?= =?UTF-8?q?Option,=20displayOptionHeader=20=E3=82=92=E4=BB=96=E3=81=AE=20c?= =?UTF-8?q?omponent=20=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 東京都発熱相談センターにおける相談件数 --- components/FeverMixedChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/FeverMixedChart.vue b/components/FeverMixedChart.vue index 387a99fe9dfb4..c1824903d7644 100644 --- a/components/FeverMixedChart.vue +++ b/components/FeverMixedChart.vue @@ -384,7 +384,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: true, @@ -486,7 +486,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], yAxes: [ { - stacked: true, + position: 'left', gridLines: { display: true, drawOnChartArea: false, From 5b15a3b4167529d08cd44c034b0c0f9b14d408b4 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 01:28:50 +0900 Subject: [PATCH 36/41] =?UTF-8?q?components/FeverMixedChart.vue:=20X?= =?UTF-8?q?=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95=E3=82=A9=E3=83=BC?= =?UTF-8?q?=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 東京都発熱相談センターにおける相談件数 --- components/FeverMixedChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/FeverMixedChart.vue b/components/FeverMixedChart.vue index c1824903d7644..292925b46d69f 100644 --- a/components/FeverMixedChart.vue +++ b/components/FeverMixedChart.vue @@ -377,7 +377,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -479,7 +479,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 8f71af19da302f1cdbe32c26f39018f3518f00c4 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Fri, 1 Jan 2021 22:43:14 +0900 Subject: [PATCH 37/41] =?UTF-8?q?components/FeverMixedChart.vue:=20display?= =?UTF-8?q?Option,=20displayOptionHeader=20=E3=81=AB=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0=EF=BC=8C=E4=B8=8D?= =?UTF-8?q?=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92?= =?UTF-8?q?=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 東京都発熱相談センターにおける相談件数 --- components/FeverMixedChart.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/FeverMixedChart.vue b/components/FeverMixedChart.vue index 292925b46d69f..df0c00b9d6c80 100644 --- a/components/FeverMixedChart.vue +++ b/components/FeverMixedChart.vue @@ -388,12 +388,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: true, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -453,7 +453,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, callback: (label: string) => { return dayjs(label).format('D') @@ -465,14 +465,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -489,13 +489,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< position: 'left', gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では true + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, From 4694f90a5e514cd0d344406c4ecd71fd3adf950d Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Mon, 4 Jan 2021 21:20:49 +0900 Subject: [PATCH 38/41] =?UTF-8?q?components/MonitoringConsultationDeskRepo?= =?UTF-8?q?rtChart.vue:=20displayOption,=20displayOptionHeader=20=E3=81=AB?= =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=82=92=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E8=A6=81=E3=81=AA=E3=82=B3=E3=83=A1=E3=83=B3?= =?UTF-8?q?=E3=83=88=E3=82=92=E9=99=A4=E5=8E=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 受診相談窓口における相談件数 --- .../MonitoringConsultationDeskReportChart.vue | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/components/MonitoringConsultationDeskReportChart.vue b/components/MonitoringConsultationDeskReportChart.vue index 321443c26924a..f31c85419e222 100644 --- a/components/MonitoringConsultationDeskReportChart.vue +++ b/components/MonitoringConsultationDeskReportChart.vue @@ -355,12 +355,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< gridLines: { display: true, drawOnChartArea: true, - color: '#E5E5E5', // #E5E5E5 + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, @@ -400,7 +400,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< ticks: { fontSize: 9, maxTicksLimit: 20, - fontColor: 'transparent', + fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, minRotation: 0, callback: (label: string) => { @@ -413,14 +413,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< stacked: true, gridLines: { drawOnChartArea: false, - drawTicks: false, // true -> false + drawTicks: false, // displayOption では true drawBorder: false, tickMarkLength: 10, }, ticks: { fontSize: 11, - fontColor: 'transparent', // #808080 - padding: 13, // 3 + 10(tickMarkLength) + fontColor: 'transparent', // displayOption では '#808080' + padding: 13, // 3 + 10(tickMarkLength)，displayOption では 3 fontStyle: 'bold', }, type: 'time', @@ -435,13 +435,13 @@ const options: ThisTypedComponentOptionsWithRecordProps< position: 'left', gridLines: { display: true, - drawOnChartArea: false, - color: '#E5E5E5', // #E5E5E5 + drawOnChartArea: false, // displayOption では true + color: '#E5E5E5', }, ticks: { suggestedMin: 0, maxTicksLimit: 8, - fontColor: '#808080', // #808080 + fontColor: '#808080', suggestedMax: this.scaledTicksYAxisMax, }, }, From 721456330521416beebace6dfaaef4d52fdaddbe Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 01:51:21 +0900 Subject: [PATCH 39/41] =?UTF-8?q?components/MonitoringConsultationDeskRepo?= =?UTF-8?q?rtChart.vue:=20displayOptionHeader=20=E3=82=92=20displayOption?= =?UTF-8?q?=20=E3=81=AB=E5=90=88=E3=82=8F=E3=81=9B=E3=82=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 受診相談窓口における相談件数 --- components/MonitoringConsultationDeskReportChart.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/components/MonitoringConsultationDeskReportChart.vue b/components/MonitoringConsultationDeskReportChart.vue index f31c85419e222..153fed75bf4fe 100644 --- a/components/MonitoringConsultationDeskReportChart.vue +++ b/components/MonitoringConsultationDeskReportChart.vue @@ -384,11 +384,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, displayOptionHeader() { const options: Chart.ChartOptions = { + tooltips: { enabled: false }, maintainAspectRatio: false, legend: { display: false, }, - tooltips: { enabled: false }, scales: { xAxes: [ { @@ -402,7 +402,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< maxTicksLimit: 20, fontColor: 'transparent', // displayOption では '#808080' maxRotation: 0, - minRotation: 0, callback: (label: string) => { return dayjs(label).format('D') }, @@ -426,12 +425,14 @@ const options: ThisTypedComponentOptionsWithRecordProps< type: 'time', time: { unit: 'month', + displayFormats: { + month: 'MMM', + }, }, }, ], yAxes: [ { - type: 'linear', position: 'left', gridLines: { display: true, From 850fe7bfdf96432ac1f66256a19411204ad37000 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 01:53:32 +0900 Subject: [PATCH 40/41] =?UTF-8?q?components/MonitoringConsultationDeskRepo?= =?UTF-8?q?rtChart.vue:=20X=E8=BB=B8=E3=81=AE=E6=9C=88=E3=81=AE=E3=83=95?= =?UTF-8?q?=E3=82=A9=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E5=A4=89?= =?UTF-8?q?=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 受診相談窓口における相談件数 --- components/MonitoringConsultationDeskReportChart.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/MonitoringConsultationDeskReportChart.vue b/components/MonitoringConsultationDeskReportChart.vue index 153fed75bf4fe..bcb51f3dc64bf 100644 --- a/components/MonitoringConsultationDeskReportChart.vue +++ b/components/MonitoringConsultationDeskReportChart.vue @@ -344,7 +344,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, @@ -426,7 +426,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< time: { unit: 'month', displayFormats: { - month: 'MMM', + month: 'YYYY-MM', }, }, }, From 7c4b7723da240ad71702d49d2f3cdb420df44e54 Mon Sep 17 00:00:00 2001 From: Shu Fujita Date: Thu, 21 Jan 2021 02:51:48 +0900 Subject: [PATCH 41/41] =?UTF-8?q?Chart=20=E9=96=A2=E9=80=A3=20component:?= =?UTF-8?q?=20=E8=A8=98=E6=B3=95=E3=81=AE=E7=B5=B1=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DashedRectangleTimeBarChart.vue | 22 ++++++---- components/FeverMixedChart.vue | 23 +++++++---- components/MixedBarAndLineChart.vue | 20 +++++---- components/MonitoringConfirmedCasesChart.vue | 20 +++++---- .../MonitoringConsultationDeskReportChart.vue | 20 +++++---- components/PositiveRateMixedChart.vue | 34 +++++++++------ components/SevereCaseBarChart.vue | 19 +++++---- components/TimeBarChart.vue | 15 ++++--- components/TimeStackedBarChart.vue | 20 +++++---- components/UntrackedRateMixedChart.vue | 41 +++++++++++-------- 10 files changed, 147 insertions(+), 87 deletions(-) diff --git a/components/DashedRectangleTimeBarChart.vue b/components/DashedRectangleTimeBarChart.vue index 705f794d5b8a0..3d5556ef9bcbb 100644 --- a/components/DashedRectangleTimeBarChart.vue +++ b/components/DashedRectangleTimeBarChart.vue @@ -255,8 +255,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOption() { - const self = this const unit = this.unit + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, @@ -264,12 +265,12 @@ const options: ThisTypedComponentOptionsWithRecordProps< return tooltipItem.datasetIndex !== 1 }, callbacks: { - label(tooltipItem) { + label: (tooltipItem) => { return `${parseInt(tooltipItem.value!).toLocaleString()} ${unit}` }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -330,18 +331,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -357,6 +360,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -414,16 +419,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/FeverMixedChart.vue b/components/FeverMixedChart.vue index df0c00b9d6c80..5752c0ee7ded4 100644 --- a/components/FeverMixedChart.vue +++ b/components/FeverMixedChart.vue @@ -305,15 +305,15 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit[1] - const getFormatter = this.getFormatter + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, callbacks: { label: (tooltipItem) => { - const formatter = getFormatter(tooltipItem.datasetIndex!) + const formatter = this.getFormatter(tooltipItem.datasetIndex!) const cases = formatter(parseFloat(tooltipItem.value!)) let label = `${ this.dataLabels[tooltipItem.datasetIndex!] @@ -325,10 +325,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< } return label }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { if (tooltipItem[0].datasetIndex! < 4) { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') } return '' }, @@ -391,18 +391,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -436,6 +438,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -493,16 +497,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/MixedBarAndLineChart.vue b/components/MixedBarAndLineChart.vue index e016ec2fb2375..3d5e757e4eaf1 100644 --- a/components/MixedBarAndLineChart.vue +++ b/components/MixedBarAndLineChart.vue @@ -306,8 +306,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, @@ -320,9 +321,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< this.dataLabels[tooltipItem.datasetIndex!] } : ${cases} ${unit}` }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -383,18 +384,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -408,6 +411,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -465,16 +470,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/MonitoringConfirmedCasesChart.vue b/components/MonitoringConfirmedCasesChart.vue index 73e1a1afc4fe4..110e47b9cc953 100644 --- a/components/MonitoringConfirmedCasesChart.vue +++ b/components/MonitoringConfirmedCasesChart.vue @@ -304,8 +304,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, @@ -318,10 +319,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< this.dataLabels[tooltipItem.datasetIndex!] } : ${cases} ${unit}` }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { if (tooltipItem[0].datasetIndex! < 2) { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') } return '' }, @@ -384,18 +385,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -409,6 +412,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -466,16 +471,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/MonitoringConsultationDeskReportChart.vue b/components/MonitoringConsultationDeskReportChart.vue index bcb51f3dc64bf..459ab3c192b42 100644 --- a/components/MonitoringConsultationDeskReportChart.vue +++ b/components/MonitoringConsultationDeskReportChart.vue @@ -282,8 +282,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, @@ -295,9 +296,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< ).toLocaleString() return `${labelText} : ${numberAsString} ${unit}` }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -358,18 +359,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -383,6 +386,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -440,16 +445,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/PositiveRateMixedChart.vue b/components/PositiveRateMixedChart.vue index 1634792ea7652..3d8d626bc516c 100644 --- a/components/PositiveRateMixedChart.vue +++ b/components/PositiveRateMixedChart.vue @@ -397,8 +397,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const scaledTicksYAxisMaxRight = this.scaledTicksYAxisMaxRight + const options: Chart.ChartOptions = { tooltips: { displayColors: false, @@ -417,9 +419,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< } return label }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!].toString() - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -482,10 +484,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, { @@ -497,11 +499,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMaxRight, - callback(value) { + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMaxRight, + callback: (value) => { return `${value}%` }, }, @@ -509,9 +511,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -567,6 +571,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const scaledTicksYAxisMaxRight = this.scaledTicksYAxisMaxRight + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -626,10 +633,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, { @@ -641,11 +648,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMaxRight, - callback(value) { + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMaxRight, + callback: (value) => { return `${value}%` }, }, @@ -654,6 +661,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/SevereCaseBarChart.vue b/components/SevereCaseBarChart.vue index bb43fd29d43b0..3becc1a221ce8 100644 --- a/components/SevereCaseBarChart.vue +++ b/components/SevereCaseBarChart.vue @@ -184,22 +184,22 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOption() { - const self = this const unit = this.unit const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, callbacks: { - label(tooltipItem) { + label: (tooltipItem) => { const labelText = `${parseInt( tooltipItem.value! ).toLocaleString()} ${unit}` return labelText }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -260,18 +260,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', + suggestedMin: 0, suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -290,6 +292,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -347,16 +351,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/TimeBarChart.vue b/components/TimeBarChart.vue index 7fead7389ae40..b5b8a10601bff 100644 --- a/components/TimeBarChart.vue +++ b/components/TimeBarChart.vue @@ -277,22 +277,22 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOption() { - const self = this const unit = this.unit const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, callbacks: { - label(tooltipItem) { + label: (tooltipItem) => { const labelText = `${parseInt( tooltipItem.value! ).toLocaleString()} ${unit}` return labelText }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -353,18 +353,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', + suggestedMin: 0, suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -451,9 +453,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', + suggestedMin: 0, suggestedMax: scaledTicksYAxisMax, }, }, @@ -461,6 +463,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/TimeStackedBarChart.vue b/components/TimeStackedBarChart.vue index 9aaaed100c937..13e33e0bfd2cc 100644 --- a/components/TimeStackedBarChart.vue +++ b/components/TimeStackedBarChart.vue @@ -311,7 +311,6 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit const sumArray = this.eachArraySum(this.chartData) const data = this.chartData @@ -319,6 +318,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< return this.cumulative(item) }) const cumulativeSumArray = this.eachArraySum(cumulativeData) + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { displayColors: false, @@ -347,9 +348,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< } return label }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') }, }, }, @@ -410,18 +411,20 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, - suggestedMax: this.scaledTicksYAxisMax, maxTicksLimit: 8, fontColor: '#808080', + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -453,6 +456,8 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -510,16 +515,17 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, ], }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() { diff --git a/components/UntrackedRateMixedChart.vue b/components/UntrackedRateMixedChart.vue index 6c666c35d4692..d846981440afd 100644 --- a/components/UntrackedRateMixedChart.vue +++ b/components/UntrackedRateMixedChart.vue @@ -380,16 +380,19 @@ const options: ThisTypedComponentOptionsWithRecordProps< .reverse() }, displayOption() { - const self = this const unit = this.unit[1] - const getFormatter = this.getFormatter + + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const scaledTicksYAxisMaxRight = this.scaledTicksYAxisMaxRight + const options: Chart.ChartOptions = { tooltips: { displayColors: false, callbacks: { label: (tooltipItem) => { - const formatter = getFormatter(tooltipItem.datasetIndex!) - const cases = formatter(parseFloat(tooltipItem.value!)) + const cases = this.getFormatter(tooltipItem.datasetIndex!)( + parseFloat(tooltipItem.value!) + ) let label = `${ this.dataLabels[tooltipItem.datasetIndex!] } : ${cases} ${this.$t('人')}` @@ -400,10 +403,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< } return label }, - title(tooltipItem, data) { + title: (tooltipItem, data) => { if (tooltipItem[0].datasetIndex! < 4) { const label = data.labels![tooltipItem[0].index!] as string - return self.$d(new Date(label), 'date') + return this.$d(new Date(label), 'date') } return '' }, @@ -468,10 +471,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, { @@ -483,11 +486,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMaxRight, - callback(value) { + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMaxRight, + callback: (value) => { return `${value}%` }, }, @@ -495,9 +498,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< ], }, } + if (this.$route.query.ogp === 'true') { Object.assign(options, { animation: { duration: 0 } }) } + return options }, displayDataHeader() { @@ -538,6 +543,9 @@ const options: ThisTypedComponentOptionsWithRecordProps< } }, displayOptionHeader() { + const scaledTicksYAxisMax = this.scaledTicksYAxisMax + const scaledTicksYAxisMaxRight = this.scaledTicksYAxisMaxRight + const options: Chart.ChartOptions = { tooltips: { enabled: false }, maintainAspectRatio: false, @@ -597,10 +605,10 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMax, + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMax, }, }, { @@ -612,11 +620,11 @@ const options: ThisTypedComponentOptionsWithRecordProps< color: '#E5E5E5', }, ticks: { - suggestedMin: 0, maxTicksLimit: 8, fontColor: '#808080', - suggestedMax: this.scaledTicksYAxisMaxRight, - callback(value) { + suggestedMin: 0, + suggestedMax: scaledTicksYAxisMaxRight, + callback: (value) => { return `${value}%` }, }, @@ -625,6 +633,7 @@ const options: ThisTypedComponentOptionsWithRecordProps< }, animation: { duration: 0 }, } + return options }, scaledTicksYAxisMax() {