diff --git a/WebRoot/html/tp/index.html b/WebRoot/html/tp/index.html
index 2f9ef41..c1556c0 100644
--- a/WebRoot/html/tp/index.html
+++ b/WebRoot/html/tp/index.html
@@ -45,12 +45,12 @@
 				tabMax: 30,
 				data: [{
 					id: "page2",
-					title: "任务维护",
+					title: "高级",
 					url: "./taskManageList.html",
 					close: false
 				}, {
 					id: "page1",
-					title: "表单模板维护",
+					title: "中级",
 					url: "./formTemplateList.html",
 					close: false
 				}]
diff --git a/WebRoot/html/tp/taskManageList.html b/WebRoot/html/tp/taskManageList.html
new file mode 100644
index 0000000..768f1db
--- /dev/null
+++ b/WebRoot/html/tp/taskManageList.html
@@ -0,0 +1,97 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <link rel="stylesheet" href="./component/pear/css/pear.css" />
+</head>
+
+<body class="pear-container">
+    <div class="layui-card">
+        <div class="layui-card-body">
+
+            <div style="text-align:center;padding-top: 40px;">
+                <div class="layui-form-item">
+                    <h1>高级教师推荐人员名单</h1>
+                </div>
+            </div>
+
+            <div class="layui-card layui-form" lay-filter="component-form-element"
+                style="text-align:center;padding-top: 40px;">
+                <div class="layui-card-header" style="color: red;">备注：从如下人员中推荐2人。</div>
+                <div class="layui-card-body layui-row layui-col-space10">
+                    <div class="layui-col-md12" id="checkboxPersonView">
+                        <!-- <input type="checkbox" name="selectPerson" value="1" title="写作" lay-skin="primary">
+                        <input type="checkbox" name="selectPerson" value="2" title="发呆" lay-skin="primary">
+                        <input type="checkbox" name="selectPerson" value="3" title="禁用" lay-skin="primary"> -->
+                    </div>
+                    <script id="checkboxPersonScript" type="text/html">
+                        {{#  layui.each(d.list, function(index, item){ }}
+                            <input type="checkbox" name="selectPerson" value="1" title="写作" lay-skin="primary">
+                        {{#  }); }}
+
+                    </script>
+                </div>
+            </div>
+
+            <div style="text-align:center;padding-top: 40px;">
+                <div class="layui-form-item">
+                    <button class="layui-btn" lay-submit lay-filter="submit">立即提交</button>
+                </div>
+            </div>
+
+
+        </div>
+    </div>
+
+
+
+
+    <script src="./component/layui/layui.js"></script>
+    <script src="./component/pear/pear.js"></script>
+    <script src="./component/other/js/base64.js"></script>
+
+    <script>
+        layui.use(['form', 'jquery', 'laytpl'], function () {
+            let form = layui.form;
+            let $ = layui.jquery;
+            let laytpl = layui.laytpl;
+
+
+            $.ajax({
+                type: "GET",
+                dataType: "json",
+                url: "/FengHuang/TouPiao/getHouXuanRenList?type_id=1",
+                success: function (data) {                    
+                    var checkboxPersonTpl = checkboxPersonScript.innerHTML,
+                    checkboxPersonView = document.getElementById('checkboxPersonView');
+                    laytpl(checkboxPersonTpl).render(data, function (html) {
+                        checkboxPersonView.innerHTML = html;
+                    });
+                }
+            });
+
+
+
+
+            form.on('submit(submit)', function (data) {
+                var arr = new Array();
+                $("input:checkbox[name='selectPerson']:checked").each(function (i) {
+                    arr[i] = $(this).val();
+                });
+                console.log(arr);
+                return false; //阻止表单跳转。如果需要表单跳转，去掉这段即可。
+            });
+
+
+
+
+
+
+
+        })
+    </script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/WebRoot/html/tp/view/org/taskManageList.html b/WebRoot/html/tp/view/org/taskManageList.html
index 4fe4f8b..7e0489f 100644
--- a/WebRoot/html/tp/view/org/taskManageList.html
+++ b/WebRoot/html/tp/view/org/taskManageList.html
@@ -31,18 +31,7 @@
             </div>
         </div>
     </div>
-    <div class="layui-card">
-        <div class="layui-card-body">
-            <table id="task-table" lay-filter="task-table"></table>
-        </div>
-    </div>
-
-    <script type="text/html" id="task-toolbar">
-        <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add">
-            <i class="layui-icon layui-icon-add-1"></i>
-            新增
-        </button>    
-    </script>
+  
 
     <script type="text/html" id="tableOperate">
         {{#  if(d.is_publish === 0){ }}
diff --git a/target/classes/undertow.properties b/target/classes/undertow.properties
index 0ff993f..aa41a7d 100644
--- a/target/classes/undertow.properties
+++ b/target/classes/undertow.properties
@@ -2,11 +2,7 @@
 undertow.devMode=true
 undertow.port=9000
 undertow.host=0.0.0.0
-<<<<<<< HEAD
-#undertow.resourcePath =/usr/local/tomcat8/webapps/FengHuang,classpath:static
-=======
 #undertow.resourcePath =/usr/local/tomcat8/webapps/ccZhiChengTouPiao,classpath:static
->>>>>>> 654e30d6091b9be653da34e04b7315edce49b3df
 undertow.resourcePath =D:/dsWork/ccZhiChengTouPiao/WebRoot,classpath:static
 
 # 目录名称
