添加部门

VisualInspection/js/config.js

@@ -1,6 +1,6 @@
-var base_ui_url = "http://localhost:8080/";
-var base_server_url = "http://localhost:8089/";
+// var base_ui_url = "http://localhost:8080/";
+// var base_server_url = "http://localhost:8089/";
 
 
-// var base_ui_url = "http://192.168.31.233:8080/";
-// var base_server_url = "http://192.168.31.233:8089/";
+var base_ui_url = "http://192.168.31.233:8080/";
+var base_server_url = "http://192.168.31.233:8089/";

VisualInspection/js/user/adddept.js

@@ -0,0 +1,10 @@
+$(document).ready(function() {
+
+
+    $('select.chosen-select').chosen({
+        no_results_text: '没有找到', // 当检索时没有找到匹配项时显示的提示文本
+        disable_search_threshold: 10, // 10 个以下的选择项则不显示检索框
+        search_contains: true // 从任意位置开始检索
+    });
+
+});

VisualInspection/js/user/userManager.js

@@ -7,9 +7,6 @@ $(document).ready(function() {
 
 
 
-
-
-
     var zTreeObj;
     // zTree 的参数配置，深入使用请参考 API 文档（setting 配置详解）
     var setting = {

VisualInspection/js/util/const.js

@@ -12,4 +12,5 @@ var MENU_GET_ALL = "menu/get/all"
 
 
 // 部门
-var DEPT_GET_ALL = "dept/get/all"
+var DEPT_GET_ALL = "dept/get/all"
+var DEPT_ADD = "dept/addDept"

VisualInspection/js/util/service.js

@@ -44,7 +44,21 @@ function DeptGetAll(success, fail) {
     });
 }
 
-function getConstantList(url, param, success, fail) {   
+function DeptAdd(data, success, fail) {
+    var url = base_server_url + DEPT_ADD
+    ajaxPost(url, data, function(response) {
+        var data = response;
+        if (data.result_code == 0) {
+            success(data.result_data)
+        } else {
+            fail(data.result_desc);
+        }
+    }, function(error) {
+        fail("网络错误");
+    });
+}
+
+function getConstantList(url, param, success, fail) {
     var url = base_server_url + url;
     ajaxPost(url, param, function(response) {
         var data = response;
@@ -58,7 +72,7 @@ function getConstantList(url, param, success, fail) {
     });
 }
 
-function addConstant_service(url, param, success, fail) {   
+function addConstant_service(url, param, success, fail) {
     var url = base_server_url + url;
     ajaxPost(url, param, function(response) {
         var data = response;

VisualInspection/view/constant/constant.html

@@ -1,50 +1,48 @@
- 
 <!--<script src="/js/constant/constant.js"></script>   -->
-    <div class="container-fluid ">
-        <div class="row">
-            <div class="col-xs-3">
-                <div class="input-group">
-                    <span class="input-group-addon">关键词</span>
-                    <input class="form-control form-focus" id="keywords" autofocus type="text" placeholder="请输入关键词">
-                </div>
-            </div>
-            
-            <div class="col-xs-3">
-                 <div class="input-group">
-                    <button class="btn btn-primary " type="button" onclick="queryConstant()">查询</button>
-                 </div>
-            </div>
-            <div style="float:right;">
-                <button class="btn btn-success" type="button" data-toggle="modal" data-target="#addModal"><i class="icon icon-plus-sign"></i> 添加</button>
+<div class="container-fluid ">
+    <div class="row">
+        <div class="col-xs-3">
+            <div class="input-group">
+                <span class="input-group-addon">关键词</span>
+                <input class="form-control form-focus" id="keywords" autofocus type="text" placeholder="请输入关键词">
             </div>
         </div>
-        <br>
 
-        <div class="row">
-             <!-- 使用一个div来显示数据表格 -->
-            <div class="datatable" data-checkable="true" data-sortable="true"></div 
+        <div class="col-xs-3">
+            <div class="input-group">
+                <button class="btn btn-primary " type="button" onclick="queryConstant()">查询</button>
+            </div>
         </div>
+        <div style="float:right;">
+            <button class="btn btn-success" type="button" data-toggle="modal" data-target="#addModal"><i class="icon icon-plus-sign"></i> 添加</button>
+        </div>
+    </div>
+    <br>
+
+    <div class="row">
+        <!-- 使用一个div来显示数据表格 -->
+        <div class="datatable" data-checkable="true" data-sortable="true"></div </div>
         <div id="kkpager" class="row" style="text-align:center">
-            
+
         </div>
     </div>
     <!-- 对话框HTML -->
     <div class="modal fade" id="addModal">
-    <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
-        <h4 class="modal-title">添加常量</h4>
-      </div>
-      <div class="modal-body">
-        <link rel="import" href="/view/constant/add.html?__inline">
-      </div>
-    </div>
-    </div>
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                    <h4 class="modal-title">添加常量</h4>
+                </div>
+                <div class="modal-body">
+                    <link rel="import" href="/view/constant/add.html?__inline">
+                </div>
+            </div>
+        </div>
     </div>
 
-<script>
-    $(document).ready(function() {
-        getConstant();
-    });
-</script>
+    <script>
+        $(document).ready(function() {
+            getConstant();
+        });
+    </script>

VisualInspection/view/user/addDept.html

@@ -0,0 +1,52 @@
+<script type="text/javascript" src="/node_modules/zui/dist/lib/chosen/chosen.min.js?__inline">
+</script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosen/chosen.min.css">
+<script type="text/javascript" src="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.js?__inline">
+</script>
+<link rel="stylesheet" type="text/css" href="/node_modules/zui/dist/lib/chosenicons/zui.chosenicons.min.css">
+<script type="text/javascript" src="/js/user/adddept.js?__inline"></script>
+<div class="container-fluid ">
+    <form class="form-horizontal">
+        <div class="form-group">
+            <label for="exampleInputAccount4" class="col-sm-2">名称：</label>
+            <div class="col-md-6 col-sm-10">
+                <input type="text" class="form-control" id="code_flag" placeholder="名称">
+            </div>
+        </div>
+        <div class="form-group">
+            <label for="exampleInputPassword4" class="col-sm-2">上级部门：</label>
+            <div class="col-md-6 col-sm-10">
+                <select data-placeholder="选择一个宠物..." class="chosen-select form-control" tabindex="-1" style="display: none;">
+                        <option value=""></option>
+                        <option value="cat">小猫</option>
+                        <option value="fish">金鱼</option>
+                        <option value="dragon">龙</option>
+                        <option value="mammoth">猛犸</option>
+                        <option value="gollum">咕噜</option>
+               </select>
+                <div class="chosen-container chosen-container-single" style="width: 100%;" title="">
+                    <a class="chosen-single chosen-single-with-deselect chosen-default" tabindex="-1">
+                        <span title="选择一个宠物...">选择一个宠物...</span>
+                        <div><b></b></div>
+                    </a>
+                    <div class="chosen-drop">
+                        <div class="chosen-search"><input type="text" autocomplete="off" tabindex="2"></div>
+                        <ul class="chosen-results">
+                            <li class="active-result" title="" data-option-array-index="1"><em></em>小猫</li>
+                            <li class="active-result" title="" data-option-array-index="2"><em></em>金鱼</li>
+                            <li class="active-result" title="" data-option-array-index="3"><em></em>龙</li>
+                            <li class="active-result result-selected" title="" data-option-array-index="4"><em></em>猛犸</li>
+                            <li class="active-result" title="" data-option-array-index="5"><em></em>咕噜</li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        </div>
+
+        <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+                <button type="button" class="btn btn-default" onclick="addConstant()">保存</button>
+            </div>
+        </div>
+    </form>
+</div>

VisualInspection/view/user/userManager.html

@@ -10,9 +10,9 @@
                     <div class="panel-heading">
                         <span class="title">部门列表</span>
                         <div class="panel-actions">
-                            <button type="button" class="btn" data-toggle="tooltip" title="添加"><i class="icon-plus"></i></button>
-                            <button type="button" class="btn" data-toggle="tooltip" title="编辑"><i class="icon-pencil"></i></button>
-                            <button type="button" class="btn" data-toggle="tooltip" title="删除"><i class="icon-trash"></i></button>
+                            <button type="button" class="btn" id="dept_add" data-position="center" data-toggle="modal" data-target="#addModal" data-toggle="tooltip" title="添加"><i class="icon-plus"></i></button>
+                            <button type="button" class="btn" id="dept_edit" data-toggle="tooltip" title="编辑"><i class="icon-pencil"></i></button>
+                            <button type="button" class="btn" id="dept_delete" data-toggle="tooltip" title="删除"><i class="icon-trash"></i></button>
                         </div>
                     </div>
                     <div class="panel-body">
@@ -39,4 +39,19 @@
             </div>
         </div>
     </div>
+</div>
+
+
+<div class="modal fade" id="addModal">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">×</span><span class="sr-only">关闭</span></button>
+                <h4 class="modal-title">添加部门</h4>
+            </div>
+            <div class="modal-body">
+                <link rel="import" href="/view/user/addDept.html?__inline">
+            </div>
+        </div>
+    </div>
 </div>

VisualInspection_server/src/main/java/com/xintong/visualinspection/controller/DepartmentController.java

@@ -97,14 +97,14 @@ public class DepartmentController extends BaseController {
         }
     }
     
-    @RequestMapping(value = "/getDeptByParent/{pid}/{page}/{size}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
-    public String getDeptByParent(@PathVariable Integer pid,@PathVariable Integer page,@PathVariable Integer size){
+    @RequestMapping(value = "/getDeptByParent/{pid}",method=RequestMethod.GET,produces="application/json;charset=UTF-8")
+    public String getDeptByParent(@PathVariable Integer pid){
         try{
-        	PageHelper.startPage(page, size); 
+   
         	Organ organ = new Organ();
         	organ.setParentid(pid);
         	List<Organ> organs= departmentService.getOrgans(organ);
-        	return returnResult(0, "获取成功", new PageInfo(organs));
+        	return returnResult(0, "获取成功",(organs));
         }catch(Exception e){
         	throw new BusinessException(20001);
         }