From ad569eb8d40da3d69043e15ab7ba1595805f839f Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Sat, 24 Jul 2021 00:12:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/x.min.js              | 105 ++++++++++++++++++----------------
 web/srczip/logic/dashboard.js | 105 ++++++++++++++++++----------------
 2 files changed, 112 insertions(+), 98 deletions(-)

diff --git a/web/src/x.min.js b/web/src/x.min.js
index c7f03ce..0b1bc39 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -3219,6 +3219,7 @@ var X = window.X || {
             
             X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
                 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);
@@ -3242,57 +3243,63 @@ var X = window.X || {
                                 })
                             }
                         }
-                        
-                    })
-                }
-                console.log(eventdata);
-                X.template("modeltable","chart-box",eventdata,function(){
-                    for(let i in eventdata){
-                        if(eventdata[i]['modeltype'] == 'echarts'){
-                            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'
-                                        }
+                        index --;
+                        console.log(eventdata);
+                        if(index <= 0){
+                            X.template("modeltable","chart-box",eventdata,function(){
+                                for(let i in eventdata){
+                                    if(eventdata[i]['modeltype'] == 'echarts'){
+                                        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);
                                     }
-                                },
-                                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);
+                                }
+                            });
                         }
-                    }
-                });
+                    })
+                    
+                }
+               
+                
+                
                 
                 
 
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 48e9e71..ace2eb3 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -241,6 +241,7 @@
             
             X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
                 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);
@@ -264,57 +265,63 @@
                                 })
                             }
                         }
-                        
-                    })
-                }
-                console.log(eventdata);
-                X.template("modeltable","chart-box",eventdata,function(){
-                    for(let i in eventdata){
-                        if(eventdata[i]['modeltype'] == 'echarts'){
-                            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'
-                                        }
+                        index --;
+                        console.log(eventdata);
+                        if(index <= 0){
+                            X.template("modeltable","chart-box",eventdata,function(){
+                                for(let i in eventdata){
+                                    if(eventdata[i]['modeltype'] == 'echarts'){
+                                        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);
                                     }
-                                },
-                                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);
+                                }
+                            });
                         }
-                    }
-                });
+                    })
+                    
+                }
+               
+                
+