From 441b0a52aac0493f27c7af8938d7d560ce76f384 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Tue, 22 Jan 2019 14:42:11 +0800
Subject: [PATCH] 1

---
 chapter2/mysite/myapp/static/scripts/index.js | 19 +++++++++++
 .../mysite/myapp/templates/myapp/crawl.html   | 34 ++++++++++---------
 2 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/chapter2/mysite/myapp/static/scripts/index.js b/chapter2/mysite/myapp/static/scripts/index.js
index cb24aa9..c66f226 100755
--- a/chapter2/mysite/myapp/static/scripts/index.js
+++ b/chapter2/mysite/myapp/static/scripts/index.js
@@ -2,6 +2,25 @@ var symptomName = last_month_day();
 
 $(function(){
 
+    //更新抓取信息
+    $.ajax('/myapp/api/crawl_info.json').done(function(data){
+        console.log(data);
+        $('#crawl_info_total_count').html(data.total_count);
+        $('#crawl_info_today_count').html(data.today_total_count);
+        $('#crawl_info_product_count').html(data.product_count);
+        $('#crawl_info_today_product_count').html(data.today_product_count);
+        $('#crawl_info_comment_count').html(data.comment_count);
+        $('#crawl_info_today_comment_count').html(data.today_comment_count);
+    });
+
+    $.ajax('/myapp/api/platform_info.json').done(function(data){
+        $('#disk_freed').html(data.disk_freed+'G');
+        $('#disk_used').html(data.disk_used+'G');
+        $('#mem_free').html(data.mem_free+'G');
+        $('#mem_used').html(data.mem_used+'G');
+        $('#tasks_count').html(data.tasks);
+    });
+
 
   init();
   init2();
diff --git a/chapter2/mysite/myapp/templates/myapp/crawl.html b/chapter2/mysite/myapp/templates/myapp/crawl.html
index 6abf16a..bcb19c5 100644
--- a/chapter2/mysite/myapp/templates/myapp/crawl.html
+++ b/chapter2/mysite/myapp/templates/myapp/crawl.html
@@ -54,14 +54,14 @@
                 <img src="{% static "images/info_1.png" %}" class="left text01_img"/>
                 <div class="left text01_div">
                     <p>总采集数据量(条)</p>
-                    <p>{{ crawl_info.total_count }}</p>
+                    <p id="crawl_info_total_count">{{ crawl_info.total_count }}</p>
                 </div>
             </div>
             <div class="con_div_text01 right">
                 <img src="{% static "images/info_2.png" %}" class="left text01_img"/>
                 <div class="left text01_div">
                     <p>当天采集数据量(条)</p>
-                    <p>{{ crawl_info.today_total_count }}</p>
+                    <p id="crawl_info_today_count">{{ crawl_info.today_total_count }}</p>
                 </div>
             </div>
         </div>
@@ -70,14 +70,14 @@
                 <img src="{% static "images/info_3.png" %}" class="left text01_img"/>
                 <div class="left text01_div">
                     <p>商品采集总数(条)</p>
-                    <p class="sky">{{ crawl_info.product_count }}</p>
+                    <p class="sky" id="crawl_info_product_count">{{ crawl_info.product_count }}</p>
                 </div>
             </div>
             <div class="con_div_text01 right">
                 <img src="{% static "images/info_4.png" %}" class="left text01_img"/>
                 <div class="left text01_div">
                     <p>当天商品采集(条)</p>
-                    <p class="sky">{{ crawl_info.today_product_count }}</p>
+                    <p class="sky" id="crawl_info_today_product_count">{{ crawl_info.today_product_count }}</p>
                 </div>
             </div>
         </div>
@@ -87,14 +87,14 @@
                 <img src="{% static "images/info_5.png" %}" class="left text01_img"/>
                 <div class="left text01_div">
                     <p>评论采集总量(条)</p>
-                    <p class="org">{{ crawl_info.comment_count }}</p>
+                    <p class="org" id="crawl_info_comment_count">{{ crawl_info.comment_count }}</p>
                 </div>
             </div>
             <div class="con_div_text01 right">
                 <img src="{% static "images/info_6.png" %}" class="left text01_img"/>
                 <div class="left text01_div">
                     <p>当天评论采集(条)</p>
-                    <p class="org">{{ crawl_info.today_comment_count }}</p>
+                    <p class="org" id="crawl_info_today_comment_count">{{ crawl_info.today_comment_count }}</p>
                 </div>
             </div>
         </div>
@@ -103,35 +103,37 @@
     <div class="div_any">
         <div class="left div_any01">
             <div class="div_any_child">
-                <div class="div_any_title"><img src="{% static "images/title_1.png" %}">cpu用量</div>
-                <p id="pieChart1" class="p_chart"></p>
-            </div>
-            <div class="div_any_child">
-                <div class="div_any_title"><img src="{% static "images/title_2.png" %}">各商品采集数据量</div>
+                <div class="div_any_title"><img src="{% static "images/title_2.png" %}">服务器状态</div>
                 <div class="percentChart">
                     <li>
                      <span class="leftTitle">存储空间</span>
                      <div class="rightPercent">
-                      <span>{{platform_info.disk_freed}}G</span>
-                      <p style="width:{% present platform_info.disk_used platform_info.disk_total %}%">{{platform_info.disk_used}}G</plaintext></p >
+                      <span id="disk_freed">{{platform_info.disk_freed}}G</span>
+                      <p id="disk_used" style="width:{% present platform_info.disk_used platform_info.disk_total %}%">{{platform_info.disk_used}}G</p >
                      </div>
                     </li>
                     <li>
                      <span class="leftTitle">内存占用</span>
                      <div class="rightPercent">
-                      <span>{{platform_info.mem_free|to_g}}G</span>
-                      <p style="width:{% present platform_info.mem_used platform_info.mem_total %}%">{{platform_info.mem_used|to_g}}G</p >
+                      <span id="mem_free">{{platform_info.mem_free|to_g}}G</span>
+                      <p id="mem_used" style="width:{% present platform_info.mem_used platform_info.mem_total %}%">{{platform_info.mem_used|to_g}}G</p >
                      </div>
                     </li>
                     <li>
                      <span class="leftTitle">进程数</span>
                      <div class="rightPercent">
                       <span></span>
-                      <p style="width:100%">{{platform_info.tasks}}</p >
+                      <p id="tasks_count" style="width:100%">{{platform_info.tasks}}</p >
                      </div>
                     </li>
                    </div>
             </div>
+            <div class="div_any_child">
+
+                <div class="div_any_title"><img src="{% static "images/title_1.png" %}">cpu用量</div>
+                <p id="pieChart1" class="p_chart"></p>
+                
+            </div>
         </div>
         <div class="div_any02 left ">
             <div class="left div_table_box" style="width: 100%;">