From 93cff61aeb2b257c0cb6b4bacea9e29b204876d0 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Mon, 26 Jul 2021 21:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/pages/analysis.html      |  4 ++--
 web/pages/modeltable.html    |  8 ++++----
 web/src/x.min.js             | 11 ++++++-----
 web/srczip/common.js         |  7 ++++---
 web/srczip/logic/analysis.js |  4 ++--
 5 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/web/pages/analysis.html b/web/pages/analysis.html
index dc50e1c..6dcb331 100644
--- a/web/pages/analysis.html
+++ b/web/pages/analysis.html
@@ -224,7 +224,7 @@
 
     <div class="analysis-con-left-screen-list">
         <!-- 指标选择 -->
-        {{#  if(item.customEvent != " " && item.customEvent != undefined){ }}
+        {{#  if(item.customEvent != "" && item.customEvent != undefined){ }}
             <div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box-{{index}}" style="display: none;">
         {{#  } else { }}
             <div class="analysis-con-left-screen-list-left-box" id="analysis-con-left-screen-list-left-box-{{index}}">
@@ -285,7 +285,7 @@
             {{#  } }} 
         </div>
         <!-- 公式 -->
-        {{#  if(item.customEvent != " " && item.customEvent != undefined){ }}
+        {{#  if(item.customEvent != "" && item.customEvent != undefined){ }}
             <div class="analysis-custom-box" id="analysis-custom-box-{{index}}" style="display: block;">
         {{#  } else { }}
             <div class="analysis-custom-box" id="analysis-custom-box-{{index}}">
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index a207d67..3efdf9f 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -156,10 +156,10 @@
                     <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
                 </div>
                 </div>
-                <p class="dqtime">2021-03-23(二)</p>
+                <p class="dqtime">{{d.date}}</p>
                 <div class="data-box">
                 <div style="display: flex; align-items: center;">
-                    <div class="data-num">{{d.sameday}}<span>人</span></div>
+                    <div class="data-num">{{d.sameday}}<span></span></div>
                     <div class="proportion">
                         <!-- <div class="proportion-data">较环比 <div class="sanjiao"></div><span>5.4%</span></div>
                         <div class="proportion-data">较同比 <div class="sanjiao"></div><span>5.4%</span></div> -->
@@ -168,8 +168,8 @@
                 
                 <div class="thesum">
                     <div class="thesum-box">
-                        <div class="thesum-data">总和 <span>{{d.sum}}</span>人</div>
-                        <div class="thesum-data">均值 <span>{{d.mean}}</span>人</div>
+                        <div class="thesum-data">总和 <span>{{d.sum}}</span></div>
+                        <div class="thesum-data">均值 <span>{{d.mean}}</span></div>
                     </div>
                 </div>
                 </div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 2a32057..c765d65 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -452,6 +452,9 @@ var X = window.X || {
         var sum = 0;
         var mean = 0;
         var sameday = 0;
+        var date;
+        var length = data[0]['date_range'].length - 1;
+        date = data[0]['date_range'][length];
         for(let i in data){
             for(let z in data[i]['values']){
                 var arr = {
@@ -479,13 +482,11 @@ var X = window.X || {
             }
         }
 
-       
-        for(let i in data){}
-
         var dataArr = {
             xAxisData:data[0]['date_range'],
             legenddata:legenddata,
             seriesData:seriesData,
+            date:date,
             sum:sum,
             mean:mean,
             sameday: sameday
@@ -1455,7 +1456,7 @@ var X = window.X || {
                         "analysis":'total_count',
                         "filts":[],//过滤项
                         "condrelation":'and',
-                        "customEvent":' ',
+                        "customEvent":'',
                         "eventNameDisplay":' '//重命名指标
                     }
                     data.events.push(defaultindicator);
@@ -1779,7 +1780,7 @@ var X = window.X || {
                     "analysis":'total_count',
                     "filts":[],//过滤项
                     "condrelation":'and',
-                    "customEvent":' ',
+                    "customEvent":'',
                     "eventNameDisplay":' '//重命名指标
                 }
                 data['events'].push(defaultindicator);
diff --git a/web/srczip/common.js b/web/srczip/common.js
index e54a05d..a59afea 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -451,6 +451,9 @@ var X = window.X || {
         var sum = 0;
         var mean = 0;
         var sameday = 0;
+        var date;
+        var length = data[0]['date_range'].length - 1;
+        date = data[0]['date_range'][length];
         for(let i in data){
             for(let z in data[i]['values']){
                 var arr = {
@@ -478,13 +481,11 @@ var X = window.X || {
             }
         }
 
-       
-        for(let i in data){}
-
         var dataArr = {
             xAxisData:data[0]['date_range'],
             legenddata:legenddata,
             seriesData:seriesData,
+            date:date,
             sum:sum,
             mean:mean,
             sameday: sameday
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index aef0a81..60823f3 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -85,7 +85,7 @@
                         "analysis":'total_count',
                         "filts":[],//过滤项
                         "condrelation":'and',
-                        "customEvent":' ',
+                        "customEvent":'',
                         "eventNameDisplay":' '//重命名指标
                     }
                     data.events.push(defaultindicator);
@@ -409,7 +409,7 @@
                     "analysis":'total_count',
                     "filts":[],//过滤项
                     "condrelation":'and',
-                    "customEvent":' ',
+                    "customEvent":'',
                     "eventNameDisplay":' '//重命名指标
                 }
                 data['events'].push(defaultindicator);