From da40ebbe48566111ae0d0220d58ecfb233cf709a Mon Sep 17 00:00:00 2001
From: luosongbai <15272473386@163.com>
Date: Fri, 30 Jul 2021 15:26:19 +0800
Subject: [PATCH] 111

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

diff --git a/web/src/x.min.js b/web/src/x.min.js
index 5af0869..1100d00 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -3529,46 +3529,7 @@ var X = window.X || {
                 X.DATA[cat+'id'] = id;
             });
 
-            //切换模板
-            // $(document).off('click','.chart').on('click','.chart',function(){
-            //     var id = $(this).attr('data-id');
-            //     var modelid = 'model'+id;
-            //     var modelsize = $(this).attr('data-modelsize');
-            //     var modeltype = $(this).attr('data-modeltype');
-            //     var cat = $(this).attr('data-cat');
-            //     var name = $(this).attr('data-name');
-
-            //     var configdata = {
-            //         graph_size:modelsize,
-            //         graph_type:modeltype,
-            //         model:cat,
-            //         name:name,
-            //         report_id:id
-            //     }
-
-            //     var obj = $(this);
-            //     var offset = obj.offset();
-            //     var dropdownlist = [
-            //         {title:'表格',id:'table'},
-            //         {title:'图形',id:'echarts'}
-            //     ]
-            //     X.querycriteriapop(dropdownlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
-            //         console.log(val);
-            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
-            //             me.fillmodeldata(d[0],modelid);  
-            //         })
-            //     })
-            // });
-    
-            //侧边栏更多控制按钮
-            // taboperation = function(e,type,id,name){
-            //     console.log(X.DATA.taboperationdata[type])
-            //     X.laydropdown('.kanbanwenjianimg',X.DATA.taboperationdata[type]);
-            // }
-
             // 渲染下拉框
-
-
             $(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
                 e.stopPropagation();
                 console.log('更多操作按钮');
@@ -3665,7 +3626,7 @@ var X = window.X || {
                             eventdata.push(data);
                         })
                     }else {
-                        X.ltvchart(val,function(data){
+                        X.ltvtable(val,function(data){
                             data['name'] = d['name'];
                             data['modeltype'] = d['graph_type'];
                             data['id'] = d['report_id'];
diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js
index 3bf32fe..84164e2 100644
--- a/web/srczip/logic/dashboard.js
+++ b/web/srczip/logic/dashboard.js
@@ -266,46 +266,7 @@
                 X.DATA[cat+'id'] = id;
             });
 
-            //切换模板
-            // $(document).off('click','.chart').on('click','.chart',function(){
-            //     var id = $(this).attr('data-id');
-            //     var modelid = 'model'+id;
-            //     var modelsize = $(this).attr('data-modelsize');
-            //     var modeltype = $(this).attr('data-modeltype');
-            //     var cat = $(this).attr('data-cat');
-            //     var name = $(this).attr('data-name');
-
-            //     var configdata = {
-            //         graph_size:modelsize,
-            //         graph_type:modeltype,
-            //         model:cat,
-            //         name:name,
-            //         report_id:id
-            //     }
-
-            //     var obj = $(this);
-            //     var offset = obj.offset();
-            //     var dropdownlist = [
-            //         {title:'表格',id:'table'},
-            //         {title:'图形',id:'echarts'}
-            //     ]
-            //     X.querycriteriapop(dropdownlist,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
-            //         console.log(val);
-            //         X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){
-            //             me.fillmodeldata(d[0],modelid);  
-            //         })
-            //     })
-            // });
-    
-            //侧边栏更多控制按钮
-            // taboperation = function(e,type,id,name){
-            //     console.log(X.DATA.taboperationdata[type])
-            //     X.laydropdown('.kanbanwenjianimg',X.DATA.taboperationdata[type]);
-            // }
-
             // 渲染下拉框
-
-
             $(document).off('click','.nav-action-bar').on('click','.nav-action-bar',function(e){
                 e.stopPropagation();
                 console.log('更多操作按钮');
@@ -402,7 +363,7 @@
                             eventdata.push(data);
                         })
                     }else {
-                        X.ltvchart(val,function(data){
+                        X.ltvtable(val,function(data){
                             data['name'] = d['name'];
                             data['modeltype'] = d['graph_type'];
                             data['id'] = d['report_id'];