leguadmin/xfrontend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
罗松柏 2021-09-16 17:28:02 +08:00
parent 34ec2d7870
commit 90ce7d635a
10 changed files with 164 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
web/pages/dashboard.html
View File

@ -622,7 +622,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" >
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}">
<img src="./static/img/gengduo.png" />
</div>
</div>
@ -663,7 +663,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" >
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}">
<img src="./static/img/gengduo.png" />
</div>
</div>
@ -700,7 +700,7 @@
<div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
<img src="./static/img/fuzhi2.png" />
</div>
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}">
<div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" data-ascending="{{d.ascending}}">
<img src="./static/img/gengduo.png" />
</div>
</div>

4
web/pages/globalfilter.html
View File

@ -5,8 +5,8 @@
<div class="analysis-overall-situation-attr" data-index="{{index}}">{{item.columnDesc}}</div>
<div class="analysis-overall-situation-fuhao" id="analysis-overall-situation-fuhao-{{index}}" data-index="{{index}}" data-type="{{item.data_type}}" >{{item.comparator_name}}</div>
{{# if(item.comparator != "is null" && item.comparator != "is not null" && item.comparator !="not null" && item.comparator != "range"){ }}
<div class="analysis-overall-situation-input" >
<input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}"/>
<div class="analysis-overall-situation-input" data-type="{{item.data_type}}">
<input type="text" data-index="{{index}}" placeholder="多个用,隔开" value="{{item.strftv}}" data-type="{{item.data_type}}"/>
</div>
{{# } }}

4
web/pages/setupbaobiao.html
View File

@ -47,7 +47,7 @@
</div>
</div>
<!-- <div class="setupbaobiao-left-from-list-box">
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">开启倒序</span>
<div class="setupbaobiao-left-from-list-radio">
<div class="setupbaobiao-left-from-list-radio-box">
@ -59,7 +59,7 @@
</div>
</div>
</div>
</div> -->
</div>
<div class="setupbaobiao-left-from-list-box">
<span class="setupbaobiao-left-from-list-title">报表备注</span>

98
web/src/x.min.js vendored
View File

@ -680,10 +680,10 @@ var X = window.X || {
for(let i in data){
if(data[i]['values'].length > 0 ){
titledata= $.extend(true,[],data[0]['date_range']);
titledata.unshift('指标');
// ,'阶段总和'
if(data[i]['groups']['length'] != 0){
titledata.unshift('指标','分组');
for(let j in data[i]['values']){
var arr;
arr = $.extend(true,[],data[i].values[j])
@ -691,8 +691,12 @@ var X = window.X || {
// ,data[i]['sum'][j]
condata.push(arr);
}
for(let j in condata){
condata[j].splice(1,0,data[i]['groups'][j]);
}
}else {
titledata.unshift('指标');
var arr;
arr = $.extend(true,[],data[i].values[0])
arr.unshift(data[i]['event_name']);
@ -3148,8 +3152,6 @@ var X = window.X || {
condata.push(arr);
}
}
// console.log(titledata);
// console.log(condata);
X.laytpldata("#table-fenxi-th-dot",titledata,".table-fenxi-th");
X.laytpldata("#table-fenxi-td-dot",condata ,".table-fenxi-td");
};
@ -3381,7 +3383,6 @@ var X = window.X || {
data['events']['quotaDesc'] = user_attr[0]['title'];
data['events']['quotatype'] = user_attr[0]['data_type'];
$('.ant-dropdown-trigger').html(user_attr[0]['title']);
var arr = {
category: user_attr,
@ -3580,6 +3581,15 @@ var X = window.X || {
})
});
// $(document).off('click','.analysis-overall-situation-input').on('click','.analysis-overall-situation-input',function(){
// var obj = $(this);
// var type = obj.attr('data-type');
// console.log(type);
// if( type == "datetime"){
// }
// });
$(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
var val = $(this).val();
var titarr = val.split(",");
@ -3765,14 +3775,10 @@ var X = window.X || {
// 反向填充数据
function backfilldata(d){
data = d.query;
baobiaodata = d;
// if(d.query.eventView.filts.length > 0){
// $(".analysis-overall").show();
// }else {
// $(".analysis-overall").hide();
// }
console.log(data);
$('.ant-dropdown-trigger').html(data['events']['quotaDesc']);
$('.analysis-choicetypename').html(data['events']['analysisDesc']);
X.template("globalfilter","xinwei-whole",data['events']['filts']);
X.template("grouped","shushi",data['eventView']['groupBy']);
calculationdata();
@ -4598,13 +4604,15 @@ var X = window.X || {
var cat = obj.attr('data-cat');
var name = obj.attr('data-name');
var modelswitch = obj.attr("data-modelswitch");
var ascending = obj.attr("data-ascending");
X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
if(d.id == 'shezhi'){
var data = {
id : id,
modelsize : modelsize,
modeltype : modeltype,
modelswitch: modelswitch
modelswitch: modelswitch,
ascending:ascending
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@ -4778,6 +4786,7 @@ var X = window.X || {
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['modelswitch'] = d['modelswitch'];
data['ascending'] = d['ascending'];
data['desc'] = d['desc'];
eventdata.push(data);
// return;
@ -4801,6 +4810,16 @@ var X = window.X || {
eventdata[0]['titledata'] = titledata;
eventdata[0]['condata'] = condata;
}
//数据根据时间降序排列
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else if(d['graph_type'] == 'echarts'){
@ -4840,6 +4859,15 @@ var X = window.X || {
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
@ -4869,6 +4897,15 @@ var X = window.X || {
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
X.ltvtable(val,function(data){
@ -4895,6 +4932,14 @@ var X = window.X || {
data['date'] = "";
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
X.userpropertychart(val,function(data){
@ -4919,6 +4964,14 @@ var X = window.X || {
data['cat'] = d['model'];
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
X.scatterchart(val,function(data){
@ -10648,12 +10701,18 @@ var X = window.X || {
}else{//大图
$("#setupbaobiao-large").prop("checked",true);
}
//初始化切换
if(data.modelswitch && data.modelswitch != "undefined"){
//初始化xy轴切换
if(data.modelswitch && data.modelswitch != "undefined" && data.modelswitch == "true"){
$("#kxyswitch").prop("checked",true);
}else {
$("#gxyswitch").prop("checked",true);
}
//初始化倒序
if(data.ascending && data.ascending != undefined && data.ascending == "true"){
$("#kqreverseorder").prop("checked",true);
}else {
$("#gbreverseorder").prop("checked",true);
}
X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select");
});
@ -10695,11 +10754,9 @@ var X = window.X || {
var modeltype = $(".icon___XxbtJ").attr('data-type');
var modelsize = $('input:radio[name="modelsize"]:checked').val();
var modelswitch = $('input:radio[name="xyswitch"]:checked').val();
if(modelswitch == "true"){
modelswitch = true;
}else {
modelswitch = false;
}
var ascending = $('input:radio[name="reverseorder"]:checked').val();
if(modelswitch == "true"){ modelswitch = true;}else {modelswitch = false;};
if(ascending == 'true'){ ascending = true }else { ascending = false };
var arr = {
_id:X.DATA.dashboard_id,
report:{
@ -10710,6 +10767,7 @@ var X = window.X || {
graph_type:modeltype,
graph_size:modelsize,
modelswitch: modelswitch,
ascending:ascending
}
}
console.log(arr);

8
web/srczip/common.js
View File

@ -679,10 +679,10 @@ var X = window.X || {
for(let i in data){
if(data[i]['values'].length > 0 ){
titledata= $.extend(true,[],data[0]['date_range']);
titledata.unshift('指标');
// ,'阶段总和'
if(data[i]['groups']['length'] != 0){
titledata.unshift('指标','分组');
for(let j in data[i]['values']){
var arr;
arr = $.extend(true,[],data[i].values[j])
@ -690,8 +690,12 @@ var X = window.X || {
// ,data[i]['sum'][j]
condata.push(arr);
}
for(let j in condata){
condata[j].splice(1,0,data[i]['groups'][j]);
}
}else {
titledata.unshift('指标');
var arr;
arr = $.extend(true,[],data[i].values[0])
arr.unshift(data[i]['event_name']);

2
web/srczip/logic/analysis.js
View File

@ -1051,8 +1051,6 @@
condata.push(arr);
}
}
// console.log(titledata);
// console.log(condata);
X.laytpldata("#table-fenxi-th-dot",titledata,".table-fenxi-th");
X.laytpldata("#table-fenxi-td-dot",condata ,".table-fenxi-td");
};

20
web/srczip/logic/attribute.js
View File

@ -58,7 +58,6 @@
data['events']['quotaDesc'] = user_attr[0]['title'];
data['events']['quotatype'] = user_attr[0]['data_type'];
$('.ant-dropdown-trigger').html(user_attr[0]['title']);
var arr = {
category: user_attr,
@ -257,6 +256,15 @@
})
});
// $(document).off('click','.analysis-overall-situation-input').on('click','.analysis-overall-situation-input',function(){
// var obj = $(this);
// var type = obj.attr('data-type');
// console.log(type);
// if( type == "datetime"){
// }
// });
$(document).off('click','.analysis-overall-situation-input input').on('blur','.analysis-overall-situation-input input',function(){
var val = $(this).val();
var titarr = val.split(",");
@ -442,14 +450,10 @@
// 反向填充数据
function backfilldata(d){
data = d.query;
baobiaodata = d;
// if(d.query.eventView.filts.length > 0){
// $(".analysis-overall").show();
// }else {
// $(".analysis-overall").hide();
// }
console.log(data);
$('.ant-dropdown-trigger').html(data['events']['quotaDesc']);
$('.analysis-choicetypename').html(data['events']['analysisDesc']);
X.template("globalfilter","xinwei-whole",data['events']['filts']);
X.template("grouped","shushi",data['eventView']['groupBy']);
calculationdata();

49
web/srczip/logic/dashboard.js
View File

@ -557,13 +557,15 @@
var cat = obj.attr('data-cat');
var name = obj.attr('data-name');
var modelswitch = obj.attr("data-modelswitch");
var ascending = obj.attr("data-ascending");
X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
if(d.id == 'shezhi'){
var data = {
id : id,
modelsize : modelsize,
modeltype : modeltype,
modelswitch: modelswitch
modelswitch: modelswitch,
ascending:ascending
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@ -737,6 +739,7 @@
// data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
data['modelswitch'] = d['modelswitch'];
data['ascending'] = d['ascending'];
data['desc'] = d['desc'];
eventdata.push(data);
// return;
@ -760,6 +763,16 @@
eventdata[0]['titledata'] = titledata;
eventdata[0]['condata'] = condata;
}
//数据根据时间降序排列
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else if(d['graph_type'] == 'echarts'){
@ -799,6 +812,15 @@
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
@ -828,6 +850,15 @@
data['timeParticleSize'] = granularity;
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
X.ltvtable(val,function(data){
@ -854,6 +885,14 @@
data['date'] = "";
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
X.userpropertychart(val,function(data){
@ -878,6 +917,14 @@
data['cat'] = d['model'];
data['desc'] = d['desc'];
eventdata.push(data);
if(d['ascending']){
var condatalength = eventdata[0]['condata'].length;
var condataascend=[];
for(var i = condatalength - 1; i >= 0; i--){
condataascend.push(eventdata[0]['condata'][i]);
}
eventdata[0]['condata'] = condataascend;
}
})
}else {
X.scatterchart(val,function(data){

19
web/srczip/logic/setupbaobiao.js
View File

@ -35,12 +35,18 @@
}else{//大图
$("#setupbaobiao-large").prop("checked",true);
}
//初始化切换
if(data.modelswitch && data.modelswitch != "undefined"){
//初始化xy轴切换
if(data.modelswitch && data.modelswitch != "undefined" && data.modelswitch == "true"){
$("#kxyswitch").prop("checked",true);
}else {
$("#gxyswitch").prop("checked",true);
}
//初始化倒序
if(data.ascending && data.ascending != undefined && data.ascending == "true"){
$("#kqreverseorder").prop("checked",true);
}else {
$("#gbreverseorder").prop("checked",true);
}
X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select");
});
@ -82,11 +88,9 @@
var modeltype = $(".icon___XxbtJ").attr('data-type');
var modelsize = $('input:radio[name="modelsize"]:checked').val();
var modelswitch = $('input:radio[name="xyswitch"]:checked').val();
if(modelswitch == "true"){
modelswitch = true;
}else {
modelswitch = false;
}
var ascending = $('input:radio[name="reverseorder"]:checked').val();
if(modelswitch == "true"){ modelswitch = true;}else {modelswitch = false;};
if(ascending == 'true'){ ascending = true }else { ascending = false };
var arr = {
_id:X.DATA.dashboard_id,
report:{
@ -97,6 +101,7 @@
graph_type:modeltype,
graph_size:modelsize,
modelswitch: modelswitch,
ascending:ascending
}
}
console.log(arr);

2
web/static/css/analysis.css
View File

@ -279,7 +279,7 @@
.table-fenxi-box { width: 100%; }
.table-fenxi-box th { background-color: #f0f2f5; min-width: 100px; max-width: 200px; padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5; }
.table-fenxi-box tr { text-align: center; border-left: 1px solid #e6e6e6; }
.table-fenxi-box tr td{ padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border-right: 1px solid #e6e6e6; border-bottom: 1px solid #f0f2f5; }
.table-fenxi-box tr td{ padding: 10px 16px; color: #202d3f; font-size: 13px; font-weight: 400; border: 1px solid #e6e6e6; }
.participate-box { color: #67729d; margin-left: 16px; padding: 0 6px; display: inline-block; min-width: 40px; height: 28px; font-size: 13px; line-height: 29px; border-radius: 2px; cursor: pointer; background-color: #fff; border: 1px solid #f0f2f5; }