diff --git a/web/pages/modeltable.html b/web/pages/modeltable.html index 846e5e3..025636e 100644 --- a/web/pages/modeltable.html +++ b/web/pages/modeltable.html @@ -3,7 +3,7 @@ {{# if(d.modelsize === "small"){ }} -
+
@@ -47,7 +47,7 @@
-
+ {{# } else { }} @@ -127,7 +127,7 @@ {{# layui.each(d.condata, function(indexs, items) { }} {{# layui.each(items, function(indexss, itemss){ }} - {{indexss}} + {{itemss}} {{# }); }} {{# }); }} diff --git a/web/pages/roleeditname.html b/web/pages/roleeditname.html new file mode 100644 index 0000000..8ca8dba --- /dev/null +++ b/web/pages/roleeditname.html @@ -0,0 +1,17 @@ + +
+
+
+

修改角色名

+ +
+ +
+ +
+
+
取消
+
确定
+
+
+
\ No newline at end of file diff --git a/web/src/x.min.js b/web/src/x.min.js index 55bd532..9e575e7 100644 --- a/web/src/x.min.js +++ b/web/src/x.min.js @@ -3907,7 +3907,6 @@ var X = window.X || { gettabledata:function(){ $("#model-box").html("");//清空表格数据 - X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ var modellist=[]; for(let i in d){ @@ -3918,7 +3917,7 @@ var X = window.X || { for(let z in d){ if(modellist[i] == d[z]['sort']){ //渲染模板和数据 - console.log(d[z]); + // console.log(d[z]); X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){ $('#model-box').append(html); X.pageLogic['dashboard'].fillmodeldata(d[z]); @@ -7129,10 +7128,10 @@ var X = window.X || { var id = obj.attr('data-id'); var name = obj.attr("data-name"); var arr = [ - // { - // title:'编辑', - // id:'edit' - // }, + { + title:'重命名', + id:'edit' + }, { title:'删除', id:'del' @@ -7158,8 +7157,8 @@ var X = window.X || { id:id, title:$(".projectadmin-list-name").html() } - X.template('addrole','projectadmin-con-box',arr,function(d){ - + X.parametersopen(arr,"roleeditname",'auto',function(d){ + updataroles(); }) } }) @@ -8114,6 +8113,36 @@ var X = window.X || { } }; })(); +// srczip/logic/roleeditname.js +(function(){ + X.pageLogic['roleeditname'] = { + init : function(parms){ + var me = this; + this.parms = parms; + this.callback = parms.callback; + var data = parms.extData; + + $(document).off('click','.modifyname-qd').on('click','.modifyname-qd',function(){ + console.log(111); + var txt = $(".modifyname-txt").val(); + X.api("authz/edit_role","post",{role_id:data['id'],name:txt,desc:""},function(d){ + console.log(d); + layer.closeAll(0); + me.callback && me.callback(); + }) + }); + + $(document).off('click','.modifyname-qx').on('click','.modifyname-qx',function(){ + layer.closeAll(); + }); + + $(document).off('click','.modifyname-cha').on('click','.modifyname-cha',function(){ + layer.closeAll(); + }); + + } + }; +})(); // srczip/logic/route.js (function(){ X.pageLogic['route'] = { diff --git a/web/srczip/logic/dashboard.js b/web/srczip/logic/dashboard.js index 69b5170..0b8920c 100644 --- a/web/srczip/logic/dashboard.js +++ b/web/srczip/logic/dashboard.js @@ -509,7 +509,6 @@ gettabledata:function(){ $("#model-box").html("");//清空表格数据 - X.api('dashboard/','post',{id:X.DATA['dashboard_id']},function(d){ var modellist=[]; for(let i in d){ @@ -520,7 +519,7 @@ for(let z in d){ if(modellist[i] == d[z]['sort']){ //渲染模板和数据 - console.log(d[z]); + // console.log(d[z]); X.laytpldata("#kanban-model-box-dot",d[z],null,function(html){ $('#model-box').append(html); X.pageLogic['dashboard'].fillmodeldata(d[z]); diff --git a/web/srczip/logic/projectadmin.js b/web/srczip/logic/projectadmin.js index 99c7932..e202700 100644 --- a/web/srczip/logic/projectadmin.js +++ b/web/srczip/logic/projectadmin.js @@ -78,10 +78,10 @@ var id = obj.attr('data-id'); var name = obj.attr("data-name"); var arr = [ - // { - // title:'编辑', - // id:'edit' - // }, + { + title:'重命名', + id:'edit' + }, { title:'删除', id:'del' @@ -107,8 +107,8 @@ id:id, title:$(".projectadmin-list-name").html() } - X.template('addrole','projectadmin-con-box',arr,function(d){ - + X.parametersopen(arr,"roleeditname",'auto',function(d){ + updataroles(); }) } }) diff --git a/web/srczip/logic/roleeditname.js b/web/srczip/logic/roleeditname.js new file mode 100644 index 0000000..c73c40a --- /dev/null +++ b/web/srczip/logic/roleeditname.js @@ -0,0 +1,29 @@ +(function(){ + X.pageLogic['roleeditname'] = { + init : function(parms){ + var me = this; + this.parms = parms; + this.callback = parms.callback; + var data = parms.extData; + + $(document).off('click','.modifyname-qd').on('click','.modifyname-qd',function(){ + console.log(111); + var txt = $(".modifyname-txt").val(); + X.api("authz/edit_role","post",{role_id:data['id'],name:txt,desc:""},function(d){ + console.log(d); + layer.closeAll(0); + me.callback && me.callback(); + }) + }); + + $(document).off('click','.modifyname-qx').on('click','.modifyname-qx',function(){ + layer.closeAll(); + }); + + $(document).off('click','.modifyname-cha').on('click','.modifyname-cha',function(){ + layer.closeAll(); + }); + + } + }; +})(); \ No newline at end of file diff --git a/web/static/css/projectadmin.css b/web/static/css/projectadmin.css index 25f6a07..c260313 100644 --- a/web/static/css/projectadmin.css +++ b/web/static/css/projectadmin.css @@ -27,7 +27,8 @@ .projectadmin-con-hz-right-box { padding: 24px 24px 24px 32px; height: calc(100% - 88px); } .projectadmin-con-hz-right-box-top { display: flex; justify-content: space-between; align-items: center; } -.projectadmin-list-name { font-size: 24px; color: #202d3f; } +.projectadmin-list-name { font-size: 24px; color: #202d3f; cursor: pointer; } +.projectadmin-list-name:hover .projectadmin-con-hz-right-box-top-right {display: flex; align-items: center;} .projectadmin-con-hz-right-box-top-right span { font-size: 12px; color: #67729d; } .projectadmin-con-hz-right-box-top-right div { cursor: pointer; margin-left: 12px; font-size: 12px; color: #fff; width: 96px; height: 32px; line-height: 30px; text-align: center; border-radius: 2px; background-color: #3d90ff; border-color: #3d90ff; }