1
This commit is contained in:
parent
23f0fd1fde
commit
ad8e4b4be4
@ -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>
|
||||
|
@ -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>
|
||||
{{# } }}
|
||||
|
||||
|
@ -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">
|
||||
|
@ -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>
|
||||
|
||||
|
36
web/src/x.min.js
vendored
36
web/src/x.min.js
vendored
@ -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){
|
||||
|
||||
// })
|
||||
})
|
||||
|
||||
|
||||
|
@ -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,'事件分析');
|
||||
}
|
||||
});
|
||||
|
||||
// 返回
|
||||
|
@ -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);
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
@ -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){
|
||||
|
||||
// })
|
||||
})
|
||||
|
||||
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user