From 6cfb560d38caecd4f36b35a2e81a809419027b75 Mon Sep 17 00:00:00 2001 From: luosongbai <15272473386@163.com> Date: Mon, 26 Jul 2021 21:41:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=97=B60.2=E7=A7=92=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/x.min.js | 175 +++++++++++++++++----------------- web/srczip/logic/dashboard.js | 175 +++++++++++++++++----------------- 2 files changed, 172 insertions(+), 178 deletions(-) diff --git a/web/src/x.min.js b/web/src/x.min.js index c765d65..7690598 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -3265,100 +3265,97 @@ var X = window.X || { var eventdata=[]; var index = d.length; for(let i in d){ - X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){ - // console.log(val); - if(d[i]['model'] == "event"){ - // 事件分析 - if(d[i]['graph_size'] == 'small'){ - X.eventsmall(val,function(data){//表格数据处理 - data['name'] = d[i]['name']; - data['modeltype'] = d[i]['graph_type']; - data['id'] = d[i]['report_id']; - data['modelsize'] = d[i]['graph_size']; - eventdata.push(data); - }) - }else { - if(d[i]['graph_type'] == 'table'){ - //表格样式 - X.eventtable(val,function(data){//表格数据处理 - data['name'] = d[i]['name']; - data['modeltype'] = d[i]['graph_type']; - data['id'] = d[i]['report_id']; - data['modelsize'] = d[i]['graph_size']; - eventdata.push(data); - }) - }else if(d[i]['graph_type'] == 'echarts'){ - //图形 - X.eventchart(val,function(data){ - data['name'] = d[i]['name']; - data['modeltype'] = d[i]['graph_type']; - data['id'] = d[i]['report_id']; - data['modelsize'] = d[i]['graph_size']; - eventdata.push(data); - }) - } - } - } - index --; - console.log(eventdata); - if(index <= 0){ - X.template("modeltable","chart-box",eventdata,function(){ - for(let i in eventdata){ - if(eventdata[i]['modeltype'] == 'echarts' && eventdata[i]['modelsize'] != 'small' ){ - var myChart = echarts.init(document.getElementById(eventdata[i]['id'])); - var option = { - title: { - text: '' - }, - color: X.DATA.echartscolor, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'cross', - label: { - backgroundColor: '#6a7985' - } - } - }, - legend: { - type:'scroll', - data: eventdata[i]['legenddata'] - }, - grid: { - left: '2%', - right: '2%', - bottom: '2%', - top: '10%', - containLabel: true - }, - xAxis: [ - { - type: 'category', - boundaryGap: false, - data: eventdata[i]['xAxisData'] - } - ], - yAxis: [ - { - type: 'value' - } - ], - series: eventdata[i]['seriesData'] - }; - myChart.setOption(option,true); + setTimeout( + X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){ + // console.log(val); + if(d[i]['model'] == "event"){ + // 事件分析 + if(d[i]['graph_size'] == 'small'){ + X.eventsmall(val,function(data){//表格数据处理 + data['name'] = d[i]['name']; + data['modeltype'] = d[i]['graph_type']; + data['id'] = d[i]['report_id']; + data['modelsize'] = d[i]['graph_size']; + eventdata.push(data); + }) + }else { + if(d[i]['graph_type'] == 'table'){ + //表格样式 + X.eventtable(val,function(data){//表格数据处理 + data['name'] = d[i]['name']; + data['modeltype'] = d[i]['graph_type']; + data['id'] = d[i]['report_id']; + data['modelsize'] = d[i]['graph_size']; + eventdata.push(data); + }) + }else if(d[i]['graph_type'] == 'echarts'){ + //图形 + X.eventchart(val,function(data){ + data['name'] = d[i]['name']; + data['modeltype'] = d[i]['graph_type']; + data['id'] = d[i]['report_id']; + data['modelsize'] = d[i]['graph_size']; + eventdata.push(data); + }) } } - }); - } - }) - + + } + index --; + console.log(eventdata); + if(index <= 0){ + X.template("modeltable","chart-box",eventdata,function(){ + for(let i in eventdata){ + if(eventdata[i]['modeltype'] == 'echarts' && eventdata[i]['modelsize'] != 'small' ){ + var myChart = echarts.init(document.getElementById(eventdata[i]['id'])); + var option = { + title: { + text: '' + }, + color: X.DATA.echartscolor, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross', + label: { + backgroundColor: '#6a7985' + } + } + }, + legend: { + type:'scroll', + data: eventdata[i]['legenddata'] + }, + grid: { + left: '2%', + right: '2%', + bottom: '2%', + top: '10%', + containLabel: true + }, + xAxis: [ + { + type: 'category', + boundaryGap: false, + data: eventdata[i]['xAxisData'] + } + ], + yAxis: [ + { + type: 'value' + } + ], + series: eventdata[i]['seriesData'] + }; + myChart.setOption(option,true); + } + } + }); + } + }),"200");//延时0.2秒调用 } - - - - }) }, diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index dcef67e..d4b6e39 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -244,100 +244,97 @@ var eventdata=[]; var index = d.length; for(let i in d){ - X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){ - // console.log(val); - if(d[i]['model'] == "event"){ - // 事件分析 - if(d[i]['graph_size'] == 'small'){ - X.eventsmall(val,function(data){//表格数据处理 - data['name'] = d[i]['name']; - data['modeltype'] = d[i]['graph_type']; - data['id'] = d[i]['report_id']; - data['modelsize'] = d[i]['graph_size']; - eventdata.push(data); - }) - }else { - if(d[i]['graph_type'] == 'table'){ - //表格样式 - X.eventtable(val,function(data){//表格数据处理 - data['name'] = d[i]['name']; - data['modeltype'] = d[i]['graph_type']; - data['id'] = d[i]['report_id']; - data['modelsize'] = d[i]['graph_size']; - eventdata.push(data); - }) - }else if(d[i]['graph_type'] == 'echarts'){ - //图形 - X.eventchart(val,function(data){ - data['name'] = d[i]['name']; - data['modeltype'] = d[i]['graph_type']; - data['id'] = d[i]['report_id']; - data['modelsize'] = d[i]['graph_size']; - eventdata.push(data); - }) - } - } - } - index --; - console.log(eventdata); - if(index <= 0){ - X.template("modeltable","chart-box",eventdata,function(){ - for(let i in eventdata){ - if(eventdata[i]['modeltype'] == 'echarts' && eventdata[i]['modelsize'] != 'small' ){ - var myChart = echarts.init(document.getElementById(eventdata[i]['id'])); - var option = { - title: { - text: '' - }, - color: X.DATA.echartscolor, - tooltip: { - trigger: 'axis', - axisPointer: { - type: 'cross', - label: { - backgroundColor: '#6a7985' - } - } - }, - legend: { - type:'scroll', - data: eventdata[i]['legenddata'] - }, - grid: { - left: '2%', - right: '2%', - bottom: '2%', - top: '10%', - containLabel: true - }, - xAxis: [ - { - type: 'category', - boundaryGap: false, - data: eventdata[i]['xAxisData'] - } - ], - yAxis: [ - { - type: 'value' - } - ], - series: eventdata[i]['seriesData'] - }; - myChart.setOption(option,true); + setTimeout( + X.api("ck/"+d[i]['model']+"_model","post",{report_id:d[i]['report_id']},function(val){ + // console.log(val); + if(d[i]['model'] == "event"){ + // 事件分析 + if(d[i]['graph_size'] == 'small'){ + X.eventsmall(val,function(data){//表格数据处理 + data['name'] = d[i]['name']; + data['modeltype'] = d[i]['graph_type']; + data['id'] = d[i]['report_id']; + data['modelsize'] = d[i]['graph_size']; + eventdata.push(data); + }) + }else { + if(d[i]['graph_type'] == 'table'){ + //表格样式 + X.eventtable(val,function(data){//表格数据处理 + data['name'] = d[i]['name']; + data['modeltype'] = d[i]['graph_type']; + data['id'] = d[i]['report_id']; + data['modelsize'] = d[i]['graph_size']; + eventdata.push(data); + }) + }else if(d[i]['graph_type'] == 'echarts'){ + //图形 + X.eventchart(val,function(data){ + data['name'] = d[i]['name']; + data['modeltype'] = d[i]['graph_type']; + data['id'] = d[i]['report_id']; + data['modelsize'] = d[i]['graph_size']; + eventdata.push(data); + }) } } - }); - } - }) - + + } + index --; + console.log(eventdata); + if(index <= 0){ + X.template("modeltable","chart-box",eventdata,function(){ + for(let i in eventdata){ + if(eventdata[i]['modeltype'] == 'echarts' && eventdata[i]['modelsize'] != 'small' ){ + var myChart = echarts.init(document.getElementById(eventdata[i]['id'])); + var option = { + title: { + text: '' + }, + color: X.DATA.echartscolor, + tooltip: { + trigger: 'axis', + axisPointer: { + type: 'cross', + label: { + backgroundColor: '#6a7985' + } + } + }, + legend: { + type:'scroll', + data: eventdata[i]['legenddata'] + }, + grid: { + left: '2%', + right: '2%', + bottom: '2%', + top: '10%', + containLabel: true + }, + xAxis: [ + { + type: 'category', + boundaryGap: false, + data: eventdata[i]['xAxisData'] + } + ], + yAxis: [ + { + type: 'value' + } + ], + series: eventdata[i]['seriesData'] + }; + myChart.setOption(option,true); + } + } + }); + } + }),"200");//延时0.2秒调用 } - - - - }) },