From d11371e526763ff41c7a71c9009ffeb427474277 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Mon, 21 Jan 2019 10:47:46 +0800
Subject: [PATCH] .

---
 chapter2/mysite/myapp/static/styles/common.css  |  2 +-
 .../mysite/myapp/templates/myapp/crawl.html     | 17 +++++++++--------
 chapter2/mysite/myapp/templatetags/__init__.py  |  0
 chapter2/mysite/myapp/templatetags/myapp.py     |  9 +++++++++
 chapter2/mysite/myapp/views.py                  |  3 ++-
 5 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 chapter2/mysite/myapp/templatetags/__init__.py
 create mode 100644 chapter2/mysite/myapp/templatetags/myapp.py
diff --git a/chapter2/mysite/myapp/static/styles/common.css b/chapter2/mysite/myapp/static/styles/common.css
index 6aafd2a..351449f 100755
--- a/chapter2/mysite/myapp/static/styles/common.css
+++ b/chapter2/mysite/myapp/static/styles/common.css
@@ -1057,7 +1057,7 @@ border-radius: 3px;
     text-align: right;
     display: block;
     color: #ffffff;
-    width: 130px;
+    width: 100px;
 }
 .percentChart li .rightPercent{
     flex:1;
diff --git a/chapter2/mysite/myapp/templates/myapp/crawl.html b/chapter2/mysite/myapp/templates/myapp/crawl.html
index f18bc72..c6d44f4 100644
--- a/chapter2/mysite/myapp/templates/myapp/crawl.html
+++ b/chapter2/mysite/myapp/templates/myapp/crawl.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load myapp %}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -8,7 +9,7 @@
     <link href="{% static "styles/common.css" %}" rel="stylesheet">
 
     <script type="text/javascript">
-			var platform_info = {{platform_info|safe}};
+			var platform_info = {{platform_info_json|safe}};
 
 			var last_day_product = {{last_day_product|safe}};
 			var last_day_comment = {{last_day_comment|safe}};
@@ -109,21 +110,21 @@
                 <div class="div_any_title"><img src="{% static "images/title_2.png" %}">各商品采集数据量</div>
                 <div class="percentChart">
                     <li>
-                     <span class="leftTitle">京东Android</span>
+                     <span class="leftTitle">存储空间</span>
                      <div class="rightPercent">
-                      <span>120</span>
-                      <p style="width:30%">40</p >
+                      <span>{{platform_info.disk_total}}</span>
+                      <p style="width:{%present(platform_info.disk_used,platform_info.disk_total)%}%">{{platform_info.disk_used}}</plaintext></p >
                      </div>
                     </li>
                     <li>
-                     <span class="leftTitle">京东iPhone</span>
+                     <span class="leftTitle">内存占用</span>
                      <div class="rightPercent">
-                      <span>500</span>
-                      <p style="width:60%">300</p >
+                      <span>{{platform_info.mem_total}}</span>
+                      <p style="width:{%present(platform_info.mem_used / platform_info.mem_total)%}%">{{platform_info.mem_used}}</p >
                      </div>
                     </li>
                     <li>
-                     <span class="leftTitle">微信购物</span>
+                     <span class="leftTitle">进程数</span>
                      <div class="rightPercent">
                       <span>300</span>
                       <p style="width:50%">150</p >
diff --git a/chapter2/mysite/myapp/templatetags/__init__.py b/chapter2/mysite/myapp/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/chapter2/mysite/myapp/templatetags/myapp.py b/chapter2/mysite/myapp/templatetags/myapp.py
new file mode 100644
index 0000000..490303e
--- /dev/null
+++ b/chapter2/mysite/myapp/templatetags/myapp.py
@@ -0,0 +1,9 @@
+
+from django import template
+
+register = template.Library()
+
+
+def present(val1, val2):
+    """获取两个数的百分比，取整 val1 / val2 """
+    return int(val1 * 100 / val2)
\ No newline at end of file
diff --git a/chapter2/mysite/myapp/views.py b/chapter2/mysite/myapp/views.py
index 53ea574..86fc29d 100644
--- a/chapter2/mysite/myapp/views.py
+++ b/chapter2/mysite/myapp/views.py
@@ -22,7 +22,8 @@ def crawl(request):
     last_day_comment.append(last_day.comment_c)
 
   return render(request, 'myapp/crawl.html', {"crawl_info": crawl_info, 
-    "platform_info":json.dumps(platform_info),
+    "platform_info_json":json.dumps(platform_info),
+    "platform_info": platform_info,
     "news": news,
     "last_day_product":json.dumps(last_day_product),
     "last_day_comment": json.dumps(last_day_comment)})	
