Skip to content

Commit

Permalink
奈良市内の感染情報のページを追加したブランチを開発版にマージ (#103)
Browse files Browse the repository at this point in the history
* Dev naracity (#50)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Dev naracity (#81)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Update data.json/news.json (#45)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* Delete 退院には、死亡退院を含む

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

* Updata data.json on 3/27

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* update data.json, 陽性者グラフの初期表示を類型に (#52)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>

* update data.json and news.json by News Relsese on 3/28

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 【本番反映】感染者データ更新(3/28)と「 貢献の仕方」の修正 (#58)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* Add CircleChart 入院患者数と残り病床数

* Updade 4/1 and Add 入院患者数表 (#65)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* WIP add chart.d.ts

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

* Update data on 2nd Apr. (#70)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

* 入院患者数と病床数の円グラフの追加 (#71)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

* WIP add chart.d.ts

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #72 (#73)

4/3  update data.json +2

* Update news release on 4/3 

Issue #73

* 4/3のデータ更新と病床数円グラフの追加 (#74)

* Change default loading image to ogp.png

* Change lise of 陽性患者の属性

* FIX code, delete commma

* Fix for Github Action ERROR

Delete 国籍、備考

* Update data.json (#40)

* FIX culumns in formatTable.ts (#42)

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "FIX culumns in formatTable.ts (#42)" (#43)

This reverts commit 1c7880e.

* Update data/news.json, Add news release on 3/22 Again. (#44)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Delete 退院には、死亡退院を含む (#46)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #14  グラフの日別を累計に変更 (#48)

* Update TimeBarChart.vue

add defaultDataKind parameter

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* Update TimeBarChart.vue

* Update index.vue

* data.jsonに3/26までのデータを追加 (#51)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* 愛知県版のリンクなどを奈良県版に変更 (#54)

* 3/28発表の二名を、感染者データと最新のお知らせに追加 (#56)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* uppdate data.json 感染者情報・感染者数の日付を3/28に更新

* Updata data.json :

* 県内の感染動向に「入院患者数の状況」を追加 (#62)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Update data.json (#63)

* Update news.json (#64)

* Updete last_update in main_summary.json

* 入院患者数と病床数の円グラフを追加 (#66)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* Revert "入院患者数と病床数の円グラフを追加 (#66)"

This reverts commit 6ea7260.

* Update data.json (#69)

* Update main_summary.json (#68)

* Update news.json (#67)

* 入院患者数と病床数の円グラフの追加 (#71)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Delete 退院には、死亡退院を含む

* Updata data.json on 3/27

* update data.json and news.json by News Relsese on 3/28

* FIX conflict data.json

* Add .vscode to .gitigore

* Add ConfirmedCasesTable to TOPPAGE using /data/main_summary.json

* update main_summary.json add NewsRelease on 1st Apr.

* Modify from 陽性者数 to 入院患者数の状況 in ConfiermedCasesCard/Table.

* Update main_summary.json last_update.

* Add CircleChart 入院患者数と残り病床数

* WIP add chart.d.ts

* Add nuxt-i18n.config.ts

* Add nuxt-i18n to tsconfig.json

* Update ogp.png, resized

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* issue #72 (#73)

4/3  update data.json +2

* Update news release on 4/3 

Issue #73

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 4/4の感染確認分の追加 (#76)

* Update data.json

* Update main_summary.json

* Update news.json

* Update sickbeds_summary.json

* Update sickbeds_summary.json

* 4/4の感染確認分の追加(更新日の更新漏れ) (#78)

* Update data.json

* Update main_summary.json

* Update news.json

* Update sickbeds_summary.json

* Update sickbeds_summary.json

* Update data.json

* Update sickbeds_summary.json

Co-authored-by: Yasushi IS <[email protected]>

* Fix PC検査グラフ, Update data_naracity.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>

* 奈良市感染動向ページに奈良市提供のデータを追加。 (#101)

* FIX culumns in formatTable.ts

* Update data/news.json, Add news release on 3/22

* Add Naracity Page, 感染動向表、検査数グラフ、相談数グラフの追加

* Modify Naracity Page 感染動向表

* Add 感染動向表に外枠等を追加

* update data_naracity.json/奈良市のデータ

* Delete News-Section from 奈良市感染動向 and Update data_naracity.json

Co-authored-by: Yasushi ISHIZUKA <[email protected]>

* FIX サイドバーのリンク順。奈良市の感染動向を心配な時の上に

Co-authored-by: Yasushi ISHIZUKA <[email protected]>
Co-authored-by: heimax222 <[email protected]>
Co-authored-by: Wakabayashi, Kenichi <[email protected]>
  • Loading branch information
4 people authored Apr 9, 2020
1 parent 246e6d9 commit a25e38c
Show file tree
Hide file tree
Showing 6 changed files with 324 additions and 1 deletion.
7 changes: 7 additions & 0 deletions components/SideNavigation.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
"Nara Prefecture Government": "奈良県",
"Tokyo COVID-19 Task Force": "新型コロナウイルス感染症対策本部",
"The latest updates": "県内の最新感染動向",
"The latest updates of NaraCity": "奈良市内の最新感染動向",
"For those concerned about novel coronavirus infections": "新型コロナウイルス感染症が心配なときに",
"for Families with children": "お子様をお持ちの皆様へ",
"for Citizens": "県民の皆様へ",
Expand Down Expand Up @@ -126,6 +127,12 @@ export default {
title: this.$t('The latest updates'),
link: '/'
},
{
icon: 'mdi-chart-timeline-variant',
title: this.$t('The latest updates of NaraCity'),
link: '/naracity',
divider: true
},
{
icon: 'covid',
title: this.$t(
Expand Down
1 change: 0 additions & 1 deletion components/SvgCard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@

<script>
import DataView from '@/components/DataView.vue'
export default {
components: { DataView },
props: {
Expand Down
45 changes: 45 additions & 0 deletions components/SvgCard_naracity.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<template>
<data-view class="SvgCard" :title="title" :title-id="titleId" :date="date">
<template v-slot:button>
<p class="Graph-Desc">
(注)表の数字は奈良市が公表したデータ
</p>
</template>
<slot />
</data-view>
</template>

<style lang="scss" scoped>
.SvgCard {
::v-deep svg {
width: 100%;
}
.Graph-Desc {
margin-top: 10px;
margin-bottom: 0;
font-size: 12px;
color: $gray-3;
}
}
</style>

<script>
import DataView from '@/components/DataView.vue'
export default {
components: { DataView },
props: {
title: {
type: String,
default: ''
},
titleId: {
type: String,
default: ''
},
date: {
type: String,
default: ''
}
}
}
</script>
1 change: 1 addition & 0 deletions data/data_naracity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"patients": {"date": "2020/04/09 14:32", "data": [{"No": 1, "日付": "2020-03-06T00:00:00.000Z", "居住地": "奈良市", "年代": "60代", "性別": "男性", "退院": null, "更新日": "2020-03-06T00:00:00.000Z", "備考": null}, {"No": 2, "日付": "2020-03-06T00:00:00.000Z", "居住地": "奈良市", "年代": "70代", "性別": "女性", "退院": null, "更新日": "2020-03-06T00:00:00.000Z", "備考": null}, {"No": 3, "日付": "2020-03-06T00:00:00.000Z", "居住地": "奈良市", "年代": "60代", "性別": "男性", "退院": null, "更新日": "2020-03-06T00:00:00.000Z", "備考": null}, {"No": 4, "日付": "2020-03-11T00:00:00.000Z", "居住地": "奈良市", "年代": "40代", "性別": "女性", "退院": null, "更新日": "2020-03-11T00:00:00.000Z", "備考": null}, {"No": 5, "日付": "2020-04-01T00:00:00.000Z", "居住地": "奈良市", "年代": "50代", "性別": "男性", "退院": null, "更新日": "2020-04-01T00:00:00.000Z", "備考": null}, {"No": 6, "日付": "2020-04-07T00:00:00.000Z", "居住地": "奈良市", "年代": "50代", "性別": "男性", "退院": null, "更新日": "2020-04-08T00:00:00.000Z", "備考": null}, {"No": 7, "日付": "2020-04-07T00:00:00.000Z", "居住地": "奈良市", "年代": "40代", "性別": "男性", "退院": null, "更新日": "2020-04-08T00:00:00.000Z", "備考": null}]}, "main_summary": {"date": "2020/04/09 14:32", "attr": "検査実施人数", "value": 10, "children": [{"attr": "陽性患者数", "value": 7, "children": [{"attr": "入院/入院調整中", "value": 0, "children": [{"attr": "軽症・中等症", "value": 2}, {"attr": "重症", "value": 1}]}, {"attr": "退院", "value": 0}, {"attr": "死亡", "value": 0}]}]}, "patients_summary": {"date": "2020/04/09 14:32", "data": [{"日付": "2020-03-01T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-02T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-03T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-04T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-05T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-06T00:00:00.000Z", "小計": 3}, {"日付": "2020-03-07T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-08T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-09T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-10T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-11T00:00:00.000Z", "小計": 1}, {"日付": "2020-03-12T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-13T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-14T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-15T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-16T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-17T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-18T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-19T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-20T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-21T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-22T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-23T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-24T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-25T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-26T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-27T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-28T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-29T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-30T00:00:00.000Z", "小計": 0}, {"日付": "2020-03-31T00:00:00.000Z", "小計": 0}, {"日付": "2020-04-01T00:00:00.000Z", "小計": 1}, {"日付": "2020-04-02T00:00:00.000Z", "小計": 0}, {"日付": "2020-04-03T00:00:00.000Z", "小計": 0}, {"日付": "2020-04-04T00:00:00.000Z", "小計": 0}, {"日付": "2020-04-05T00:00:00.000Z", "小計": 0}, {"日付": "2020-04-06T00:00:00.000Z", "小計": 1}, {"日付": "2020-04-07T00:00:00.000Z", "小計": 1}]}, "inspections_summary": {"date": "2020/04/09 14:32", "data": [{"日付": "2020-03-01T00:00:00.000Z", "小計": 0, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-02T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-03T00:00:00.000Z", "小計": 1, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-04T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-05T00:00:00.000Z", "小計": 5, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-06T00:00:00.000Z", "小計": 5, "陽性判定": 3, "陰性確認": null}, {"日付": "2020-03-07T00:00:00.000Z", "小計": 2, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-08T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-09T00:00:00.000Z", "小計": 2, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-10T00:00:00.000Z", "小計": 7, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-11T00:00:00.000Z", "小計": 4, "陽性判定": 1, "陰性確認": null}, {"日付": "2020-03-12T00:00:00.000Z", "小計": 0, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-13T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-14T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-15T00:00:00.000Z", "小計": 2, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-16T00:00:00.000Z", "小計": 0, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-17T00:00:00.000Z", "小計": 5, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-18T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-19T00:00:00.000Z", "小計": 6, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-20T00:00:00.000Z", "小計": 5, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-21T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-22T00:00:00.000Z", "小計": 4, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-23T00:00:00.000Z", "小計": 1, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-24T00:00:00.000Z", "小計": 5, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-25T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-26T00:00:00.000Z", "小計": 10, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-27T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-28T00:00:00.000Z", "小計": 4, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-29T00:00:00.000Z", "小計": 0, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-30T00:00:00.000Z", "小計": 1, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-03-31T00:00:00.000Z", "小計": 1, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-04-01T00:00:00.000Z", "小計": 10, "陽性判定": 1, "陰性確認": null}, {"日付": "2020-04-02T00:00:00.000Z", "小計": 3, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-04-03T00:00:00.000Z", "小計": 5, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-04-04T00:00:00.000Z", "小計": 6, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-04-05T00:00:00.000Z", "小計": 2, "陽性判定": 0, "陰性確認": null}, {"日付": "2020-04-06T00:00:00.000Z", "小計": 4, "陽性判定": 1, "陰性確認": null}, {"日付": "2020-04-07T00:00:00.000Z", "小計": 5, "陽性判定": 1, "陰性確認": null}]}, "querents": {"date": "2020/04/09 14:32", "data": [{"日付": "2020-03-01T00:00:00.000Z", "小計": 23}, {"日付": "2020-03-02T00:00:00.000Z", "小計": 57}, {"日付": "2020-03-03T00:00:00.000Z", "小計": 54}, {"日付": "2020-03-04T00:00:00.000Z", "小計": 45}, {"日付": "2020-03-05T00:00:00.000Z", "小計": 62}, {"日付": "2020-03-06T00:00:00.000Z", "小計": 50}, {"日付": "2020-03-07T00:00:00.000Z", "小計": 38}, {"日付": "2020-03-08T00:00:00.000Z", "小計": 30}, {"日付": "2020-03-09T00:00:00.000Z", "小計": 88}, {"日付": "2020-03-10T00:00:00.000Z", "小計": 67}, {"日付": "2020-03-11T00:00:00.000Z", "小計": 52}, {"日付": "2020-03-12T00:00:00.000Z", "小計": 60}, {"日付": "2020-03-13T00:00:00.000Z", "小計": 59}, {"日付": "2020-03-14T00:00:00.000Z", "小計": 33}, {"日付": "2020-03-15T00:00:00.000Z", "小計": 21}, {"日付": "2020-03-16T00:00:00.000Z", "小計": 82}, {"日付": "2020-03-17T00:00:00.000Z", "小計": 34}, {"日付": "2020-03-18T00:00:00.000Z", "小計": 60}, {"日付": "2020-03-19T00:00:00.000Z", "小計": 56}, {"日付": "2020-03-20T00:00:00.000Z", "小計": 23}, {"日付": "2020-03-21T00:00:00.000Z", "小計": 22}, {"日付": "2020-03-22T00:00:00.000Z", "小計": 30}, {"日付": "2020-03-23T00:00:00.000Z", "小計": 58}, {"日付": "2020-03-24T00:00:00.000Z", "小計": 32}, {"日付": "2020-03-25T00:00:00.000Z", "小計": 58}, {"日付": "2020-03-26T00:00:00.000Z", "小計": 44}, {"日付": "2020-03-27T00:00:00.000Z", "小計": 92}, {"日付": "2020-03-28T00:00:00.000Z", "小計": 62}, {"日付": "2020-03-29T00:00:00.000Z", "小計": 45}, {"日付": "2020-03-30T00:00:00.000Z", "小計": 135}, {"日付": "2020-03-31T00:00:00.000Z", "小計": 115}, {"日付": "2020-04-01T00:00:00.000Z", "小計": 142}, {"日付": "2020-04-02T00:00:00.000Z", "小計": 138}, {"日付": "2020-04-03T00:00:00.000Z", "小計": 157}, {"日付": "2020-04-04T00:00:00.000Z", "小計": 129}, {"日付": "2020-04-05T00:00:00.000Z", "小計": 86}, {"日付": "2020-04-06T00:00:00.000Z", "小計": 211}, {"日付": "2020-04-07T00:00:00.000Z", "小計": 142}]}, "lastUpdate": "2020/04/09 14:32"}
19 changes: 19 additions & 0 deletions data/news_naracity.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"newsItems": [
{
"date": "2020/03/24",
"url": "https://www.city.nara.lg.jp/site/coronavirus/61310.html",
"text": "新型コロナウイルス感染防止のため施設等の一部休館について"
},
{
"date": "2020/03/16",
"url": "https://www.city.nara.lg.jp/site/coronavirus/55138.html",
"text": "新型コロナウイルスによる感染拡大防止によるイベント中止一覧"
},
{
"date": "2020/03/16",
"url": "https://www.city.nara.lg.jp/site/coronavirus/",
"text": "新型コロナウイルスに関する情報まとめ"
}
]
}
252 changes: 252 additions & 0 deletions pages/naracity.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
<template>
<div class="MainPage">
<page-header
:icon="headerItem.icon"
:title="headerItem.title"
:date="headerItem.date"
/>
<!--
<whats-new class="mb-4" :items="newsItems" />
-->
<v-row class="DataBlock">
<v-col cols="12" md="6" class="DataCard">
<svg-card
title="検査陽性者の状況"
:title-id="'details-of-confirmed-cases'"
:date="Data.main_summary.date"
>
<confirmed-cases-table
aria-label="検査陽性者の状況"
v-bind="confirmedCases"
/>
</svg-card>
</v-col>
<v-col cols="12" md="6" class="DataCard">
<time-bar-chart
title="陽性患者数"
:title-id="'number-of-confirmed-cases'"
:chart-id="'time-bar-chart-patients'"
:chart-data="patientsGraph"
:date="Data.patients.date"
:unit="'人'"
/>
</v-col>
<v-col cols="12" md="6" class="DataCard">
<data-table
:title="'陽性患者の属性'"
:title-id="'attributes-of-confirmed-cases'"
:chart-data="patientsTable"
:chart-option="{}"
:date="Data.patients.date"
:info="sumInfoOfPatients"
/>
</v-col>
<v-col cols="12" md="6" class="DataCard">
<time-bar-chart
title="PCR検査実施数"
:title-id="'number-of-tested'"
:chart-id="'time-bar-chart-inspections'"
:chart-data="inspectionsGraph"
:date="Data.inspections_summary.date"
:unit="'件'"
/>
</v-col>
<!--
<v-col cols="12" md="6" class="DataCard">
<time-bar-chart
title="新型コロナコールセンター相談件数"
:title-id="'number-of-reports-to-covid19-telephone-advisory-center'"
:chart-id="'time-bar-chart-contacts'"
:chart-data="contactsGraph"
:date="Data.contacts.date"
:unit="'件'"
:url="''"
/>
</v-col>
-->
<v-col cols="12" md="6" class="DataCard">
<time-bar-chart
title="新型コロナ相談件数"
:title-id="'number-of-reports-to-covid19-consultation-desk'"
:chart-id="'time-bar-chart-querents'"
:chart-data="querentsGraph"
:date="Data.querents.date"
:unit="'件'"
:url="''"
/>
</v-col>
</v-row>
</div>
</template>

<script>
import PageHeader from '@/components/PageHeader.vue'
import TimeBarChart from '@/components/TimeBarChart.vue'
// import MetroBarChart from '@/components/MetroBarChart.vue'
// import TimeStackedBarChart from '@/components/TimeStackedBarChart.vue'
// import WhatsNew from '@/components/WhatsNew.vue'
// import StaticInfo from '@/components/StaticInfo.vue'
import Data from '@/data/data_naracity.json'
// import MetroData from '@/data/metro.json'
import DataTable from '@/components/DataTable.vue'
import formatGraph from '@/utils/formatGraph'
import formatTable from '@/utils/formatTable'
import formatConfirmedCases from '@/utils/formatConfirmedCases'
import News from '@/data/news_naracity.json'
import SvgCard from '@/components/SvgCard_naracity.vue'
import ConfirmedCasesTable from '@/components/ConfirmedCasesTable.vue'
export default {
components: {
PageHeader,
TimeBarChart,
// MetroBarChart,
// TimeStackedBarChart,
// WhatsNew,
// StaticInfo,
DataTable,
SvgCard,
ConfirmedCasesTable
},
data() {
// 感染者数グラフ
const patientsGraph = formatGraph(Data.patients_summary.data)
// 感染者数
const patientsTable = formatTable(Data.patients.data)
// 退院者グラフ
// const dischargesGraph = formatGraph(Data.discharges_summary.data)
// 帰国者・接触者電話相談センター相談件数
// コールセンター相談件数
// const contactsGraph = formatGraph(Data.contacts.data)
// 相談件数
const querentsGraph = formatGraph(Data.querents.data)
// 名古屋市営地下鉄の利用者数の推移
// const metroGraph = MetroData
// 検査実施日別グラフ
const inspectionsGraph = formatGraph(Data.inspections_summary.data)
// const inspectionsGraph = [
// Data.inspections_summary.data['県内'],
// Data.inspections_summary.data['その他']
// ]
// const inspectionsItems = [
// '県内発生(疑い例・接触者調査)',
// 'その他(チャーター便・クルーズ便)'
// ]
// const inspectionsLabels = Data.inspections_summary.labels
// 死亡者数
// #MEMO: 今後使う可能性あるので一時コメントアウト
// const fatalitiesTable = formatTable(
// Data.patients.data.filter(patient => patient['備考'] === '死亡')
// )
// 検査陽性者の状況
const confirmedCases = formatConfirmedCases(Data.main_summary)
const sumInfoOfPatients = {
lText: patientsGraph[
patientsGraph.length - 1
].cumulative.toLocaleString(),
sText: patientsGraph[patientsGraph.length - 1].label + 'の累計',
unit: ''
}
const data = {
Data,
patientsTable,
patientsGraph,
// dischargesGraph,
// contactsGraph,
querentsGraph,
// metroGraph,
inspectionsGraph,
// inspectionsItems,
// inspectionsLabels,
confirmedCases,
sumInfoOfPatients,
headerItem: {
icon: 'mdi-chart-timeline-variant',
title: '奈良市内の最新感染動向',
date: Data.lastUpdate
},
newsItems: News.newsItems
// metroGraphOption: {
// responsive: true,
// legend: {
// display: true
// },
// scales: {
// xAxes: [
// {
// position: 'bottom',
// stacked: false,
// gridLines: {
// display: true
// },
// ticks: {
// fontSize: 10,
// maxTicksLimit: 20,
// fontColor: '#808080'
// }
// }
// ],
// yAxes: [
// {
// stacked: false,
// gridLines: {
// display: true
// },
// ticks: {
// fontSize: 12,
// maxTicksLimit: 10,
// fontColor: '#808080',
// callback(value) {
// return value.toFixed(2) + '%'
// }
// }
// }
// ]
// },
// tooltips: {
// displayColors: false,
// callbacks: {
// title(tooltipItems, _) {
// const label = tooltipItems[0].label
// return `期間: ${label}`
// },
// label(tooltipItem, data) {
// const currentData = data.datasets[tooltipItem.datasetIndex]
// const percentage = `${currentData.data[tooltipItem.index]}%`
// return `${metroGraph.base_period}の利用者数との相対値: ${percentage}`
// }
// }
// }
// }
}
return data
},
head() {
return {
title: '奈良市内の最新感染動向'
}
}
}
</script>

<style lang="scss" scoped>
.MainPage {
.DataBlock {
margin: 20px -8px;
.DataCard {
@include largerThan($medium) {
padding: 10px;
}
@include lessThan($small) {
padding: 4px 8px;
}
}
}
}
</style>

0 comments on commit a25e38c

Please sign in to comment.