diff --git a/web/pages/customname.html b/web/pages/customname.html
index 88dea5f..c2ff6d5 100644
--- a/web/pages/customname.html
+++ b/web/pages/customname.html
@@ -3,28 +3,29 @@
 
     <div class="eventattradmin-box">
         <div class="eventattradmin-top-box">
-            <div class="eventattradmin-left___y490Q">自定义别名<i class="layui-icon" title="">&#xe60b;</i> </div>
-
-            <div class="eventattradmin-right___1TIt8">
-
+            <div class="eventattradmin-left___y490Q">游戏区服一览表<i class="layui-icon" title="">&#xe60b;</i> </div>
 
+            <!-- <div class="eventattradmin-right___1TIt8">
                 <input id="fileupload" type="file" class="form-control"  name="file"  >
                 <button type="button" class="layui-btn" id="test9" style="background-color:#3d90ff;">开始上传</button>
-            </div>
+            </div> -->
 
         </div>
 
 
         <div class="customname-table-box">
             <div class="customname-info-bg">
-                <div class="customname-info-table-top">
-                    <div class="customname-info-table1">属性</div>
-                    <div class="customname-info-table2">别名</div>
-                    <div class="customname-info-table2" style="border: 0;">值</div>
-                </div>
                 <div class="customname-content-box">
                    
-    
+                    <div class="layui-tab" lay-filter="test">
+                        <ul class="layui-tab-title">
+
+                        </ul>
+                        <div class="layui-tab-content">
+                          
+
+                        </div>
+                      </div>
                
                 </div>
 
@@ -36,7 +37,7 @@
 
 </div>
 
-<script id="customname-content-box-dot" type="text/html">
+<!-- <script id="customname-content-box-dot" type="text/html">
 
     {{# layui.each(d, function(index, item) {  }}
 
@@ -56,4 +57,41 @@
         
     {{#  }); }}
 
-</script>
\ No newline at end of file
+</script> -->
+
+<script id="customname-content-box-dot" type="text/html">
+    {{# layui.each(d, function(index, item) {  }}
+        {{#  if(index === 0){ }}
+            <li class="layui-this" lay-id="{{index}}">{{item.attr_name}}</li>
+        {{#  } else { }}
+            <li lay-id="{{index}}">{{item.attr_name}}</li>
+        {{#  } }} 
+    {{#  }); }}
+</script>
+
+<script id="layui-tab-content-dot" type="text/html">
+    {{# layui.each(d, function(index, item) {  }}
+        {{#  if(index === 0){ }}
+            <div class="layui-tab-item layui-show">
+                {{# layui.each(item.map_, function(indexs, items) {  }}
+                    <div class="customname-val-right-box">
+                        <div class="customname-val-right">
+                            <div class="customname-val-right-val">{{items.title}}</div>
+                            <div class="customname-val-right-val">{{items.id}}</div>
+                        </div>
+                    </div>
+                {{#  }); }}
+            </div>
+        {{#  } else { }}
+            <div class="layui-tab-item">
+                {{# layui.each(item.owner_name, function(indexs, items) {  }}
+                    <div class="customname-val-right-box">
+                        <div class="customname-val-right">
+                            <div class="customname-val-right-val">{{items}}</div>
+                        </div>
+                    </div>
+                {{#  }); }}
+            </div>
+        {{#  } }} 
+    {{#  }); }}
+</script>
diff --git a/web/pages/dashboard.html b/web/pages/dashboard.html
index 1968334..31d858c 100644
--- a/web/pages/dashboard.html
+++ b/web/pages/dashboard.html
@@ -51,7 +51,7 @@
                       <dd><a class="ajax-content" href="eventmanagement" data-id="conetnt">事件管理</a></dd>
                       <dd><a class="ajax-content" href="eventattradmin" data-id="conetnt">事件属性管理</a></dd>
                       <dd><a class="ajax-content" href="userattradmin" data-id="conetnt">用户属性管理</a></dd>
-                      <dd><a class="ajax-content" href="customname" data-id="conetnt">自定义别名</a></dd>
+                      <dd><a class="ajax-content" href="customname" data-id="conetnt">游戏区服一览表</a></dd>
                       <dd><a class="ajax-content" href="datacheck" data-id="conetnt">埋点数据检查</a></dd>
                     </dl>
                   </li>
diff --git a/web/pages/projectadmin.html b/web/pages/projectadmin.html
index a55be7d..ca475bb 100644
--- a/web/pages/projectadmin.html
+++ b/web/pages/projectadmin.html
@@ -1,19 +1,3 @@
-<!-- 项目管理 -->
-<!-- <div class="projectadmin-box">
-    <div class="projectadmin-left-list-box">
-        <div class="projectadmin-left-list-bg">
-            <div class="menu_dapax">
-                <div class="item_kuvn selected___3ctlt" data-url=""> <a class="ajax-content" href="projectinfo" data-id="projectadmin-con-box">项目信息</a>  </div>
-                <div class="item_kuvn" data-url="">成员管理</div>
-                <div class="item_kuvn" data-url="">角色管理</div>
-                <div class="item_kuvn" data-url="">数据权限</div>
-            </div>
-        </div>
-    </div> -->
-
-    
-
-    <!-- <div class="projectadmin-con-box" id="projectadmin-con-box"> -->
 
         <div class="main___Tea6c">
             <div class="projectadmin-con-bg">
@@ -71,9 +55,6 @@
             </div>
         </div>
 
-    <!-- </div> --> 
-
-<!-- </div> -->
 <script id="projectadmin-info-box-dot" type="text/html">
     <div class="projectadmin-info-bg">
         <div class="projectadmin-info-table-top">
diff --git a/web/src/x.min.js b/web/src/x.min.js
index 92e92e9..1f1dd13 100644
--- a/web/src/x.min.js
+++ b/web/src/x.min.js
@@ -128,10 +128,11 @@ var X = window.X || {
     },
 };
 
+
 (function(){
     //本地
     //  var ipurl = "http://10.0.0.240:7899/api/v1/";
-    // 线上
+    // 线上 
     var ipurl = "http://139.159.159.3:9865/api/v1/";
     //线上测试
     // var ipurl = "http://139.159.159.3:7889/api/v1/";
@@ -5914,13 +5915,17 @@ var X = window.X || {
 
             updataselect_list();
             
-            X.uploadfile("data_mana/add_select_map","#fileupload",function(res){
-                updataselect_list();
-            });
+            // X.uploadfile("data_mana/add_select_map","#fileupload",function(res){
+            //     updataselect_list();
+            // });
 
             function updataselect_list(){
                 X.api("data_mana/select_list","get",{},function(res){
-                    X.laytpldata('#customname-content-box-dot',res,'.customname-content-box');
+                    X.laytpldata('#customname-content-box-dot',res,'.layui-tab-title');
+                    X.laytpldata('#layui-tab-content-dot',res,'.layui-tab-content');
+                    console.log($(".customname-content-box").height())
+                    $(".layui-tab-content").css('height',$(".customname-content-box").height());
+                    
                 })
             };
             
@@ -7981,6 +7986,129 @@ var X = window.X || {
     };
 })();
 
+// srczip/logic/defaultrole.js
+(function(){
+    X.pageLogic['defaultrole'] = {
+        init : function(parms){
+            var role_id,datalist;
+            updataroles();
+            function updataroles(){
+                X.api("authz/roles","get",{},function(d){
+                    datalist = d;
+                    if(d[0]){
+                        role_id = d[0]['_id'];
+                        $(".projectadmin-list-name").html(d[0]["name"]);
+                        X.laytpldata("#projectadmin-con-hz-left-list-tit-xiangmu-dot",d,".projectadmin-con-hz-left-list-tit-xiangmu");
+                        updataapiinfo(d[0]['_id']);
+                    }else {
+                        layer.msg('查无数据');
+                    }
+
+                    // X.laytpldata("#projectadmin-info-box-dot",d.sys_role[0]['authority'],".projectadmin-info-box");
+                });
+            }
+
+            $(document).off('click',".menu_dapax .item_kuvn").on('click',".menu_dapax .item_kuvn",function(){
+                $(".menu_dapax .item_kuvn").removeClass("selected___3ctlt");
+                $(this).addClass("selected___3ctlt");
+                var url = $(this).attr("data-url");
+            });
+
+            $(document).off('click','.roleinproject-tit').on("click",".roleinproject-tit",function(){
+                var index = $(this).attr("data-index");
+                $(".projectadmin-con-hz-left-list-con").removeClass("selected___3ctlt");
+                $(this).addClass("selected___3ctlt");
+                $(".projectadmin-list-name").html(datalist[index]['name']);
+                var id = $(this).attr("data-id");
+                updataapiinfo(id);
+                // X.laytpldata("#projectadmin-info-box-dot",data.dom_role[index]['authority'],".projectadmin-info-box");
+            });
+
+            function updataapiinfo(id){
+                role_id = id;
+                X.api("authz/get_permissions_for_user_in_domain","post",{role_id:id,game:X['DATA']['game']},function(d){
+                    X.laytpldata("#projectadmin-info-box-dot",d,".projectadmin-info-box");
+                });
+            };
+
+            $(document).off('click','.projectadmin-del').on('click','.projectadmin-del',function(){
+                var index = $(this).attr('data-index');
+                var path = $(this).attr('data-path');
+                layer.confirm('确认删除当前api吗？', {
+                    btn: ['取消','删除 '] //按钮
+                  }, function(){
+                    //取消
+                    layer.close(layer.index);
+                  }, function(){
+                    //删除
+                    X.api("authz/del_policy",'post',{role_id:role_id,game:X['DATA']['game'],path:path,act:"*"},function(d){
+                        layer.msg('删除成功');
+                        layer.close(layer.index);
+                        updataapiinfo(role_id);
+                    })
+                });
+            });
+
+            $(document).off('click','.projectadmin-edit').on('click','.projectadmin-edit',function(params){
+                var path = $(this).attr('data-path');
+                var arr = [];
+                arr.push(path);
+                X.api("authz/add_policy",'post',{role_id:role_id,game:X['DATA']['game'],path_list:arr,act:"*"},function(d){
+                    layer.close(layer.index);
+                    layer.msg('添加成功');
+                    updataapiinfo(role_id);
+                })
+            });
+
+            $(document).off('click','.projectadmin-gongduo').on('click','.projectadmin-gongduo',function(e){
+                e.stopPropagation();
+                var obj = $(this);
+                var offset = obj.offset();
+                var id = obj.attr('data-id');
+                var name = obj.attr("data-name");
+                var arr = [
+                    {
+                        title:'重命名',
+                        id:'edit'
+                    },
+                    {
+                        title:'删除',
+                        id:'del'
+                    }
+                ]
+                X.querycriteriapop(arr,'dropdownlist',offset.left,offset.top+obj.height(),function(val){
+                    if(val.id == 'del'){
+                        layer.confirm('确认删除当前角色吗？', {
+                            btn: ['取消','删除 '] //按钮
+                          }, function(){
+                            //取消
+                            layer.close(layer.index);
+                          }, function(){
+                            //删除
+                            X.api("authz/del_role_user_domain",'post',{role_id:id,game:X['DATA']['game'],username:name},function(d){
+                                layer.close(layer.index);
+                                layer.msg('删除成功');
+                                updataroles();
+                            })
+                        });
+                    }else {
+                        var arr = {
+                            id:id,
+                            title:$(".projectadmin-list-name").html()
+                        }
+                        X.parametersopen(arr,"roleeditname",'auto',function(d){
+                            updataroles();
+                        })
+                    }
+                })
+            });
+
+
+
+           
+        }
+    };
+})();
 // srczip/logic/deluserinfo.js
 (function(){
     X.pageLogic['deluserinfo'] = {
diff --git a/web/srczip/common.js b/web/srczip/common.js
index c53f72f..2d9641b 100644
--- a/web/srczip/common.js
+++ b/web/srczip/common.js
@@ -127,10 +127,11 @@ var X = window.X || {
     },
 };
 
+
 (function(){
     //本地
     //  var ipurl = "http://10.0.0.240:7899/api/v1/";
-    // 线上
+    // 线上 
     var ipurl = "http://139.159.159.3:9865/api/v1/";
     //线上测试
     // var ipurl = "http://139.159.159.3:7889/api/v1/";
diff --git a/web/srczip/logic/customname.js b/web/srczip/logic/customname.js
index b64c5f2..5faca13 100644
--- a/web/srczip/logic/customname.js
+++ b/web/srczip/logic/customname.js
@@ -4,13 +4,17 @@
 
             updataselect_list();
             
-            X.uploadfile("data_mana/add_select_map","#fileupload",function(res){
-                updataselect_list();
-            });
+            // X.uploadfile("data_mana/add_select_map","#fileupload",function(res){
+            //     updataselect_list();
+            // });
 
             function updataselect_list(){
                 X.api("data_mana/select_list","get",{},function(res){
-                    X.laytpldata('#customname-content-box-dot',res,'.customname-content-box');
+                    X.laytpldata('#customname-content-box-dot',res,'.layui-tab-title');
+                    X.laytpldata('#layui-tab-content-dot',res,'.layui-tab-content');
+                    console.log($(".customname-content-box").height())
+                    $(".layui-tab-content").css('height',$(".customname-content-box").height());
+                    
                 })
             };