From 380592f329634f9f862bbe1ad20b023b53c6a21e Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Sat, 3 Aug 2024 17:14:07 +0800
Subject: [PATCH 01/12] Addition of epidemic data statistics page and chart
 performance optimization

---
 package.json                     |   2 +-
 pnpm-lock.yaml                   |  69 +++++++++-------
 source/page/Statistics/index.tsx | 133 +++++++++++++++++++++++++++++++
 source/page/data/menu.ts         |   7 +-
 source/page/index.tsx            |   7 +-
 source/service/Epidemic.ts       |  13 +++
 6 files changed, 198 insertions(+), 33 deletions(-)
 create mode 100644 source/page/Statistics/index.tsx

diff --git a/package.json b/package.json
index 15ac71c..1e99f83 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
         "classnames": "^2.5.1",
         "dom-renderer": "^2.1.8",
         "echarts": "^5.5.0",
-        "echarts-jsx": "^1.2.0",
+        "echarts-jsx": "^1.2.1",
         "github-web-widget": "^4.0.0-rc.2",
         "koajax": "^1.1.2",
         "mobx": "^6.12.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1218fc1..082dec3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -27,8 +27,8 @@ importers:
         specifier: ^5.5.0
         version: 5.5.0
       echarts-jsx:
-        specifier: ^1.2.0
-        version: 1.2.0(typescript@5.4.5)
+        specifier: ^1.2.1
+        version: 1.2.1(typescript@5.4.5)
       github-web-widget:
         specifier: ^4.0.0-rc.2
         version: 4.0.0-rc.2(element-internals-polyfill@1.3.11)(typescript@5.4.5)
@@ -802,12 +802,6 @@ packages:
     cpu: [arm64]
     os: [linux]
 
-  '@esbuild/linux-arm@0.21.5':
-    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
-    engines: {node: '>=12'}
-    cpu: [arm]
-    os: [linux]
-
   '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
@@ -2022,6 +2016,11 @@ packages:
     resolution: {integrity: sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==}
     engines: {node: '>=0.10.0'}
 
+  declarative-shadow-dom-polyfill@0.4.0:
+    resolution: {integrity: sha512-a3c/x43EIo+gzc7ZPY1NuOowPOClqaaU+5G1wwOG7h5xQ8UhZPM6NYcSDsvhTn9Pyc275pmvSUPPY+r4pPTOVA==}
+    peerDependencies:
+      typescript: '>=5.5.3'
+
   decompress-response@3.3.0:
     resolution: {integrity: sha512-BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA==}
     engines: {node: '>=4'}
@@ -2071,6 +2070,9 @@ packages:
   dom-renderer@2.1.8:
     resolution: {integrity: sha512-XciJAb8pAFAlpFOBO79njazvbfNzA16+045Uie5kZORSu+NY5X2cecjI4nyT4M4ji0nzRsF8P8KHH8xvKM1cdg==}
 
+  dom-renderer@2.3.0:
+    resolution: {integrity: sha512-HSYhONmJqFc/wsRmQIm+Lw2DGoVn3T99t0rh3A9/bZvlm82THWM+QYjSC7SyM8EIybvhjPt94LoXnxlyai3ncA==}
+
   dom-serializer@1.4.1:
     resolution: {integrity: sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==}
 
@@ -2098,8 +2100,8 @@ packages:
   duplexer3@0.1.5:
     resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
 
-  echarts-jsx@1.2.0:
-    resolution: {integrity: sha512-ZMlNsj8KcQAr6pz1YErPYMkamPqjKMs8cq2dtWdiFHXERDuTgQrK1oulzYHB+iZuqxxkygqhLIjKwTrJNq1OIQ==}
+  echarts-jsx@1.2.1:
+    resolution: {integrity: sha512-epcIsL91qcVbd/3gzKPa1cxSqhBtcG5uphDwse6edzTd8m61WGg3O/Sr/DBI5/nZISuOCKBbT0INdMrw1IzCfQ==}
     peerDependencies:
       '@webcomponents/webcomponentsjs': ^2.8
 
@@ -4732,9 +4734,6 @@ snapshots:
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
-  '@esbuild/linux-arm@0.21.5':
-    optional: true
-
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
@@ -4925,13 +4924,15 @@ snapshots:
       '@parcel/utils': 2.11.0
       lmdb: 2.8.5
 
-  '@parcel/cache@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))':
+  '@parcel/cache@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)':
     dependencies:
       '@parcel/core': 2.12.0(@swc/helpers@0.5.11)
       '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/logger': 2.12.0
       '@parcel/utils': 2.12.0
       lmdb: 2.8.5
+    transitivePeerDependencies:
+      - '@swc/helpers'
 
   '@parcel/codeframe@2.11.0':
     dependencies:
@@ -4995,7 +4996,7 @@ snapshots:
   '@parcel/core@2.12.0(@swc/helpers@0.5.11)':
     dependencies:
       '@mischnic/json-sourcemap': 0.1.1
-      '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
+      '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/diagnostic': 2.12.0
       '@parcel/events': 2.12.0
       '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
@@ -5008,7 +5009,7 @@ snapshots:
       '@parcel/source-map': 2.1.1
       '@parcel/types': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/utils': 2.12.0
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       abortcontroller-polyfill: 1.7.5
       base-x: 3.0.9
       browserslist: 4.23.0
@@ -5052,7 +5053,7 @@ snapshots:
       '@parcel/types': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/utils': 2.12.0
       '@parcel/watcher': 2.4.0
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
     transitivePeerDependencies:
       - '@swc/helpers'
 
@@ -5147,7 +5148,7 @@ snapshots:
       '@parcel/plugin': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       '@parcel/rust': 2.12.0
       '@parcel/utils': 2.12.0
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
 
   '@parcel/optimizer-svgo@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))':
     dependencies:
@@ -5191,7 +5192,7 @@ snapshots:
       '@parcel/node-resolver-core': 3.3.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       '@parcel/types': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/utils': 2.12.0
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       '@swc/core': 1.4.1(@swc/helpers@0.5.11)
       semver: 7.6.0
     transitivePeerDependencies:
@@ -5401,7 +5402,7 @@ snapshots:
       '@parcel/core': 2.12.0(@swc/helpers@0.5.11)
       '@parcel/plugin': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       '@parcel/utils': 2.12.0
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       nullthrows: 1.1.1
 
   '@parcel/transformer-js@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))':
@@ -5412,7 +5413,7 @@ snapshots:
       '@parcel/rust': 2.12.0
       '@parcel/source-map': 2.1.1
       '@parcel/utils': 2.12.0
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       '@swc/helpers': 0.5.6
       browserslist: 4.23.0
       nullthrows: 1.1.1
@@ -5523,12 +5524,12 @@ snapshots:
 
   '@parcel/types@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)':
     dependencies:
-      '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
+      '@parcel/cache': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/diagnostic': 2.12.0
       '@parcel/fs': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/package-manager': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/source-map': 2.1.1
-      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
+      '@parcel/workers': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))
       utility-types: 3.11.0
     transitivePeerDependencies:
       - '@parcel/core'
@@ -5622,7 +5623,7 @@ snapshots:
       '@parcel/utils': 2.11.0
       nullthrows: 1.1.1
 
-  '@parcel/workers@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)':
+  '@parcel/workers@2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))':
     dependencies:
       '@parcel/core': 2.12.0(@swc/helpers@0.5.11)
       '@parcel/diagnostic': 2.12.0
@@ -5631,8 +5632,6 @@ snapshots:
       '@parcel/types': 2.12.0(@parcel/core@2.12.0(@swc/helpers@0.5.11))(@swc/helpers@0.5.11)
       '@parcel/utils': 2.12.0
       nullthrows: 1.1.1
-    transitivePeerDependencies:
-      - '@swc/helpers'
 
   '@rollup/plugin-babel@5.3.1(@babel/core@7.24.5)(rollup@2.79.1)':
     dependencies:
@@ -6262,6 +6261,10 @@ snapshots:
 
   decamelize@1.2.0: {}
 
+  declarative-shadow-dom-polyfill@0.4.0(typescript@5.4.5):
+    dependencies:
+      typescript: 5.4.5
+
   decompress-response@3.3.0:
     dependencies:
       mimic-response: 1.0.1
@@ -6309,6 +6312,15 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
+  dom-renderer@2.3.0(typescript@5.4.5):
+    dependencies:
+      declarative-shadow-dom-polyfill: 0.4.0(typescript@5.4.5)
+      tslib: 2.6.3
+      web-streams-polyfill: 4.0.0
+      web-utility: 4.4.0(typescript@5.4.5)
+    transitivePeerDependencies:
+      - typescript
+
   dom-serializer@1.4.1:
     dependencies:
       domelementtype: 2.3.0
@@ -6337,9 +6349,9 @@ snapshots:
 
   duplexer3@0.1.5: {}
 
-  echarts-jsx@1.2.0(typescript@5.4.5):
+  echarts-jsx@1.2.1(typescript@5.4.5):
     dependencies:
-      dom-renderer: 2.1.8(typescript@5.4.5)
+      dom-renderer: 2.3.0(typescript@5.4.5)
       echarts: 5.5.0
       iterable-observer: 1.0.1
       lodash: 4.17.21
@@ -6454,7 +6466,6 @@ snapshots:
       '@esbuild/darwin-x64': 0.21.5
       '@esbuild/freebsd-arm64': 0.21.5
       '@esbuild/freebsd-x64': 0.21.5
-      '@esbuild/linux-arm': 0.21.5
       '@esbuild/linux-arm64': 0.21.5
       '@esbuild/linux-ia32': 0.21.5
       '@esbuild/linux-loong64': 0.21.5
diff --git a/source/page/Statistics/index.tsx b/source/page/Statistics/index.tsx
new file mode 100644
index 0000000..9dcf780
--- /dev/null
+++ b/source/page/Statistics/index.tsx
@@ -0,0 +1,133 @@
+import { observable } from 'mobx';
+import {component,observer} from 'web-cell';
+import {Overall,AreaData,getOverall,getArea } from '../../service/Epidemic';
+import 'echarts-jsx/dist/renderers/SVG';
+import 'echarts-jsx/dist/components/title';
+import 'echarts-jsx/dist/components/legend';
+import 'echarts-jsx/dist/components/tooltip';
+import 'echarts-jsx/dist/components/grid';
+import 'echarts-jsx/dist/components/x-axis';
+import 'echarts-jsx/dist/components/y-axis';
+import 'echarts-jsx/dist/charts/line';
+import 'echarts-jsx/dist/charts/bar';
+
+@component({ tagName: 'statistics-page' })
+@observer
+export default class StatisticsPage extends HTMLElement {
+  
+    @observable
+    accessor virusData : {
+        overAll: Overall[];
+        areaData:AreaData[];
+    }
+    async mountedCallback() {
+       const [overall,areadata]  =await Promise.all([getOverall(),getArea()])
+
+       this.virusData = {
+        overAll:overall,
+        areaData:areadata,
+        }
+    }
+    toMonth(dateString){
+        let date = new Date(dateString);
+        let year = date.getFullYear();
+        let month = date.getMonth(); 
+        return new Date(year, month);
+    }
+
+    render(){
+        if(this.virusData){
+            let confirmedCount =  this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.confirmedCount])
+            let suspectedCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.suspectedCount])
+            let curedCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.curedCount])
+            let deadCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.deadCount])
+            let seriousCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.seriousCount])
+          
+            let cityData =  this.virusData.areaData.filter((item)=>{
+                if(item.provinceName==='广东省'){return item}
+            })
+            let city_confirmedCounts = cityData.map((item)=>[item.cityName,item.city_confirmedCount])
+            let city_curedCounts = cityData.map((item)=>[item.cityName,item.city_curedCount])
+            let city_suspectedCounts = cityData.map((item)=>[item.cityName,item.city_suspectedCount])
+            let city_deadCounts = cityData.map((item)=>[item.cityName,item.city_deadCount])
+            return (
+                <div>
+                    <ec-svg-renderer
+                        className="w-100 h-50"
+                    >
+                        <ec-title text="患者人数数据" top="5%" x="center" />
+                        <ec-legend
+                            orient="horizontal"
+                            bottom="13%"
+                            data={['确诊',"恢复",'严重',"疑似",'死亡']}
+                        />
+                        <ec-tooltip trigger="axis" />
+                        <ec-grid bottom="25%" left={60} />
+                        <ec-x-axis name="日期" type="time" nameGap={5} />
+                        <ec-y-axis id='y1' name="确诊&恢复&严重人数" type="value" nameGap={10}  />
+                        <ec-y-axis id='y2' name="疑似&死亡人数" type="value" nameGap={10}  />
+                    
+                        <ec-bar-chart
+                            data={confirmedCount}
+                            name="确诊"
+                        />
+                        <ec-bar-chart
+                            data={curedCount}
+                            name="恢复"
+                        />
+                        <ec-bar-chart
+                            data={seriousCount}
+                            name="严重"
+                        />
+                        <ec-line-chart
+                            data={suspectedCount}
+                            yAxisIndex={1}
+                            name="疑似"
+                        />
+                        <ec-line-chart
+                            data={deadCount}
+                            yAxisIndex={1}
+                            name="死亡"
+                        />
+                    </ec-svg-renderer>
+
+                    <ec-svg-renderer
+                        className="w-100 h-50"
+                    >
+                        <ec-title text="患者人数地市分布" top="5%" x="center" />
+                        <ec-legend
+                            orient="horizontal"
+                            bottom="13%"
+                            data={['确诊',"恢复",'疑似','死亡']}
+                        />
+                        <ec-tooltip trigger="axis" />
+                        <ec-grid bottom="25%" left={60} />
+                        <ec-x-axis name="地市" type="category" nameGap={5} />
+                        <ec-y-axis id='y1' name="确诊&恢复人数" type="value" nameGap={10}  />
+                        <ec-y-axis id='y2' name="疑似&死亡人数" type="value" nameGap={10}  />
+
+                        <ec-bar-chart
+                            data={city_confirmedCounts}
+                            name="确诊"
+                        />
+                        <ec-bar-chart
+                            data={city_curedCounts}
+                            name="恢复"
+                        />
+                        <ec-line-chart
+                            data={city_suspectedCounts}
+                            name="疑似"
+                            yAxisIndex={1}
+                        />
+                        <ec-line-chart
+                            data={city_deadCounts}
+                            name="死亡"
+                            yAxisIndex={1}
+                        />
+
+                    </ec-svg-renderer>
+                </div>
+            );
+        }
+    }
+}
diff --git a/source/page/data/menu.ts b/source/page/data/menu.ts
index a69d3d0..b302043 100644
--- a/source/page/data/menu.ts
+++ b/source/page/data/menu.ts
@@ -7,7 +7,8 @@ export enum RouteRoot {
     Clinic = 'clinic',
     Maps = 'maps',
     Admin = 'admin',
-    Community = 'community'
+    Community = 'community',
+    Statistics = 'statistics'
 }
 
 export default [
@@ -58,5 +59,9 @@ export default [
     {
         title: '开放社区',
         href: RouteRoot.Community
+    },
+    {
+        title: '疫情统计',
+        href: RouteRoot.Statistics
     }
 ];
diff --git a/source/page/index.tsx b/source/page/index.tsx
index 1748aa8..2dc5b02 100644
--- a/source/page/index.tsx
+++ b/source/page/index.tsx
@@ -16,6 +16,7 @@ import logo from '../image/wuhan2020.png';
 import { HomePage } from './Home';
 import Disclaimer from '../../Disclaimer.md';
 
+
 const HospitalPage = lazy(() => import('./Hospital')),
     HospitalEdit = lazy(() => import('./Hospital/Edit')),
     LogisticsPage = lazy(() => import('./Logistics')),
@@ -30,8 +31,8 @@ const HospitalPage = lazy(() => import('./Hospital')),
     ClinicEdit = lazy(() => import('./Clinic/Edit')),
     UserAdmin = lazy(() => import('./Admin/User')),
     CommunityPage = lazy(() => import('./Community')),
-    MapsPage = lazy(() => import('./Map'));
-
+    MapsPage = lazy(() => import('./Map')),
+    StatisticsPage= lazy(() => import('./Statistics'));
 const userMenu = [
     {
         title: '管理',
@@ -117,6 +118,7 @@ export const PageFrame: FC = () => (
             <Route path={RouteRoot.Maps} component={MapsPage} />
             <Route path={RouteRoot.Admin} component={UserAdmin} />
             <Route path={RouteRoot.Community} component={CommunityPage} />
+            <Route path={RouteRoot.Statistics} component={StatisticsPage} />
             <Route
                 path="disclaimer"
                 component={({ className = '', ...props }) => (
@@ -127,6 +129,7 @@ export const PageFrame: FC = () => (
                     />
                 )}
             />
+            
         </Container>
 
         <footer className="d-md-flex justify-content-around text-center bg-light py-5">
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index e0009a7..7e832cd 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -74,6 +74,12 @@ export interface Province extends Base, StatisticData {
     cities?: City[];
 }
 
+export interface AreaData extends Base,
+    Partial<Record<`${'city_' | 'province_'}${StatisticType}Count`,number>>,
+    Record<`${'city'|'continent'|'country'|'province'}EnglishName`,string>,
+    Record<`${'city'|'continent'|'country'|'province'}Name`,string>,
+    Record<`${'city_' | 'province_'}zipCode`,string>{}
+
 export async function getOverall() {
     const { body } = await epidemic.get<Overall[]>('Overall', { Range: '0-9' });
 
@@ -91,3 +97,10 @@ export async function getCurrent() {
 
     return body;
 }
+
+export async function getArea() {
+    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-9' });
+
+    return body;
+}
+

From 6c2e386dad77bc88c35b684ed0fc154330100490 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Sun, 25 Aug 2024 21:43:29 +0800
Subject: [PATCH 02/12] [fix]Fix Map Page

---
 package.json                                  |  2 +-
 source/page/Map/adapter/isaaclin.ts           | 18 +++++++------
 .../Map/component/HierarchicalVirusMap.tsx    |  2 +-
 source/page/Map/component/VirusChart.tsx      | 25 ++++++++++++++-----
 source/page/Map/component/VirusMap.tsx        | 16 ++++++------
 source/page/Map/data/province.ts              |  4 +--
 source/page/Map/index.tsx                     |  2 +-
 source/page/data/menu.ts                      |  5 ----
 source/page/index.tsx                         |  4 +--
 source/service/Epidemic.ts                    | 13 +++++++---
 10 files changed, 55 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index 1e99f83..9d57e18 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "clean": "rm -rf .parcel-cache/ dist/",
         "start:local": "npm run clean  &&  cross-env HTTP_ENV=local  parcel source/index.html --open",
         "start:remote": "npm run clean  &&  cross-env HTTP_ENV=remote  parcel source/index.html --open",
-        "start": "npm run clean  &&  cross-env HTTP_ENV=test  parcel source/index.html --open",
+        "start": "npm run && cross-env HTTP_ENV=test  parcel source/index.html --open",
         "pack-dist": "parcel build source/index.html --public-url . --no-source-maps  &&  tsx fix-script",
         "pack-sw": "rm -f dist/sw.js.map  &&  workbox generateSW",
         "build": "npm run clean  &&  npm run pack-dist  &&  npm run pack-sw"
diff --git a/source/page/Map/adapter/isaaclin.ts b/source/page/Map/adapter/isaaclin.ts
index 235a9b8..56884fc 100644
--- a/source/page/Map/adapter/isaaclin.ts
+++ b/source/page/Map/adapter/isaaclin.ts
@@ -76,7 +76,7 @@ function fillForward<T extends ProvinceData | CityData | CountryData>(
     series: Series<T>
 ) {
     const all_ts = Object.keys(series).sort();
-
+    
     for (const [i, t] of all_ts.entries())
         if (i < all_ts.length - 1)
             for (const name of Object.keys(series[t])) {
@@ -100,17 +100,17 @@ export function convertProvincesSeries(
     source = [...source].sort(
         ({ updateTime: a }, { updateTime: b }) => +b - +a
     );
-
+    console.log('source',source);
     for (const item of source) {
-        const t = roundTime(+item.updateTime, resolution);
-
+        const date = new Date(item.updateTime);
+        const timestamp = date.getTime();
+        const t = roundTime(timestamp, resolution);
         if (res[t] === undefined) res[t] = {};
-
         const prov = convertProvince(item);
 
         res[t][prov.name] = prov;
     }
-
+    
     if (shouldFillForward) fillForward(res);
 
     return res;
@@ -146,5 +146,9 @@ export const convertCountrySeries = (
     resolution: number
 ): Series<CountryOverviewData> =>
     Object.fromEntries(
-        source.map(item => [roundTime(+item.updateTime, resolution), item])
+        source.map(item => {
+            const date = new Date(item.updateTime);
+            const timestamp = date.getTime();
+            return [roundTime(timestamp, resolution), item]
+        })
     );
diff --git a/source/page/Map/component/HierarchicalVirusMap.tsx b/source/page/Map/component/HierarchicalVirusMap.tsx
index ec140f3..888f481 100644
--- a/source/page/Map/component/HierarchicalVirusMap.tsx
+++ b/source/page/Map/component/HierarchicalVirusMap.tsx
@@ -134,7 +134,7 @@ export class HierarchicalVirusMap
                         )
                     )
                 ];
-
+            
         return (
             <>
                 <VirusMap
diff --git a/source/page/Map/component/VirusChart.tsx b/source/page/Map/component/VirusChart.tsx
index 3581dca..f54f0b2 100644
--- a/source/page/Map/component/VirusChart.tsx
+++ b/source/page/Map/component/VirusChart.tsx
@@ -256,16 +256,25 @@ export class VirusChart
     mountedCallback() {
         this.classList.add('d-flex', 'flex-column');
     }
-
+    toMonth(dateString){
+        let date = new Date(dateString);
+        let year = date.getFullYear();
+        let month = date.getMonth(); 
+        return new Date(year, month);
+    }
     render() {
         const { data, area, path } = this.props;
-
+        
         const orderedProvincesData = this.getOrderedTimeData(
                 data.provincesSeries
             ),
             orderedCountryData = this.getOrderedTimeData(data.countrySeries);
-
-        return (
+            let confirmedCount =  orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.confirmed])
+            let suspectedCount = orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.suspected])
+            let curedCount = orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.cured])
+            let deadCount = orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.dead])
+           
+            return (
             <>
                 <ec-svg-renderer
                     className="w-100 h-50"
@@ -284,11 +293,13 @@ export class VirusChart
                         name="确诊"
                         stack="总量"
                         areaStyle={{ color: '#f6bdcd' }}
+                        data={confirmedCount}
                     />
                     <ec-line-chart
                         name="疑似"
                         stack="总量"
                         areaStyle={{ color: '#f9e4ba' }}
+                        data={suspectedCount}
                     />
                     <ec-tooltip trigger="axis" />
                 </ec-svg-renderer>
@@ -306,10 +317,12 @@ export class VirusChart
                     <ec-grid bottom="25%" left={60} />
                     <ec-x-axis name="日期" type="time" nameGap={5} />
                     <ec-y-axis name="人数" nameGap={10} />
-                    <ec-line-chart name="治愈" />
-                    <ec-line-chart name="死亡" />
+                    <ec-line-chart name="治愈" data={curedCount} />
+                    <ec-line-chart name="死亡" data={deadCount} />
                     <ec-tooltip trigger="axis" />
                 </ec-svg-renderer>
+
+                
             </>
         );
     }
diff --git a/source/page/Map/component/VirusMap.tsx b/source/page/Map/component/VirusMap.tsx
index 6b2fe3a..971347c 100644
--- a/source/page/Map/component/VirusMap.tsx
+++ b/source/page/Map/component/VirusMap.tsx
@@ -94,7 +94,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
         mapScale: 1,
         chartArea: this.name
     };
-
+   
     get basicVisualMap() {
         return {
             show: true,
@@ -194,7 +194,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
             isAdjustLabel = true,
             domWidth = chart.getWidth(),
             domHeight = chart.getHeight();
-
+            
         let options = this.baseOptions(this.name, this.breaks);
 
         if (isForceRatio)
@@ -222,11 +222,12 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
                   options
               ) as any)
             : (this.getChartOptions(this.data as MapDataType, options) as any);
-
+                
         chart.setOption(options);
     };
 
     getChartOptions = (data: MapDataType, options?: any) => {
+
         options ||= this.baseOptions(this.name, this.breaks);
 
         const extra = this.overrides(data);
@@ -239,7 +240,6 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
 
     getSTChartOptions = (data: STMapDataType, options?: any) => {
         options ||= this.baseOptions(this.name, this.breaks);
-
         options['timeline'] = {
             axisType: 'time',
             show: true,
@@ -264,9 +264,11 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
                 }
             }
         };
+        const sortedTimeline = data.timeline.slice().sort();
+
         return {
             baseOption: options,
-            options: data.timeline.sort().map(t => this.overrides(data.data[t]))
+            options: sortedTimeline.map(t => this.overrides(data.data[t]))
         };
     };
 
@@ -277,10 +279,10 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
     mountedCallback() {
         this.classList.add(style.box);
     }
-
+   
     render() {
         const { name, data, currentChartArea, chartData, chartPath } = this;
-
+        
         return (
             <>
                 <EChartsMap
diff --git a/source/page/Map/data/province.ts b/source/page/Map/data/province.ts
index 6e64b4e..06feef3 100644
--- a/source/page/Map/data/province.ts
+++ b/source/page/Map/data/province.ts
@@ -1,7 +1,7 @@
-const server_root = 'https://map-1252957949.cos.ap-guangzhou.myqcloud.com/';
+const server_root = 'https://geo.datav.aliyun.com/areas_v3/bound/';
 
 export default {
-    中国: server_root + 'china.json',
+    中国: server_root + '100000_full.json',
     世界: server_root + 'world.json',
     安徽: server_root + 'china/anhui.json',
     澳门: server_root + 'china/aomen.json',
diff --git a/source/page/Map/index.tsx b/source/page/Map/index.tsx
index c192c4b..9bc3a90 100644
--- a/source/page/Map/index.tsx
+++ b/source/page/Map/index.tsx
@@ -45,7 +45,7 @@ export default class MapsPage extends HTMLElement implements CustomElement {
             getCurrent(),
             getOverall()
         ]);
-
+       
         this.virusData = {
             provincesSeries: convertProvincesSeries(rawData, resolution, true),
             countrySeries: convertCountrySeries(overviewData.map(convertStat), resolution),
diff --git a/source/page/data/menu.ts b/source/page/data/menu.ts
index b302043..ed37fe4 100644
--- a/source/page/data/menu.ts
+++ b/source/page/data/menu.ts
@@ -8,7 +8,6 @@ export enum RouteRoot {
     Maps = 'maps',
     Admin = 'admin',
     Community = 'community',
-    Statistics = 'statistics'
 }
 
 export default [
@@ -59,9 +58,5 @@ export default [
     {
         title: '开放社区',
         href: RouteRoot.Community
-    },
-    {
-        title: '疫情统计',
-        href: RouteRoot.Statistics
     }
 ];
diff --git a/source/page/index.tsx b/source/page/index.tsx
index 2dc5b02..c00af6c 100644
--- a/source/page/index.tsx
+++ b/source/page/index.tsx
@@ -31,8 +31,7 @@ const HospitalPage = lazy(() => import('./Hospital')),
     ClinicEdit = lazy(() => import('./Clinic/Edit')),
     UserAdmin = lazy(() => import('./Admin/User')),
     CommunityPage = lazy(() => import('./Community')),
-    MapsPage = lazy(() => import('./Map')),
-    StatisticsPage= lazy(() => import('./Statistics'));
+    MapsPage = lazy(() => import('./Map'))
 const userMenu = [
     {
         title: '管理',
@@ -118,7 +117,6 @@ export const PageFrame: FC = () => (
             <Route path={RouteRoot.Maps} component={MapsPage} />
             <Route path={RouteRoot.Admin} component={UserAdmin} />
             <Route path={RouteRoot.Community} component={CommunityPage} />
-            <Route path={RouteRoot.Statistics} component={StatisticsPage} />
             <Route
                 path="disclaimer"
                 component={({ className = '', ...props }) => (
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index 7e832cd..acfd526 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -87,9 +87,16 @@ export async function getOverall() {
 }
 
 export async function getHistory() {
-    const { body } = await epidemic.get<Province[]>('Area', { Range: '0-9' });
-
-    return body;
+    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' });//
+    for (const item of body) {
+        item["provinceShortName"]=item.provinceName
+        item["confirmedCount"]=item.province_confirmedCount
+        item["suspectedCount"]=item.province_suspectedCount
+        item["curedCount"]=item.province_curedCount
+        item["deadCount"]=item.province_deadCount
+
+    }
+    return body as unknown as Province[];
 }
 
 export async function getCurrent() {

From 03d02b148f42ea724dd956fbde64fd8268b991ac Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Mon, 26 Aug 2024 21:29:26 +0800
Subject: [PATCH 03/12] [fix] fix Map Page

---
 source/page/Map/component/VirusChart.tsx |  45 +++++---
 source/page/Statistics/index.tsx         | 133 -----------------------
 source/page/index.tsx                    |   4 +-
 source/service/Epidemic.ts               |   6 -
 4 files changed, 31 insertions(+), 157 deletions(-)
 delete mode 100644 source/page/Statistics/index.tsx

diff --git a/source/page/Map/component/VirusChart.tsx b/source/page/Map/component/VirusChart.tsx
index f54f0b2..6a024d8 100644
--- a/source/page/Map/component/VirusChart.tsx
+++ b/source/page/Map/component/VirusChart.tsx
@@ -1,4 +1,5 @@
 import { WebCell, component, attribute, observer } from 'web-cell';
+import { formatDate } from 'web-utility';
 import { observable } from 'mobx';
 import { EChartsOption } from 'echarts';
 import 'echarts-jsx/dist/renderers/SVG';
@@ -253,28 +254,44 @@ export class VirusChart
         } as EChartsOption;
     }
 
+    transformData(orderedCountryData: any[]) {
+        return orderedCountryData.map(
+            ({ updateTime, confirmed, suspected, cured, dead }) => ({
+                date: new Date(formatDate(updateTime, 'YYYY/MM')),
+                confirmed,
+                suspected,
+                cured,
+                dead
+            })
+        );
+    }
     mountedCallback() {
         this.classList.add('d-flex', 'flex-column');
     }
-    toMonth(dateString){
-        let date = new Date(dateString);
-        let year = date.getFullYear();
-        let month = date.getMonth(); 
-        return new Date(year, month);
-    }
     render() {
         const { data, area, path } = this.props;
-        
+
         const orderedProvincesData = this.getOrderedTimeData(
                 data.provincesSeries
             ),
             orderedCountryData = this.getOrderedTimeData(data.countrySeries);
-            let confirmedCount =  orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.confirmed])
-            let suspectedCount = orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.suspected])
-            let curedCount = orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.cured])
-            let deadCount = orderedCountryData.map(item=>[this.toMonth(item.updateTime),item.dead])
-           
-            return (
+
+        const transformedCounts = this.transformData(orderedCountryData);
+        const confirmedCount = transformedCounts.map(item => [
+            item.date,
+            item.confirmed
+        ]);
+        const suspectedCount = transformedCounts.map(item => [
+            item.date,
+            item.suspected
+        ]);
+        const curedCount = transformedCounts.map(item => [
+            item.date,
+            item.cured
+        ]);
+        const deadCount = transformedCounts.map(item => [item.date, item.dead]);
+
+        return (
             <>
                 <ec-svg-renderer
                     className="w-100 h-50"
@@ -321,8 +338,6 @@ export class VirusChart
                     <ec-line-chart name="死亡" data={deadCount} />
                     <ec-tooltip trigger="axis" />
                 </ec-svg-renderer>
-
-                
             </>
         );
     }
diff --git a/source/page/Statistics/index.tsx b/source/page/Statistics/index.tsx
deleted file mode 100644
index 9dcf780..0000000
--- a/source/page/Statistics/index.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import { observable } from 'mobx';
-import {component,observer} from 'web-cell';
-import {Overall,AreaData,getOverall,getArea } from '../../service/Epidemic';
-import 'echarts-jsx/dist/renderers/SVG';
-import 'echarts-jsx/dist/components/title';
-import 'echarts-jsx/dist/components/legend';
-import 'echarts-jsx/dist/components/tooltip';
-import 'echarts-jsx/dist/components/grid';
-import 'echarts-jsx/dist/components/x-axis';
-import 'echarts-jsx/dist/components/y-axis';
-import 'echarts-jsx/dist/charts/line';
-import 'echarts-jsx/dist/charts/bar';
-
-@component({ tagName: 'statistics-page' })
-@observer
-export default class StatisticsPage extends HTMLElement {
-  
-    @observable
-    accessor virusData : {
-        overAll: Overall[];
-        areaData:AreaData[];
-    }
-    async mountedCallback() {
-       const [overall,areadata]  =await Promise.all([getOverall(),getArea()])
-
-       this.virusData = {
-        overAll:overall,
-        areaData:areadata,
-        }
-    }
-    toMonth(dateString){
-        let date = new Date(dateString);
-        let year = date.getFullYear();
-        let month = date.getMonth(); 
-        return new Date(year, month);
-    }
-
-    render(){
-        if(this.virusData){
-            let confirmedCount =  this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.confirmedCount])
-            let suspectedCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.suspectedCount])
-            let curedCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.curedCount])
-            let deadCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.deadCount])
-            let seriousCount = this.virusData.overAll.map(item=>[this.toMonth(item.updateTime),item.seriousCount])
-          
-            let cityData =  this.virusData.areaData.filter((item)=>{
-                if(item.provinceName==='广东省'){return item}
-            })
-            let city_confirmedCounts = cityData.map((item)=>[item.cityName,item.city_confirmedCount])
-            let city_curedCounts = cityData.map((item)=>[item.cityName,item.city_curedCount])
-            let city_suspectedCounts = cityData.map((item)=>[item.cityName,item.city_suspectedCount])
-            let city_deadCounts = cityData.map((item)=>[item.cityName,item.city_deadCount])
-            return (
-                <div>
-                    <ec-svg-renderer
-                        className="w-100 h-50"
-                    >
-                        <ec-title text="患者人数数据" top="5%" x="center" />
-                        <ec-legend
-                            orient="horizontal"
-                            bottom="13%"
-                            data={['确诊',"恢复",'严重',"疑似",'死亡']}
-                        />
-                        <ec-tooltip trigger="axis" />
-                        <ec-grid bottom="25%" left={60} />
-                        <ec-x-axis name="日期" type="time" nameGap={5} />
-                        <ec-y-axis id='y1' name="确诊&恢复&严重人数" type="value" nameGap={10}  />
-                        <ec-y-axis id='y2' name="疑似&死亡人数" type="value" nameGap={10}  />
-                    
-                        <ec-bar-chart
-                            data={confirmedCount}
-                            name="确诊"
-                        />
-                        <ec-bar-chart
-                            data={curedCount}
-                            name="恢复"
-                        />
-                        <ec-bar-chart
-                            data={seriousCount}
-                            name="严重"
-                        />
-                        <ec-line-chart
-                            data={suspectedCount}
-                            yAxisIndex={1}
-                            name="疑似"
-                        />
-                        <ec-line-chart
-                            data={deadCount}
-                            yAxisIndex={1}
-                            name="死亡"
-                        />
-                    </ec-svg-renderer>
-
-                    <ec-svg-renderer
-                        className="w-100 h-50"
-                    >
-                        <ec-title text="患者人数地市分布" top="5%" x="center" />
-                        <ec-legend
-                            orient="horizontal"
-                            bottom="13%"
-                            data={['确诊',"恢复",'疑似','死亡']}
-                        />
-                        <ec-tooltip trigger="axis" />
-                        <ec-grid bottom="25%" left={60} />
-                        <ec-x-axis name="地市" type="category" nameGap={5} />
-                        <ec-y-axis id='y1' name="确诊&恢复人数" type="value" nameGap={10}  />
-                        <ec-y-axis id='y2' name="疑似&死亡人数" type="value" nameGap={10}  />
-
-                        <ec-bar-chart
-                            data={city_confirmedCounts}
-                            name="确诊"
-                        />
-                        <ec-bar-chart
-                            data={city_curedCounts}
-                            name="恢复"
-                        />
-                        <ec-line-chart
-                            data={city_suspectedCounts}
-                            name="疑似"
-                            yAxisIndex={1}
-                        />
-                        <ec-line-chart
-                            data={city_deadCounts}
-                            name="死亡"
-                            yAxisIndex={1}
-                        />
-
-                    </ec-svg-renderer>
-                </div>
-            );
-        }
-    }
-}
diff --git a/source/page/index.tsx b/source/page/index.tsx
index c00af6c..28420ea 100644
--- a/source/page/index.tsx
+++ b/source/page/index.tsx
@@ -16,7 +16,6 @@ import logo from '../image/wuhan2020.png';
 import { HomePage } from './Home';
 import Disclaimer from '../../Disclaimer.md';
 
-
 const HospitalPage = lazy(() => import('./Hospital')),
     HospitalEdit = lazy(() => import('./Hospital/Edit')),
     LogisticsPage = lazy(() => import('./Logistics')),
@@ -31,7 +30,7 @@ const HospitalPage = lazy(() => import('./Hospital')),
     ClinicEdit = lazy(() => import('./Clinic/Edit')),
     UserAdmin = lazy(() => import('./Admin/User')),
     CommunityPage = lazy(() => import('./Community')),
-    MapsPage = lazy(() => import('./Map'))
+    MapsPage = lazy(() => import('./Map'));
 const userMenu = [
     {
         title: '管理',
@@ -127,7 +126,6 @@ export const PageFrame: FC = () => (
                     />
                 )}
             />
-            
         </Container>
 
         <footer className="d-md-flex justify-content-around text-center bg-light py-5">
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index acfd526..90d3ea3 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -105,9 +105,3 @@ export async function getCurrent() {
     return body;
 }
 
-export async function getArea() {
-    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-9' });
-
-    return body;
-}
-

From 0436134d8f60cc0247df88de83f327eeec157cfc Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Thu, 29 Aug 2024 08:49:37 +0800
Subject: [PATCH 04/12] [fix]Fixed Map page code details

---
 package.json                             |  2 +-
 source/page/Map/adapter/isaaclin.ts      | 14 +++++-------
 source/page/Map/component/VirusChart.tsx |  6 +++++-
 source/service/Epidemic.ts               | 27 ++++++++++++------------
 4 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/package.json b/package.json
index 9d57e18..7dbf48d 100644
--- a/package.json
+++ b/package.json
@@ -76,7 +76,7 @@
         "clean": "rm -rf .parcel-cache/ dist/",
         "start:local": "npm run clean  &&  cross-env HTTP_ENV=local  parcel source/index.html --open",
         "start:remote": "npm run clean  &&  cross-env HTTP_ENV=remote  parcel source/index.html --open",
-        "start": "npm run && cross-env HTTP_ENV=test  parcel source/index.html --open",
+        "start": "npm run clean  && cross-env HTTP_ENV=test  parcel source/index.html --open",
         "pack-dist": "parcel build source/index.html --public-url . --no-source-maps  &&  tsx fix-script",
         "pack-sw": "rm -f dist/sw.js.map  &&  workbox generateSW",
         "build": "npm run clean  &&  npm run pack-dist  &&  npm run pack-sw"
diff --git a/source/page/Map/adapter/isaaclin.ts b/source/page/Map/adapter/isaaclin.ts
index 56884fc..e679e4b 100644
--- a/source/page/Map/adapter/isaaclin.ts
+++ b/source/page/Map/adapter/isaaclin.ts
@@ -76,7 +76,7 @@ function fillForward<T extends ProvinceData | CityData | CountryData>(
     series: Series<T>
 ) {
     const all_ts = Object.keys(series).sort();
-    
+
     for (const [i, t] of all_ts.entries())
         if (i < all_ts.length - 1)
             for (const name of Object.keys(series[t])) {
@@ -100,17 +100,15 @@ export function convertProvincesSeries(
     source = [...source].sort(
         ({ updateTime: a }, { updateTime: b }) => +b - +a
     );
-    console.log('source',source);
+
     for (const item of source) {
-        const date = new Date(item.updateTime);
-        const timestamp = date.getTime();
-        const t = roundTime(timestamp, resolution);
+        const t = roundTime(+new Date(item.updateTime), resolution);
         if (res[t] === undefined) res[t] = {};
         const prov = convertProvince(item);
 
         res[t][prov.name] = prov;
     }
-    
+
     if (shouldFillForward) fillForward(res);
 
     return res;
@@ -147,8 +145,6 @@ export const convertCountrySeries = (
 ): Series<CountryOverviewData> =>
     Object.fromEntries(
         source.map(item => {
-            const date = new Date(item.updateTime);
-            const timestamp = date.getTime();
-            return [roundTime(timestamp, resolution), item]
+            return [roundTime(+new Date(item.updateTime), resolution), item];
         })
     );
diff --git a/source/page/Map/component/VirusChart.tsx b/source/page/Map/component/VirusChart.tsx
index 6a024d8..626f8d7 100644
--- a/source/page/Map/component/VirusChart.tsx
+++ b/source/page/Map/component/VirusChart.tsx
@@ -38,6 +38,10 @@ const LINE_WIDTH = 5,
 
 export interface VirusChart extends WebCell<VirusChartProps> {}
 
+interface DataItem
+    extends Record<'confirmed' | 'suspected' | 'cured' | 'dead', number> {
+    updateTime: Date;
+}
 /**
  * WebCell 疫情数据折线图可视化组件
  *
@@ -254,7 +258,7 @@ export class VirusChart
         } as EChartsOption;
     }
 
-    transformData(orderedCountryData: any[]) {
+    transformData(orderedCountryData: DataItem[]) {
         return orderedCountryData.map(
             ({ updateTime, confirmed, suspected, cured, dead }) => ({
                 date: new Date(formatDate(updateTime, 'YYYY/MM')),
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index 90d3ea3..1ddf7b6 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -74,12 +74,12 @@ export interface Province extends Base, StatisticData {
     cities?: City[];
 }
 
-export interface AreaData extends Base,
-    Partial<Record<`${'city_' | 'province_'}${StatisticType}Count`,number>>,
-    Record<`${'city'|'continent'|'country'|'province'}EnglishName`,string>,
-    Record<`${'city'|'continent'|'country'|'province'}Name`,string>,
-    Record<`${'city_' | 'province_'}zipCode`,string>{}
-
+export type Area = 'city' | 'continent' | 'country' | 'province';
+export type AreaData = Base &
+    Partial<Record<`${'city' | 'province'}_${StatisticType}Count`, number>> &
+    Record<`${Area}EnglishName`, string> &
+    Record<`${Area}Name`, string> &
+    Record<`${'city' | 'province'}_zipCode`, string>;
 export async function getOverall() {
     const { body } = await epidemic.get<Overall[]>('Overall', { Range: '0-9' });
 
@@ -87,14 +87,14 @@ export async function getOverall() {
 }
 
 export async function getHistory() {
-    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' });//
-    for (const item of body) {
-        item["provinceShortName"]=item.provinceName
-        item["confirmedCount"]=item.province_confirmedCount
-        item["suspectedCount"]=item.province_suspectedCount
-        item["curedCount"]=item.province_curedCount
-        item["deadCount"]=item.province_deadCount
+    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' }); //
 
+    for (const item of body) {
+        item['provinceShortName'] = item.provinceName;
+        item['confirmedCount'] = item.province_confirmedCount;
+        item['suspectedCount'] = item.province_suspectedCount;
+        item['curedCount'] = item.province_curedCount;
+        item['deadCount'] = item.province_deadCount;
     }
     return body as unknown as Province[];
 }
@@ -104,4 +104,3 @@ export async function getCurrent() {
 
     return body;
 }
-

From 0d5bbc162b45082960dfe3a17a61e1d132e0f5f1 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Thu, 29 Aug 2024 22:47:48 +0800
Subject: [PATCH 05/12] [fix]Fix code details

---
 package.json                        |   5 +-
 pnpm-lock.yaml                      | 164 ++++++++++++++++++++++++++++
 source/page/Map/adapter/isaaclin.ts |   8 +-
 source/service/Epidemic.ts          |   6 +-
 4 files changed, 175 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 7dbf48d..a09fc44 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
         "parcel-transformer-markdown": "^3.0.1",
         "prettier": "^3.3.2",
         "process": "^0.11.10",
+        "rimraf": "^6.0.1",
         "tsx": "^4.15.6",
         "typescript": "~5.4.5",
         "workbox-cli": "^7.1.0"
@@ -73,10 +74,10 @@
     "scripts": {
         "prepare": "husky",
         "test": "lint-staged  &&  tsc --noEmit",
-        "clean": "rm -rf .parcel-cache/ dist/",
+        "clean": "rimraf .parcel-cache/ dist/",
         "start:local": "npm run clean  &&  cross-env HTTP_ENV=local  parcel source/index.html --open",
         "start:remote": "npm run clean  &&  cross-env HTTP_ENV=remote  parcel source/index.html --open",
-        "start": "npm run clean  && cross-env HTTP_ENV=test  parcel source/index.html --open",
+        "start": "npm run clean  &&  cross-env HTTP_ENV=test  parcel source/index.html --open",
         "pack-dist": "parcel build source/index.html --public-url . --no-source-maps  &&  tsx fix-script",
         "pack-sw": "rm -f dist/sw.js.map  &&  workbox generateSW",
         "build": "npm run clean  &&  npm run pack-dist  &&  npm run pack-sw"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 082dec3..ccdeecc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -105,6 +105,9 @@ importers:
       process:
         specifier: ^0.11.10
         version: 0.11.10
+      rimraf:
+        specifier: ^6.0.1
+        version: 6.0.1
       tsx:
         specifier: ^4.15.6
         version: 4.15.6
@@ -802,6 +805,12 @@ packages:
     cpu: [arm64]
     os: [linux]
 
+  '@esbuild/linux-arm@0.21.5':
+    resolution: {integrity: sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==}
+    engines: {node: '>=12'}
+    cpu: [arm]
+    os: [linux]
+
   '@esbuild/linux-ia32@0.21.5':
     resolution: {integrity: sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==}
     engines: {node: '>=12'}
@@ -909,6 +918,10 @@ packages:
   '@humanwhocodes/object-schema@2.0.2':
     resolution: {integrity: sha512-6EwiSjwWYP7pTckG6I5eyFANjPhmPjUX9JRLUSfNPC7FX7zK9gyZAfUEaECL6ALTpGX5AjnBq3C9XmVWPitNpw==}
 
+  '@isaacs/cliui@8.0.2':
+    resolution: {integrity: sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==}
+    engines: {node: '>=12'}
+
   '@jridgewell/gen-mapping@0.3.3':
     resolution: {integrity: sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==}
     engines: {node: '>=6.0.0'}
@@ -1356,30 +1369,35 @@ packages:
     engines: {node: '>= 10.0.0'}
     cpu: [arm]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-glibc@2.4.0':
     resolution: {integrity: sha512-QuJTAQdsd7PFW9jNGaV9Pw+ZMWV9wKThEzzlY3Lhnnwy7iW23qtQFPql8iEaSFMCVI5StNNmONUopk+MFKpiKg==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-arm64-musl@2.4.0':
     resolution: {integrity: sha512-oyN+uA9xcTDo/45bwsd6TFHa7Lc7hKujyMlvwrCLvSckvWogndCEoVYFNfZ6JJ2KNL/6fFiGPcbjp8jJmEh5Ng==}
     engines: {node: '>= 10.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-linux-x64-glibc@2.4.0':
     resolution: {integrity: sha512-KphV8awJmxU3q52JQvJot0QMu07CIyEjV+2Tb2ZtbucEgqyRcxOBDMsqp1JNq5nuDXtcCC0uHQICeiEz38dPBQ==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@parcel/watcher-linux-x64-musl@2.4.0':
     resolution: {integrity: sha512-7jzcOonpXNWcSijPpKD5IbC6xC7yTibjJw9jviVzZostYLGxbz8LDJLUnLzLzhASPlPGgpeKLtFUMjAAzM+gSA==}
     engines: {node: '>= 10.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@parcel/watcher-win32-arm64@2.4.0':
     resolution: {integrity: sha512-NOej2lqlq8bQNYhUMnOD0nwvNql8ToQF+1Zhi9ULZoG+XTtJ9hNnCFfyICxoZLXor4bBPTOnzs/aVVoefYnjIg==}
@@ -1415,6 +1433,10 @@ packages:
     peerDependencies:
       '@parcel/core': ^2.12.0
 
+  '@pkgjs/parseargs@0.11.0':
+    resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==}
+    engines: {node: '>=14'}
+
   '@rollup/plugin-babel@5.3.1':
     resolution: {integrity: sha512-WFfdLWU/xVWKeRQnKmIAQULUI7Il0gZnBIH/ZFO069wYIfPu+8zrfp/KMW0atmELoRDq8FbiP3VCss9MhCut7Q==}
     engines: {node: '>= 10.0.0'}
@@ -1494,24 +1516,28 @@ packages:
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   '@swc/core-linux-arm64-musl@1.4.1':
     resolution: {integrity: sha512-b/vWGQo2n7lZVUnSQ7NBq3Qrj85GrAPPiRbpqaIGwOytiFSk8VULFihbEUwDe0rXgY4LDm8z8wkgADZcLnmdUA==}
     engines: {node: '>=10'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   '@swc/core-linux-x64-gnu@1.4.1':
     resolution: {integrity: sha512-AFMQlvkKEdNi1Vk2GFTxxJzbICttBsOQaXa98kFTeWTnFFIyiIj2w7Sk8XRTEJ/AjF8ia8JPKb1zddBWr9+bEQ==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   '@swc/core-linux-x64-musl@1.4.1':
     resolution: {integrity: sha512-QX2MxIECX1gfvUVZY+jk528/oFkS9MAl76e3ZRvG2KC/aKlCQL0KSzcTSm13mOxkDKS30EaGRDRQWNukGpMeRg==}
     engines: {node: '>=10'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   '@swc/core-win32-arm64-msvc@1.4.1':
     resolution: {integrity: sha512-OklkJYXXI/tntD2zaY8i3iZldpyDw5q+NAP3k9OlQ7wXXf37djRsHLV0NW4+ZNHBjE9xp2RsXJ0jlOJhfgGoFA==}
@@ -2100,6 +2126,9 @@ packages:
   duplexer3@0.1.5:
     resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==}
 
+  eastasianwidth@0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+
   echarts-jsx@1.2.1:
     resolution: {integrity: sha512-epcIsL91qcVbd/3gzKPa1cxSqhBtcG5uphDwse6edzTd8m61WGg3O/Sr/DBI5/nZISuOCKBbT0INdMrw1IzCfQ==}
     peerDependencies:
@@ -2125,6 +2154,9 @@ packages:
   emoji-regex@8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
+  emoji-regex@9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+
   end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
 
@@ -2296,6 +2328,10 @@ packages:
   for-each@0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
 
+  foreground-child@3.3.0:
+    resolution: {integrity: sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==}
+    engines: {node: '>=14'}
+
   fs-extra@9.1.0:
     resolution: {integrity: sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==}
     engines: {node: '>=10'}
@@ -2370,6 +2406,11 @@ packages:
     resolution: {integrity: sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==}
     engines: {node: '>=10.13.0'}
 
+  glob@11.0.0:
+    resolution: {integrity: sha512-9UiX/Bl6J2yaBbxKoEBRm4Cipxgok8kQYcOPEhScPwebu2I0HoQOuYdIO6S3hLuWoZgpDpwQZMzTFxgpkyT76g==}
+    engines: {node: 20 || >=22}
+    hasBin: true
+
   glob@7.2.3:
     resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
 
@@ -2712,6 +2753,10 @@ packages:
   iterable-observer@1.0.1:
     resolution: {integrity: sha512-qy2Kuf1drKVmWgWaRsqdM8EHanAW4xS37j1nFdVP07qiN0Mj4D5sl9dYA8mZJdX/d3De4bhZoFuVWXvcOM1usg==}
 
+  jackspeak@4.0.1:
+    resolution: {integrity: sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==}
+    engines: {node: 20 || >=22}
+
   jake@10.8.7:
     resolution: {integrity: sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==}
     engines: {node: '>=10'}
@@ -2833,24 +2878,28 @@ packages:
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-arm64-musl@1.23.0:
     resolution: {integrity: sha512-cU00LGb6GUXCwof6ACgSMKo3q7XYbsyTj0WsKHLi1nw7pV0NCq8nFTn6ZRBYLoKiV8t+jWl0Hv8KkgymmK5L5g==}
     engines: {node: '>= 12.0.0'}
     cpu: [arm64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-linux-x64-gnu@1.23.0:
     resolution: {integrity: sha512-q4jdx5+5NfB0/qMbXbOmuC6oo7caPnFghJbIAV90cXZqgV8Am3miZhC4p+sQVdacqxfd+3nrle4C8icR3p1AYw==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [glibc]
 
   lightningcss-linux-x64-musl@1.23.0:
     resolution: {integrity: sha512-G9Ri3qpmF4qef2CV/80dADHKXRAQeQXpQTLx7AiQrBYQHqBjB75oxqj06FCIe5g4hNCqLPnM9fsO4CyiT1sFSQ==}
     engines: {node: '>= 12.0.0'}
     cpu: [x64]
     os: [linux]
+    libc: [musl]
 
   lightningcss-win32-x64-msvc@1.23.0:
     resolution: {integrity: sha512-1rcBDJLU+obPPJM6qR5fgBUiCdZwZLafZM5f9kwjFLkb/UBNIzmae39uCSmh71nzPCTXZqHbvwu23OWnWEz+eg==}
@@ -2918,6 +2967,10 @@ packages:
     resolution: {integrity: sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==}
     engines: {node: '>=8'}
 
+  lru-cache@11.0.0:
+    resolution: {integrity: sha512-Qv32eSV1RSCfhY3fpPE2GNZ8jgM9X7rdAfemLWqTUxwiyIC4jJ6Sy0fZ8H+oLWevO6i4/bizg7c8d8i6bxrzbA==}
+    engines: {node: 20 || >=22}
+
   lru-cache@5.1.1:
     resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==}
 
@@ -2997,6 +3050,10 @@ packages:
     resolution: {integrity: sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==}
     engines: {node: '>=4'}
 
+  minimatch@10.0.1:
+    resolution: {integrity: sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==}
+    engines: {node: 20 || >=22}
+
   minimatch@3.1.2:
     resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==}
 
@@ -3015,6 +3072,10 @@ packages:
   minimist@1.2.8:
     resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
 
+  minipass@7.1.2:
+    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
+    engines: {node: '>=16 || 14 >=14.17'}
+
   mobx-github@0.3.2:
     resolution: {integrity: sha512-Q0MugbQ8iTxaazzauBbyuqZAdS57s6DoROISh4ENbYG2dXyu72EV9Kb6k/8QjQDKgLBD/5dRW16znMExPWFWKw==}
 
@@ -3161,6 +3222,9 @@ packages:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
     engines: {node: '>=6'}
 
+  package-json-from-dist@1.0.0:
+    resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==}
+
   package-json@6.5.0:
     resolution: {integrity: sha512-k3bdm2n25tkyxcjSKzB5x8kfVxlMdgsbPr0GkZcwHsLpba6cBjqCt1KlcChKEvxHIcTB1FVMuwoijZ26xex5MQ==}
     engines: {node: '>=8'}
@@ -3207,6 +3271,10 @@ packages:
   path-parse@1.0.7:
     resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
 
+  path-scurry@2.0.0:
+    resolution: {integrity: sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==}
+    engines: {node: 20 || >=22}
+
   path-type@4.0.0:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
@@ -3397,6 +3465,12 @@ packages:
 
   rimraf@3.0.2:
     resolution: {integrity: sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==}
+    deprecated: Rimraf versions prior to v4 are no longer supported
+    hasBin: true
+
+  rimraf@6.0.1:
+    resolution: {integrity: sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==}
+    engines: {node: 20 || >=22}
     hasBin: true
 
   rollup@2.79.1:
@@ -3537,6 +3611,10 @@ packages:
     resolution: {integrity: sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==}
     engines: {node: '>=8'}
 
+  string-width@5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+
   string-width@7.1.0:
     resolution: {integrity: sha512-SEIJCWiX7Kg4c129n48aDRwLbFb2LJmXXFrWBG4NGaRtMQ3myKPKbwrD1BKqQn74oCoNMBVrfDEr5M9YxCsrkw==}
     engines: {node: '>=18'}
@@ -3900,6 +3978,14 @@ packages:
   workbox-window@7.1.0:
     resolution: {integrity: sha512-ZHeROyqR+AS5UPzholQRDttLFqGMwP0Np8MKWAdyxsDETxq3qOAyXvqessc3GniohG6e0mAqSQyKOHmT8zPF7g==}
 
+  wrap-ansi@7.0.0:
+    resolution: {integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==}
+    engines: {node: '>=10'}
+
+  wrap-ansi@8.1.0:
+    resolution: {integrity: sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==}
+    engines: {node: '>=12'}
+
   wrap-ansi@9.0.0:
     resolution: {integrity: sha512-G8ura3S+3Z2G+mkgNRq8dqaFZAuxfsxpBB8OCTGRTCtp+l/v9nbFNmCUP1BZMts3G1142MsZfn6eeUKrr4PD1Q==}
     engines: {node: '>=18'}
@@ -4734,6 +4820,9 @@ snapshots:
   '@esbuild/linux-arm64@0.21.5':
     optional: true
 
+  '@esbuild/linux-arm@0.21.5':
+    optional: true
+
   '@esbuild/linux-ia32@0.21.5':
     optional: true
 
@@ -4808,6 +4897,15 @@ snapshots:
 
   '@humanwhocodes/object-schema@2.0.2': {}
 
+  '@isaacs/cliui@8.0.2':
+    dependencies:
+      string-width: 5.1.2
+      string-width-cjs: string-width@4.2.3
+      strip-ansi: 7.1.0
+      strip-ansi-cjs: strip-ansi@6.0.1
+      wrap-ansi: 8.1.0
+      wrap-ansi-cjs: wrap-ansi@7.0.0
+
   '@jridgewell/gen-mapping@0.3.3':
     dependencies:
       '@jridgewell/set-array': 1.1.2
@@ -5633,6 +5731,9 @@ snapshots:
       '@parcel/utils': 2.12.0
       nullthrows: 1.1.1
 
+  '@pkgjs/parseargs@0.11.0':
+    optional: true
+
   '@rollup/plugin-babel@5.3.1(@babel/core@7.24.5)(rollup@2.79.1)':
     dependencies:
       '@babel/core': 7.24.5
@@ -6349,6 +6450,8 @@ snapshots:
 
   duplexer3@0.1.5: {}
 
+  eastasianwidth@0.2.0: {}
+
   echarts-jsx@1.2.1(typescript@5.4.5):
     dependencies:
       dom-renderer: 2.3.0(typescript@5.4.5)
@@ -6377,6 +6480,8 @@ snapshots:
 
   emoji-regex@8.0.0: {}
 
+  emoji-regex@9.2.2: {}
+
   end-of-stream@1.4.4:
     dependencies:
       once: 1.4.0
@@ -6466,6 +6571,7 @@ snapshots:
       '@esbuild/darwin-x64': 0.21.5
       '@esbuild/freebsd-arm64': 0.21.5
       '@esbuild/freebsd-x64': 0.21.5
+      '@esbuild/linux-arm': 0.21.5
       '@esbuild/linux-arm64': 0.21.5
       '@esbuild/linux-ia32': 0.21.5
       '@esbuild/linux-loong64': 0.21.5
@@ -6651,6 +6757,11 @@ snapshots:
     dependencies:
       is-callable: 1.2.7
 
+  foreground-child@3.3.0:
+    dependencies:
+      cross-spawn: 7.0.3
+      signal-exit: 4.1.0
+
   fs-extra@9.1.0:
     dependencies:
       at-least-node: 1.0.0
@@ -6733,6 +6844,15 @@ snapshots:
     dependencies:
       is-glob: 4.0.3
 
+  glob@11.0.0:
+    dependencies:
+      foreground-child: 3.3.0
+      jackspeak: 4.0.1
+      minimatch: 10.0.1
+      minipass: 7.1.2
+      package-json-from-dist: 1.0.0
+      path-scurry: 2.0.0
+
   glob@7.2.3:
     dependencies:
       fs.realpath: 1.0.0
@@ -7034,6 +7154,12 @@ snapshots:
     dependencies:
       '@swc/helpers': 0.5.11
 
+  jackspeak@4.0.1:
+    dependencies:
+      '@isaacs/cliui': 8.0.2
+    optionalDependencies:
+      '@pkgjs/parseargs': 0.11.0
+
   jake@10.8.7:
     dependencies:
       async: 3.2.5
@@ -7245,6 +7371,8 @@ snapshots:
 
   lowercase-keys@2.0.0: {}
 
+  lru-cache@11.0.0: {}
+
   lru-cache@5.1.1:
     dependencies:
       yallist: 3.1.1
@@ -7316,6 +7444,10 @@ snapshots:
 
   min-indent@1.0.1: {}
 
+  minimatch@10.0.1:
+    dependencies:
+      brace-expansion: 2.0.1
+
   minimatch@3.1.2:
     dependencies:
       brace-expansion: 1.1.11
@@ -7336,6 +7468,8 @@ snapshots:
 
   minimist@1.2.8: {}
 
+  minipass@7.1.2: {}
+
   mobx-github@0.3.2(typescript@5.4.5):
     dependencies:
       '@octokit/openapi-types': 22.2.0
@@ -7514,6 +7648,8 @@ snapshots:
 
   p-try@2.2.0: {}
 
+  package-json-from-dist@1.0.0: {}
+
   package-json@6.5.0:
     dependencies:
       got: 9.6.0
@@ -7581,6 +7717,11 @@ snapshots:
 
   path-parse@1.0.7: {}
 
+  path-scurry@2.0.0:
+    dependencies:
+      lru-cache: 11.0.0
+      minipass: 7.1.2
+
   path-type@4.0.0: {}
 
   picocolors@1.0.0: {}
@@ -7760,6 +7901,11 @@ snapshots:
     dependencies:
       glob: 7.2.3
 
+  rimraf@6.0.1:
+    dependencies:
+      glob: 11.0.0
+      package-json-from-dist: 1.0.0
+
   rollup@2.79.1:
     optionalDependencies:
       fsevents: 2.3.3
@@ -7895,6 +8041,12 @@ snapshots:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
+  string-width@5.1.2:
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.1.0
+
   string-width@7.1.0:
     dependencies:
       emoji-regex: 10.3.0
@@ -8355,6 +8507,18 @@ snapshots:
       '@types/trusted-types': 2.0.7
       workbox-core: 7.1.0
 
+  wrap-ansi@7.0.0:
+    dependencies:
+      ansi-styles: 4.3.0
+      string-width: 4.2.3
+      strip-ansi: 6.0.1
+
+  wrap-ansi@8.1.0:
+    dependencies:
+      ansi-styles: 6.2.1
+      string-width: 5.1.2
+      strip-ansi: 7.1.0
+
   wrap-ansi@9.0.0:
     dependencies:
       ansi-styles: 6.2.1
diff --git a/source/page/Map/adapter/isaaclin.ts b/source/page/Map/adapter/isaaclin.ts
index e679e4b..541bbe3 100644
--- a/source/page/Map/adapter/isaaclin.ts
+++ b/source/page/Map/adapter/isaaclin.ts
@@ -104,6 +104,7 @@ export function convertProvincesSeries(
     for (const item of source) {
         const t = roundTime(+new Date(item.updateTime), resolution);
         if (res[t] === undefined) res[t] = {};
+
         const prov = convertProvince(item);
 
         res[t][prov.name] = prov;
@@ -144,7 +145,8 @@ export const convertCountrySeries = (
     resolution: number
 ): Series<CountryOverviewData> =>
     Object.fromEntries(
-        source.map(item => {
-            return [roundTime(+new Date(item.updateTime), resolution), item];
-        })
+        source.map(item => [
+            roundTime(+new Date(item.updateTime), resolution),
+            item
+        ])
     );
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index 1ddf7b6..929b179 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -87,15 +87,15 @@ export async function getOverall() {
 }
 
 export async function getHistory() {
-    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' }); //
+    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' });
 
-    for (const item of body) {
+    body.map(item => {
         item['provinceShortName'] = item.provinceName;
         item['confirmedCount'] = item.province_confirmedCount;
         item['suspectedCount'] = item.province_suspectedCount;
         item['curedCount'] = item.province_curedCount;
         item['deadCount'] = item.province_deadCount;
-    }
+    });
     return body as unknown as Province[];
 }
 

From c1edee2e82207c5707aa86e2a728b98fb04301e5 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Mon, 2 Sep 2024 10:57:52 +0800
Subject: [PATCH 06/12] [fix]Fix the map function

---
 source/service/Epidemic.ts | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index 929b179..61f267b 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -89,14 +89,15 @@ export async function getOverall() {
 export async function getHistory() {
     const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' });
 
-    body.map(item => {
-        item['provinceShortName'] = item.provinceName;
-        item['confirmedCount'] = item.province_confirmedCount;
-        item['suspectedCount'] = item.province_suspectedCount;
-        item['curedCount'] = item.province_curedCount;
-        item['deadCount'] = item.province_deadCount;
-    });
-    return body as unknown as Province[];
+    const updatedBody = body.map(item => ({
+        ...item,
+        provinceShortName: item.provinceName,
+        confirmedCount: item.province_confirmedCount,
+        suspectedCount: item.province_suspectedCount,
+        curedCount: item.province_curedCount,
+        deadCount: item.province_deadCount
+    }));
+    return updatedBody as unknown as Province[];
 }
 
 export async function getCurrent() {

From a9d2ae66617589598d52bbadabadd7099bc3b4c6 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Thu, 5 Sep 2024 09:26:07 +0800
Subject: [PATCH 07/12] [fix]Fix the output type of getHistory function.

---
 source/service/Epidemic.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index 61f267b..b281bb5 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -90,14 +90,16 @@ export async function getHistory() {
     const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' });
 
     const updatedBody = body.map(item => ({
-        ...item,
+        id: item.id,
+        updateTime: item.updateTime,
         provinceShortName: item.provinceName,
         confirmedCount: item.province_confirmedCount,
         suspectedCount: item.province_suspectedCount,
         curedCount: item.province_curedCount,
         deadCount: item.province_deadCount
     }));
-    return updatedBody as unknown as Province[];
+
+    return updatedBody as Province[];
 }
 
 export async function getCurrent() {

From 0859ddac89ad97270d87bd4c79ca2e587e538865 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Tue, 10 Sep 2024 11:58:16 +0800
Subject: [PATCH 08/12] [fix]Fix map json path, map data request API add range
 date filter condition

---
 source/page/Map/data/province.ts | 3 ++-
 source/service/Epidemic.ts       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/source/page/Map/data/province.ts b/source/page/Map/data/province.ts
index 06feef3..65cd3ee 100644
--- a/source/page/Map/data/province.ts
+++ b/source/page/Map/data/province.ts
@@ -1,4 +1,5 @@
-const server_root = 'https://geo.datav.aliyun.com/areas_v3/bound/';
+const server_root =
+    'https://oss-toolbox.kaiyuanshe.cn/proxy/geo.datav.aliyun.com/areas_v3/bound/';
 
 export default {
     中国: server_root + '100000_full.json',
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index b281bb5..c5cd010 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -87,7 +87,9 @@ export async function getOverall() {
 }
 
 export async function getHistory() {
-    const { body } = await epidemic.get<AreaData[]>('Area', { Range: '0-199' });
+    const { body } = await epidemic.get<AreaData[]>(
+        'Area?updateTime=gt.2022-01-01T10:54:11&updateTime=lt.2022-12-30T10:54:11&countryName=eq.%E4%B8%AD%E5%9B%BD'
+    );
 
     const updatedBody = body.map(item => ({
         id: item.id,

From 9d465a214ee7d76a257d1b7128510b12791998a8 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Thu, 19 Sep 2024 12:00:53 +0800
Subject: [PATCH 09/12] [optimize]To reduce the number of data requests, modify
 the map timeline button functionality so that a click initiates a REQUEST
 request that contains only the current date data and renders the data to the
 map

---
 source/page/Map/component/EChartsMap.tsx | 27 +++++++++++++++--
 source/page/Map/component/VirusMap.tsx   | 38 +++++++++++++++++++-----
 source/service/Epidemic.ts               | 11 ++++---
 3 files changed, 62 insertions(+), 14 deletions(-)

diff --git a/source/page/Map/component/EChartsMap.tsx b/source/page/Map/component/EChartsMap.tsx
index 1898997..e0a4cfe 100644
--- a/source/page/Map/component/EChartsMap.tsx
+++ b/source/page/Map/component/EChartsMap.tsx
@@ -2,6 +2,7 @@ import { DataObject } from 'dom-renderer';
 import { WebCell, component, attribute, observer } from 'web-cell';
 import { observable } from 'mobx';
 import { EChartsOption, EChartsType, init, registerMap } from 'echarts';
+import { getHistory } from '../../../service/Epidemic';
 
 import { long2short } from '../adapter';
 
@@ -92,13 +93,22 @@ export class EChartsMap
                     hovered = '';
                 }
             })
-            .on('click', 'timeline', ({ dataIndex }) =>
+            .on('click', 'timeline', async ({ dataIndex }) => {
+                const clickedDate = new Date(dataIndex);
+                const formattedDate = clickedDate.toISOString().split('T')[0]; // 格式化日期为 YYYY-MM-DD
                 chart.dispatchAction({
                     type: 'timelineChange',
                     // index of time point
                     currentIndex: data.findIndex(d => d === dataIndex)
                 })
-            );
+                try {
+                    const newData = await getHistory(formattedDate);
+                    // 更新图表数据
+                    this.updateChartData(newData);
+                } catch (error) {
+                    console.error('Failed to fetch data:', error);
+                }
+            })
     }
 
     async loadData() {
@@ -119,4 +129,17 @@ export class EChartsMap
 
         chart.hideLoading();
     }
+
+    // 添加一个方法来更新图表数据
+    updateChartData(newData) {
+        // 根据新数据更新图表
+        this.chart.setOption({
+            series: [{
+                data: newData.map(item => ({
+                    name: item.provinceShortName,
+                    value: item.confirmedCount
+                }))
+            }]
+        });
+    }
 }
diff --git a/source/page/Map/component/VirusMap.tsx b/source/page/Map/component/VirusMap.tsx
index 971347c..c3a08e5 100644
--- a/source/page/Map/component/VirusMap.tsx
+++ b/source/page/Map/component/VirusMap.tsx
@@ -94,7 +94,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
         mapScale: 1,
         chartArea: this.name
     };
-   
+
     get basicVisualMap() {
         return {
             show: true,
@@ -194,7 +194,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
             isAdjustLabel = true,
             domWidth = chart.getWidth(),
             domHeight = chart.getHeight();
-            
+
         let options = this.baseOptions(this.name, this.breaks);
 
         if (isForceRatio)
@@ -222,12 +222,11 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
                   options
               ) as any)
             : (this.getChartOptions(this.data as MapDataType, options) as any);
-                
+
         chart.setOption(options);
     };
 
     getChartOptions = (data: MapDataType, options?: any) => {
-
         options ||= this.baseOptions(this.name, this.breaks);
 
         const extra = this.overrides(data);
@@ -238,6 +237,29 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
         return options;
     };
 
+    getTimelineData = () => {
+        // 定义开始和结束日期
+        const startDate = new Date('2022-09-01');
+        const endDate = new Date('2022-09-29');
+
+        // 计算时间间隔（以毫秒为单位）
+        const interval = 24 * 60 * 60 * 1000; // 一天的毫秒数
+        const timestampArray = Array.from(
+            {
+                length:
+                    (endDate.getTime() - startDate.getTime()) /
+                        (interval as number) +
+                    1
+            },
+            (_, i) => {
+                const date = new Date(startDate);
+                date.setDate(date.getDate() + i);
+                return date.getTime();
+            }
+        );
+
+        return timestampArray;
+    };
     getSTChartOptions = (data: STMapDataType, options?: any) => {
         options ||= this.baseOptions(this.name, this.breaks);
         options['timeline'] = {
@@ -246,7 +268,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
             tooltip: {},
             playInterval: 1500,
             currentIndex: data.timeline.length - 1,
-            data: data.timeline,
+            data: this.getTimelineData(), //[1668700800000, 1668787200000, 1668873600000], //data.timeline,
             left: 'left',
             right: 0,
             label: {
@@ -264,8 +286,8 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
                 }
             }
         };
-        const sortedTimeline = data.timeline.slice().sort();
 
+        const sortedTimeline = [...data.timeline].sort();
         return {
             baseOption: options,
             options: sortedTimeline.map(t => this.overrides(data.data[t]))
@@ -279,10 +301,10 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
     mountedCallback() {
         this.classList.add(style.box);
     }
-   
+
     render() {
         const { name, data, currentChartArea, chartData, chartPath } = this;
-        
+
         return (
             <>
                 <EChartsMap
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index c5cd010..15f8f74 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -85,12 +85,15 @@ export async function getOverall() {
 
     return body;
 }
-
-export async function getHistory() {
+//updateTime=gt.2022-01-01T10:54:11&updateTime=lt.2022-12-30T10:54:11  2022-09-29T14:14:55
+export async function getHistory(date: string = '2022-09-01') {
+    const startOfDay = `${date}T00:00:00`;
+    const endOfDay = `${date}T23:59:59`;
+    
     const { body } = await epidemic.get<AreaData[]>(
-        'Area?updateTime=gt.2022-01-01T10:54:11&updateTime=lt.2022-12-30T10:54:11&countryName=eq.%E4%B8%AD%E5%9B%BD'
+        `Area?updateTime=gt.${startOfDay}&updateTime=lt.${endOfDay}&countryName=eq.中国&limit=299`
     );
-
+    
     const updatedBody = body.map(item => ({
         id: item.id,
         updateTime: item.updateTime,

From 2794e26b1358b210e1f5d1aa332c41ee97d09e9f Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Thu, 19 Sep 2024 22:24:38 +0800
Subject: [PATCH 10/12] [fix]Further refinement of codes

---
 source/page/Map/component/EChartsMap.tsx | 26 ++++++++++++----------
 source/page/Map/component/VirusMap.tsx   | 28 ++++++------------------
 source/service/Epidemic.ts               | 13 +++++++----
 3 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/source/page/Map/component/EChartsMap.tsx b/source/page/Map/component/EChartsMap.tsx
index e0a4cfe..f1d53d8 100644
--- a/source/page/Map/component/EChartsMap.tsx
+++ b/source/page/Map/component/EChartsMap.tsx
@@ -2,9 +2,10 @@ import { DataObject } from 'dom-renderer';
 import { WebCell, component, attribute, observer } from 'web-cell';
 import { observable } from 'mobx';
 import { EChartsOption, EChartsType, init, registerMap } from 'echarts';
-import { getHistory } from '../../../service/Epidemic';
+import { getHistory, Province } from '../../../service/Epidemic';
 
 import { long2short } from '../adapter';
+import { formatDate } from 'web-utility';
 
 export interface EChartsMapProps {
     /**
@@ -94,13 +95,12 @@ export class EChartsMap
                 }
             })
             .on('click', 'timeline', async ({ dataIndex }) => {
-                const clickedDate = new Date(dataIndex);
-                const formattedDate = clickedDate.toISOString().split('T')[0]; // 格式化日期为 YYYY-MM-DD
+                const formattedDate = formatDate(dataIndex, 'YYYY-MM-DD');
                 chart.dispatchAction({
                     type: 'timelineChange',
                     // index of time point
                     currentIndex: data.findIndex(d => d === dataIndex)
-                })
+                });
                 try {
                     const newData = await getHistory(formattedDate);
                     // 更新图表数据
@@ -108,7 +108,7 @@ export class EChartsMap
                 } catch (error) {
                     console.error('Failed to fetch data:', error);
                 }
-            })
+            });
     }
 
     async loadData() {
@@ -131,15 +131,17 @@ export class EChartsMap
     }
 
     // 添加一个方法来更新图表数据
-    updateChartData(newData) {
+    updateChartData(newData: Province[]) {
         // 根据新数据更新图表
         this.chart.setOption({
-            series: [{
-                data: newData.map(item => ({
-                    name: item.provinceShortName,
-                    value: item.confirmedCount
-                }))
-            }]
+            series: [
+                {
+                    data: newData.map(item => ({
+                        name: item.provinceShortName,
+                        value: item.confirmedCount
+                    }))
+                }
+            ]
         });
     }
 }
diff --git a/source/page/Map/component/VirusMap.tsx b/source/page/Map/component/VirusMap.tsx
index c3a08e5..099c106 100644
--- a/source/page/Map/component/VirusMap.tsx
+++ b/source/page/Map/component/VirusMap.tsx
@@ -1,6 +1,6 @@
 import { WebCell, component, attribute, observer } from 'web-cell';
 import { observable } from 'mobx';
-import { Hour } from 'web-utility';
+import { Day, Hour } from 'web-utility';
 
 import { EChartsMapProps, EChartsMap } from './EChartsMap';
 import { VirusChart } from './VirusChart';
@@ -239,26 +239,12 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
 
     getTimelineData = () => {
         // 定义开始和结束日期
-        const startDate = new Date('2022-09-01');
-        const endDate = new Date('2022-09-29');
-
-        // 计算时间间隔（以毫秒为单位）
-        const interval = 24 * 60 * 60 * 1000; // 一天的毫秒数
-        const timestampArray = Array.from(
-            {
-                length:
-                    (endDate.getTime() - startDate.getTime()) /
-                        (interval as number) +
-                    1
-            },
-            (_, i) => {
-                const date = new Date(startDate);
-                date.setDate(date.getDate() + i);
-                return date.getTime();
-            }
+        const startDate = +new Date('2022-09-01');
+        const endDate = +new Date('2022-09-28');
+        return Array.from(
+            { length: (endDate - startDate) / Day + 1 },
+            (_, i) => startDate + Day * i
         );
-
-        return timestampArray;
     };
     getSTChartOptions = (data: STMapDataType, options?: any) => {
         options ||= this.baseOptions(this.name, this.breaks);
@@ -268,7 +254,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
             tooltip: {},
             playInterval: 1500,
             currentIndex: data.timeline.length - 1,
-            data: this.getTimelineData(), //[1668700800000, 1668787200000, 1668873600000], //data.timeline,
+            data: this.getTimelineData(),
             left: 'left',
             right: 0,
             label: {
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index 15f8f74..d24269b 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -86,14 +86,19 @@ export async function getOverall() {
     return body;
 }
 //updateTime=gt.2022-01-01T10:54:11&updateTime=lt.2022-12-30T10:54:11  2022-09-29T14:14:55
-export async function getHistory(date: string = '2022-09-01') {
+export async function getHistory(date = '2022-09-01') {
     const startOfDay = `${date}T00:00:00`;
     const endOfDay = `${date}T23:59:59`;
-    
+
     const { body } = await epidemic.get<AreaData[]>(
-        `Area?updateTime=gt.${startOfDay}&updateTime=lt.${endOfDay}&countryName=eq.中国&limit=299`
+        `Area?${new URLSearchParams([
+            ['updateTime', `gt.${startOfDay}`],
+            ['updateTime', `lt.${endOfDay}`],
+            ['countryName', 'eq.中国'],
+            ['limit', '299']
+        ])}`
     );
-    
+
     const updatedBody = body.map(item => ({
         id: item.id,
         updateTime: item.updateTime,

From 2b08208a5862b9447e6ca620b8365e498f62067b Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Sat, 21 Sep 2024 09:25:38 +0800
Subject: [PATCH 11/12] [fix]Remove extra comment code, getTimelineData
 function to accessor property timelineData

---
 source/page/Map/component/EChartsMap.tsx | 4 ----
 source/page/Map/component/VirusMap.tsx   | 7 +++----
 source/service/Epidemic.ts               | 1 -
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/source/page/Map/component/EChartsMap.tsx b/source/page/Map/component/EChartsMap.tsx
index f1d53d8..98b22cb 100644
--- a/source/page/Map/component/EChartsMap.tsx
+++ b/source/page/Map/component/EChartsMap.tsx
@@ -103,7 +103,6 @@ export class EChartsMap
                 });
                 try {
                     const newData = await getHistory(formattedDate);
-                    // 更新图表数据
                     this.updateChartData(newData);
                 } catch (error) {
                     console.error('Failed to fetch data:', error);
@@ -129,10 +128,7 @@ export class EChartsMap
 
         chart.hideLoading();
     }
-
-    // 添加一个方法来更新图表数据
     updateChartData(newData: Province[]) {
-        // 根据新数据更新图表
         this.chart.setOption({
             series: [
                 {
diff --git a/source/page/Map/component/VirusMap.tsx b/source/page/Map/component/VirusMap.tsx
index 099c106..6072503 100644
--- a/source/page/Map/component/VirusMap.tsx
+++ b/source/page/Map/component/VirusMap.tsx
@@ -237,15 +237,14 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
         return options;
     };
 
-    getTimelineData = () => {
-        // 定义开始和结束日期
+    get timelineData() {
         const startDate = +new Date('2022-09-01');
         const endDate = +new Date('2022-09-28');
         return Array.from(
             { length: (endDate - startDate) / Day + 1 },
             (_, i) => startDate + Day * i
         );
-    };
+    }
     getSTChartOptions = (data: STMapDataType, options?: any) => {
         options ||= this.baseOptions(this.name, this.breaks);
         options['timeline'] = {
@@ -254,7 +253,7 @@ export class VirusMap extends HTMLElement implements WebCell<VirusMapProps> {
             tooltip: {},
             playInterval: 1500,
             currentIndex: data.timeline.length - 1,
-            data: this.getTimelineData(),
+            data: this.timelineData,
             left: 'left',
             right: 0,
             label: {
diff --git a/source/service/Epidemic.ts b/source/service/Epidemic.ts
index d24269b..ef9dd77 100644
--- a/source/service/Epidemic.ts
+++ b/source/service/Epidemic.ts
@@ -85,7 +85,6 @@ export async function getOverall() {
 
     return body;
 }
-//updateTime=gt.2022-01-01T10:54:11&updateTime=lt.2022-12-30T10:54:11  2022-09-29T14:14:55
 export async function getHistory(date = '2022-09-01') {
     const startOfDay = `${date}T00:00:00`;
     const endOfDay = `${date}T23:59:59`;

From a7db8d4dc6e54d6b6007845baf186c44b3bd7e53 Mon Sep 17 00:00:00 2001
From: ziwu7 <263377135@qq.com>
Date: Sat, 21 Sep 2024 16:01:07 +0800
Subject: [PATCH 12/12] [fix]Standardize code formatting

---
 source/page/Map/component/EChartsMap.tsx | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/source/page/Map/component/EChartsMap.tsx b/source/page/Map/component/EChartsMap.tsx
index 98b22cb..77046f0 100644
--- a/source/page/Map/component/EChartsMap.tsx
+++ b/source/page/Map/component/EChartsMap.tsx
@@ -2,10 +2,10 @@ import { DataObject } from 'dom-renderer';
 import { WebCell, component, attribute, observer } from 'web-cell';
 import { observable } from 'mobx';
 import { EChartsOption, EChartsType, init, registerMap } from 'echarts';
-import { getHistory, Province } from '../../../service/Epidemic';
+import { formatDate } from 'web-utility';
 
+import { getHistory, Province } from '../../../service/Epidemic';
 import { long2short } from '../adapter';
-import { formatDate } from 'web-utility';
 
 export interface EChartsMapProps {
     /**
@@ -101,12 +101,9 @@ export class EChartsMap
                     // index of time point
                     currentIndex: data.findIndex(d => d === dataIndex)
                 });
-                try {
-                    const newData = await getHistory(formattedDate);
-                    this.updateChartData(newData);
-                } catch (error) {
-                    console.error('Failed to fetch data:', error);
-                }
+                const newData = await getHistory(formattedDate);
+
+                this.updateChartData(newData);
             });
     }