From 2bb9f61d28e88fd18383f3205b6523d264aae6e3 Mon Sep 17 00:00:00 2001
From: guange <8863824@gmail.com>
Date: Fri, 18 Jan 2019 15:43:41 +0800
Subject: [PATCH] .

---
 chapter2/mysite/myapp/static/scripts/trend.js | 19 +++++++------------
 .../mysite/myapp/templates/myapp/result.html  |  2 +-
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/chapter2/mysite/myapp/static/scripts/trend.js b/chapter2/mysite/myapp/static/scripts/trend.js
index 4916551..88893e8 100755
--- a/chapter2/mysite/myapp/static/scripts/trend.js
+++ b/chapter2/mysite/myapp/static/scripts/trend.js
@@ -409,7 +409,11 @@ $(function(){
 
    })
 
-   //年龄分布
+   //终端分布
+   var pieChart1Data = [];
+   for(var key in from_type_info){
+     pieChart1Data.push({value: from_type_info[key], name: key});
+   }
    var pieChart1 = echarts.init(document.getElementById('pieChart1'));
    pieChart1.setOption({
      color:["#32cd32","#ff7f50","#87cefa","#FD6C88","#4b5cc4","#faff72"],
@@ -420,24 +424,15 @@ $(function(){
      calculable : true,
      series : [
          {
-             name:'购买人群',
+             name:'终端分布',
              type:'pie',
              radius : [30, 110],
              center : ['50%', '50%'],
              roseType : 'area',
              x: '50%',
         
-
-
              sort : 'ascending',
-             data:[
-                 {value:10, name:'婴儿(1-3岁)'},
-                 {value:5, name:'少儿(4-10岁)'},
-                 {value:15, name:'少年(10-18岁)'},
-                 {value:25, name:'青年(18-45岁)'},
-                 {value:125, name:'中年(45-60岁)'},
-                 {value:175, name:'老年(60岁以上)'},
-             ]
+             data: pieChart1Data
          }
      ]
    })
diff --git a/chapter2/mysite/myapp/templates/myapp/result.html b/chapter2/mysite/myapp/templates/myapp/result.html
index ff28170..22c4fa6 100644
--- a/chapter2/mysite/myapp/templates/myapp/result.html
+++ b/chapter2/mysite/myapp/templates/myapp/result.html
@@ -105,7 +105,7 @@
 <div class="div_any" style="margin-left: 0.5%;">
     <div class="left div_any01" style="width:27%;">
         <div class="div_any_child" style="height: 420px;">
-            <div class="div_any_title"><img src="{% static "images/title_18.png" %}">年龄分布</div>
+            <div class="div_any_title"><img src="{% static "images/title_18.png" %}">购买终端分布</div>
             <p id="pieChart1" class="p_chart" style="height: 400px;"></p>
         </div>
     </div>