1

web/pages/adminkanban.html

@@ -17,9 +17,10 @@
             <input type="checkbox" name="reading" id="adminmykanban-quanxuan"> 全选
         </div>
         <div class="adminmykanban-operation-but">
-            <button class="adminmykanban-operation-but-yidong"> <img src="./static/img/yidong.png" /> 移动至</button>
+            <button class="adminmykanban-operation-but-yidong"> <img src="./static/img/yidong.png" /> 移动至 </button>
-            <button class="adminmykanban-operation-but-copy"><i class="layui-icon">&#xe656;</i> 复制</button>
+            <button class="adminmykanban-operation-but-copykongjian"> <i class="layui-icon">&#xe656;</i> 复制至空间 </button>
-            <button class="adminmykanban-operation-but-del"> <img src="./static/img/del-red.png" /> 删除</button>
+            <button class="adminmykanban-operation-but-copy"><i class="layui-icon">&#xe656;</i> 复制至项目 </button>
+            <button class="adminmykanban-operation-but-del"> <img src="./static/img/del-red.png" /> 删除 </button>
         </div>
     </div>
 

web/pages/copykanban.html

@@ -2,7 +2,7 @@
 <div class="copy-box">
     <div class="copy-top">
         <p>复制看板</p>
-        <img src="./static/img/cha.png" class="copy-cha"/>
+        <!-- <img src="./static/img/cha.png" class="copy-cha"/> -->
     </div>
     <input id="copyid" style="display: none;">
     <div class="copy-name-box">

web/pages/copykanban_kongjian.html

@@ -0,0 +1,22 @@
+<!-- 复制至空间 -->
+<div class="yidong-box">
+    <div class="yidong-top">
+        <p>复制至空间</p>
+        <!-- <img src="./static/img/cha.png" class="yidong-cha"/> -->
+    </div>
+    <input id="yidongid" style="display: none;">
+    <div class="yidong-tab-box">
+        <div class="yidong-tab">
+            <div class="tabdata" id='yidongkanban' >我的看板</div>
+            <div id='yidongkongjian'>项目空间</div>
+        </div>
+    </div>
+    <div class="yidong-txt-box">
+        <input type="text" class="justAnotherInputBox1" id="yidongjustAnotherInputBox1" placeholder=""/>
+        <input type="text" class="justAnotherInputBox2" id="yidongjustAnotherInputBox2" placeholder=""/>
+    </div>
+    <div class="yidong-but-box">
+        <!-- <div class="yidong-qx" >取消</div> -->
+        <div class="yidong-qd" >确定</div>
+    </div>
+</div>

web/pages/dashboard.html

@@ -333,7 +333,7 @@
             <a href="javascript:;" class="fontcolor mykanban"> <img src="./static/img/wenjian.png" data-id="{{item._id}}"/><span>{{item.name}}</span> </a>
             {{#  layui.each(item.children, function(indexs, items){ }}
             <dl class="layui-nav-child modeify-layui-nav-child">
-                <dd class="layui-left-dd" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}} </span> 
+                <dd class="layui-left-dd" data-id="{{items._id}}" data-authority="{{item.authority}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}} </span> 
                 <img src="./static/img/gengduo.png" alt=""> </a></dd>
             </dl>
             {{#  }); }}
@@ -345,7 +345,7 @@
                 <img class='kanbanwenjianimg' src="./static/img/gengduo.png"/></a>
                 {{#  layui.each(item.children, function(indexs, items){ }}
                 <dl class="layui-nav-child modeify-layui-nav-child">
-                    <dd class="layui-left-dd" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}}</span> 
+                    <dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"><span>{{items.name}}</span> 
                     <img src="./static/img/gengduo.png" alt=""> </a></dd>
                 </dl>
                 {{#  }); }}
@@ -362,17 +362,29 @@
         <li class="layui-nav-item layui-nav-itemed">
             <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}}
+                {{#  if(item.authority == "rw"){ }}
                     <img src="./static/img/renyuan.png" class="nav-space-bar" data-id="{{item._id}}"/>
+                {{#  } }}
             </a>
             <dl class="layui-nav-child modeify-layui-nav-child" id="sidebar-box{{item._id}}">
                 {{#  layui.each(item.children, function(indexs, items){ }}
-                    {{#  if(items.onclick == 1){ }}
+                    {{#  if(items.onclick == 1 && index == 0){ }}
-                        <dd class="layui-left-dd layui-this"  data-id="{{items._id}}"><a href="javascript:;" class="fontcolor second category"> <span class="tuodong">{{items.name}}</span>
+                        <dd class="layui-left-dd layui-this" data-authority="{{item.authority}}" data-id="{{items._id}}">
-                            <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
+                            <a href="javascript:;" class="fontcolor second category"> 
+                                <span class="tuodong">{{items.name}}</span>
+                                {{#  if(item.authority == "rw"){ }}
+                                    <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 class="tuodong">{{items.name}}</span>
+                        <dd class="layui-left-dd" data-authority="{{item.authority}}" data-id="{{items._id}}">
-                            <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}"></a>
+                            <a href="javascript:;" class="fontcolor second category"> 
+                                <span class="tuodong">{{items.name}}</span>
+                                {{#  if(item.authority == "rw"){ }}
+                                    <img src="./static/img/gengduo.png" alt="" class="nav-action-bar" data-id="{{items._id}}">
+                                {{#  } }}
+                            </a>
                         </dd>
                     {{#  } }}
                 {{#  }); }}

web/pages/datarights.html

@@ -21,12 +21,12 @@
                 
                 <div class="datarights-top-box">
                     <div class="datarights-tit-box">
-                        数据权限 <img src="./static/img/capytishi.png" title="数据权限是一系列可用事件的组合，可通过设置数据权限组限制成员的可用事件范围，无数据权限用户默认可用全部事件。">
+                        渠道权限 <img src="./static/img/capytishi.png" title="数据权限是一系列可用事件的组合，可通过设置数据权限组限制成员的可用事件范围，无数据权限用户默认可用全部事件。">
                     </div>
-                    <div class="datarights-add-box">
+                    <!-- <div class="datarights-add-box">
                         <i class="layui-icon layui-icon-addition"></i>  
                         创建数据权限
-                    </div>
+                    </div> -->
                 </div>
 
                 <div class="datarights-tab-box">

web/pages/datarightsedit.html

@@ -1,26 +1,19 @@
-<!-- 编辑数据权限 -->
+<!-- 编辑渠道权限 -->
 <div class="datarightsedit-box">
 
         <div class="datarightsedit-top-box">
-            <div>编辑数据权限</div>
+            <div>编辑渠道权限</div>
             <img src="./static/img/cha.png">
         </div>
 
         <div class="datarightsedit-con-box">
             <div class="datarightsedit-txt-box">
-                <div class="datarightsedit-txt-box-tit">数据权限名称</div> <input type="text" placeholder="请输入" class="datarightsedit-txt-input"/>
+                <div class="datarightsedit-txt-box-tit">添加渠道名称</div> 
+                <textarea type="text" placeholder="输入渠道多个用逗号','隔开" maxlength="1000000" class="datarightsedit-txt-input">
+
+                </textarea>
             </div>
 
-            <div class="datarightsedit-txt-box">
-                <div class="datarightsedit-txt-box-tit">数据权限配置</div> 
-                <form class="layui-form" action="" lay-filter="datarightseditexample">
-                    <div class="datarightsedit-check-box">
-                        
-                        
-
-                    </div>
-                </form>
-            </div>
 
         </div>
 
@@ -30,8 +23,3 @@
         </div>
 
 </div>
-<script id="datarightsedit-check-box-dot" type="text/html">
-    {{#  layui.each(d, function(index, item){ }}
-        <input type="checkbox" name="{{item}}" lay-skin="primary" title="{{item}}">
-    {{#  }); }}
-</script>

web/pages/modeltype.html

@@ -29,9 +29,11 @@
                     {{#  } }} 
                 {{#  } }} 
             </div>
+            {{#  if(d.authority == "rw"){ }}
             <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
                 <img src="./static/img/qvshitu.png" /> <span>报表</span>
             </div>
+            {{#  } }} 
         </div>
         <div class="conent-box" id="conent-box{{d.id}}">
 
@@ -58,9 +60,11 @@
                 {{#  } }} 
 
             </div>
+            {{#  if(d.authority == "rw"){ }}
             <div class="chart control" id="chart{{d.id}}" data-modelsize="{{d.modelsize}}" data-modeltype={{d.modeltype}} data-cat="{{d.cat}}" data-name="{{d.name}}" data-id="{{d.id}}">
                 <img src="./static/img/qvshitu.png" /> <span>趋势图</span>
             </div>
+            {{#  } }} 
         </div>
         <div class="conent-box" id="conent-box{{d.id}}">
 

web/pages/projectinfo.html

@@ -8,7 +8,7 @@
                 <div class="item_kuvn" data-url=""> <a class="item_kuvn-pl ajax-content" href="useradmin" data-id="projectadmin-con-box">成员管理</a> </div>
                 <div class="item_kuvn" data-url=""> <a class="item_kuvn-pl ajax-content" href="apiadmin" data-id="projectadmin-con-box">api管理</a> </div>
                 <div class="item_kuvn" data-url=""> <a class="item_kuvn-pl ajax-content" href="projectadmin" data-id="projectadmin-con-box">角色管理</a></div>
-                <div class="item_kuvn" data-url=""> <a class="item_kuvn-pl ajax-content" href="datarights" data-id="projectadmin-con-box">数据权限</a></div>
+                <div class="item_kuvn" data-url=""> <a class="item_kuvn-pl ajax-content" href="datarights" data-id="projectadmin-con-box">渠道权限</a></div>
             </div>
         </div>
     </div>

web/src/x.min.js

@@ -32,7 +32,6 @@ var X = window.X || {
         ],
         'gengduolist2':[
             {'title':'数据导出','id':'export'},
-            {'title':'报表移除','id':'del'},
         ],
         //用户搜索条件
         'search':{
@@ -3117,6 +3116,7 @@ var X = window.X || {
                         ProjectData[i]['checked'] = false;
                     }
                 }
+                
                 X.treemenu("#adminmykanban-con-mykanban",KanBanData,'mykanban');
                 X.treemenu("#adminmykanban-con-kongjian",ProjectData,'kongjian');
             });
@@ -3261,8 +3261,26 @@ var X = window.X || {
                 
             });
 
+            // 复制至空间
+            $(document).off('click','.adminmykanban-operation-but-copykongjian').on('click','.adminmykanban-operation-but-copykongjian',function(){
+                var mykanban = layui.tree.getChecked('mykanban');
+                var kongjian = layui.tree.getChecked('kongjian');
+                console.log(kongjian);
+                if(mykanban.length < 1 && kongjian.length < 1){
+                        alert('请先选择需要移动的看板!!!');
+                        return;
+                }
+                var data = {
+                    'mykanban':selectkanbanidarr(mykanban),
+                    'kongjian':selectkongjianidarr(kongjian)
+                }
+                var source_id = data['mykanban'].concat(data['kongjian']);
+                X.parametersopen(source_id,'copykanban_kongjian','auto',function(){
+                    me.updata(X.DATA['projectid']);
+                })
+            })
 
-            // 复制
+            // 复制至项目
             $(document).off('click','.adminmykanban-operation-but-copy').on('click','.adminmykanban-operation-but-copy',function(){
                 var mykanban = layui.tree.getChecked('mykanban');
                 var kongjian = layui.tree.getChecked('kongjian');
@@ -3485,6 +3503,9 @@ var X = window.X || {
                                 if(X.DATA.eventid && X.DATA.eventid != ''){
                                     var report_idarr = [];
                                     report_idarr.push(X.DATA.eventid);
+                                    if(X.DATA.authority != 'rw'){
+                                        $('.analysis-savereport').hide();
+                                    }
                                     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                                         backfilldata(d[0]);
                                     })
@@ -4838,6 +4859,9 @@ var X = window.X || {
                 if(X.DATA.user_propertyid && X.DATA.user_propertyid != ''){
                     var report_idarr = [];
                     report_idarr.push(X.DATA.user_propertyid);
+                    if(X.DATA.authority != 'rw'){
+                        $('.analysis-savereport').hide();
+                    }
                     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                         backfilldata(d[0]);
                     })
@@ -5494,6 +5518,86 @@ var X = window.X || {
         }
     };
 })();
+// srczip/logic/copykanban_kongjian.js
+(function(){
+    X.pageLogic['copykanban_kongjian'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            this.callback = parms.callback; //选择后执行的回调
+            var data = parms.extData;//获取到上层弹窗传的数据
+            var comboTree1,comboTree2
+            comboTree1 = $('.yidong-txt-box .justAnotherInputBox1').comboTree({
+                source : X.DATA.KanBanData,
+                isMultiple: false
+            });
+            comboTree2 = $('.yidong-txt-box .justAnotherInputBox2').comboTree({
+                source : X.DATA.ProjectData,
+                isMultiple: false
+            });
+            
+            //叉图标关闭弹窗
+            $(".yidong-top .yidong-cha").click(function(){
+                console.log(layer.index)
+                parent.layer.closeAll(layer.index);
+            });
+            //取消按钮
+            $(".yidong-but-box .yidong-qx").click(function(){
+                layer.closeAll(layer.index);
+            });
+            //我的看板，空间切换实践
+            $(".yidong-tab-box .yidong-tab div").click(function(){
+                $(".yidong-tab-box .yidong-tab div").removeClass('tabdata');
+                $(this).addClass('tabdata');
+                if($(this).html() == "我的看板"){
+                    $(".yidong-txt-box .justAnotherInputBox1").show();
+                    $(".yidong-txt-box .justAnotherInputBox2").hide();
+                }else {
+                    $(".yidong-txt-box .justAnotherInputBox1").hide();
+                    $(".yidong-txt-box .justAnotherInputBox2").show();
+                }
+                $(".yidong-txt-box .justAnotherInputBox1").val("");
+                $(".yidong-txt-box .justAnotherInputBox2").val("");
+            })
+
+            //确定按钮
+            $(".yidong-but-box .yidong-qd").click(function(){
+                var type ='kanban';
+                var id = '';//没有默认传看板
+                if($('#yidongjustAnotherInputBox2').val() != ""){
+                    var Addlocation = $('#yidongjustAnotherInputBox2').val();
+                    type = "space"
+                }else {
+                    var Addlocation = $('#yidongjustAnotherInputBox1').val();
+                }
+                // console.log(Addlocation);
+                if(Addlocation){
+                   id = X.pageLogic.newkanban.matchingid(Addlocation,type);
+                }else {
+                    alert('请选择添加的位置');
+                    return;
+                }
+                // var source_id = data['mykanban'].concat(data['kongjian']);
+                var dataArr = {
+                    'source_ids':data,
+                    'project_id': X.DATA.projectid,
+                    'dest_space_id': id
+                };
+                console.log(dataArr);
+                X.api('dashboard/copy_to_my_space','post',dataArr,function(d){
+                    
+                        X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
+                        X.pageLogic.adminkanban.updata(X.DATA.projectid);//刷新数据
+                        console.log(me.parms.layIndex);
+                        layer.closeAll(0);
+                    
+                })
+            });
+
+
+        }
+    };
+})();
 // srczip/logic/copyreport.js
 (function(){
     X.pageLogic['copyreport'] = {
@@ -5636,6 +5740,13 @@ var X = window.X || {
 
             // 修改面板名
             $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
+                var authority = $(this).attr("data-authority");
+                X.DATA.authority = authority;
+                if(authority == "rw"){
+                    $(".baobiao").show();
+                }else{
+                    $(".baobiao").hide();
+                }
                 $(".tab-tit-box .tab-tit").html($(this).find("span").html());
                 setHashParms("menu",$(this).attr('data-id'));
                 // $("#model-box").html("");
@@ -5936,7 +6047,12 @@ var X = window.X || {
                 e.stopPropagation();
                 var obj = $(this);
                 var offset = obj.offset();
+                var innerHeight = window.innerHeight;
                 var offsets = [ offset.top + 10,offset.left];
+
+                if( innerHeight - offset.top < 150){
+                    offsets = [ offset.top - 100,offset.left];
+                }
                 var id = $(this).attr('data-id');
                 X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist2",offsets,function(d){
                     var arr = [];
@@ -6591,6 +6707,7 @@ var X = window.X || {
                 
 
             }
+            eventdata[0]['authority'] = X.DATA.authority;
             return eventdata;
         },
 
@@ -7370,10 +7487,10 @@ var X = window.X || {
 
         },
         dataauthlist:function(){
-            X.tabledata('#datarightsdata','data_auth/list',[[
+            X.tabledata('#datarightsdata','authz/account_owner_list',[[
-                {field:'title', title: '数据权限名称', sort: true}
+                {field:'name', title: '用户名', sort: true}
-                ,{field:'data_range', title: '事件范围'}
+                ,{field:'nickname', title: '显示名'}
-                ,{field:'update_date', title: '最后调整时间', sort: true}
+                ,{field:'owner_list', title: '渠道', sort: true}
                 ,{fixed: 'right', title:'操作', toolbar: '#datarights-barDemo', width:100}
             ]]);
         }
@@ -7389,18 +7506,10 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback; //选择后执行的回调
             var data = parms.extData;//获取到上层弹窗传的数据
-            X.api("data_auth/all_event","get",{},function(d){
+            console.log(data);
-                X.laytpldata("#datarightsedit-check-box-dot",d,".datarightsedit-check-box");
-                layui.form.render();
-            })
             
             if(data){
-                var dataArr ={};
+                $(".datarightsedit-txt-input").html(data.owner_list);
-                for(let i in data.data){
-                    dataArr[data.data[i]] = true;
-                }
-                layui.form.val('datarightseditexample',dataArr);
-                $(".datarightsedit-txt-input").val(data.title);
             }
 
 
@@ -7413,25 +7522,13 @@ var X = window.X || {
             })
 
             $(".datarightsedit-qd").click(function(){
-                var tit = $(".datarightsedit-txt-box input").val();
+                var tit = $(".datarightsedit-txt-input").val();
-                var fromdata = layui.form.val('datarightseditexample');//选中的权限
+                var owners = tit.split(",");
-                var dataArr=[];
+                X.api("authz/update_account_owner","post",{owners:owners,account_name:data.name},function(d){
-                for(let i in fromdata){
-                    dataArr.push(i);
-                }
-                if(data){
-                    X.api("data_auth/edit_data_auth","post",{title:tit,data:dataArr,data_auth_id:data.id},function(d){
-                        layer.msg("修改成功");
-                        layer.closeAll();
-                        X.pageLogic.datarights.dataauthlist();
-                    })
-                }else {
-                    X.api("data_auth/add_data_auth","post",{title:tit,data:dataArr},function(d){
                     layer.msg("创建成功");
                     layer.closeAll();
                     X.pageLogic.datarights.dataauthlist();
                 })
-                }
                 
             })
 
@@ -7587,6 +7684,9 @@ var X = window.X || {
                     if(X.DATA.scatterid && X.DATA.scatterid != ''){
                         var report_idarr = [];
                         report_idarr.push(X.DATA.scatterid);
+                        if(X.DATA.authority != 'rw'){
+                            $('.analysis-savereport').hide();
+                        }
                         X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                             backfilldata(d[0]);
                         })
@@ -10041,6 +10141,9 @@ var X = window.X || {
                     if(X.DATA.ltvid && X.DATA.ltvid != ''){
                         var report_idarr = [];
                         report_idarr.push(X.DATA.ltvid);
+                        if(X.DATA.authority != 'rw'){
+                            $('.analysis-savereport').hide();
+                        }
                         X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                             backfilldata(d[0]);
                         })
@@ -10385,6 +10488,7 @@ var X = window.X || {
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
+            console.log(data);
             X.laytpldata("#kanban-model-modify-type-dot",data,"model"+data.id,function(html){
                 // console.log(html);
                 $("#model-two-"+data.id).html(html);
@@ -11210,6 +11314,9 @@ var X = window.X || {
                                 if(X.DATA.retentionid && X.DATA.retentionid != ''){
                                     var report_idarr = [];
                                     report_idarr.push(X.DATA.retentionid);
+                                    if(X.DATA.authority != 'rw'){
+                                        $('.analysis-savereport').hide();
+                                    }
                                     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                                         backfilldata(d[0]);
                                     })
@@ -11313,7 +11420,6 @@ var X = window.X || {
             });
 
             $(document).off('click','.analysis-zhibiao-list-del-return-event').on('click','.analysis-zhibiao-list-del-return-event',function(){
-                debugger;
                 var index = $(this).attr("data-twonum");
                 data['events'][1]['filts'].splice(index,1);
                 X.template("returnvisitevent","returnvisit-event",data['events'][1]);

web/srczip/common.js

@@ -31,7 +31,6 @@ var X = window.X || {
         ],
         'gengduolist2':[
             {'title':'数据导出','id':'export'},
-            {'title':'报表移除','id':'del'},
         ],
         //用户搜索条件
         'search':{

web/srczip/logic/adminkanban.js

@@ -35,6 +35,7 @@
                         ProjectData[i]['checked'] = false;
                     }
                 }
+                
                 X.treemenu("#adminmykanban-con-mykanban",KanBanData,'mykanban');
                 X.treemenu("#adminmykanban-con-kongjian",ProjectData,'kongjian');
             });
@@ -179,8 +180,26 @@
                 
             });
 
+            // 复制至空间
+            $(document).off('click','.adminmykanban-operation-but-copykongjian').on('click','.adminmykanban-operation-but-copykongjian',function(){
+                var mykanban = layui.tree.getChecked('mykanban');
+                var kongjian = layui.tree.getChecked('kongjian');
+                console.log(kongjian);
+                if(mykanban.length < 1 && kongjian.length < 1){
+                        alert('请先选择需要移动的看板!!!');
+                        return;
+                }
+                var data = {
+                    'mykanban':selectkanbanidarr(mykanban),
+                    'kongjian':selectkongjianidarr(kongjian)
+                }
+                var source_id = data['mykanban'].concat(data['kongjian']);
+                X.parametersopen(source_id,'copykanban_kongjian','auto',function(){
+                    me.updata(X.DATA['projectid']);
+                })
+            })
 
-            // 复制
+            // 复制至项目
             $(document).off('click','.adminmykanban-operation-but-copy').on('click','.adminmykanban-operation-but-copy',function(){
                 var mykanban = layui.tree.getChecked('mykanban');
                 var kongjian = layui.tree.getChecked('kongjian');

web/srczip/logic/analysis.js

@@ -98,6 +98,9 @@
                                 if(X.DATA.eventid && X.DATA.eventid != ''){
                                     var report_idarr = [];
                                     report_idarr.push(X.DATA.eventid);
+                                    if(X.DATA.authority != 'rw'){
+                                        $('.analysis-savereport').hide();
+                                    }
                                     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                                         backfilldata(d[0]);
                                     })

web/srczip/logic/attribute.js

@@ -85,6 +85,9 @@
                 if(X.DATA.user_propertyid && X.DATA.user_propertyid != ''){
                     var report_idarr = [];
                     report_idarr.push(X.DATA.user_propertyid);
+                    if(X.DATA.authority != 'rw'){
+                        $('.analysis-savereport').hide();
+                    }
                     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                         backfilldata(d[0]);
                     })

web/srczip/logic/copykanban_kongjian.js

@@ -0,0 +1,79 @@
+(function(){
+    X.pageLogic['copykanban_kongjian'] = {
+        init : function(parms){
+            var me = this;
+            this.parms = parms;
+            this.callback = parms.callback; //选择后执行的回调
+            var data = parms.extData;//获取到上层弹窗传的数据
+            var comboTree1,comboTree2
+            comboTree1 = $('.yidong-txt-box .justAnotherInputBox1').comboTree({
+                source : X.DATA.KanBanData,
+                isMultiple: false
+            });
+            comboTree2 = $('.yidong-txt-box .justAnotherInputBox2').comboTree({
+                source : X.DATA.ProjectData,
+                isMultiple: false
+            });
+            
+            //叉图标关闭弹窗
+            $(".yidong-top .yidong-cha").click(function(){
+                console.log(layer.index)
+                parent.layer.closeAll(layer.index);
+            });
+            //取消按钮
+            $(".yidong-but-box .yidong-qx").click(function(){
+                layer.closeAll(layer.index);
+            });
+            //我的看板，空间切换实践
+            $(".yidong-tab-box .yidong-tab div").click(function(){
+                $(".yidong-tab-box .yidong-tab div").removeClass('tabdata');
+                $(this).addClass('tabdata');
+                if($(this).html() == "我的看板"){
+                    $(".yidong-txt-box .justAnotherInputBox1").show();
+                    $(".yidong-txt-box .justAnotherInputBox2").hide();
+                }else {
+                    $(".yidong-txt-box .justAnotherInputBox1").hide();
+                    $(".yidong-txt-box .justAnotherInputBox2").show();
+                }
+                $(".yidong-txt-box .justAnotherInputBox1").val("");
+                $(".yidong-txt-box .justAnotherInputBox2").val("");
+            })
+
+            //确定按钮
+            $(".yidong-but-box .yidong-qd").click(function(){
+                var type ='kanban';
+                var id = '';//没有默认传看板
+                if($('#yidongjustAnotherInputBox2').val() != ""){
+                    var Addlocation = $('#yidongjustAnotherInputBox2').val();
+                    type = "space"
+                }else {
+                    var Addlocation = $('#yidongjustAnotherInputBox1').val();
+                }
+                // console.log(Addlocation);
+                if(Addlocation){
+                   id = X.pageLogic.newkanban.matchingid(Addlocation,type);
+                }else {
+                    alert('请选择添加的位置');
+                    return;
+                }
+                // var source_id = data['mykanban'].concat(data['kongjian']);
+                var dataArr = {
+                    'source_ids':data,
+                    'project_id': X.DATA.projectid,
+                    'dest_space_id': id
+                };
+                console.log(dataArr);
+                X.api('dashboard/copy_to_my_space','post',dataArr,function(d){
+                    
+                        X.pageLogic.dashboard.freshMenu(X.DATA.projectid);//刷新侧边栏
+                        X.pageLogic.adminkanban.updata(X.DATA.projectid);//刷新数据
+                        console.log(me.parms.layIndex);
+                        layer.closeAll(0);
+                    
+                })
+            });
+
+
+        }
+    };
+})();

web/srczip/logic/dashboard.js

@@ -78,6 +78,13 @@
 
             // 修改面板名
             $(document).off('click','.layui-left-dd').on('click','.layui-left-dd',function(){
+                var authority = $(this).attr("data-authority");
+                X.DATA.authority = authority;
+                if(authority == "rw"){
+                    $(".baobiao").show();
+                }else{
+                    $(".baobiao").hide();
+                }
                 $(".tab-tit-box .tab-tit").html($(this).find("span").html());
                 setHashParms("menu",$(this).attr('data-id'));
                 // $("#model-box").html("");
@@ -378,7 +385,12 @@
                 e.stopPropagation();
                 var obj = $(this);
                 var offset = obj.offset();
+                var innerHeight = window.innerHeight;
                 var offsets = [ offset.top + 10,offset.left];
+
+                if( innerHeight - offset.top < 150){
+                    offsets = [ offset.top - 100,offset.left];
+                }
                 var id = $(this).attr('data-id');
                 X.parametersopen(X.DATA.taboperationdata['kanban'],"dropdownlist2",offsets,function(d){
                     var arr = [];
@@ -1033,6 +1045,7 @@
                 
 
             }
+            eventdata[0]['authority'] = X.DATA.authority;
             return eventdata;
         },
 

web/srczip/logic/datarights.js

@@ -30,10 +30,10 @@
 
         },
         dataauthlist:function(){
-            X.tabledata('#datarightsdata','data_auth/list',[[
+            X.tabledata('#datarightsdata','authz/account_owner_list',[[
-                {field:'title', title: '数据权限名称', sort: true}
+                {field:'name', title: '用户名', sort: true}
-                ,{field:'data_range', title: '事件范围'}
+                ,{field:'nickname', title: '显示名'}
-                ,{field:'update_date', title: '最后调整时间', sort: true}
+                ,{field:'owner_list', title: '渠道', sort: true}
                 ,{fixed: 'right', title:'操作', toolbar: '#datarights-barDemo', width:100}
             ]]);
         }

web/srczip/logic/datarightsedit.js

@@ -5,18 +5,10 @@
             this.parms = parms;
             this.callback = parms.callback; //选择后执行的回调
             var data = parms.extData;//获取到上层弹窗传的数据
-            X.api("data_auth/all_event","get",{},function(d){
+            console.log(data);
-                X.laytpldata("#datarightsedit-check-box-dot",d,".datarightsedit-check-box");
-                layui.form.render();
-            })
             
             if(data){
-                var dataArr ={};
+                $(".datarightsedit-txt-input").html(data.owner_list);
-                for(let i in data.data){
-                    dataArr[data.data[i]] = true;
-                }
-                layui.form.val('datarightseditexample',dataArr);
-                $(".datarightsedit-txt-input").val(data.title);
             }
 
 
@@ -29,25 +21,13 @@
             })
 
             $(".datarightsedit-qd").click(function(){
-                var tit = $(".datarightsedit-txt-box input").val();
+                var tit = $(".datarightsedit-txt-input").val();
-                var fromdata = layui.form.val('datarightseditexample');//选中的权限
+                var owners = tit.split(",");
-                var dataArr=[];
+                X.api("authz/update_account_owner","post",{owners:owners,account_name:data.name},function(d){
-                for(let i in fromdata){
-                    dataArr.push(i);
-                }
-                if(data){
-                    X.api("data_auth/edit_data_auth","post",{title:tit,data:dataArr,data_auth_id:data.id},function(d){
-                        layer.msg("修改成功");
-                        layer.closeAll();
-                        X.pageLogic.datarights.dataauthlist();
-                    })
-                }else {
-                    X.api("data_auth/add_data_auth","post",{title:tit,data:dataArr},function(d){
                     layer.msg("创建成功");
                     layer.closeAll();
                     X.pageLogic.datarights.dataauthlist();
                 })
-                }
                 
             })
 

web/srczip/logic/distribution.js

@@ -121,6 +121,9 @@
                     if(X.DATA.scatterid && X.DATA.scatterid != ''){
                         var report_idarr = [];
                         report_idarr.push(X.DATA.scatterid);
+                        if(X.DATA.authority != 'rw'){
+                            $('.analysis-savereport').hide();
+                        }
                         X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                             backfilldata(d[0]);
                         })

web/srczip/logic/ltvmodel.js

@@ -60,6 +60,9 @@
                     if(X.DATA.ltvid && X.DATA.ltvid != ''){
                         var report_idarr = [];
                         report_idarr.push(X.DATA.ltvid);
+                        if(X.DATA.authority != 'rw'){
+                            $('.analysis-savereport').hide();
+                        }
                         X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                             backfilldata(d[0]);
                         })

web/srczip/logic/modeltype.js

@@ -5,6 +5,7 @@
             this.parms = parms;
             this.callback = parms.callback;
             var data = parms;
+            console.log(data);
             X.laytpldata("#kanban-model-modify-type-dot",data,"model"+data.id,function(html){
                 // console.log(html);
                 $("#model-two-"+data.id).html(html);

web/srczip/logic/retained.js

@@ -99,6 +99,9 @@
                                 if(X.DATA.retentionid && X.DATA.retentionid != ''){
                                     var report_idarr = [];
                                     report_idarr.push(X.DATA.retentionid);
+                                    if(X.DATA.authority != 'rw'){
+                                        $('.analysis-savereport').hide();
+                                    }
                                     X.api('report/read_report','post',{project_id:X.DATA.projectid,report_id:report_idarr},function(d){
                                         backfilldata(d[0]);
                                     })

web/static/css/event.css

@@ -8,7 +8,7 @@
 .eventattradmin-right___1TIt8 { display: flex; justify-content: space-between; align-items: center; }
 .eventattradmin-display___21tQp { color: #67729d; font-size: 13px; font-weight: 400; cursor: pointer; padding: 0 8px; height: 32px; line-height: 32px; border: 1px solid #f0f0f0; border-radius: 2px; }
 .eventattradmin-actions___141YT { color: #fff; background-color: #3d90ff; font-size: 13px; font-weight: 400; cursor: pointer; padding: 0 8px; height: 32px; line-height: 32px; border: 1px solid #f0f0f0; border-radius: 2px; margin-left: 8px; }
-.eventattradmin-table-box { margin: 24px; height: calc(100% - 120px); overflow-y: auto; }
+.eventattradmin-table-box { margin: 24px; height: calc(100% - 120px); overflow: hidden; }
 
 /* 修改事件属性管理 */
 

web/static/css/style.css

@@ -17,7 +17,7 @@
 .modify-layui-header { background-color: #475285; }
 .layui-nav { background: none; }
 .layui-form-select dl { max-height: 225px !important; }
-.layui-table-body { height: 100% !important; }
+.layui-table-body { height: 660px !important; }
 .layui-form-item .layui-form-checkbox[lay-skin=primary] { text-indent: 0px !important; }
 .layui-anim-downbit { max-height: 350px; overflow-y: auto; overflow-x: hidden; }
 /* .layui-nav .layui-nav-child dd.layui-this a, .layui-nav-child dd.layui-this { background-color: #f6f8fa !important; } */
@@ -520,7 +520,9 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
 .adminmykanban-operation { border-bottom: 1px solid #f0f0f0; padding: 7px 24px; display: flex; justify-content: space-between; align-items: center; }
 .adminmykanban-operation-but button { cursor: pointer; background-color: #fff; padding: 0 16px; height: 32px; font-size: 14px; line-height: 30px; text-shadow: none; }
 
+
 .adminmykanban-operation-but-yidong { color: #42546d; border: 1px solid #f0f0f0; }
+.adminmykanban-operation-but-copykongjian { color: #009688; border: 1px solid #009688; }
 .adminmykanban-operation-but-copy { color: #009688; border: 1px solid #009688; }
 .adminmykanban-operation-but-del { color: #ff5d5d; border:1px solid #ff5d5d; }
 .adminmykanban-con-box { padding: 7px 24px; overflow-y: scroll; }
@@ -836,3 +838,5 @@ label:not(.form-check-label):not(.custom-file-label) { font-weight: 400; }
     border-right: 1px solid #e6e6e6;
    border-bottom: 1px solid #f0f2f5;
 }
+
+.datarightsedit-txt-input { width: 420px; height: 400px; padding: 10px 15px; resize:none; border: 1px solid #f0f0f0; }