From ec550dbaab2743958b713c9077295cbe08f37826 Mon Sep 17 00:00:00 2001
From: yangxudongll <1593744164@qq.com>
Date: Wed, 12 Aug 2020 18:31:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E5=A4=96=E7=96=AB=E6=83=85=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../__pycache__/models.cpython-36.pyc         | Bin 3089 -> 3405 bytes
 .../新冠疫情/hello.py                     |   7 +-
 .../新冠疫情/models.py                    |   2 +-
 .../新冠疫情/templates/foreign.html       |  73 ++++++++++++++++--
 数据存储/.idea/workspace.xml              |  21 ++---
 数据存储/DataFrame.py                     |  26 ++-----
 .../__pycache__/DataFrame.cpython-36.pyc      | Bin 8722 -> 8260 bytes
 7 files changed, 85 insertions(+), 44 deletions(-)

diff --git a/数据分析和可视化/新冠疫情/__pycache__/models.cpython-36.pyc b/数据分析和可视化/新冠疫情/__pycache__/models.cpython-36.pyc
index 22c4966c28639ff29f5afc60e09ba224f7d8f14e..7ea1016c023579afffcd0d38566c1b210a5a5541 100644
GIT binary patch
delta 201
zcmbOzaaM}Un3tE!a+7hqC-+3IV#bt-b+J4tVl50&yeZ<r44M)f@4IkKV)x{zC{E2u
zO)gQGY{(|Vo}6ErS5j0txr<$QvH>fXcyfMTT4qshYKlTiYH_kcPG)XqiGrcQ<XSd!
zbMC^@)S}AxlKcWg178LPhGGsN!NAA?gglH@qVB0BZbkXIE>3z#>ijhMCaZC$Gb&Gh
i$Spp30XLVF7*G#T3nvE)2O9?nu!Auh2m9nh-2MQjl{2FN

delta 77
zcmX>rHBo}gn3tEUuGu(VfomdHF=Nccx>%NA22HVz&t15f{WN(eNAsjlR^%0)e2a%m
bLWF^VfrF8QlY@nWjROSO!I*9GKOTPo)Oio-

diff --git a/数据分析和可视化/新冠疫情/hello.py b/数据分析和可视化/新冠疫情/hello.py
index a3ed7ef..1bebf49 100644
--- a/数据分析和可视化/新冠疫情/hello.py
+++ b/数据分析和可视化/新冠疫情/hello.py
@@ -52,7 +52,8 @@ def GlobalInfomation():
     country.append("中国")
     confirmed = [x[0] for x in results]
     confirmed.append(db.searchSummaryChina('2020-08-10')[0][1])
-
+    top10data=db.query_top10(nowtime)
+    print(top10data)
     summaryData=db.querySummaryForeign(nowtime)[0]
     data=jsonify(country=country, confirmed=confirmed,died=[x[1] for x in results],
                  crued=[x[2] for x in results],curConfirm=[x[4] for x in results],
@@ -60,7 +61,9 @@ def GlobalInfomation():
                  TotalConfirmed=summaryData[1],TotalCurConfirm=summaryData[2],
                  TotalconfirmRelative=summaryData[3],TotalCrued=summaryData[4],
                  TotalDied=summaryData[6],TotalDiedRelative=summaryData[7],
-                 TotalCruedRelative=summaryData[5],TotalcurConfirmRelative=summaryData[9])
+                 TotalCruedRelative=summaryData[5],TotalcurConfirmRelative=summaryData[9],
+                 top10confirmed=[x[0] for x in top10data],top10curconfirm=[x[1] for x in top10data],
+                 top10country=[x[2] for x in top10data])
     return data
 
 @app.route("/")
diff --git a/数据分析和可视化/新冠疫情/models.py b/数据分析和可视化/新冠疫情/models.py
index 2c717e3..7281eb6 100644
--- a/数据分析和可视化/新冠疫情/models.py
+++ b/数据分析和可视化/新冠疫情/models.py
@@ -76,7 +76,7 @@ class GetFromDB():
     #新增国家top10
     def query_top10(self,date):
         thedate=date+"%"
-        sql='select confirmed,confirmedRelative from ForeignCountry where pub_date like "%s" order by confirmed desc limit 10'%(thedate)
+        sql='select confirmed,confirmedRelative,country from ForeignCountry where pub_date like "%s" order by confirmed desc limit 10'%(thedate)
         self.cursor.execute(sql)
         return self.cursor.fetchall()
 
diff --git a/数据分析和可视化/新冠疫情/templates/foreign.html b/数据分析和可视化/新冠疫情/templates/foreign.html
index 34416a9..b108022 100644
--- a/数据分析和可视化/新冠疫情/templates/foreign.html
+++ b/数据分析和可视化/新冠疫情/templates/foreign.html
@@ -115,8 +115,8 @@
                     </div>
                     <div class="map t_common">
                         <div class="map_tit tit_common">
-                            <span class="tit_con">当前确诊人数最多的5个省份</span>
-                            <div class="map_con" id="top5chart" style="width:100%;height:300px;"></div>
+                            <span class="tit_con">当前确诊人数最多的10个国家</span>
+                            <div class="map_con" id="top10chart" style="width:100%;height:300px;"></div>
                         </div>
                     </div>
                     <div id="echarts1" style="width:100%;height:4rem;margin-bottom:0.4rem;"></div>
@@ -164,12 +164,12 @@
 
 //在国内，国外疫情，防护知识间切换
 
-console.log("+++++++++++++++++++++++++++++");
+
 var ospan = document.querySelectorAll('.middle_con .wrap .tabs .tabs_wrap span');
-console.log(ospan.length);
+
 var num_op = 0;
 var tabs_list = document.querySelectorAll('.middle_con .wrap .tabs_content .tabs_list');
-console.log(tabs_list.length);
+
 tabs_list[0].style.display = 'block';
 for (var i = 0; i < ospan.length; i++) {
     ospan[i].index = i;
@@ -429,7 +429,7 @@ dataRange:{
 
         };
 
-
+//表格填充
 function eachchina(province,confirmed,curconfirm,died) {
     var str = '';
     if (province.length!=0) {
@@ -450,6 +450,54 @@ function eachchina(province,confirmed,curconfirm,died) {
     }
 }
 
+//绘制世界top10确诊国家
+var top10chart=echarts.init(document.getElementById('top10chart'));
+var top10option={
+    title:{
+        text:'确诊top10',
+        left:'20px',
+
+    },
+    tooltip:{
+        trigger:"axis",
+    },
+    legend:{
+        itemWith:15,
+        itemHeight:15,
+        data:['累计确诊','新增确诊']
+    },
+    xAxis:{
+        type:'category',
+        data:[],
+        splitLine:{
+            show:true,
+        },
+        axisLabel:{interval: 0}
+    },
+    yAxis:{
+        splitLine:{
+            show:false,
+           }
+    },
+    series:[{
+        name:'累计确诊',
+        type:'bar',
+        stack:'累计',
+        data:[],
+
+    },{
+        name:'新增确诊',
+        type:'bar',
+        stack:'新增',
+        data:[],
+
+    }
+
+    ]
+};
+
+
+
 $.ajax({
     cache:false,
     type:'POST',
@@ -472,8 +520,7 @@ $.ajax({
 
         confirmed=results.confirmed;
         foreignName=results.country;
-        console.log(confirmed);
-        console.log(foreignName);
+
         for(i=0;i<confirmed.length;i++){
             option.series[0].data.push({name:foreignName[i],value:confirmed[i]});
         }
@@ -481,10 +528,20 @@ $.ajax({
         curConfirmedRelative=results.confirmedRelative;
         died=results.died;
         $(".china.table_pro .content").html(eachchina(foreignName,confirmed,curConfirmedRelative,died));
+        top10confirmed=results.top10confirmed;
+        top10curconfirm=results.top10curconfirm;
+        top10country=results.top10country;
+        for(i=0;i<10;i++){
+            top10option.xAxis.data.push(top10country[i]);
+            top10option.series[0].data.push(top10confirmed[i]);
+            top10option.series[1].data.push(top10curconfirm[i]);
+        }
+
     }
 
 });
     myChart.setOption(option);
+    top10chart.setOption(top10option);
 
 
 
diff --git a/数据存储/.idea/workspace.xml b/数据存储/.idea/workspace.xml
index 6ff662c..c8a9e3e 100644
--- a/数据存储/.idea/workspace.xml
+++ b/数据存储/.idea/workspace.xml
@@ -4,14 +4,9 @@
     <list default="true" id="fcea9d71-f4b2-41ab-b680-ecae8402b966" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/hello.py" beforeDir="false" afterPath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/hello.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/models.py" beforeDir="false" afterPath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/models.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/static/js/update.js" beforeDir="false" afterPath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/static/js/update.js" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/templates/foreign.html" beforeDir="false" afterPath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/templates/foreign.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/templates/global.html" beforeDir="false" afterPath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/templates/global.html" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/templates/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/../数据分析和可视化/新冠疫情/templates/index.html" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/DataFrame.py" beforeDir="false" afterPath="$PROJECT_DIR$/DataFrame.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/GrapData.py" beforeDir="false" afterPath="$PROJECT_DIR$/GrapData.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/xinguan.sql" beforeDir="false" afterPath="$PROJECT_DIR$/xinguan.sql" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -91,22 +86,22 @@
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
     <state x="704" y="108" width="624" height="753" key="FileChooserDialogImpl/67.27.1853.1053@67.27.1853.1053" timestamp="1596679790740" />
-    <state width="1814" height="398" key="GridCell.Tab.0.bottom" timestamp="1597212800889">
+    <state width="1814" height="437" key="GridCell.Tab.0.bottom" timestamp="1597227635575">
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
-    <state width="1814" height="398" key="GridCell.Tab.0.bottom/67.27.1853.1053@67.27.1853.1053" timestamp="1597212800889" />
-    <state width="1814" height="398" key="GridCell.Tab.0.center" timestamp="1597212800886">
+    <state width="1814" height="437" key="GridCell.Tab.0.bottom/67.27.1853.1053@67.27.1853.1053" timestamp="1597227635575" />
+    <state width="1814" height="437" key="GridCell.Tab.0.center" timestamp="1597227635572">
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
-    <state width="1814" height="398" key="GridCell.Tab.0.center/67.27.1853.1053@67.27.1853.1053" timestamp="1597212800886" />
-    <state width="1814" height="398" key="GridCell.Tab.0.left" timestamp="1597212800883">
+    <state width="1814" height="437" key="GridCell.Tab.0.center/67.27.1853.1053@67.27.1853.1053" timestamp="1597227635572" />
+    <state width="1814" height="437" key="GridCell.Tab.0.left" timestamp="1597227635571">
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
-    <state width="1814" height="398" key="GridCell.Tab.0.left/67.27.1853.1053@67.27.1853.1053" timestamp="1597212800883" />
-    <state width="1814" height="398" key="GridCell.Tab.0.right" timestamp="1597212800888">
+    <state width="1814" height="437" key="GridCell.Tab.0.left/67.27.1853.1053@67.27.1853.1053" timestamp="1597227635571" />
+    <state width="1814" height="437" key="GridCell.Tab.0.right" timestamp="1597227635573">
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
-    <state width="1814" height="398" key="GridCell.Tab.0.right/67.27.1853.1053@67.27.1853.1053" timestamp="1597212800888" />
+    <state width="1814" height="437" key="GridCell.Tab.0.right/67.27.1853.1053@67.27.1853.1053" timestamp="1597227635573" />
     <state x="67" y="27" width="1521" height="1053" key="SettingsEditor" timestamp="1596677393346">
       <screen x="67" y="27" width="1853" height="1053" />
     </state>
diff --git a/数据存储/DataFrame.py b/数据存储/DataFrame.py
index cc5ed3d..79f96ac 100644
--- a/数据存储/DataFrame.py
+++ b/数据存储/DataFrame.py
@@ -119,26 +119,6 @@ class SaveToDB():
             autocommit=True
         )
 
-    def connect(self):
-        self.conn = pymysql.connect(
-            user=self.user,
-            host=self.host,
-            port=self.port,
-            password=self.password,
-            database='xinguan',
-            autocommit=True
-        )
-        curser=self.conn.cursor()
-        curser.execute('insert into ForeignCountry(confirmed,'
-                       'died,crued,country,curConfirm,confirmedRelative,pub_data) '
-                       'values(1,1,1,"英国",1,1,"2020-10-18 10:00:00");')
-        self.__rule('ForeignCountry')
-        curser.execute('select * from ForeignCountry;')
-        data=curser.fetchall()
-        frame=pd.DataFrame(list(data),columns=['id','confirmed','died','crued','country','curConfirm','curConfirmRelative','pubdate'])
-        print(frame['country'])
-        curser.close()
-        self.conn.close()
 
     #存储国内各省疫情信息
     def InsertIntoProvince(self,data):
@@ -184,7 +164,13 @@ class SaveToDB():
         cursor.execute(deletesql)
         #设置ID从最小开始
         self.__rule('ForeignCountry')
+        flag=0
         for i in range(len(data)):
+            if data[i][3]=='美国':
+                if flag==1:
+                    continue
+                else:
+                    flag=1
             sql='insert into ForeignCountry(confirmed,died,crued,country,curConfirm,' \
             'confirmedRelative,pub_date) values(%d,%d,%d,"%s",%d,%d,"%s");'%(data[i])
             cursor.execute(sql)
diff --git a/数据存储/__pycache__/DataFrame.cpython-36.pyc b/数据存储/__pycache__/DataFrame.cpython-36.pyc
index 317d3604d736ac59af047c2f91273688345ca9ef..272491d970f30e402e18df6c24002a919315c90b 100644
GIT binary patch
delta 950
zcmbu7O=uHA6vt;ayPM6X4M|8$6Rr6`#pp>xVolQ;O$=H=kRH^9Qr6BIs%btZ8)(CZ
zA~_1BILAUkubyh5H?@c~;MIe6?;^c;@+`jD=s~C+>J0OH^XB96=FR_E`F&B%jE<^z
z-eu-Lrnb~qeqRM4WFQR_qzNR%KKS$EEJ}x&Kd^%}HVC|A8_}oRFTy2^v+RE8bjp^f
zUauOqt7g<~X`$9=8)-LHA&e~&-PGv>i$tzti_Jy$aE_fC`*iCPY{Ho=7&^gmnIq3J
z$x+~#0{jX@r}=_&@(Q07Ij(YCW0hzEud!;h;8S2hgi(Ug-eg<R5LVe<G_gu>Pg>SY
z(UdIQhh9c=Gd<bDmK;Syf+0T^=&~sjcOPS9NkjnO1YhBPt6Ud}(36N~c;guAxh>(5
zU^%B-<+}(xcOPLy5LC*0n_`|>4$z$>M$KRsVujTM7x*0+@b%5wmyOrm?D?a#Zf@#G
zjV;Cc_nfjT|1P^NHR)pA99Ca(zVWc?+v3BTUj6+CyYbk?N`o4U)q1JXf!iya@X&S&
zfCLqf2ntrgia3b<SaG^2h-~HfI?ipYC!XMflbUpBYK{)%zh(jw7>u96JM7!|bCB2i
z$?yLcY&U)u57<HcbMa4krd>`7n#a^1fYS9PLz5Rev~5u8g=Y>i0y9mXpQoLgvCn=a
zra^&zZ#c#!Ny{8JIBs&xaO7DlnLOu%DU>Lv1QowBrUaBAO~X>!Lo;A(xvAHQ-nNA%
JVQ-VOKLHfw$~6E0

delta 1144
zcmbu9O-vI(6vubAU)ybgEwq#xptX_68o>fefD*$;LGc4k;Gm5OSvm{Sl(x=pF_IEA
z<$wVa;&}7s)f12yFKS{G6Hg=_G<!55@oJ)HeQ!Y%6TN6>-*4Z(zIpFIJCl7q@E|33
zRaME?R=cJ?9ov$(mFjUp5Og6;sE`(EJ%6Y4`Dt)PNXs-dA*f+41)dU%zYIKCCXk6g
zCzuR23}!q8m_nA6g{%nX0CR%5D4`;CY`Dw96j;`s^;Co<QYKl6IxB<-5c5)(?P1J)
z=*f^Jn!c>xtSXBYLOoQXUMf=`_1~aXw0c&eH5=lR!>lels4pTMPOGU1c1d^E_NV~T
zm2uVv;wDu$Ylk~Kg-9Se5S@rFKxq@e*BWjNYievk%awGawc{j?_~*5){YTH^2M?Wz
z&O}=WTs^UlL|+20xSC|gVfJE^q386B89TxE!ollFOPr(3g$>+@Iz%hNi--Wyo?>a5
zYNoCd%abYOO7nR`RoH3#{|w?!lDm0tuw^+d&FE(4rk2ZDVv$<jlxAw9Oq<s&XKv0g
zEmx7v<>8je6%1W<GTbW5ohdOxXO<IsYL;sT^O+AD+3^4Dy9kaE0|><VYluV^Wg<Jk
zh!i1l;wKVWR3@|qeX@`mYR?q%d00LF9$eq~Ry#~OyJ0@-Mf4$(0L#U+{H$&{a(bQ(
zKtT1_%GeNQ^zysG5wgj5gS#ZfH$oqzk%N?OeyhGNF^W0o5CaEcT+`u9^v)y35El>^
zc_3C-?H|j-ip|Nw@SJ()G2g52=Tc||%D)MZ@cRvw|8K!>M?z#9DmU?GkyVn~89Z{2
z9F%o2Tlvue&;tkXuX=5%JkVH2Uh!CSi1#(FgTl9sU;m|y+#DkBq0GmY-#0*Y*aFgC
zQ=5j@k6S+ox_B%aCi}c6dY1UO;tNIXgLetv;AI4U8Q2xXRYa1<91Z+M)Z3=OqeNsy
hs+Vdd1x7%sWhw+!uYH0ocTvkz&0zfy<6oi^KLCDK_g?@2