1

web/pages/dashboard.html

@@ -166,7 +166,7 @@
                 <div class="img-box shezhi" title="设置">
                     <img src="./static/img/shezhi.png" />
                 </div>
-                <div class="img-box baobiao" title="报表">
+                <div class="img-box baobiao" title="报表" style="display: none;">
                     <img src="./static/img/baobiao2.png">
                 </div>
             </div>
@@ -358,7 +358,7 @@
     {{# layui.each(d, function(index, item) {  }}
         {{#  if(item.name != undefined ){ }}
         <li class="layui-nav-item layui-nav-itemed">
-            <a href="javascript:;" class="fontcolor mykanban category xiangmukongjian" data-id="{{item._id}}"> 
+            <a href="javascript:;" class="fontcolor mykanban category xiangmukongjian" data-id="{{item._id}}" data-authority="{{item.authority}}"> 
                 <i class="layui-icon layui-icon-template-1"></i> {{item.name}} 
                 <img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/>
             </a>

web/pages/kanbanadmin.html

@@ -11,7 +11,7 @@
                 <span class="kanbanadmin-head-right"></span>
             </div>
 
-            <div class="to-added-baobiao">
+            <div class="to-added-baobiao" id="to-added-baobiao">
                 
             </div>
 
@@ -54,7 +54,7 @@
         {{#  if(item.added === false){ }}
             <div class="kanbanadmin-list-box">
                 <span class="kanbanadmin-list-tit">{{item.name}}</span>
-                <span class="kanbanadmin-list-add-box"><span class="kanbanadmin-list-add kanbanadd" data-index="{{index}}">+</span></span>
+                <span class="kanbanadmin-list-add-box"><span class="kanbanadmin-list-add kanbanadd" data-index="{{index}}" data-id="{{item._id}}">+</span></span>
             </div>
         {{#  } }} 
     {{#  }); }}

web/pages/modeltable.html

@@ -33,7 +33,7 @@
     {{#  if(d.modeltype === "table"){ }}
                 
         <div class="table-box">
-            <div class="table-tbody-box">
+            <div class="table-tbody-box" id="table-tbody-box-{{d.id}}">
 
                 <!-- <div class="fixed-table-box row-col-fixed" >
                     <div class="fixed-table_header-wraper">
@@ -194,11 +194,13 @@
         
     {{#  } else { }}
     
-    {{#  if(d.cat != "user_property" && d.cat != "scatter"){ }}
+    {{#  if(d.cat != "user_property" && d.cat != "scatter" ){ }}
         
         <div class="data-box">
             <div style="display: flex; align-items: center;">
+                {{#  if(d.daydata != false ){ }}
                     <div class="data-num">{{d.sameday}}<span></span></div>
+                {{#  } }} 
                 <div class="proportion">
                     {{#  if(d.wowtype != ''){ }}
                         {{#  if(d.wowtype == '-'){ }}
@@ -216,7 +218,7 @@
                     {{#  } }} 
                 </div>
             </div>
-            
+            {{#  if(d.avesumdata != false ){ }}
                 <div class="thesum">
                     <div class="thesum-box">
                         {{#  if(d.sum != -1){ }}
@@ -227,16 +229,21 @@
                         {{#  } }} 
                     </div>
                 </div>
+            {{#  } }} 
         </div>
 
         {{#  } }} 
         
-
         <div class="echarts-box">
+        {{#  if(d.daydata != false && d.avesumdata != false){ }}
                 <div id="{{d.id}}" class="echarts"></div>
+        {{# } else { }}
+                <div id="{{d.id}}" class="echarts2"></div>
+        {{#  } }} 
         </div>
 
 
+
     {{#  } }} 
 
 

web/src/x.min.js

@@ -30,6 +30,10 @@ var X = window.X || {
             {'title':'数据导出','id':'export'},
             {'title':'报表移除','id':'del'},
         ],
+        'gengduolist2':[
+            {'title':'数据导出','id':'export'},
+            {'title':'报表移除','id':'del'},
+        ],
         //用户搜索条件
         'search':{
             category:[
@@ -89,6 +93,7 @@ var X = window.X || {
                 {'title':'每十分钟','id':'PT10M'},
                 {'title':'每十五分钟','id':'PT15M'},
                 {'title':'按小时','id':'PT1H'},
+                // {'title':'按小时段','id':'HOUR'},
                 {'title':'按周','id':'P1W'},
                 {'title':'按月','id':'P1M'},
                 {'title':'合计','id':'total'},
@@ -181,9 +186,16 @@ var X = window.X || {
                         layer.msg('查无数据');
                         // callback && callback(d);
                     }
+                }else {
+                    if(d.code == -5){
+                        layer.msg("登录过期请重新登录!!!");
+                        window.localStorage.removeItem('loginData');
+                        X.gourl("login");
+                        location.reload();
                     }else {
                         layer.msg(d.msg);
                     }
+                }
                 
             },
             error:function(error){
@@ -2605,7 +2617,7 @@ var X = window.X || {
             });
 
             //删除指标
-            $(document).on('click',".analysis-del",function(){
+            $(document).off('click','.analysis-del').on('click',".analysis-del",function(){
                 if(data['events'].length != 1){
                     var index = $(this).attr("data-index");
                     data['events'].splice(index,1);
@@ -4212,6 +4224,18 @@ var X = window.X || {
                 X.gourl(url);
             });
 
+            //空间单击事件
+            $(document).off("click",'.xiangmukongjian').on('click','.xiangmukongjian',function(){
+                var authority = $(this).attr("data-authority");
+                X.DATA.authority = authority;
+                if(authority == "rw"){
+                    $(".baobiao").show();
+                }else{
+                    $(".baobiao").hide();
+                }
+                // console.log(authority);
+            });
+
             // 修改面板名
             $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
                 $(".tab-tit-box .tab-tit").html($(this).find("span").html());
@@ -4723,7 +4747,14 @@ var X = window.X || {
                 var ascending = obj.attr("data-ascending");
                 var avesumdata = obj.attr("data-avesumdata");
                 var daydata = obj.attr("data-daydata");
-                X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
+
+                var gengduolist
+                if(X.DATA.authority == "rw"){
+                    gengduolist = X['DATA']['gengduolist'];
+                }else {
+                    gengduolist = X['DATA']['gengduolist2'];
+                }
+                X.parametersopen(gengduolist,'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
                     if(d.id == 'shezhi'){
                         var data = {
                             id : id,
@@ -4763,6 +4794,12 @@ var X = window.X || {
             X.api('project/kanban',"post",{"_id":id},function (d){
                 X.DATA['KanBanData'] = d.kanban;
                 X.DATA['ProjectData'] = d.spaces;
+                X.DATA.authority = d.spaces[0]['authority'];
+                if(d.spaces[0]['authority'] == "rw"){
+                    $(".baobiao").show();
+                }else{
+                    $(".baobiao").hide();
+                }
                 for(let i in d.spaces){
                     if(d.spaces[i]['children'].length > 0){
                         if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){
@@ -7862,11 +7899,34 @@ var X = window.X || {
                         updatalist(d.id);
                     })
                     toadddataprocessing();
+
+
+                    var sidebar = document.getElementById('to-added-baobiao');
+                    new Sortable(sidebar, {
+                        handle: '.kanbanadmin-list-tit', // handle class
+                        animation: 150,
+                        onUpdate:function(evt){
+                            var newIndex = evt.newIndex;
+                            var oldIndex = evt.oldIndex;
+                            let item = submitdata.splice(oldIndex, 1)		// arr删除2，把2给item
+                            submitdata.splice(newIndex, 0, item[0])
+                            for(let i in submitdata){
+                                submitdata[i]['sort'] = i
+                            }
+                            // console.log(submitdata);
+
+                            X.api('dashboard/add_report','post',{_id:X['DATA']['dashboard_id'],report_ids:submitdata},function(d){
+                                // console.log(d);
+                                kanbanupdata();
+                            });
+                        }
+                    });
+
                 })
             };
 
             function updatalist(title){
-                console.log(title);
+                // console.log(title);
                 var screendata=[];//筛选后的数据
                 for(let i in reportlistdata){
                    if(title == 0){
@@ -7899,10 +7959,18 @@ var X = window.X || {
             //添加报表
             $(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
                 var index = $(this).attr('data-index');
+                var id = $(this).attr('data-id');
+                console.log(id); 
+                for(let i in reportlistdata){
+                    if(reportlistdata[i]['_id'] == id){
+                        console.log(reportlistdata[i]['_id']);
                         reportlistdata[index]['added'] = true;
                         X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
                         X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
                         toadddataprocessing();
+                    }
+                }
+                
             });
 
             // 修改报表类型
@@ -7943,7 +8011,7 @@ var X = window.X || {
                         if(submitdata[i]['report_id'] == id){
                             submitdata[i]['graph_type'] = d['graph_type'];
                             submitdata[i]['graph_size'] = d['graph_size'];
-                            submitdata[i]['sort'] = d['sort'];
+                            // submitdata[i]['sort'] = d['sort'];
                         }
                     }
                 })
@@ -7958,7 +8026,6 @@ var X = window.X || {
                     }
                 };
                 submitdata = [];
-                console.log(toadddata);
                 for(let i in toadddata){
                     var arr = {
                         report_id:toadddata[i]['_id'],
@@ -7966,12 +8033,12 @@ var X = window.X || {
                         model:toadddata[i]['cat'],
                         name:toadddata[i]['name'],
                         graph_size:toadddata[i]['show_config']['graph_size'] || 'in',
-                        sort: toadddata[i]['show_config']['sort']
+                        // sort: toadddata[i]['show_config']['sort']
+                        sort: i
                     };
                     submitdata.push(arr);
                 }
                 submitdata.sort( X.compare("sort") );
-                console.log(submitdata);
             };
 
             $(document).off('click','.to-added-del').on('click','.to-added-del',function(){
@@ -8722,24 +8789,24 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
-            console.log("table",data);
+            // console.log("table",data);
             X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
                 $("#conent-box"+data.id).html(html);
-                if(data.modeltype == 'table' && data.modelsize != "small"){
+                // if(data.modeltype == 'table' && data.modelsize != "small"){
-                    var headdata = [];
+                //     var headdata = [];
-                    for(let i in data.titledata){
+                //     for(let i in data.titledata){
-                        var arr =  {
+                //         var arr =  {
-                            width: "150px",
+                //             width: "150px",
-                            field: data.titledata[i],
+                //             field: data.titledata[i],
-                            fixed: false
+                //             fixed: false
-                        };
+                //         };
-                        if(i == 0){
+                //         if(i == 0){
-                            arr['fixed'] = true;
+                //             arr['fixed'] = true;
-                        }
+                //         }
-                        headdata.push(arr);
+                //         headdata.push(arr);
-                    }
+                //     }
-                    X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
+                //     X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
-                }
+                // }
                 
             })
 

web/srczip/common.js

@@ -29,6 +29,10 @@ var X = window.X || {
             {'title':'数据导出','id':'export'},
             {'title':'报表移除','id':'del'},
         ],
+        'gengduolist2':[
+            {'title':'数据导出','id':'export'},
+            {'title':'报表移除','id':'del'},
+        ],
         //用户搜索条件
         'search':{
             category:[
@@ -88,6 +92,7 @@ var X = window.X || {
                 {'title':'每十分钟','id':'PT10M'},
                 {'title':'每十五分钟','id':'PT15M'},
                 {'title':'按小时','id':'PT1H'},
+                // {'title':'按小时段','id':'HOUR'},
                 {'title':'按周','id':'P1W'},
                 {'title':'按月','id':'P1M'},
                 {'title':'合计','id':'total'},
@@ -180,9 +185,16 @@ var X = window.X || {
                         layer.msg('查无数据');
                         // callback && callback(d);
                     }
+                }else {
+                    if(d.code == -5){
+                        layer.msg("登录过期请重新登录!!!");
+                        window.localStorage.removeItem('loginData');
+                        X.gourl("login");
+                        location.reload();
                     }else {
                         layer.msg(d.msg);
                     }
+                }
                 
             },
             error:function(error){

web/srczip/logic/analysis.js

@@ -448,7 +448,7 @@
             });
 
             //删除指标
-            $(document).on('click',".analysis-del",function(){
+            $(document).off('click','.analysis-del').on('click',".analysis-del",function(){
                 if(data['events'].length != 1){
                     var index = $(this).attr("data-index");
                     data['events'].splice(index,1);

web/srczip/logic/dashboard.js

@@ -64,6 +64,18 @@
                 X.gourl(url);
             });
 
+            //空间单击事件
+            $(document).off("click",'.xiangmukongjian').on('click','.xiangmukongjian',function(){
+                var authority = $(this).attr("data-authority");
+                X.DATA.authority = authority;
+                if(authority == "rw"){
+                    $(".baobiao").show();
+                }else{
+                    $(".baobiao").hide();
+                }
+                // console.log(authority);
+            });
+
             // 修改面板名
             $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
                 $(".tab-tit-box .tab-tit").html($(this).find("span").html());
@@ -575,7 +587,14 @@
                 var ascending = obj.attr("data-ascending");
                 var avesumdata = obj.attr("data-avesumdata");
                 var daydata = obj.attr("data-daydata");
-                X.parametersopen(X['DATA']['gengduolist'],'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
+
+                var gengduolist
+                if(X.DATA.authority == "rw"){
+                    gengduolist = X['DATA']['gengduolist'];
+                }else {
+                    gengduolist = X['DATA']['gengduolist2'];
+                }
+                X.parametersopen(gengduolist,'dropdownlist',[offset.top+obj.height(),offset.left-170],function(d){
                     if(d.id == 'shezhi'){
                         var data = {
                             id : id,
@@ -615,6 +634,12 @@
             X.api('project/kanban',"post",{"_id":id},function (d){
                 X.DATA['KanBanData'] = d.kanban;
                 X.DATA['ProjectData'] = d.spaces;
+                X.DATA.authority = d.spaces[0]['authority'];
+                if(d.spaces[0]['authority'] == "rw"){
+                    $(".baobiao").show();
+                }else{
+                    $(".baobiao").hide();
+                }
                 for(let i in d.spaces){
                     if(d.spaces[i]['children'].length > 0){
                         if(X.DATA['dashboard_id'] == undefined || X.DATA['dashboard_id'] == ""){

web/srczip/logic/kanbanadmin.js

@@ -35,11 +35,34 @@
                         updatalist(d.id);
                     })
                     toadddataprocessing();
+
+
+                    var sidebar = document.getElementById('to-added-baobiao');
+                    new Sortable(sidebar, {
+                        handle: '.kanbanadmin-list-tit', // handle class
+                        animation: 150,
+                        onUpdate:function(evt){
+                            var newIndex = evt.newIndex;
+                            var oldIndex = evt.oldIndex;
+                            let item = submitdata.splice(oldIndex, 1)		// arr删除2，把2给item
+                            submitdata.splice(newIndex, 0, item[0])
+                            for(let i in submitdata){
+                                submitdata[i]['sort'] = i
+                            }
+                            // console.log(submitdata);
+
+                            X.api('dashboard/add_report','post',{_id:X['DATA']['dashboard_id'],report_ids:submitdata},function(d){
+                                // console.log(d);
+                                kanbanupdata();
+                            });
+                        }
+                    });
+
                 })
             };
 
             function updatalist(title){
-                console.log(title);
+                // console.log(title);
                 var screendata=[];//筛选后的数据
                 for(let i in reportlistdata){
                    if(title == 0){
@@ -72,10 +95,18 @@
             //添加报表
             $(document).off('click','.kanbanadd').on('click','.kanbanadd',function(){
                 var index = $(this).attr('data-index');
+                var id = $(this).attr('data-id');
+                console.log(id); 
+                for(let i in reportlistdata){
+                    if(reportlistdata[i]['_id'] == id){
+                        console.log(reportlistdata[i]['_id']);
                         reportlistdata[index]['added'] = true;
                         X.laytpldata('#to-be-added-baobiao-dot',reportlistdata,'.to-be-added-baobiao');
                         X.laytpldata('#to-added-baobiao-dot',reportlistdata,'.to-added-baobiao');
                         toadddataprocessing();
+                    }
+                }
+                
             });
 
             // 修改报表类型
@@ -116,7 +147,7 @@
                         if(submitdata[i]['report_id'] == id){
                             submitdata[i]['graph_type'] = d['graph_type'];
                             submitdata[i]['graph_size'] = d['graph_size'];
-                            submitdata[i]['sort'] = d['sort'];
+                            // submitdata[i]['sort'] = d['sort'];
                         }
                     }
                 })
@@ -131,7 +162,6 @@
                     }
                 };
                 submitdata = [];
-                console.log(toadddata);
                 for(let i in toadddata){
                     var arr = {
                         report_id:toadddata[i]['_id'],
@@ -139,12 +169,12 @@
                         model:toadddata[i]['cat'],
                         name:toadddata[i]['name'],
                         graph_size:toadddata[i]['show_config']['graph_size'] || 'in',
-                        sort: toadddata[i]['show_config']['sort']
+                        // sort: toadddata[i]['show_config']['sort']
+                        sort: i
                     };
                     submitdata.push(arr);
                 }
                 submitdata.sort( X.compare("sort") );
-                console.log(submitdata);
             };
 
             $(document).off('click','.to-added-del').on('click','.to-added-del',function(){

web/srczip/logic/modeltable.js

@@ -7,8 +7,22 @@
             var data = parms;
             // console.log("table",data);
             X.laytpldata("#kanban-model-modify-table-dot",data,"model"+data.id,function(html){
-
                 $("#conent-box"+data.id).html(html);
+                // if(data.modeltype == 'table' && data.modelsize != "small"){
+                //     var headdata = [];
+                //     for(let i in data.titledata){
+                //         var arr =  {
+                //             width: "150px",
+                //             field: data.titledata[i],
+                //             fixed: false
+                //         };
+                //         if(i == 0){
+                //             arr['fixed'] = true;
+                //         }
+                //         headdata.push(arr);
+                //     }
+                //     X.fixedTable("table-tbody-box-"+data.id,'row-col-fixed','',headdata,data.condata,data.cat);
+                // }
                 
             })