diff --git a/web/pages/adminkanban.html b/web/pages/adminkanban.html index 593b29b..646f870 100644 --- a/web/pages/adminkanban.html +++ b/web/pages/adminkanban.html @@ -17,9 +17,10 @@ 全选
- - - + + + +
diff --git a/web/pages/copykanban.html b/web/pages/copykanban.html index 25c7c7a..a96065c 100644 --- a/web/pages/copykanban.html +++ b/web/pages/copykanban.html @@ -2,7 +2,7 @@

复制看板

- +
diff --git a/web/pages/copykanban_kongjian.html b/web/pages/copykanban_kongjian.html new file mode 100644 index 0000000..74fb711 --- /dev/null +++ b/web/pages/copykanban_kongjian.html @@ -0,0 +1,22 @@ + +
+
+

复制至空间

+ +
+ +
+
+
我的看板
+
项目空间
+
+
+
+ + +
+
+ +
确定
+
+
\ No newline at end of file diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html index 14c0411..7fbbd82 100644 --- a/web/pages/dashboard.html +++ b/web/pages/dashboard.html @@ -333,7 +333,7 @@ {{item.name}} {{# layui.each(item.children, function(indexs, items){ }}
-
{{items.name}} +
{{items.name}}
{{# }); }} @@ -345,7 +345,7 @@ {{# layui.each(item.children, function(indexs, items){ }}
-
{{items.name}} +
{{items.name}}
{{# }); }} @@ -361,18 +361,30 @@ {{# if(item.name != undefined ){ }}
  • - {{item.name}} - + {{item.name}} + {{# if(item.authority == "rw"){ }} + + {{# } }}
    • @@ -58,9 +60,11 @@ {{# } }}
    + {{# if(d.authority == "rw"){ }}
    趋势图
    + {{# } }}
    diff --git a/web/pages/projectinfo.html b/web/pages/projectinfo.html index 5298975..be93806 100644 --- a/web/pages/projectinfo.html +++ b/web/pages/projectinfo.html @@ -8,7 +8,7 @@
    成员管理
    api管理
    角色管理
    -
    数据权限
    +
    渠道权限
    diff --git a/web/src/x.min.js b/web/src/x.min.js index f1706d2..771f8d0 100644 --- a/web/src/x.min.js +++ b/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',[[ - {field:'title', title: '数据权限名称', sort: true} - ,{field:'data_range', title: '事件范围'} - ,{field:'update_date', title: '最后调整时间', sort: true} + X.tabledata('#datarightsdata','authz/account_owner_list',[[ + {field:'name', title: '用户名', sort: true} + ,{field:'nickname', title: '显示名'} + ,{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){ - X.laytpldata("#datarightsedit-check-box-dot",d,".datarightsedit-check-box"); - layui.form.render(); - }) + console.log(data); if(data){ - var dataArr ={}; - for(let i in data.data){ - dataArr[data.data[i]] = true; - } - layui.form.val('datarightseditexample',dataArr); - $(".datarightsedit-txt-input").val(data.title); + $(".datarightsedit-txt-input").html(data.owner_list); } @@ -7413,25 +7522,13 @@ var X = window.X || { }) $(".datarightsedit-qd").click(function(){ - var tit = $(".datarightsedit-txt-box input").val(); - var fromdata = layui.form.val('datarightseditexample');//选中的权限 - var dataArr=[]; - 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(); - }) - } + var tit = $(".datarightsedit-txt-input").val(); + var owners = tit.split(","); + X.api("authz/update_account_owner","post",{owners:owners,account_name:data.name},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]); diff --git a/web/srczip/common.js b/web/srczip/common.js index 154114b..81f5ff6 100644 --- a/web/srczip/common.js +++ b/web/srczip/common.js @@ -31,7 +31,6 @@ var X = window.X || { ], 'gengduolist2':[ {'title':'数据导出','id':'export'}, - {'title':'报表移除','id':'del'}, ], //用户搜索条件 'search':{ diff --git a/web/srczip/logic/adminkanban.js b/web/srczip/logic/adminkanban.js index 8796c33..4ab3d49 100644 --- a/web/srczip/logic/adminkanban.js +++ b/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'); diff --git a/web/srczip/logic/analysis.js b/web/srczip/logic/analysis.js index d3349a7..525c563 100644 --- a/web/srczip/logic/analysis.js +++ b/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]); }) diff --git a/web/srczip/logic/attribute.js b/web/srczip/logic/attribute.js index a421f7f..f14f9bd 100644 --- a/web/srczip/logic/attribute.js +++ b/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]); }) diff --git a/web/srczip/logic/copykanban_kongjian.js b/web/srczip/logic/copykanban_kongjian.js new file mode 100644 index 0000000..d38408a --- /dev/null +++ b/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); + + }) + }); + + + } + }; +})(); \ No newline at end of file diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 8f70390..5c243fd 100644 --- a/web/srczip/logic/dashboard.js +++ b/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; }, diff --git a/web/srczip/logic/datarights.js b/web/srczip/logic/datarights.js index ad686a1..59c809b 100644 --- a/web/srczip/logic/datarights.js +++ b/web/srczip/logic/datarights.js @@ -30,10 +30,10 @@ }, dataauthlist:function(){ - X.tabledata('#datarightsdata','data_auth/list',[[ - {field:'title', title: '数据权限名称', sort: true} - ,{field:'data_range', title: '事件范围'} - ,{field:'update_date', title: '最后调整时间', sort: true} + X.tabledata('#datarightsdata','authz/account_owner_list',[[ + {field:'name', title: '用户名', sort: true} + ,{field:'nickname', title: '显示名'} + ,{field:'owner_list', title: '渠道', sort: true} ,{fixed: 'right', title:'操作', toolbar: '#datarights-barDemo', width:100} ]]); } diff --git a/web/srczip/logic/datarightsedit.js b/web/srczip/logic/datarightsedit.js index ce1b516..97af60b 100644 --- a/web/srczip/logic/datarightsedit.js +++ b/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){ - X.laytpldata("#datarightsedit-check-box-dot",d,".datarightsedit-check-box"); - layui.form.render(); - }) + console.log(data); if(data){ - var dataArr ={}; - for(let i in data.data){ - dataArr[data.data[i]] = true; - } - layui.form.val('datarightseditexample',dataArr); - $(".datarightsedit-txt-input").val(data.title); + $(".datarightsedit-txt-input").html(data.owner_list); } @@ -29,25 +21,13 @@ }) $(".datarightsedit-qd").click(function(){ - var tit = $(".datarightsedit-txt-box input").val(); - var fromdata = layui.form.val('datarightseditexample');//选中的权限 - var dataArr=[]; - 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(); - }) - } + var tit = $(".datarightsedit-txt-input").val(); + var owners = tit.split(","); + X.api("authz/update_account_owner","post",{owners:owners,account_name:data.name},function(d){ + layer.msg("创建成功"); + layer.closeAll(); + X.pageLogic.datarights.dataauthlist(); + }) }) diff --git a/web/srczip/logic/distribution.js b/web/srczip/logic/distribution.js index 55adba1..6ae4c62 100644 --- a/web/srczip/logic/distribution.js +++ b/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]); }) diff --git a/web/srczip/logic/ltvmodel.js b/web/srczip/logic/ltvmodel.js index cb4f123..fe73b42 100644 --- a/web/srczip/logic/ltvmodel.js +++ b/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]); }) diff --git a/web/srczip/logic/modeltype.js b/web/srczip/logic/modeltype.js index 22fcfec..ffd3e77 100644 --- a/web/srczip/logic/modeltype.js +++ b/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); diff --git a/web/srczip/logic/retained.js b/web/srczip/logic/retained.js index e59b5ee..682156e 100644 --- a/web/srczip/logic/retained.js +++ b/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]); }) diff --git a/web/static/css/event.css b/web/static/css/event.css index 1d13ab5..ddae8de 100644 --- a/web/static/css/event.css +++ b/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; } /* 修改事件属性管理 */ diff --git a/web/static/css/style.css b/web/static/css/style.css index 22be2ab..30fedc5 100644 --- a/web/static/css/style.css +++ b/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; }