diff --git a/templates/organization/branchList.html b/templates/organization/branchList.html
index 5ff2d4da6f09c6e325d52f23c87c34dfadb90abf..11bbdf21cede49058da8e2e49b0634ac2c6d82a9 100644
--- a/templates/organization/branchList.html
+++ b/templates/organization/branchList.html
@@ -26,125 +26,126 @@
     <link href="../../static/css/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
     <!-- 弹出框插件 -->
     <link href="../../static/css/plugins/sweetalert/sweetalert.css"
+
           th:href="@{/static/css/plugins/sweetalert/sweetalert.css}" rel="stylesheet">
     <style type="text/css">
         .table > thead > tr > th {
             color: #2a62bc;
         }
 
-        .form-inline .input-group > .form-control {
-            width: auto;
-        }
     </style>
 
 </head>
 <body class="gray-bg">
-<div class="row wrapper border-bottom white-bg page-heading">
-    <div class="panel-body" style="margin: 15px 5px">
-        <div class="panel panel-default">
-            <div class="panel-body">
-                <form class="form-inline">
-                    <div class="form-group">
-                        <label>分支名称:</label>
-                        <input type="text" name="branch_name" class="form-control" id="name">
-                    </div>
-                    <div class="form-group">
-                        <label>&nbsp;&nbsp;所属机构:</label>
-                        <div class="input-group">
-                            <input type="text" class="form-control org">
-                            <div class="input-group-btn">
-                                <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
-                                    <span class="caret"></span>
+<div class="wrapper-content wrapper animated fadeInRight">
+
+    <form class="form-inline" style="margin: 15px 5px">
+        <div class="form-group">
+            <label>分支名称:</label>
+            <input type="text" name="branch_name" class="form-control" id="name">
+        </div>
+        <div class="form-group">
+            <label>&nbsp;&nbsp;所属机构:</label>
+            <div class="input-group">
+                <input type="text" class="form-control org">
+                <div class="input-group-btn">
+                    <button type="button" class="btn btn-white dropdown-toggle" data-toggle="dropdown">
+                        <span class="caret"></span>
+                    </button>
+                    <ul class="dropdown-menu dropdown-menu-right" role="menu">
+                    </ul>
+                </div>
+                <!-- /btn-group -->
+            </div>
+        </div>
+        <button class="btn-success btn">查询</button>
+        <div style="float: right">
+            <!-- Button trigger modal -->
+            <button type="button" class="btn btn-success " data-toggle="modal" data-target="#myModal">
+                添加
+            </button>
+            <!-- Modal -->
+            <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+                <div class="modal-dialog" role="document">
+                    <div class="modal-content">
+                        <div class="modal-header">
+                            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                                    aria-hidden="true">&times;</span>
+                            </button>
+                            <h4 class="modal-title" id="add">增加</h4>
+                        </div>
+                        <div class="modal-body form-horizontal">
+                            <div class="form-group">
+                                <label class="col-sm-2 control-label">分支名称</label>
+                                <div class="col-sm-4">
+                                    <input type="text" class="form-control" placeholder="请输入机构名称">
+                                </div>
+                            </div>
+                            <div class="form-group form-inline">
+                                <label class="col-md-2 control-label">机构类型</label>
+                                <div class="col-md-4">
+                                    <select class="form-control">
+                                        <option value="学校">学校</option>
+                                        <option value="培训机构">培训机构</option>
+                                    </select>
+                                </div>
+                            </div>
+                            <!--footer-->
+                            <div class="modal-footer">
+                                <button type="button" class="btn btn-default" data-dismiss="modal">
+                                    关闭
+                                </button>
+                                <button type="submit" class="btn btn-primary"
+                                        id="update_teacher_btn">保存
                                 </button>
-                                <ul class="dropdown-menu dropdown-menu-right" role="menu">
-                                </ul>
                             </div>
-                            <!-- /btn-group -->
                         </div>
                     </div>
-                    <button class="btn-success btn">查询</button>
-                    <div style="float: right">
-                        <!-- Button trigger modal -->
-                        <button type="button" class="btn btn-success " data-toggle="modal" data-target="#myModal">
-                            添加
-                        </button>
-                        <!-- Modal -->
-                        <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                            <div class="modal-dialog" role="document">
-                                <div class="modal-content">
-                                    <div class="modal-header">
-                                        <h4 class="modal-title" id="myModalLabel">新增</h4>
-                                    </div>
+                </div>
+            </div>
+            <button type="submit" id="delete" class="btn btn-danger">删除</button>
+        </div>
+    </form>
 
-                                    <div class="modal-body">
-                                        <!-- 表单定义 -->
-                                        <div class="form-group form-inline">
-                                            <label class=" control-label">分支名称
-                                                <input type="text" class="form-control">
-                                            </label>
-                                        </div>
-                                        <div class="form-group form-inline">
-                                            <label class=" control-label">所属机构
-                                                <select class="form-control">
-                                                    <option value="学校">学校</option>
-                                                    <option value="培训机构">培训机构</option>
-                                                </select>
-                                            </label>
-                                        </div>
-                                        <!--footer-->
-                                        <div class="modal-footer">
-                                            <button type="button" class="btn btn-default" data-dismiss="modal">
-                                                关闭
-                                            </button>
-                                            <button type="submit" class="btn btn-success"
-                                                    id="update_teacher_btn">保存
-                                            </button>
-                                        </div>
-                                    </div>
-                                </div>
+    <table class="table table-striped" id="myTab">
+        <!--模态框-->
+        <div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
+            <div class="modal-dialog" role="document">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
+                                aria-hidden="true">&times;</span>
+                        </button>
+                        <h4 class="modal-title" id="change">修改</h4>
+                    </div>
+                    <div class="modal-body form-horizontal">
+                        <div class="form-group">
+                            <label class="col-sm-2 control-label">分支名称</label>
+                            <div class="col-sm-4">
+                                <input type="text" class="form-control">
                             </div>
                         </div>
-                        <button type="submit" id="delete" class="btn btn-success">删除</button>
-                    </div>
-                </form>
-                <table class="table table-striped" id="myTab">
-                    <div class="modal fade" id="updateModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel">
-                        <div class="modal-dialog" role="document">
-                            <div class="modal-content">
-                                <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                                            aria-hidden="true">&times;</span>
-                                    </button>
-                                    <h4 class="modal-title" id="update">修改</h4>
-                                </div>
-                                <div class="modal-body">
-                                    <!-- 表单定义 -->
-                                    <div class="form-group form-inline">
-                                        <label class=" control-label">分支名称
-                                            <input type="text" class="form-control">
-                                        </label>
-                                    </div>
-                                    <div class="form-group form-inline">
-                                        <label class=" control-label">所属机构
-                                            <select class="form-control">
-                                                <option value="学校">学校</option>
-                                                <option value="培训机构">培训机构</option>
-                                            </select>
-                                        </label>
-                                    </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
-                                </div>
+                        <div class="form-group form-inline">
+                            <label class="col-md-2 control-label">机构类型</label>
+                            <div class="col-md-4">
+                                <select class="form-control">
+                                    <option value="学校">学校</option>
+                                    <option value="培训机构">培训机构</option>
+                                </select>
                             </div>
                         </div>
+                        <!--footer-->
+                        <div class="modal-footer">
+                            <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                            <button type="button" class="btn btn-primary">保存</button>
+                        </div>
                     </div>
-                </table>
+                </div>
             </div>
         </div>
-    </div>
+    </table>
 </div>
+
 <!--表单-->
 
 <!-- 全局js -->
@@ -220,7 +221,7 @@
                                 title: "您确定要删除小信息吗",
                                 type: "warning",
                                 showCancelButton: true,
-                                confirmButtonColor: "1E90ff",
+                                confirmButtonColor: "#DD6B55",
                                 confirmButtonText: "删除",
                                 closeOnConfirm: false
                             }, function () {
diff --git a/templates/organization/orgList.html b/templates/organization/orgList.html
index af6971f6d889c048745dd0215b010596db976cd4..c131079f0390713352f94886165a5db5a33d0a1d 100644
--- a/templates/organization/orgList.html
+++ b/templates/organization/orgList.html
@@ -32,19 +32,14 @@
             color: #2a62bc;
         }
 
-        .form-inline .input-group > .form-control {
-            width: auto;
-        }
+
     </style>
 
 </head>
-<body class="white-bg">
-<div class="row wrapper border-bottom white-bg page-heading">
+<body class="gray-bg">
+<div class="wrapper wrapper-content animated fadeInRight">
 
-    <div class="panel-body" style="margin:15px 5px">
-        <div class="panel panel-default">
-            <div class="panel-body">
-                <form class="form-inline">
+                <form class="form-inline" style="margin:15px 5px">
                     <div class="form-group">
                         <label>机构名称:</label>
                         <input type="text" name="institutional_name" class="form-control" id="name">
@@ -74,30 +69,32 @@
                             <div class="modal-dialog" role="document">
                                 <div class="modal-content">
                                     <div class="modal-header">
-                                        <h4 class="modal-title" id="myModalLabel">新增</h4>
+                                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
+                                        </button>
+                                        <h4 class="modal-title" id="add">增加</h4>
                                     </div>
-
-                                    <div class="modal-body">
-                                        <!-- 表单定义 -->
-                                        <div class="form-group form-inline">
-                                            <label class=" control-label">机构名称
-                                                <input type="text" class="form-control">
-                                            </label>
+                                    <div class="modal-body form-horizontal">
+                                        <div class="form-group">
+                                            <label class="col-sm-2 control-label">机构名称</label>
+                                            <div class="col-sm-4">
+                                                <input type="text" class="form-control" placeholder="请输入机构名称" name="add_content">
+                                            </div>
                                         </div>
                                         <div class="form-group form-inline">
-                                            <label class=" control-label">机构类型
+                                            <label class="col-md-2 control-label">机构类型</label>
+                                        <div class="col-md-4">
                                                 <select class="form-control">
                                                     <option value="学校">学校</option>
                                                     <option value="培训机构">培训机构</option>
                                                 </select>
-                                            </label>
+                                        </div>
                                         </div>
                                         <!--footer-->
                                         <div class="modal-footer">
                                             <button type="button" class="btn btn-default" data-dismiss="modal">
                                                 关闭
                                             </button>
-                                            <button type="submit" class="btn btn-success"
+                                            <button type="submit" class="btn btn-primary"
                                                     id="update_teacher_btn">保存
                                             </button>
                                         </div>
@@ -105,7 +102,7 @@
                                 </div>
                             </div>
                         </div>
-                        <button type="submit" id="delete" class="btn btn-success">删除</button>
+                        <button type="submit" id="delete" class="btn btn-danger">删除</button>
                     </div>
                 </form>
                 <!--表单-->
@@ -115,30 +112,31 @@
                         <div class="modal-dialog" role="document">
                             <div class="modal-content">
                                 <div class="modal-header">
-                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
-                                            aria-hidden="true">&times;</span>
+                                    <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span>
                                     </button>
-                                    <h4 class="modal-title" id="update">修改</h4>
+                                    <h4 class="modal-title" id="change">修改</h4>
                                 </div>
-                                <div class="modal-body">
-                                    <!-- 表单定义 -->
-                                    <div class="form-group form-inline">
-                                        <label class=" control-label">机构名称
-                                            <input type="text" class="form-control">
-                                        </label>
+                                <div class="modal-body form-horizontal">
+                                    <div class="form-group">
+                                        <label class="col-sm-2 control-label">机构名称</label>
+                                        <div class="col-sm-4">
+                                            <input type="text" class="form-control"  name="add_content">
+                                        </div>
                                     </div>
                                     <div class="form-group form-inline">
-                                        <label class=" control-label">机构类型
+                                        <label class="col-md-2 control-label">机构类型</label>
+                                        <div class="col-md-4">
                                             <select class="form-control">
                                                 <option value="学校">学校</option>
                                                 <option value="培训机构">培训机构</option>
                                             </select>
-                                        </label>
+                                        </div>
+                                    </div>
+                                    <!--footer-->
+                                    <div class="modal-footer">
+                                        <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
+                                        <button type="button" class="btn btn-primary">保存</button>
                                     </div>
-                                </div>
-                                <div class="modal-footer">
-                                    <button type="button" class="btn btn-default" data-dismiss="modal">关闭</button>
-                                    <button type="button" class="btn btn-primary">保存</button>
                                 </div>
                             </div>
                         </div>
diff --git a/templates/user/adminList.html b/templates/user/adminList.html
index e681208ab3fe39a13cb886714bfeb66b4a56472f..3737d070b7bd86bdf3e5892dd7bbd1fac4763f73 100644
--- a/templates/user/adminList.html
+++ b/templates/user/adminList.html
@@ -305,16 +305,157 @@
 <script>
     $(function () {
         /*时间控件配置*/
+<<<<<<< HEAD
+        $('.form-control.myData_add').datepicker({
+            language: "zh-CN",
+            clearBtn: true,//清除
+            autoclose: true,
+            todayHighlight: true,
+            format: 'yyyy-mm-dd',
+            todayBtn: false,//今日按钮
+            startDate: '1970-1-1', //与你自己设置的格式一致yyyy-mm-dd，未设置的话与默认格式一致mm/dd/yyyy
+            endDate: '2070-1-1'
+        });
+
+=======
         let object = '.form-control.myData_add';
         timeAllocation(object);
+>>>>>>> 390650fbbb242b0f1182dfaf3777b9a91272ffc5
     });
+
 </script>
 <!--树形控制-->
 <script>
     $(function () {
+<<<<<<< HEAD
+        var json = '[' +
+
+            '{' +
+            '"text": "用户组",' +
+            '"nodes": [' +
+            '{' +
+            '"text": "代码测试组"' +
+            '},'+
+            '{' +
+            '"text": "市场部"' +
+            '},'+
+            '{' +
+            '"text": "班主任"' +
+            '},'+
+            '{' +
+            '"text": "测试教务"' +
+            '},'+
+            '{' +
+            '"text": "教务处"' +
+            '},'+
+            '{' +
+            '"text": "教师组"' +
+            '},'+
+            '{' +
+            '"text": "管理员组"' +
+            '}'+
+            ']' +
+            '},'+
+
+            '{' +
+            '"text": "用户组2",' +
+            '"nodes": [' +
+            '{' +
+            '"text": "代码测试组"' +
+            '},'+
+            '{' +
+            '"text": "市场部"' +
+            '},'+
+            '{' +
+            '"text": "班主任"' +
+            '},'+
+            '{' +
+            '"text": "测试教务"' +
+            '},'+
+            '{' +
+            '"text": "教务处"' +
+            '},'+
+            '{' +
+            '"text": "教师组"' +
+            '},'+
+            '{' +
+            '"text": "管理员组"' +
+            '}'+
+            ']' +
+            '}'+
+
+            ']';
+        var tree = [
+            {
+                text: "Parent 1",
+                hideCheckbox: true,
+                nodes: [
+                    {
+                        text: "Child 1",
+                        nodes: [
+                            {
+                                text: "Grandchild 1"
+                            },
+                            {
+                                text: "Grandchild 2"
+                            }
+                        ]
+                    },
+                    {
+                        text: "Child 2"
+                    }
+                ]
+            },
+            {
+                text: "Parent 2"
+            },
+            {
+                text: "Parent 3"
+            },
+            {
+                text: "Parent 4"
+            },
+            {
+                text: "Parent 5"
+            }
+        ];
+        let $treevie = $('#treeview_allocation');
+        $treevie.treeview({
+            levels: 1 ,
+            showCheckbox: true,//在节点上显示checkboxes
+            data: json,
+            showIcon: false,//是否显示节点图标。
+            showBorder: false,//是否在节点上显示边框。
+            expandIcon: undefined,//设置列表树可展开节点的图标。
+            collapseIcon: undefined,//设置列表树可收缩节点的图标。
+            multiSelect: true,//是否可以同时选择多个节点。
+            highlightSelected: 0,//是否高亮搜索结果。
+            selectedBackColor:'#ddaddd',//设置被选择节点的背景颜色
+            /*节点选中事件*/
+            onNodeChecked:nodeChecked,
+        });
+
+        function nodeChecked(event, node) {
+            let childNodes = [];
+            if(node.nodes!=null&& node.nodes.length > 0){
+                for (let i in node.nodes) {
+                    childNodes.push(node.nodes[i].nodeId);
+                    if (node.nodes[i].nodes!=null&& node.nodes.length > 0){
+
+                    }
+                }
+            }
+
+            $treevie.treeview('checkNode', [node.nodeId,{ silent: true }]);
+
+        }
+
+
+=======
         let $treeview = $('#treeview_allocation');
         let url = "../../static/js/demo/user/user_treeCheck_test.json";
         initCheckTree($treeview,url);
+>>>>>>> 390650fbbb242b0f1182dfaf3777b9a91272ffc5
     });
 </script>
 <!--右上角按钮对的监听处理-->
