From ad8e4b4be416fb3863bd46e71a75473fca609d49 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Tue, 26 Apr 2022 18:16:39 +0800
Subject: [PATCH] 1

---
 web/pages/distribution.html    |  4 ++--
 web/pages/groupeditemspop.html |  6 +++---
 web/pages/grouptable.html      |  6 ++++--
 web/pages/modeltable.html      |  2 +-
 web/src/x.min.js               | 36 +++++++++++++++++++++++++++-------
 web/srczip/logic/analysis.js   | 12 +++++++++++-
 web/srczip/logic/dashboard.js  | 13 +++++++++---
 web/srczip/logic/grouptable.js | 11 ++++++++---
 web/static/css/analysis.css    |  6 +++++-
 9 files changed, 73 insertions(+), 23 deletions(-)

diff --git a/web/pages/distribution.html b/web/pages/distribution.html
index 4d12e19..58f6c6f 100644
--- a/web/pages/distribution.html
+++ b/web/pages/distribution.html
@@ -133,13 +133,13 @@
 
 <script id="table-fenxi-td-dot" type="text/html">
     {{#  layui.each(d, function(index, item){ }}
-    <tr >
+    <tr > 
         <td>{{item.date}} <img src="./static/img/jia1.png" class="table-info-list-box" data-time="{{item.date}}"> </td>
         <td>{{item.total}}</td>
         {{#  layui.each(item.data, function(indexs, items){ }}
         <td>
             <p>{{items.n}}</p>
-            <p>{{items.p}}%</p>
+            <p>{{items.p}}</p>  
         </td>
         {{#  }); }}
     </tr>
diff --git a/web/pages/groupeditemspop.html b/web/pages/groupeditemspop.html
index c7d948a..176e8a4 100644
--- a/web/pages/groupeditemspop.html
+++ b/web/pages/groupeditemspop.html
@@ -35,15 +35,15 @@
     {{#  layui.each(d, function(index, item){ }}
         {{#  if(index == 0){ }}
             <div class="qvjian">
-                <input type="text" disabled='disabled' value="-∞" >，<input type="text"  value="{{item.tail}}"  data-index="{{index}}">
+                <input type="text"  value="-∞" >，<input type="text"  value="{{item.tail}}"  data-index="{{index}}">
             </div>
         {{#  } else if(index == d.length - 1) { }}
             <div class="qvjian">
-                <input type="text" disabled='disabled' value="{{item.rise}}">，<input type="text" disabled='disabled' value="+∞"  >
+                <input type="text" value="{{item.rise}}">，<input type="text"  value="+∞"  >
             </div>
         {{#  } else { }}
             <div class="qvjian">
-                <input type="text" disabled='disabled' value="{{item.rise}}">，<input type="text" value="{{item.tail}}"  data-index="{{index}}">
+                <input type="text"  value="{{item.rise}}">，<input type="text" value="{{item.tail}}"  data-index="{{index}}">
             </div>
         {{#  } }} 
         
diff --git a/web/pages/grouptable.html b/web/pages/grouptable.html
index 46abcc9..e2fb9e0 100644
--- a/web/pages/grouptable.html
+++ b/web/pages/grouptable.html
@@ -1,6 +1,8 @@
 <div class="grouptable-box">
-
-    <p class="grouptable-title-box"><span>2022-04-18</span> 分组详情</p>
+    <div class="grouptable-title-box">
+        <p><span>2022-04-18</span> 分组详情</p>
+        <img src="./static/img/xiazai.png" id="fenbu-grouptable">
+    </div>
 
     <div class="grouptable-table-box">
         <div class="table-div-box table-grouptable-div-box">
diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html
index 724bf72..d3b7ce5 100644
--- a/web/pages/modeltable.html
+++ b/web/pages/modeltable.html
@@ -5,7 +5,7 @@
 
         <div class="condition-box">
             <div class="time-cond">
-                <span>{{d.date}}</span>
+                <span id="times{{d.id}}">{{d.date}}</span>
             </div>
         </div>
 
diff --git a/web/src/x.min.js b/web/src/x.min.js
index e21702b..a2b296d 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -4970,7 +4970,17 @@ var X = window.X || {
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
                 // console.log(11111);
-                X.download('ck/event_model_export',data,'事件分析');
+
+                //日充总额导出的数据单独处理
+                if(data.events[0]['eventNameDisplay'] != "日充总额"){
+                    X.download('ck/event_model_export',data,'事件分析');
+                }else {
+                    var timearr = {
+                        start_time: data.eventView.startTime,
+                        end_time: data.eventView.endTime
+                    }
+                    X.download('ck/event_model_pay',timearr,'事件分析');
+                }
             });
 
               // 返回
@@ -6784,9 +6794,16 @@ var X = window.X || {
                             var time = $("#"+dateid).html();
                             var timearr = time.split(" ");
                             arr['eventView']['startTime'] = timearr[0] + ' 00:00:00';
-                            arr['eventView']['endTime'] = timearr[2] + ' 23:59:59';
-
-                            X.download('ck/'+ cat +'_model_export',arr,name);
+                            arr['eventView']['endTime'] = (timearr[2])? timearr[2] + ' 23:59:59' :  timearr[0] + ' 00:00:00';
+                            if(d[0]['name'] && d[0]['name'] == '日充总额'){
+                                var timearr = {
+                                    start_time:  timearr[0] + ' 00:00:00',
+                                    end_time: (timearr[2])? timearr[2] + ' 23:59:59' :  timearr[0] + ' 23:59:59'
+                                }
+                                X.download('ck/event_model_pay',timearr,name);
+                            }else {
+                                X.download('ck/'+ cat +'_model_export',arr,name);
+                            }
                         })
 
                         
@@ -10294,12 +10311,17 @@ var X = window.X || {
                     }
                     contnetdata.push(drr);
                 }
-
-                console.log(contnetdata);
-
+                // console.log(contnetdata);
+                $('.grouptable-title-box span').html(d.start_date);
                 X.laytpldata("#table-fenxi-th-group-dot",d.tabletitle,".table-fenxi-group-th");
                 X.laytpldata("#table-fenxi-td-group-dot",contnetdata,".table-fenxi-group-td");
 
+            });
+
+            $(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box',function(){
+                // X.uploadfile("ck/scatter_model_details",'#fenbu-grouptable',function(d){
+
+                // })
             })
            
 
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 1bee50c..17002ba 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -1288,7 +1288,17 @@
             // 下载
             $(document).off('click','.download-table').on('click','.download-table',function(){
                 // console.log(11111);
-                X.download('ck/event_model_export',data,'事件分析');
+
+                //日充总额导出的数据单独处理
+                if(data.events[0]['eventNameDisplay'] != "日充总额"){
+                    X.download('ck/event_model_export',data,'事件分析');
+                }else {
+                    var timearr = {
+                        start_time: data.eventView.startTime,
+                        end_time: data.eventView.endTime
+                    }
+                    X.download('ck/event_model_pay',timearr,'事件分析');
+                }
             });
 
               // 返回
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index c18b108..de8e5e0 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -740,9 +740,16 @@
                             var time = $("#"+dateid).html();
                             var timearr = time.split(" ");
                             arr['eventView']['startTime'] = timearr[0] + ' 00:00:00';
-                            arr['eventView']['endTime'] = timearr[2] + ' 23:59:59';
-
-                            X.download('ck/'+ cat +'_model_export',arr,name);
+                            arr['eventView']['endTime'] = (timearr[2])? timearr[2] + ' 23:59:59' :  timearr[0] + ' 00:00:00';
+                            if(d[0]['name'] && d[0]['name'] == '日充总额'){
+                                var timearr = {
+                                    start_time:  timearr[0] + ' 00:00:00',
+                                    end_time: (timearr[2])? timearr[2] + ' 23:59:59' :  timearr[0] + ' 23:59:59'
+                                }
+                                X.download('ck/event_model_pay',timearr,name);
+                            }else {
+                                X.download('ck/'+ cat +'_model_export',arr,name);
+                            }
                         })
 
                         
diff --git a/web/srczip/logic/grouptable.js b/web/srczip/logic/grouptable.js
index 90a26f4..fe17f05 100644
--- a/web/srczip/logic/grouptable.js
+++ b/web/srczip/logic/grouptable.js
@@ -31,12 +31,17 @@
                     }
                     contnetdata.push(drr);
                 }
-
-                console.log(contnetdata);
-
+                // console.log(contnetdata);
+                $('.grouptable-title-box span').html(d.start_date);
                 X.laytpldata("#table-fenxi-th-group-dot",d.tabletitle,".table-fenxi-group-th");
                 X.laytpldata("#table-fenxi-td-group-dot",contnetdata,".table-fenxi-group-td");
 
+            });
+
+            $(document).off("click",'.grouptable-title-box img').on("click",'.grouptable-title-box',function(){
+                // X.uploadfile("ck/scatter_model_details",'#fenbu-grouptable',function(d){
+
+                // })
             })
            
 
diff --git a/web/static/css/analysis.css b/web/static/css/analysis.css
index 55bfe24..3842b38 100644
--- a/web/static/css/analysis.css
+++ b/web/static/css/analysis.css
@@ -367,12 +367,16 @@
 .table-info-list-box { cursor: pointer; }
 .grouptable-box { width: 1270px; max-width: 1270px; height: 742px; }
 .grouptable-title-box { 
-    margin: 0 30px;
+    padding: 0 30px;
     height: 50px;
     line-height: 50px;
     border-bottom: 1px solid #e7e7e7;
     font-size: 16px; 
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
 }
+.grouptable-title-box img { width: 16px; height: 16px; cursor: pointer; }
 .grouptable-table-box {
     margin: 30px;
 }