修改饼状图显示逻辑

hdw

2018-11-30 7745715cf591176567807c7f0bf6abc561521de8

修改饼状图显示逻辑

 gx_tieta/WebRoot/index.jsp

@@ -3770,35 +3770,43 @@
                data:null,        

                success: function(data){ 

                    var model = eval('('+data.result+')');

                    var resData;

                    if(model.code == 1) {

                        var result = model.data;

                        //console.log(result);

                        var formatData = formatPieRsData(result[0]);

                        laytpl(pieConfTpl).render(formatData, function(html) {

                            layer.open({

                                id: 'pie',

                                title: '饼状图配置',

                                maxHeight: 450,

                                content: html,

                                yes: function(index) {

                                    var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');

                                    var iptArr = [];

                                    iptList.each(function() {

                                        if($(this).is(':checked')) {

                                            iptArr.push(1);

                                        }else {

                                            iptArr.push(0);

                                        }

                                    });

									
                                    var temp = structUpdatePie(iptArr);

                                    layer.load();

                                    updateUserBieState(temp);

                                }

                            });

                        });

                        resData = result[0];

                    }else {

                        resData = {

                            echarts1_enable:1,

                            echarts2_enable:1,

                            echarts3_enable:1,

                            echarts4_enable:1

                        };

                    }

                    

                    // 格式获取到的数据

                    var formatData = formatPieRsData(resData);

                    laytpl(pieConfTpl).render(formatData, function(html) {

                        layer.open({

                            id: 'pie',

                            title: '饼状图配置',

                            maxHeight: 450,

                            content: html,

                            yes: function(index) {

                                var iptList = $('#tplTblOpts .tpl-tbl-opts-header input[type=checkbox]');

                                var iptArr = [];

                                iptList.each(function() {

                                    if($(this).is(':checked')) {

                                        iptArr.push(1);

                                    }else {

                                        iptArr.push(0);

                                    }

                                });

                                var temp = structUpdatePie(iptArr);

                                layer.load();

                                updateUserBieState(temp);

                            }

                        });

                    });

                   }                 

            });

        }


 gx_tieta/WebRoot/pages/js/pages/index-common.js

@@ -45,10 +45,12 @@
                    var data = rs.data[0];

                    var rsStatus = formaterPieStauts(data);

                    pieItems = getPieList(rsStatus);

                }else {

                    pieItems = getPieList([1, 1, 1, 1]);

                }

            }

        });

		
        //console.log(pieItems);

        return pieItems;

    }