diff --git a/web/src/x.min.js b/web/src/x.min.js
index 425e4ce..8aa3034 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -116,7 +116,7 @@ var X = window.X || {
(function(){
//本地
- // var ipurl = "http://10.0.0.77:7889/api/v1/";
+ // var ipurl = "http://10.0.0.77:7889/api/v1/";
//线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
@@ -624,6 +624,7 @@ var X = window.X || {
var sameday = 0;
var date;
var wowtype='',chain_ratiotype='';//判断较环比和较同比的正负
+ var selected = {};//线多的话默认显示5条
var length = data[0]['date_range'].length - 1;
date = data[0]['date_range'][length];
@@ -635,7 +636,7 @@ var X = window.X || {
data: data[i]['values'][z]
}
seriesData.push(arr);
- sameday = data[i]['values'][z][data[i]['values'][z].length - 1];
+ sameday = data[0]['last_value'];
}
}
@@ -651,6 +652,17 @@ var X = window.X || {
seriesData[i]['name'] = legenddata[i];
}
}
+
+ if(legenddata.length > 5){
+ for(let i in legenddata){
+ if(i < 5){
+ selected[legenddata[i]] = true;
+ }else {
+ selected[legenddata[i]] = false;
+ }
+ }
+ }
+
if(data[0]['wow']){
if(data[0]['wow'] >= 0){
wowtype = '+'
@@ -666,11 +678,12 @@ var X = window.X || {
chain_ratiotype = '-'
}
}
-
+
var dataArr = {
xAxisData:data[0]['date_range'],
legenddata:legenddata,
seriesData:seriesData,
+ selected:selected,
date:date,
sum:sum,
mean:mean,
@@ -4172,66 +4185,66 @@ var X = window.X || {
});
// 横纵切换
- $(document).off('click','.model-switch').on('click','.model-switch',function(){
- var id = $(this).attr('data-id');
- var modelswitch = $(this).attr('data-modelswitch');
- var d = X['DATA']['kanbanlist'][id];
- var modelid = 'model'+id;
- var eventdata = [];
- var startTime = d['query']['eventView']['startTime'];
- var endTime = d['query']['eventView']['endTime'];
+ // $(document).off('click','.model-switch').on('click','.model-switch',function(){
+ // var id = $(this).attr('data-id');
+ // var modelswitch = $(this).attr('data-modelswitch');
+ // var d = X['DATA']['kanbanlist'][id];
+ // var modelid = 'model'+id;
+ // var eventdata = [];
+ // var startTime = d['query']['eventView']['startTime'];
+ // var endTime = d['query']['eventView']['endTime'];
- if(startTime && endTime){
- var startTimearr = startTime.split(" ");
- var endTimearr = endTime.split(" ");
- }else {
- var startTimearr = [];
- var endTimearr = [];
- }
+ // if(startTime && endTime){
+ // var startTimearr = startTime.split(" ");
+ // var endTimearr = endTime.split(" ");
+ // }else {
+ // var startTimearr = [];
+ // var endTimearr = [];
+ // }
- var timeParticleSize = d['query']['eventView']['timeParticleSize'];
- var granularity = ''
- if(timeParticleSize){
- X.granularity(timeParticleSize,function(d){
- granularity = d;
- });
- }
- X.api("ck/event_model","post",{report_id:id},function(val){
- X.eventtable(val,function(data){//表格数据处理
- data['name'] = d['name'];
- data['modeltype'] = d['graph_type'];
- data['id'] = d['report_id'];
- data['modelsize'] = d['graph_size'];
- data['cat'] = d['model'];
- data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
- data['timeParticleSize'] = granularity;
- eventdata.push(data);
- })
- if(modelswitch){
- eventdata[0]['modelswitch'] = 1;
- var originaldata;//原始数据
- originaldata= $.extend(true,[],eventdata[0]['condata']);
- originaldata.unshift(eventdata[0]['titledata']);
- var dataarr = [];
- for(let i in originaldata[0]){
- var arr = [];
- dataarr.push(arr);
- }
- for(let i in originaldata){
- for(let j in originaldata[i]){
- dataarr[j].push(originaldata[i][j]);
- }
- }
- var titledata = dataarr[0];
- var condata = dataarr.slice(1, dataarr.length - 1);
- eventdata[0]['titledata'] = titledata;
- eventdata[0]['condata'] = condata;
- }
- X.template("modeltable",modelid,eventdata[0],function(){
- X.pageLogic['dashboard'].morefeatures(eventdata[0]);
- });
- })
- });
+ // var timeParticleSize = d['query']['eventView']['timeParticleSize'];
+ // var granularity = ''
+ // if(timeParticleSize){
+ // X.granularity(timeParticleSize,function(d){
+ // granularity = d;
+ // });
+ // }
+ // X.api("ck/event_model","post",{report_id:id},function(val){
+ // X.eventtable(val,function(data){//表格数据处理
+ // data['name'] = d['name'];
+ // data['modeltype'] = d['graph_type'];
+ // data['id'] = d['report_id'];
+ // data['modelsize'] = d['graph_size'];
+ // data['cat'] = d['model'];
+ // data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
+ // data['timeParticleSize'] = granularity;
+ // eventdata.push(data);
+ // })
+ // if(modelswitch){
+ // eventdata[0]['modelswitch'] = 1;
+ // var originaldata;//原始数据
+ // originaldata= $.extend(true,[],eventdata[0]['condata']);
+ // originaldata.unshift(eventdata[0]['titledata']);
+ // var dataarr = [];
+ // for(let i in originaldata[0]){
+ // var arr = [];
+ // dataarr.push(arr);
+ // }
+ // for(let i in originaldata){
+ // for(let j in originaldata[i]){
+ // dataarr[j].push(originaldata[i][j]);
+ // }
+ // }
+ // var titledata = dataarr[0];
+ // var condata = dataarr.slice(1, dataarr.length - 1);
+ // eventdata[0]['titledata'] = titledata;
+ // eventdata[0]['condata'] = condata;
+ // }
+ // X.template("modeltable",modelid,eventdata[0],function(){
+ // X.pageLogic['dashboard'].morefeatures(eventdata[0]);
+ // });
+ // })
+ // });
},
@@ -4315,8 +4328,30 @@ var X = window.X || {
data['cat'] = d['model'];
data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
+ data['modelswitch'] = d['modelswitch'];
eventdata.push(data);
+
+ if(d['modelswitch']){
+ var originaldata;//原始数据
+ originaldata= $.extend(true,[],eventdata[0]['condata']);
+ originaldata.unshift(eventdata[0]['titledata']);
+ var dataarr = [];
+ for(let i in originaldata[0]){
+ var arr = [];
+ dataarr.push(arr);
+ }
+ for(let i in originaldata){
+ for(let j in originaldata[i]){
+ dataarr[j].push(originaldata[i][j]);
+ }
+ }
+ var titledata = dataarr[0];
+ var condata = dataarr.slice(1, dataarr.length - 1);
+ eventdata[0]['titledata'] = titledata;
+ eventdata[0]['condata'] = condata;
+ }
})
+
}else if(d['graph_type'] == 'echarts'){
//图形
X.eventchart(val,function(data){
@@ -4428,7 +4463,8 @@ var X = window.X || {
var data = {
id : eventdata.id,
modelsize : eventdata.modelsize,
- modeltype : eventdata.modeltype
+ modeltype : eventdata.modeltype,
+ modelswitch: eventdata.modelswitch
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@@ -4555,7 +4591,8 @@ var X = window.X || {
legend: {
type:'scroll',
bottom:0,
- data: eventdata['legenddata']
+ data: eventdata['legenddata'],
+ selected:eventdata['selected']
},
grid: {
left: '2%',
@@ -7356,7 +7393,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var data = parms;
- console.log(data);
+ // console.log(data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
$("#model"+data.id).html(html);
@@ -10033,6 +10070,7 @@ var X = window.X || {
this.parms = parms;
this.callback = parms.callback;
var data = parms.extData;
+ console.log('luo',data);
var report_id = [];
report_id.push(data.id);
var postdata;//上传数据
@@ -10041,8 +10079,13 @@ var X = window.X || {
$('.setupbaobiao-title').val(d[0]['name']);
$('.setupbaobiao-textarea').val(d[0]['desc']);
// 初始化时间
- var endTime = d[0]['query']['eventView']['endTime'];
- var startTime = d[0]['query']['eventView']['startTime'];
+ if(endTime && startTime){
+ var endTime = d[0]['query']['eventView']['endTime'];
+ var startTime = d[0]['query']['eventView']['startTime'];
+ }else {
+ $(".setupbaobiao-date-box").hide();
+ }
+
$(".setupbaobiao-time").html(startTime +' - '+ endTime);
if(data.modeltype == "table"){ //初始化图表类型
$("#setupbaobiao-table").addClass("icon___XxbtJ");
@@ -10057,6 +10100,14 @@ var X = window.X || {
}else{//大图
$("#setupbaobiao-large").prop("checked",true);
}
+ //初始化切换
+ if(data.modelswitch){
+
+ $("#kxyswitch").prop("checked",true);
+
+ }else {
+ $("#gxyswitch").prop("checked",true);
+ }
X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select");
});
@@ -10096,7 +10147,13 @@ var X = window.X || {
var title = $('.setupbaobiao-title').val();
var desc = $(".setupbaobiao-textarea").val();
var modeltype = $(".icon___XxbtJ").attr('data-type');
- var modelsize = $('input:radio[name="modelsize"]:checked').val()
+ 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 arr = {
_id:X.DATA.dashboard_id,
report:{
@@ -10105,10 +10162,11 @@ var X = window.X || {
desc:desc,
model:postdata[0]['cat'],
graph_type:modeltype,
- graph_size:modelsize
+ graph_size:modelsize,
+ modelswitch: modelswitch,
}
}
-
+ console.log(arr);
X.api('dashboard/edit_report','post',arr,function(d){
console.log(d);
var reportedit = {
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 3fdd387..9dde5a1 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -115,7 +115,7 @@ var X = window.X || {
(function(){
//本地
- // var ipurl = "http://10.0.0.77:7889/api/v1/";
+ // var ipurl = "http://10.0.0.77:7889/api/v1/";
//线上
var ipurl = "http://139.159.159.3:9865/api/v1/";
@@ -623,6 +623,7 @@ var X = window.X || {
var sameday = 0;
var date;
var wowtype='',chain_ratiotype='';//判断较环比和较同比的正负
+ var selected = {};//线多的话默认显示5条
var length = data[0]['date_range'].length - 1;
date = data[0]['date_range'][length];
@@ -634,7 +635,7 @@ var X = window.X || {
data: data[i]['values'][z]
}
seriesData.push(arr);
- sameday = data[i]['values'][z][data[i]['values'][z].length - 1];
+ sameday = data[0]['last_value'];
}
}
@@ -650,6 +651,17 @@ var X = window.X || {
seriesData[i]['name'] = legenddata[i];
}
}
+
+ if(legenddata.length > 5){
+ for(let i in legenddata){
+ if(i < 5){
+ selected[legenddata[i]] = true;
+ }else {
+ selected[legenddata[i]] = false;
+ }
+ }
+ }
+
if(data[0]['wow']){
if(data[0]['wow'] >= 0){
wowtype = '+'
@@ -665,11 +677,12 @@ var X = window.X || {
chain_ratiotype = '-'
}
}
-
+
var dataArr = {
xAxisData:data[0]['date_range'],
legenddata:legenddata,
seriesData:seriesData,
+ selected:selected,
date:date,
sum:sum,
mean:mean,
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 52b4437..58ea8e0 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -422,66 +422,66 @@
});
// 横纵切换
- $(document).off('click','.model-switch').on('click','.model-switch',function(){
- var id = $(this).attr('data-id');
- var modelswitch = $(this).attr('data-modelswitch');
- var d = X['DATA']['kanbanlist'][id];
- var modelid = 'model'+id;
- var eventdata = [];
- var startTime = d['query']['eventView']['startTime'];
- var endTime = d['query']['eventView']['endTime'];
+ // $(document).off('click','.model-switch').on('click','.model-switch',function(){
+ // var id = $(this).attr('data-id');
+ // var modelswitch = $(this).attr('data-modelswitch');
+ // var d = X['DATA']['kanbanlist'][id];
+ // var modelid = 'model'+id;
+ // var eventdata = [];
+ // var startTime = d['query']['eventView']['startTime'];
+ // var endTime = d['query']['eventView']['endTime'];
- if(startTime && endTime){
- var startTimearr = startTime.split(" ");
- var endTimearr = endTime.split(" ");
- }else {
- var startTimearr = [];
- var endTimearr = [];
- }
+ // if(startTime && endTime){
+ // var startTimearr = startTime.split(" ");
+ // var endTimearr = endTime.split(" ");
+ // }else {
+ // var startTimearr = [];
+ // var endTimearr = [];
+ // }
- var timeParticleSize = d['query']['eventView']['timeParticleSize'];
- var granularity = ''
- if(timeParticleSize){
- X.granularity(timeParticleSize,function(d){
- granularity = d;
- });
- }
- X.api("ck/event_model","post",{report_id:id},function(val){
- X.eventtable(val,function(data){//表格数据处理
- data['name'] = d['name'];
- data['modeltype'] = d['graph_type'];
- data['id'] = d['report_id'];
- data['modelsize'] = d['graph_size'];
- data['cat'] = d['model'];
- data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
- data['timeParticleSize'] = granularity;
- eventdata.push(data);
- })
- if(modelswitch){
- eventdata[0]['modelswitch'] = 1;
- var originaldata;//原始数据
- originaldata= $.extend(true,[],eventdata[0]['condata']);
- originaldata.unshift(eventdata[0]['titledata']);
- var dataarr = [];
- for(let i in originaldata[0]){
- var arr = [];
- dataarr.push(arr);
- }
- for(let i in originaldata){
- for(let j in originaldata[i]){
- dataarr[j].push(originaldata[i][j]);
- }
- }
- var titledata = dataarr[0];
- var condata = dataarr.slice(1, dataarr.length - 1);
- eventdata[0]['titledata'] = titledata;
- eventdata[0]['condata'] = condata;
- }
- X.template("modeltable",modelid,eventdata[0],function(){
- X.pageLogic['dashboard'].morefeatures(eventdata[0]);
- });
- })
- });
+ // var timeParticleSize = d['query']['eventView']['timeParticleSize'];
+ // var granularity = ''
+ // if(timeParticleSize){
+ // X.granularity(timeParticleSize,function(d){
+ // granularity = d;
+ // });
+ // }
+ // X.api("ck/event_model","post",{report_id:id},function(val){
+ // X.eventtable(val,function(data){//表格数据处理
+ // data['name'] = d['name'];
+ // data['modeltype'] = d['graph_type'];
+ // data['id'] = d['report_id'];
+ // data['modelsize'] = d['graph_size'];
+ // data['cat'] = d['model'];
+ // data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
+ // data['timeParticleSize'] = granularity;
+ // eventdata.push(data);
+ // })
+ // if(modelswitch){
+ // eventdata[0]['modelswitch'] = 1;
+ // var originaldata;//原始数据
+ // originaldata= $.extend(true,[],eventdata[0]['condata']);
+ // originaldata.unshift(eventdata[0]['titledata']);
+ // var dataarr = [];
+ // for(let i in originaldata[0]){
+ // var arr = [];
+ // dataarr.push(arr);
+ // }
+ // for(let i in originaldata){
+ // for(let j in originaldata[i]){
+ // dataarr[j].push(originaldata[i][j]);
+ // }
+ // }
+ // var titledata = dataarr[0];
+ // var condata = dataarr.slice(1, dataarr.length - 1);
+ // eventdata[0]['titledata'] = titledata;
+ // eventdata[0]['condata'] = condata;
+ // }
+ // X.template("modeltable",modelid,eventdata[0],function(){
+ // X.pageLogic['dashboard'].morefeatures(eventdata[0]);
+ // });
+ // })
+ // });
},
@@ -565,8 +565,30 @@
data['cat'] = d['model'];
data['date'] = startTimearr[0] + ' - ' + endTimearr[0];
data['timeParticleSize'] = granularity;
+ data['modelswitch'] = d['modelswitch'];
eventdata.push(data);
+
+ if(d['modelswitch']){
+ var originaldata;//原始数据
+ originaldata= $.extend(true,[],eventdata[0]['condata']);
+ originaldata.unshift(eventdata[0]['titledata']);
+ var dataarr = [];
+ for(let i in originaldata[0]){
+ var arr = [];
+ dataarr.push(arr);
+ }
+ for(let i in originaldata){
+ for(let j in originaldata[i]){
+ dataarr[j].push(originaldata[i][j]);
+ }
+ }
+ var titledata = dataarr[0];
+ var condata = dataarr.slice(1, dataarr.length - 1);
+ eventdata[0]['titledata'] = titledata;
+ eventdata[0]['condata'] = condata;
+ }
})
+
}else if(d['graph_type'] == 'echarts'){
//图形
X.eventchart(val,function(data){
@@ -678,7 +700,8 @@
var data = {
id : eventdata.id,
modelsize : eventdata.modelsize,
- modeltype : eventdata.modeltype
+ modeltype : eventdata.modeltype,
+ modelswitch: eventdata.modelswitch
}
X.parametersopen(data,'setupbaobiao',"auto",function(d){
X.pageLogic['dashboard'].gettabledata();
@@ -805,7 +828,8 @@
legend: {
type:'scroll',
bottom:0,
- data: eventdata['legenddata']
+ data: eventdata['legenddata'],
+ selected:eventdata['selected']
},
grid: {
left: '2%',
diff --git a/web/srczip/logic/modeltable.js b/web/srczip/logic/modeltable.js
index c093290..7a312ed 100644
--- a/web/srczip/logic/modeltable.js
+++ b/web/srczip/logic/modeltable.js
@@ -5,7 +5,7 @@
this.parms = parms;
this.callback = parms.callback;
var data = parms;
- console.log(data);
+ // console.log(data);
X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
$("#model"+data.id).html(html);
diff --git a/web/srczip/logic/setupbaobiao.js b/web/srczip/logic/setupbaobiao.js
index 70b0b2e..72a9e52 100644
--- a/web/srczip/logic/setupbaobiao.js
+++ b/web/srczip/logic/setupbaobiao.js
@@ -5,6 +5,7 @@
this.parms = parms;
this.callback = parms.callback;
var data = parms.extData;
+ console.log('luo',data);
var report_id = [];
report_id.push(data.id);
var postdata;//上传数据
@@ -13,8 +14,13 @@
$('.setupbaobiao-title').val(d[0]['name']);
$('.setupbaobiao-textarea').val(d[0]['desc']);
// 初始化时间
- var endTime = d[0]['query']['eventView']['endTime'];
- var startTime = d[0]['query']['eventView']['startTime'];
+ if(endTime && startTime){
+ var endTime = d[0]['query']['eventView']['endTime'];
+ var startTime = d[0]['query']['eventView']['startTime'];
+ }else {
+ $(".setupbaobiao-date-box").hide();
+ }
+
$(".setupbaobiao-time").html(startTime +' - '+ endTime);
if(data.modeltype == "table"){ //初始化图表类型
$("#setupbaobiao-table").addClass("icon___XxbtJ");
@@ -29,6 +35,14 @@
}else{//大图
$("#setupbaobiao-large").prop("checked",true);
}
+ //初始化切换
+ if(data.modelswitch){
+
+ $("#kxyswitch").prop("checked",true);
+
+ }else {
+ $("#gxyswitch").prop("checked",true);
+ }
X.laytpldata("#setupbaobiao-select-dot",X['DATA']['screenlist'][d[0]['cat']],".setupbaobiao-select");
});
@@ -68,7 +82,13 @@
var title = $('.setupbaobiao-title').val();
var desc = $(".setupbaobiao-textarea").val();
var modeltype = $(".icon___XxbtJ").attr('data-type');
- var modelsize = $('input:radio[name="modelsize"]:checked').val()
+ 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 arr = {
_id:X.DATA.dashboard_id,
report:{
@@ -77,10 +97,11 @@
desc:desc,
model:postdata[0]['cat'],
graph_type:modeltype,
- graph_size:modelsize
+ graph_size:modelsize,
+ modelswitch: modelswitch,
}
}
-
+ console.log(arr);
X.api('dashboard/edit_report','post',arr,function(d){
console.log(d);
var reportedit = {
