From e6688260f84111a45158616dd8c18bd14c056a69 Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Thu, 9 Sep 2021 14:44:33 +0800
Subject: [PATCH] 111

---
 web/pages/dashboard.html         |  16 +--
 web/src/x.min.js                 | 219 ++++++++++++++++++++-----------
 web/srczip/common.js             |  10 +-
 web/srczip/logic/dashboard.js    | 203 ++++++++++++++++++----------
 web/srczip/logic/setupbaobiao.js |   6 +-
 web/static/css/style.css         |   1 +
 6 files changed, 297 insertions(+), 158 deletions(-)

diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 4cc1ab5..8a8e2cc 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -570,15 +570,15 @@
             <dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box">
 
                 {{#  layui.each(item.children, function(indexs, items){ }}
-                    <!-- {{#  if(indexs == 0){ }}
-                        <dd class="layui-left-dd layui-this"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
+                    {{#  if(items.onclick == 1){ }}
+                        <dd class="layui-left-dd layui-this"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}}</span>
                             <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
                         </dd>
-                    {{#  } else { }} -->
-                        <dd class="layui-left-dd"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}} </span>
+                    {{#  } else { }}
+                        <dd class="layui-left-dd"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span>{{items.name}}</span>
                             <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
                         </dd>
-                    <!-- {{#  } }} -->
+                    {{#  } }}
                     <!-- {{#  if(items.isFolder === true){ }}
                     <li class="layui-nav-item">
                         <a href="javascript:;" class="fontcolor mykanban second category xiangmukongjian" data-id="{{items._id}}"> <i class="layui-icon layui-icon-file-b"></i> {{items.name}}
@@ -848,7 +848,7 @@
                             <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}" >
                                 <img src="./static/img/fuzhi2.png" />
                             </div>
-                            <div class="tishi model-gengduo" title="更多">
+                            <div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}">
                                 <img src="./static/img/gengduo.png" />
                             </div>
                         </div>
@@ -886,7 +886,7 @@
                                 <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
                                     <img src="./static/img/fuzhi2.png" />
                                 </div>
-                                <div class="tishi model-gengduo" title="更多">
+                                <div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}" >
                                     <img src="./static/img/gengduo.png" />
                                 </div>
                             </div>
@@ -920,7 +920,7 @@
                                 <div class="tishi model-fuzhi" title="复制" data-id="{{d.report_id}}">
                                     <img src="./static/img/fuzhi2.png" />
                                 </div>
-                                <div class="tishi model-gengduo" title="更多">
+                                <div class="tishi model-gengduo" title="更多" data-id="{{d.report_id}}" data-cat="{{d.cat}}" data-modelsize="{{d.graph_size}}" data-modeltype="{{d.graph_type}}" data-name="{{d.name}}" data-modelswitch="{{d.modelswitch}}">
                                     <img src="./static/img/gengduo.png" />
                                 </div>
                             </div>
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 35d5666..511643d 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -119,6 +119,8 @@ var X = window.X || {
     // var ipurl = "http://10.0.0.77:7889/api/v1/";
     //线上
     var ipurl = "http://139.159.159.3:9865/api/v1/";
+    //线上测试
+    // var ipurl = "http://139.159.159.3:7889/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -170,13 +172,14 @@ var X = window.X || {
                 index = layer.load(1);
             },
             success:function(d){
-                // console.log(d);
                 layer.close(index);
+
                 if(d.code == 0){
                     if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
                         callback && callback(d.data);
                     }else {
                         layer.msg('查无数据');
+                        // callback && callback(d);
                     }
                 }else {
                     layer.msg(d.msg);
@@ -207,8 +210,9 @@ var X = window.X || {
           body: JSON.stringify(params),
           method: 'POST',
           headers: {
-            Authorization:token//此处放置请求到的用户token
-          }
+              Authorization:token,//此处放置请求到的用户token
+              'Content-Type':'application/json',
+          },
         }
      
         const response = await fetch(url, request);
@@ -3898,6 +3902,7 @@ var X = window.X || {
                         $(".projecttit").html(d[i]['name']);
                     }
                 }
+                $("#model-box").html("");
                 me.freshMenu(X.DATA['projectid']);
                 // X.template("toptab","analysis-zhanwei",d);
             });
@@ -4321,7 +4326,7 @@ var X = window.X || {
                 var obj = $(this);
                 var offset = obj.offset();
                 var id = obj.attr('data-id');
-                var modelid = 'model'+id;
+                var modelid = id;
                 var modelsize = obj.attr('data-modelsize');
                 var modeltype = obj.attr('data-modeltype');
                 var cat = obj.attr('data-cat');
@@ -4359,6 +4364,47 @@ var X = window.X || {
                 }
                 X.DATA.oclickarr =arr;
             });
+
+            //更多按钮配置下拉框
+            $(document).off('click','.model-gengduo').on('click','.model-gengduo',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var id = obj.attr('data-id');
+                // var modelid = 'model'+id;
+                var modelsize = obj.attr('data-modelsize');
+                var modeltype = obj.attr('data-modeltype');
+                var cat = obj.attr('data-cat');
+                var name = obj.attr('data-name');
+                var modelswitch = obj.attr("data-modelswitch");
+                X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
+                    if(d.id == 'shezhi'){
+                        var data = {
+                            id : id,
+                            modelsize : modelsize,
+                            modeltype : modeltype,
+                            modelswitch: modelswitch
+                        }
+                        X.parametersopen(data,'setupbaobiao',"auto",function(d){
+                            X.pageLogic['dashboard'].gettabledata();
+                        })
+                    }else if(d.id == 'export'){
+                        X.download('ck/'+ cat +'_model_export',{report_id:id},name);
+                    }else {
+
+                        layer.confirm('确认移除['+ name + ']', {
+                            btn: ['取消','删除 '] //按钮
+                            }, function(){
+                            //取消
+                            layer.close(layer.index);
+                            }, function(){
+                            //删除
+                            X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){
+                                X.pageLogic['dashboard'].gettabledata();
+                            });
+                        });
+                    }
+                })
+            })
             
         },
 
@@ -4368,24 +4414,36 @@ var X = window.X || {
             X.api('project/kanban',"post",{"_id":id},function (d){
                 X.DATA['KanBanData'] = d.kanban;
                 X.DATA['ProjectData'] = d.spaces;
-                X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
-                X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
-            
-                // if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
-                //     $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
-                //     X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
-                // }else {
-                //     for(let i in d.spaces){
-                //         for(let j in d.spaces[i]['children']){
-                //             if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
-                //                 $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
-                //             }
-                //         }
-                //     }
-                // }
-                // $("#model-box").html("");
-                // // 获取报表数据
-                // X.pageLogic['dashboard'].gettabledata();
+                if(d.spaces[0]['children'].length > 0){
+                    if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
+                        for(let i in d.spaces){
+                            for(let j in d.spaces[i]['children']){
+                                d.spaces[i]['children'][j]['onclick'] = 0;
+                                if(j == 0){
+                                    d.spaces[i]['children'][j]['onclick'] = 1;
+                                }
+                            }
+                        }
+                        $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
+                        X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
+                    }else {
+                        for(let i in d.spaces){
+                            for(let j in d.spaces[i]['children']){
+                                d.spaces[i]['children'][j]['onclick'] = 0;
+                                if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
+                                    d.spaces[i]['children'][j]['onclick'] = 1;
+                                    $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
+                                }
+                            }
+                        }
+                    }
+                    X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
+                    X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
+                    $("#model-box").html("");
+                    // 获取报表数据
+                    X.pageLogic['dashboard'].gettabledata();
+                }
+                
                 
                 // var updateOutput = function(e){
 
@@ -4415,28 +4473,34 @@ var X = window.X || {
         //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
         fillmodeldata:function(d,id,type){
             X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
-                var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
-                var data;
-                if(eventdata.length > 0){
-                    for(var z in eventdata){
-                        if(id){
-                            //当有id时更新对应id看板内的内容
-                            X.template("modeltype","model-two-"+id,eventdata[z],function(){ 
-                                // X.pageLogic['dashboard'].morefeatures(eventdata[z]);
-                                X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){ 
-                                    X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                // console.log(val);
+                if(val == null ){
+                    $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
+                }else {
+                    var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
+                    var data;
+                    if(eventdata.length > 0){
+                        for(var z in eventdata){
+                            if(id){
+                                //当有id时更新对应id看板内的内容
+                                X.template("modeltype","model-two-"+id,eventdata[z],function(){ 
+                                    // X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){ 
+                                        X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    });
                                 });
-                            });
-                        }else {
-                            //渲染模板和数据
-                            X.template("modeltype",'model-two-'+eventdata[z]['id'],eventdata[z],function(){
-                                //X.pageLogic['dashboard'].morefeatures(eventdata[z]);
-                                X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){
-                                    X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                            }else {
+                                //渲染模板和数据
+                                X.template("modeltype",'model-two-'+eventdata[z]['id'],eventdata[z],function(){
+                                    //X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){
+                                        X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    });
                                 });
-                            });
+                            }
                         }
                     }
+
                 }
 
             })
@@ -4608,34 +4672,34 @@ var X = window.X || {
         morefeatures:function(eventdata){
 
             //更多按钮配置下拉框
-            X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
-                if(d.id == 'shezhi'){
-                    var data = {
-                        id : eventdata.id,
-                        modelsize : eventdata.modelsize,
-                        modeltype : eventdata.modeltype,
-                        modelswitch: eventdata.modelswitch
-                    }
-                    X.parametersopen(data,'setupbaobiao',"auto",function(d){
-                        X.pageLogic['dashboard'].gettabledata();
-                    })
-                }else if(d.id == 'export'){
-                    X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
-                }else {
+            // X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
+            //     if(d.id == 'shezhi'){
+            //         var data = {
+            //             id : eventdata.id,
+            //             modelsize : eventdata.modelsize,
+            //             modeltype : eventdata.modeltype,
+            //             modelswitch: eventdata.modelswitch
+            //         }
+            //         X.parametersopen(data,'setupbaobiao',"auto",function(d){
+            //             X.pageLogic['dashboard'].gettabledata();
+            //         })
+            //     }else if(d.id == 'export'){
+            //         X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
+            //     }else {
 
-                    layer.confirm('确认移除['+ eventdata.name + ']', {
-                        btn: ['取消','删除 '] //按钮
-                      }, function(){
-                        //取消
-                        layer.close(layer.index);
-                      }, function(){
-                        //删除
-                        X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
-                            X.pageLogic['dashboard'].gettabledata();
-                        });
-                    });
-                }
-            });
+            //         layer.confirm('确认移除['+ eventdata.name + ']', {
+            //             btn: ['取消','删除 '] //按钮
+            //           }, function(){
+            //             //取消
+            //             layer.close(layer.index);
+            //           }, function(){
+            //             //删除
+            //             X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
+            //                 X.pageLogic['dashboard'].gettabledata();
+            //             });
+            //         });
+            //     }
+            // });
 
             //设置时间
             X.daterender(".model-times",function(start, end, label){
@@ -4791,9 +4855,8 @@ var X = window.X || {
         },
 
         //获取表格数据
-        //渲染外框大小位置
+        //先渲染外框大小位置和标题
         gettabledata:function(){
-            $("#model-box").html("");//清空表格数据
             X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
                 X['DATA']['kanbanlist'] = d;
                 var modellist=[];
@@ -4804,16 +4867,24 @@ var X = window.X || {
                     }
                     modellist.push(arr);
                 }
-
                 modellist.sort( X.compare("sort") );
+                var num = 0;
+                $("#model-box").html("");//清空表格数据
                 for(let i in modellist){
                     for(let z in d){
                         if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
                             //渲染模板和数据
                             X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
                                 $('#model-box').append(html);
-                                X.pageLogic['dashboard'].fillmodeldata(d[z]);
+                                num ++;
+                                // X.pageLogic['dashboard'].fillmodeldata(d[z]);
                             });
+                            //当外框和标题渲染完在渲染数据
+                            if(num == Object.getOwnPropertyNames(d).length){
+                                for(let q in d){
+                                    X.pageLogic['dashboard'].fillmodeldata(d[q]);
+                                }
+                            }
                         }
                     }
                 }
@@ -10301,7 +10372,7 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms.extData;
-            console.log('luo',data);
+            // console.log('luo',data);
             var report_id = [];
             report_id.push(data.id);
             var postdata;//上传数据
@@ -10332,10 +10403,8 @@ var X = window.X || {
                     $("#setupbaobiao-large").prop("checked",true);
                 }
                 //初始化切换
-                if(data.modelswitch){
-                    
+                if(data.modelswitch && data.modelswitch != "undefined"){
                     $("#kxyswitch").prop("checked",true);
-                    
                 }else {
                     $("#gxyswitch").prop("checked",true);
                 }
diff --git a/web/srczip/common.js b/web/srczip/common.js
index 410879c..aeb7a31 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -118,6 +118,8 @@ var X = window.X || {
     // var ipurl = "http://10.0.0.77:7889/api/v1/";
     //线上
     var ipurl = "http://139.159.159.3:9865/api/v1/";
+    //线上测试
+    // var ipurl = "http://139.159.159.3:7889/api/v1/";
 
     //设置或读取登录缓存，需要保存到localStorage，防止刷新时候登录数据丢失
     X.loginCache = function(data){
@@ -169,13 +171,14 @@ var X = window.X || {
                 index = layer.load(1);
             },
             success:function(d){
-                // console.log(d);
                 layer.close(index);
+
                 if(d.code == 0){
                     if( JSON.stringify(d.data) != "{}" && JSON.stringify(d.data) != "[]"){
                         callback && callback(d.data);
                     }else {
                         layer.msg('查无数据');
+                        // callback && callback(d);
                     }
                 }else {
                     layer.msg(d.msg);
@@ -206,8 +209,9 @@ var X = window.X || {
           body: JSON.stringify(params),
           method: 'POST',
           headers: {
-            Authorization:token//此处放置请求到的用户token
-          }
+              Authorization:token,//此处放置请求到的用户token
+              'Content-Type':'application/json',
+          },
         }
      
         const response = await fetch(url, request);
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index f0b146b..397af91 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -29,6 +29,7 @@
                         $(".projecttit").html(d[i]['name']);
                     }
                 }
+                $("#model-box").html("");
                 me.freshMenu(X.DATA['projectid']);
                 // X.template("toptab","analysis-zhanwei",d);
             });
@@ -452,7 +453,7 @@
                 var obj = $(this);
                 var offset = obj.offset();
                 var id = obj.attr('data-id');
-                var modelid = 'model'+id;
+                var modelid = id;
                 var modelsize = obj.attr('data-modelsize');
                 var modeltype = obj.attr('data-modeltype');
                 var cat = obj.attr('data-cat');
@@ -490,6 +491,47 @@
                 }
                 X.DATA.oclickarr =arr;
             });
+
+            //更多按钮配置下拉框
+            $(document).off('click','.model-gengduo').on('click','.model-gengduo',function(){
+                var obj = $(this);
+                var offset = obj.offset();
+                var id = obj.attr('data-id');
+                // var modelid = 'model'+id;
+                var modelsize = obj.attr('data-modelsize');
+                var modeltype = obj.attr('data-modeltype');
+                var cat = obj.attr('data-cat');
+                var name = obj.attr('data-name');
+                var modelswitch = obj.attr("data-modelswitch");
+                X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
+                    if(d.id == 'shezhi'){
+                        var data = {
+                            id : id,
+                            modelsize : modelsize,
+                            modeltype : modeltype,
+                            modelswitch: modelswitch
+                        }
+                        X.parametersopen(data,'setupbaobiao',"auto",function(d){
+                            X.pageLogic['dashboard'].gettabledata();
+                        })
+                    }else if(d.id == 'export'){
+                        X.download('ck/'+ cat +'_model_export',{report_id:id},name);
+                    }else {
+
+                        layer.confirm('确认移除['+ name + ']', {
+                            btn: ['取消','删除 '] //按钮
+                            }, function(){
+                            //取消
+                            layer.close(layer.index);
+                            }, function(){
+                            //删除
+                            X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:id},function(){
+                                X.pageLogic['dashboard'].gettabledata();
+                            });
+                        });
+                    }
+                })
+            })
             
         },
 
@@ -499,24 +541,36 @@
             X.api('project/kanban',"post",{"_id":id},function (d){
                 X.DATA['KanBanData'] = d.kanban;
                 X.DATA['ProjectData'] = d.spaces;
-                X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
-                X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
-            
-                // if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
-                //     $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
-                //     X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
-                // }else {
-                //     for(let i in d.spaces){
-                //         for(let j in d.spaces[i]['children']){
-                //             if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
-                //                 $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
-                //             }
-                //         }
-                //     }
-                // }
-                // $("#model-box").html("");
-                // // 获取报表数据
-                // X.pageLogic['dashboard'].gettabledata();
+                if(d.spaces[0]['children'].length > 0){
+                    if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
+                        for(let i in d.spaces){
+                            for(let j in d.spaces[i]['children']){
+                                d.spaces[i]['children'][j]['onclick'] = 0;
+                                if(j == 0){
+                                    d.spaces[i]['children'][j]['onclick'] = 1;
+                                }
+                            }
+                        }
+                        $(".tab-tit-box .tab-tit").html(d.spaces[0]['children'][0]['name']);
+                        X.DATA['dashboard_id'] = d.spaces[0]['children'][0]['_id']; //看板id
+                    }else {
+                        for(let i in d.spaces){
+                            for(let j in d.spaces[i]['children']){
+                                d.spaces[i]['children'][j]['onclick'] = 0;
+                                if(d.spaces[i]['children'][j]['_id'] == X.DATA['dashboard_id']){
+                                    d.spaces[i]['children'][j]['onclick'] = 1;
+                                    $(".tab-tit-box .tab-tit").html(d.spaces[i]['children'][j]['name']);
+                                }
+                            }
+                        }
+                    }
+                    X.laytpldata('#mykanban-dot',d.kanban,'#mykanban');
+                    X.laytpldata('#kongjian-dot',d.spaces,'#kongjian');
+                    $("#model-box").html("");
+                    // 获取报表数据
+                    X.pageLogic['dashboard'].gettabledata();
+                }
+                
                 
                 // var updateOutput = function(e){
 
@@ -546,28 +600,34 @@
         //总体逻辑是：根据获取到的看板内容去先渲染放置的框，在根据不同分析模型处理对应的数据进行填充
         fillmodeldata:function(d,id,type){
             X.api("ck/"+d['model']+"_model","post",{report_id:d['report_id']},function(val){
-                var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
-                var data;
-                if(eventdata.length > 0){
-                    for(var z in eventdata){
-                        if(id){
-                            //当有id时更新对应id看板内的内容
-                            X.template("modeltype","model-two-"+id,eventdata[z],function(){ 
-                                // X.pageLogic['dashboard'].morefeatures(eventdata[z]);
-                                X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){ 
-                                    X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                // console.log(val);
+                if(val == null ){
+                    $('#model-two-'+d['report_id']).html('<span class="woshujv">查无数据</span>');
+                }else {
+                    var eventdata = X.pageLogic['dashboard'].modeldata(d,val,type);
+                    var data;
+                    if(eventdata.length > 0){
+                        for(var z in eventdata){
+                            if(id){
+                                //当有id时更新对应id看板内的内容
+                                X.template("modeltype","model-two-"+id,eventdata[z],function(){ 
+                                    // X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){ 
+                                        X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    });
                                 });
-                            });
-                        }else {
-                            //渲染模板和数据
-                            X.template("modeltype",'model-two-'+eventdata[z]['id'],eventdata[z],function(){
-                                //X.pageLogic['dashboard'].morefeatures(eventdata[z]);
-                                X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){
-                                    X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                            }else {
+                                //渲染模板和数据
+                                X.template("modeltype",'model-two-'+eventdata[z]['id'],eventdata[z],function(){
+                                    //X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    X.template("modeltable",'conent-box'+eventdata[z]['id'],eventdata[z],function(){
+                                        X.pageLogic['dashboard'].morefeatures(eventdata[z]);
+                                    });
                                 });
-                            });
+                            }
                         }
                     }
+
                 }
 
             })
@@ -739,34 +799,34 @@
         morefeatures:function(eventdata){
 
             //更多按钮配置下拉框
-            X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
-                if(d.id == 'shezhi'){
-                    var data = {
-                        id : eventdata.id,
-                        modelsize : eventdata.modelsize,
-                        modeltype : eventdata.modeltype,
-                        modelswitch: eventdata.modelswitch
-                    }
-                    X.parametersopen(data,'setupbaobiao',"auto",function(d){
-                        X.pageLogic['dashboard'].gettabledata();
-                    })
-                }else if(d.id == 'export'){
-                    X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
-                }else {
+            // X.laydropdown(".model-gengduo",X['DATA']['gengduolist'],function(d){
+            //     if(d.id == 'shezhi'){
+            //         var data = {
+            //             id : eventdata.id,
+            //             modelsize : eventdata.modelsize,
+            //             modeltype : eventdata.modeltype,
+            //             modelswitch: eventdata.modelswitch
+            //         }
+            //         X.parametersopen(data,'setupbaobiao',"auto",function(d){
+            //             X.pageLogic['dashboard'].gettabledata();
+            //         })
+            //     }else if(d.id == 'export'){
+            //         X.download('ck/'+ eventdata.cat +'_model_export',{report_id:eventdata.id},eventdata.name);
+            //     }else {
 
-                    layer.confirm('确认移除['+ eventdata.name + ']', {
-                        btn: ['取消','删除 '] //按钮
-                      }, function(){
-                        //取消
-                        layer.close(layer.index);
-                      }, function(){
-                        //删除
-                        X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
-                            X.pageLogic['dashboard'].gettabledata();
-                        });
-                    });
-                }
-            });
+            //         layer.confirm('确认移除['+ eventdata.name + ']', {
+            //             btn: ['取消','删除 '] //按钮
+            //           }, function(){
+            //             //取消
+            //             layer.close(layer.index);
+            //           }, function(){
+            //             //删除
+            //             X.api('dashboard/del_report','post',{_id:X['DATA']['dashboard_id'],report_id:eventdata.id},function(){
+            //                 X.pageLogic['dashboard'].gettabledata();
+            //             });
+            //         });
+            //     }
+            // });
 
             //设置时间
             X.daterender(".model-times",function(start, end, label){
@@ -922,9 +982,8 @@
         },
 
         //获取表格数据
-        //渲染外框大小位置
+        //先渲染外框大小位置和标题
         gettabledata:function(){
-            $("#model-box").html("");//清空表格数据
             X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
                 X['DATA']['kanbanlist'] = d;
                 var modellist=[];
@@ -935,16 +994,24 @@
                     }
                     modellist.push(arr);
                 }
-
                 modellist.sort( X.compare("sort") );
+                var num = 0;
+                $("#model-box").html("");//清空表格数据
                 for(let i in modellist){
                     for(let z in d){
                         if(modellist[i]['sort'] == d[z]['sort'] && modellist[i]['report_id'] == d[z]['report_id']){
                             //渲染模板和数据
                             X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){
                                 $('#model-box').append(html);
-                                X.pageLogic['dashboard'].fillmodeldata(d[z]);
+                                num ++;
+                                // X.pageLogic['dashboard'].fillmodeldata(d[z]);
                             });
+                            //当外框和标题渲染完在渲染数据
+                            if(num == Object.getOwnPropertyNames(d).length){
+                                for(let q in d){
+                                    X.pageLogic['dashboard'].fillmodeldata(d[q]);
+                                }
+                            }
                         }
                     }
                 }
diff --git a/web/srczip/logic/setupbaobiao.js b/web/srczip/logic/setupbaobiao.js
index 72a9e52..c971b1f 100644
--- a/web/srczip/logic/setupbaobiao.js
+++ b/web/srczip/logic/setupbaobiao.js
@@ -5,7 +5,7 @@
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms.extData;
-            console.log('luo',data);
+            // console.log('luo',data);
             var report_id = [];
             report_id.push(data.id);
             var postdata;//上传数据
@@ -36,10 +36,8 @@
                     $("#setupbaobiao-large").prop("checked",true);
                 }
                 //初始化切换
-                if(data.modelswitch){
-                    
+                if(data.modelswitch && data.modelswitch != "undefined"){
                     $("#kxyswitch").prop("checked",true);
-                    
                 }else {
                     $("#gxyswitch").prop("checked",true);
                 }
diff --git a/web/static/css/style.css b/web/static/css/style.css
index 42be546..051fd5e 100644
--- a/web/static/css/style.css
+++ b/web/static/css/style.css
@@ -112,6 +112,7 @@
 .souduo:hover { background-color: #3f4979; color: rgba(255,255,255,1); }
 .qvjiantou { left: 250px; }
 .qvjiantou span { display: none; }
+.woshujv { width: 100%; text-align: center; display: inline-block; position: absolute; top: 0; bottom: 0; margin: auto; height: 20px; }
 
 .sousuo-box { width: 254px; margin: 0px 8px; padding: 15px 0px; display: flex; justify-content: space-between; align-items: center; }
 .sousuo { display: flex; align-items: center;}