Merge pull request #227 from covid19-oita/development

covid19-oita · Apr 29, 2020 · e8c06d0 · e8c06d0
2 parents 59ed019 + b3c767d
commit e8c06d0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/components/ConfirmedCasesTable.vue b/components/ConfirmedCasesTable.vue
@@ -8,7 +8,7 @@
           <span :class="$style.small">({{ $t('累計') }})</span>
           <span>
             <strong>{{ 累計 }}</strong>
-            <span :class="$style.unit">{{ $t('件.tested') }}</span>
+            <span :class="$style.unit">{{ $t('人') }}</span>
           </span>
         </div>
       </div>
@@ -19,7 +19,7 @@
               <span>{{ $t('入院中') }}</span>
               <span>
                 <strong>{{ 入院中 }}</strong>
-                <span :class="$style.unit">{{ $t('件.tested') }}</span>
+                <span :class="$style.unit">{{ $t('人') }}</span>
               </span>
             </div>
           </div>
@@ -30,7 +30,7 @@
               <span>{{ $t('死亡') }}</span>
               <span>
                 <strong>{{ 死亡 }}</strong>
-                <span :class="$style.unit">{{ $t('件.tested') }}</span>
+                <span :class="$style.unit">{{ $t('人') }}</span>
               </span>
             </div>
           </div>
@@ -41,7 +41,7 @@
               <span>{{ $t('退院') }}</span>
               <span>
                 <strong>{{ 退院 }}</strong>
-                <span :class="$style.unit">{{ $t('件.tested') }}</span>
+                <span :class="$style.unit">{{ $t('人') }}</span>
               </span>
             </div>
           </div>

diff --git a/components/TimeChart.vue b/components/TimeChart.vue
@@ -48,7 +48,7 @@
         />
       </div>
     </div>
-    <template v-if="!isTOS()" v-slot:dataTable>
+    <template v-slot:dataTable>
       <v-data-table
         :headers="tableHeaders"
         :items="tableData"
@@ -111,7 +111,6 @@ type Methods = {
   displayValue: (chartType: 'bar' | 'line') => 'block' | 'none'
   isTransition: () => boolean
   isCumulative: () => boolean
-  isTOS: () => boolean
 }
 
 type Computed = {
@@ -546,9 +545,6 @@ const options: ThisTypedComponentOptionsWithRecordProps<
     },
     isCumulative() {
       return this.dataKind === 'cumulative'
-    },
-    isTOS() {
-      return location.href === 'https://www.tostv.jp/emergency/'
     }
   },
   mounted() {