diff --git a/web/src/x.min.js b/web/src/x.min.js
index 9eed3a8..e85c7de 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -914,7 +914,9 @@ var X = window.X || {
wowtype:wowtype,
wow: Math.abs(data[0]['wow']),//环比
chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
- chain_ratiotype:chain_ratiotype
+ chain_ratiotype:chain_ratiotype,
+ proid_money: data[0]['proid_money'],
+ proid_name: data[0]['proid_name']
}
console.log(dataArr);
callback && callback(dataArr);
@@ -4481,12 +4483,11 @@ var X = window.X || {
// 计算
$(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
calculationdata();
-
});
var querydata;//查询数据
$(document).on('click','.analtsis-chart-switch-box .analtsis-chart-switch',function(){
- console.log(querydata);
+
if(querydata){
$('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
$(this).addClass('select-chart');
@@ -4545,6 +4546,21 @@ var X = window.X || {
label: {
backgroundColor: '#6a7985'
}
+ },
+ formatter:function(params){
+ var axisIndex = params[0]['axisIndex'];
+ if(d[axisIndex]['proid_name'] && d[axisIndex]['proid_name'].length > 0){
+ var index = params[0]['dataIndex'];
+ var money = d[axisIndex]['proid_money'][index];
+ var name = d[axisIndex]['proid_name'][index];
+ var html = name+'
'+'次数：'+ params[axisIndex]['data']+"
"+'总金额：'+money;
+ }else {
+ var html = params[0]['axisValue']+'
';
+ for(let i in params){
+ html+= params[i]['seriesName']+':'+ params[i]['value']+"
"
+ }
+ }
+ return html;
}
},
legend: {
@@ -6108,6 +6124,7 @@ var X = window.X || {
}
var report_id = [];
report_id.push(id);
+
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:report_id,dashboard_id:X.DATA.dashboard_id},function(q){
var bbsetdata = {
graph_size:modelsize,
@@ -6460,6 +6477,11 @@ var X = window.X || {
var timearr = time.split(" ");
query['eventView']['startTime'] = timearr[0] + ' 00:00:00';
query['eventView']['endTime'] = timearr[2] + ' 23:59:59';
+ for(let i in X.DATA['screenlist']){
+ if(X.DATA['screenlist'][i]['id'] == id){
+ query['eventView']['filts'] = X.DATA['screenlist'][i]['filts']
+ }
+ }
// console.log(query);
X.modelapi("ck/"+ cat +"_model","post",query,function(vals){
var bbsetdata = {
@@ -6529,7 +6551,7 @@ var X = window.X || {
name:$(this).attr('data-name'),
}
X.DATA.oclickarr =arr;
- $("#sxjg"+$(this).attr('data-id')).hide();
+ // $("#sxjg"+$(this).attr('data-id')).hide();
});
//更多按钮配置下拉框
@@ -7057,6 +7079,11 @@ var X = window.X || {
query['eventView']['timeParticleSize'] = timeParticleSize;
}
// query['eventView']['timeParticleSize'] = timeParticleSize;
+ for(let i in X.DATA['screenlist']){
+ if(X.DATA['screenlist'][i]['id'] == oclickarr.id){
+ query['eventView']['filts'] = X.DATA['screenlist'][i]['filts']
+ }
+ }
X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){
if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){
var bbsetdata = {
@@ -7142,6 +7169,23 @@ var X = window.X || {
label: {
backgroundColor: '#6a7985'
}
+ },
+ formatter:function(params){
+ //鼠标移入图表自定义显示内容
+ var axisIndex = params[0]['axisIndex'];
+ if(eventdata['proid_name'] && eventdata['proid_name'].length > 0){
+ var index = params[0]['dataIndex'];
+ var money = eventdata['proid_money'][index];
+ var name = eventdata['proid_name'][index];
+ var html = name+'
'+'次数：'+ params[axisIndex]['data']+"
"+'总金额：'+money;
+
+ }else {
+ var html = params[0]['axisValue']+'
';
+ for(let i in params){
+ html+= params[i]['seriesName']+':'+ params[i]['value']+"
"
+ }
+ }
+ return html;
}
},
legend: {
diff --git a/web/srczip/common.js b/web/srczip/common.js
index baebe5d..4478309 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -913,7 +913,9 @@ var X = window.X || {
wowtype:wowtype,
wow: Math.abs(data[0]['wow']),//环比
chain_ratio: Math.abs(data[0]['chain_ratio']),//同比
- chain_ratiotype:chain_ratiotype
+ chain_ratiotype:chain_ratiotype,
+ proid_money: data[0]['proid_money'],
+ proid_name: data[0]['proid_name']
}
console.log(dataArr);
callback && callback(dataArr);
diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js
index 2d57e89..43abd74 100644
--- a/web/srczip/logic/analysis.js
+++ b/web/srczip/logic/analysis.js
@@ -876,12 +876,11 @@
// 计算
$(document).off('click','.analysis-calculation').on('click','.analysis-calculation',function(){
calculationdata();
-
});
var querydata;//查询数据
$(document).on('click','.analtsis-chart-switch-box .analtsis-chart-switch',function(){
- console.log(querydata);
+
if(querydata){
$('.analtsis-chart-switch-box .analtsis-chart-switch').removeClass('select-chart');
$(this).addClass('select-chart');
@@ -940,6 +939,21 @@
label: {
backgroundColor: '#6a7985'
}
+ },
+ formatter:function(params){
+ var axisIndex = params[0]['axisIndex'];
+ if(d[axisIndex]['proid_name'] && d[axisIndex]['proid_name'].length > 0){
+ var index = params[0]['dataIndex'];
+ var money = d[axisIndex]['proid_money'][index];
+ var name = d[axisIndex]['proid_name'][index];
+ var html = name+'
'+'次数：'+ params[axisIndex]['data']+"
"+'总金额：'+money;
+ }else {
+ var html = params[0]['axisValue']+'
';
+ for(let i in params){
+ html+= params[i]['seriesName']+':'+ params[i]['value']+"
"
+ }
+ }
+ return html;
}
},
legend: {
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 403fccb..8af9f36 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -246,6 +246,7 @@
}
var report_id = [];
report_id.push(id);
+
X.api('report/read_report','post',{project_id:X.DATA['projectid'],report_id:report_id,dashboard_id:X.DATA.dashboard_id},function(q){
var bbsetdata = {
graph_size:modelsize,
@@ -598,6 +599,11 @@
var timearr = time.split(" ");
query['eventView']['startTime'] = timearr[0] + ' 00:00:00';
query['eventView']['endTime'] = timearr[2] + ' 23:59:59';
+ for(let i in X.DATA['screenlist']){
+ if(X.DATA['screenlist'][i]['id'] == id){
+ query['eventView']['filts'] = X.DATA['screenlist'][i]['filts']
+ }
+ }
// console.log(query);
X.modelapi("ck/"+ cat +"_model","post",query,function(vals){
var bbsetdata = {
@@ -667,7 +673,7 @@
name:$(this).attr('data-name'),
}
X.DATA.oclickarr =arr;
- $("#sxjg"+$(this).attr('data-id')).hide();
+ // $("#sxjg"+$(this).attr('data-id')).hide();
});
//更多按钮配置下拉框
@@ -1195,6 +1201,11 @@
query['eventView']['timeParticleSize'] = timeParticleSize;
}
// query['eventView']['timeParticleSize'] = timeParticleSize;
+ for(let i in X.DATA['screenlist']){
+ if(X.DATA['screenlist'][i]['id'] == oclickarr.id){
+ query['eventView']['filts'] = X.DATA['screenlist'][i]['filts']
+ }
+ }
X.api("ck/"+ oclickarr.cat +"_model","post",query,function(val){
if(JSON.stringify(val) != "{}" && JSON.stringify(val) != "[]"){
var bbsetdata = {
@@ -1280,6 +1291,23 @@
label: {
backgroundColor: '#6a7985'
}
+ },
+ formatter:function(params){
+ //鼠标移入图表自定义显示内容
+ var axisIndex = params[0]['axisIndex'];
+ if(eventdata['proid_name'] && eventdata['proid_name'].length > 0){
+ var index = params[0]['dataIndex'];
+ var money = eventdata['proid_money'][index];
+ var name = eventdata['proid_name'][index];
+ var html = name+'
'+'次数：'+ params[axisIndex]['data']+"
"+'总金额：'+money;
+
+ }else {
+ var html = params[0]['axisValue']+'
';
+ for(let i in params){
+ html+= params[i]['seriesName']+':'+ params[i]['value']+"
"
+ }
+ }
+ return html;
}
},
legend: {