diff --git a/web/pages/addrole.html b/web/pages/addrole.html index ba492c7..4b182c5 100644 --- a/web/pages/addrole.html +++ b/web/pages/addrole.html @@ -12,7 +12,7 @@
- +
全选
{{# }); }} + diff --git a/web/src/x.min.js b/web/src/x.min.js index 511643d..1aeb9b2 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -1447,8 +1447,30 @@ var X = window.X || { console.log(selinput); layui.form.val('addroleexample', selinput) }); - } - $(".addrole-qd").click(function(){ + }; + + // layui.form.on('checkbox(addrolelist)', function(data){ + // console.log(data.othis[0]['innerText']); + // var title = data.othis[0]['innerText']; + // var selinput = {} + // if(title == "全选"){ + // for(let i in data){ + // selinput[data[i]['path']] = true + // } + // layui.form.val('addroleexample', selinput) + // } + // }); + + $(document).off('click','.addrole-list-qx').on('click','.addrole-list-qx',function(){ + var selinput = {} + for(let i in data){ + selinput[data[i]['path']] = true + } + console.log(selinput); + layui.form.val('addroleexample', selinput) + }); + + $(document).off('click','.addrole-qd').on('click','.addrole-qd',function(){ var tit = $(".addrole-tit").val(); var addroledata = layui.form.val("addroleexample"); @@ -1475,7 +1497,6 @@ var X = window.X || { }) }) } - }); } @@ -1514,8 +1535,8 @@ var X = window.X || { for(let i in titarr){ var arr = { "username": titarr[i], - "role_name": projectrolearr[0]["name"], - "data_authority":datarightsarr[0]["title"], + // "role_name": projectrolearr[0]["name"], + // "data_authority":datarightsarr[0]["title"], "data_auth_id":datarightsarr[0]["id"] } adduserData.push(arr); diff --git a/web/srczip/logic/addrole.js b/web/srczip/logic/addrole.js index ad28cfa..56908dc 100644 --- a/web/srczip/logic/addrole.js +++ b/web/srczip/logic/addrole.js @@ -24,8 +24,30 @@ console.log(selinput); layui.form.val('addroleexample', selinput) }); - } - $(".addrole-qd").click(function(){ + }; + + // layui.form.on('checkbox(addrolelist)', function(data){ + // console.log(data.othis[0]['innerText']); + // var title = data.othis[0]['innerText']; + // var selinput = {} + // if(title == "全选"){ + // for(let i in data){ + // selinput[data[i]['path']] = true + // } + // layui.form.val('addroleexample', selinput) + // } + // }); + + $(document).off('click','.addrole-list-qx').on('click','.addrole-list-qx',function(){ + var selinput = {} + for(let i in data){ + selinput[data[i]['path']] = true + } + console.log(selinput); + layui.form.val('addroleexample', selinput) + }); + + $(document).off('click','.addrole-qd').on('click','.addrole-qd',function(){ var tit = $(".addrole-tit").val(); var addroledata = layui.form.val("addroleexample"); @@ -52,7 +74,6 @@ }) }) } - }); } diff --git a/web/srczip/logic/adduser.js b/web/srczip/logic/adduser.js index cbb9dab..6afd1d6 100644 --- a/web/srczip/logic/adduser.js +++ b/web/srczip/logic/adduser.js @@ -30,8 +30,8 @@ for(let i in titarr){ var arr = { "username": titarr[i], - "role_name": projectrolearr[0]["name"], - "data_authority":datarightsarr[0]["title"], + // "role_name": projectrolearr[0]["name"], + // "data_authority":datarightsarr[0]["title"], "data_auth_id":datarightsarr[0]["id"] } adduserData.push(arr); diff --git a/web/static/css/projectadmin.css b/web/static/css/projectadmin.css index cc8e477..8d76d48 100644 --- a/web/static/css/projectadmin.css +++ b/web/static/css/projectadmin.css @@ -326,6 +326,7 @@ .addrole-but-box div { cursor: pointer; margin-left: 10px; height: 32px; padding: 0 16px; font-weight: 400; font-size: 14px; line-height: 30px; border-radius: 2px; } .addrole-qx { color: #42546d; border: 1px solid #f0f0f0; } .addrole-qd { color: #fff; background-color: #3d90ff; } +.addrole-list-qx { width: 30px; cursor: pointer; height: 32px; padding: 0 16px; font-weight: 400; font-size: 14px; line-height: 30px; border-radius: 2px; color: #fff; background-color: #3d90ff; } /* 个人信息 */ .personalsettings-box{ width: 100%; height: 100%; background-color: #fff; overflow: hidden; position: fixed; top: 60px; }