diff --git a/WebRoot/admin/data/menu.json b/WebRoot/admin/data/menu.json
index d1fc9648..6a100429 100644
--- a/WebRoot/admin/data/menu.json
+++ b/WebRoot/admin/data/menu.json
@@ -1,442 +1,21 @@
 [{
 		"id": 1,
-		"title": "工作空间",
+		"title": "填报任务管理",
 		"icon": "layui-icon layui-icon-console",
 		"type": 0,
 		"href": "",
 		"children": [{
 			"id": 10,
-			"title": "控制后台",			
+			"title": "待填报任务",			
 			"type": 1,
 			"openType": "_iframe",
-			"href": "view/console/console1.html"
+			"href": "view/tb/school/task_list_p.html?is_finish=0"
 		}, {
 			"id": 13,
-			"title": "数据分析",			
+			"title": "已填报任务",			
 			"type": 1,
 			"openType": "_iframe",
-			"href": "view/console/console2.html"
-		}, {
-			"id": 14,
-			"title": "百度一下",
-			"icon": "layui-icon layui-icon-console",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "view/jcgl/zwfg/index.html"
-		}, {
-			"id": 15,
-			"title": "主题预览",
-			"icon": "layui-icon layui-icon-console",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "view/system/theme.html"
-		}, {
-			"id": 16,
-			"title": "酸爽翻倍",
-			"icon": "layui-icon layui-icon-console",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "view/document/core.html"
-		}]
-	},
-	{
-		"id": "component",
-		"title": "常用组件",
-		"icon": "layui-icon layui-icon-component",
-		"type": 0,
-		"href": "",
-		"children": [{
-			"id": 201,
-			"title": "基础组件",
-			"icon": "layui-icon layui-icon-console",
-			"type": 0,
-			"children": [
-			{
-				"id": 2011,
-				"title": "功能按钮",
-				"icon": "layui-icon layui-icon-face-smile",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/button.html"
-			}, {
-				"id": 2014,
-				"title": "表单集合",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/form.html"
-			}, {
-				"id": 2010,
-				"title": "字体图标",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/icon.html"
-			}, {
-				"id": 2012,
-				"title": "多选下拉",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/select.html"
-			}, {
-				"id": 2013,
-				"title": "动态标签",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/tag.html"
-			}]
-		}, {
-			"id": 203,
-			"title": "进阶组件",
-			"icon": "layui-icon layui-icon-console",
-			"type": 0,
-			"children": [{
-				"id": 2031,
-				"title": "数据表格",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/table.html"
-			}, {
-				"id": 2032,
-				"title": "分布表单",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/step.html"
-			}, {
-				"id": 2033,
-				"title": "树形表格",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/treetable.html"
-			}, {
-				"id": 2034,
-				"title": "树状结构",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/dtree.html"
-			}, {
-				"id": 2035,
-				"title": "文本编辑",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/tinymce.html"
-			}, {
-				"id": 2036,
-				"title": "卡片组件",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/card.html"
-			}]
-		}, {
-			"id": 202,
-			"title": "弹层组件",
-			"icon": "layui-icon layui-icon-console",
-			"type": 0,
-			"children": [{
-				"id": 2021,
-				"title": "抽屉组件",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/drawer.html"
-			}, {
-				"id": 2022,
-				"title": "消息通知 (过时)",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/notice.html"
-			}, {
-				"id": 2025,
-				"title": "消息通知 (新增)",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/toast.html"
-			}, {
-				"id": 2024,
-				"title": "加载组件",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/loading.html"
-			}, {
-				"id": 2023,
-				"title": "弹层组件",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/popup.html"
-			}]
-		},{
-			"id": 60331,
-			"title": "高级组件",
-			"icon": "layui-icon layui-icon-console",
-			"type": 0,
-			"children": [{
-				"id": 60131,
-				"title": "多选项卡",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/tab.html"
-			},{
-				"id": 60132,
-				"title": "数据菜单",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/document/menu.html"
-			}]
-		}, {
-			"id": 204,
-			"title": "其他组件",
-			"icon": "layui-icon layui-icon-console",
-			"type": 0,
-			"children": [{
-					"id": 2041,
-					"title": "哈希加密",
-					"icon": "layui-icon layui-icon-face-cry",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/encrypt.html"
-				},
-				{
-					"id": 2042,
-					"title": "图标选择",
-					"icon": "layui-icon layui-icon-face-cry",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/iconPicker.html"
-				},
-				{
-					"id": 2043,
-					"title": "省市级联",
-					"icon": "layui-icon layui-icon-face-cry",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/area.html"
-				},
-				{
-					"id": 2044,
-					"title": "数字滚动",
-					"icon": "layui-icon layui-icon-face-cry",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/count.html"
-				},
-				{
-					"id": 2045,
-					"title": "顶部返回",
-					"icon": "layui-icon layui-icon-face-cry",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/topBar.html"
-				},
-				{
-					"id": 2046,
-					"title": "水印组件",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/watermark.html"
-				},
-				{
-					"id": 2047,
-					"title": "全屏组件",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/fullscreen.html"
-				},
-				{
-					"id": 2048,
-					"title": "汽泡组件",
-					"type": 1,
-					"openType": "_iframe",
-					"href": "view/document/popover.html"
-				}
-			]
-		}]
-	},
-	{
-		"id": "result",
-		"title": "结果页面",
-		"icon": "layui-icon layui-icon-auz",
-		"type": 0,
-		"href": "",
-		"children": [{
-				"id": "success",
-				"title": "成功",
-				"icon": "layui-icon layui-icon-face-smile",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/result/success.html"
-			},
-			{
-				"id": "failure",
-				"title": "失败",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/result/error.html"
-			}
-		]
-	},
-	{
-		"id": "error",
-		"title": "错误页面",
-		"icon": "layui-icon layui-icon-face-cry",
-		"type": 0,
-		"href": "",
-		"children": [{
-				"id": 403,
-				"title": "403",
-				"icon": "layui-icon layui-icon-face-smile",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/error/403.html"
-			},
-			{
-				"id": 404,
-				"title": "404",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/error/404.html"
-			},
-
-			{
-				"id": 500,
-				"title": "500",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/error/500.html"
-			}
-
-		]
-	},
-	{
-		"id": "system",
-		"title": "系统管理",
-		"icon": "layui-icon layui-icon-set-fill",
-		"type": 0,
-		"href": "",
-		"children": [{
-				"id": 601,
-				"title": "用户管理",
-				"icon": "layui-icon layui-icon-face-smile",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/system/user.html"
-			},
-			{
-				"id": 602,
-				"title": "角色管理",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/system/role.html"
-			},
-
-			{
-				"id": 603,
-				"title": "权限管理",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/system/power.html"
-			},
-
-			{
-				"id": 604,
-				"title": "部门管理",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/system/deptment.html"
-			},
-			{
-				"id": 605,
-				"title": "行为日志",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/system/log.html"
-			}, {
-				"id": 606,
-				"title": "数据字典",
-				"icon": "layui-icon layui-icon-face-cry",
-				"type": 1,
-				"openType": "_iframe",
-				"href": "view/system/dict.html"
-			}
-
-		]
-	},
-	{
-		"id": "common",
-		"title": "常用页面",
-		"icon": "layui-icon layui-icon-template-1",
-		"type": 0,
-		"href": "",
-		"children": [{
-			"id": 701,
-			"title": "登录页面",
-			"icon": "layui-icon layui-icon-face-smile",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "login.html"
-		}, {
-			"id": 702,
-			"title": "空白页面",
-			"icon": "layui-icon layui-icon-face-smile",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "view/system/space.html"
-		}]
-	}, {
-		"id": "echarts",
-		"title": "数据图表",
-		"icon": "layui-icon layui-icon-chart",
-		"type": 0,
-		"href": "",
-		"children": [{
-			"id": 12121,
-			"title": "折线图",
-			"icon": "layui-icon layui-icon-face-smile",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "view/echarts/line.html"
-		}, {
-			"id": 121212,
-			"title": "柱状图",
-			"icon": "layui-icon layui-icon-face-smile",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "view/echarts/column.html"
-		}]
-	},
-	{
-		"id": "code",
-		"title": "开发工具",
-		"icon": "layui-icon layui-icon-util",
-		"type": 0,
-		"href": "",
-		"children": [{
-			"id": 801,
-			"title": "表单构建",
-			"icon": "layui-icon layui-icon-util",
-			"type": 1,
-			"openType": "_iframe",
-			"href": "component/code/index.html"
+			"href": "view/tb/school/task_list_p.html?is_finish=1"
 		}]
 	}
 ]
\ No newline at end of file
diff --git a/WebRoot/config/pear.config.p.yml b/WebRoot/config/pear.config.p.yml
index 8a73c2ec..c2174b3b 100644
--- a/WebRoot/config/pear.config.p.yml
+++ b/WebRoot/config/pear.config.p.yml
@@ -1,7 +1,7 @@
 ## 网站配置
 logo: 
   ## 网站名称
-  title: "Pear Admin"
+  title: "长春市教育装备与信息化项目智慧管理系统"
   ## 网站图标
   image: "admin/images/logo.png"
 ## 菜单配置
diff --git a/WebRoot/plogin.html b/WebRoot/plogin.html
index d5c7a134..a5727d07 100644
--- a/WebRoot/plogin.html
+++ b/WebRoot/plogin.html
@@ -58,7 +58,7 @@
 					type: "POST",
 					dataType: "json",
 					async: false,
-					url: "/QingLong/loginPerson/doFillLogin",
+					url: "/QingLong/collect/doFillLogin",
 					data: {
 						"username": data.field.loginName,
 						"password": encrypt.encrypt(data.field.password)
diff --git a/WebRoot/view/tb/school/task_list_p.html b/WebRoot/view/tb/school/task_list_p.html
new file mode 100644
index 00000000..1c7ac3eb
--- /dev/null
+++ b/WebRoot/view/tb/school/task_list_p.html
@@ -0,0 +1,227 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <link rel="stylesheet" href="../../../component/pear/css/pear.css" />
+    <link rel="stylesheet" href="../iconfont/iconfont.css" />
+
+</head>
+
+<body class="pear-container layui-form">
+
+    <div class="layui-card" style="margin-bottom: 10px !important;">
+        <div class="layui-card-body">
+            <div class="layui-form-item" style="margin: 10px 0 5px 0 !important;">
+                <div class="layui-form-item layui-inline">
+                    <label class="layui-form-label" style="width: auto;">任务名称：</label>
+                    <div class="layui-input-inline">
+                        <input type="text" id="task_name" lay-affix="clear" lay-filter="clear" placeholder="请输入任务名称"
+                            class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item layui-inline">
+                    <button class="pear-btn pear-btn-md pear-btn-primary" lay-submit lay-filter="user-query">
+                        <i class="layui-icon layui-icon-search"></i>
+                        查询
+                    </button>
+                </div>
+
+            </div>
+        </div>
+    </div>
+
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <table id="data-table"></table>
+            <script type="text/html" id="jobName-Templet">
+                {{#if (d.job_type == 1) { }}
+                    <img src="../imgs/form.png" title="表单" style="max-width: 16px;margin-top: -4px;">
+                {{# } else { }}
+                    <img src="../imgs/excel.png" title="EXCEL模板" style="max-width: 16px;margin-top: -4px;">
+                {{#  } }}
+                {{d.job_name}}
+                {{#if (d.jiezhi == true) { }}
+                    <img src="../imgs/yjz.svg" style="max-width: 50px;margin-top: -9px;margin-left: 10px;">
+                {{# } }}
+            </script>
+            <script type="text/html" id="targetType">
+                {{#if (d.target_type_id == 1) { }}
+                    单位
+                {{# } else { }}
+                    人员
+                {{#  } }}
+            </script>
+        </div>
+    </div>
+
+    <script type="text/html" id="table-bar">
+        {{#  if(d.jiezhi == false){ }}
+            <button type="button" class="layui-btn layui-btn-sm" lay-event="report"  style="font-size: 12px !important;">
+                <i class="iconfont icon-tianbao"></i> 填报
+            </button>
+        {{#  } }}
+        <button type="button" class="layui-btn layui-btn-sm" lay-event="view" style="font-size: 12px !important;">
+            <i class="iconfont icon-chakan"></i> 查看
+        </button>
+        {{#  if(d.is_finish === 1){ }}            
+            {{#  if(d.job_type === 2){ }}
+                <button type="button" class="layui-btn layui-btn-sm" lay-event="download" style="font-size: 12px !important;">
+                    <i class="iconfont icon-xiazai"></i> 下载
+                </button>                
+            {{#  } }}
+        {{#  } }}
+    </script>
+
+    <script src="../../../component/layui/layui.js"></script>
+    <script src="../../../component/pear/pear.js"></script>
+    <script src="../../../component/pear/base64.js"></script>
+
+    <script>
+        layui.use(['table', 'form', 'jquery', 'common', 'laytpl'], function () {
+            var table = layui.table;
+            var form = layui.form;
+            var $ = layui.jquery;
+            var common = layui.common;
+            var laytpl = layui.laytpl;
+
+            var isFinish = GetQueryString("is_finish");
+
+            tableRender();
+
+            form.on('submit(user-query)', function () {
+                tableRender();
+                return false;
+            });
+
+            form.on('input-affix(clear)', function (data) {
+                tableRender();
+            });
+
+            function tableRender() {
+                table.render({
+                    elem: '#data-table',
+                    url: '/QingLong/collect/viewJobList',
+                    where: {
+                        keyword: $("#task_name").val(),
+                        is_finish: isFinish,
+                        queryTypeIds: "1_1_3",
+                        forward_progress_xiaji: -1,
+                        forward_progress_bendanwei: -1
+                    },
+                    height: 'full-150',
+                    page: {
+                        limit: 15
+                        , layout: ['count', 'prev', 'page', 'next', 'skip']
+                        , prev: "上一页"
+                        , next: "下一页"
+                    },
+                    cols: [[
+                        { title: '序号', unresize: true, align: 'center', width: "5%", type: 'numbers' },
+                        { title: '任务名称', unresize: true, align: 'left', templet: '#jobName-Templet' },
+                        { title: '发布时间', unresize: true, field: 'publish_time', align: 'center', width: "15%" },
+                        { title: '截止时间', unresize: true, field: 'deadline_time', align: 'center', width: "15%" },
+                        { title: '发布对象', unresize: true, align: 'center', width: "8%", templet: '#targetType' },
+                        { title: '操作', unresize: true, align: 'center', width: "15%", toolbar: '#table-bar' }
+                    ]],
+                    skin: 'line',
+                    defaultToolbar: []
+                });
+            }
+
+            table.on('tool(data-table)', function (obj) {
+                if (obj.event === 'report') {
+                    window.report(obj);
+                } else if (obj.event === 'view') {
+                    window.view(obj);
+                } else if (obj.event === 'download') {
+                    window.download(obj);
+                }
+            });
+
+            window.report = function (obj) {
+
+                if (obj.data.target_type_id === 1) {
+                    if (obj.data.job_type === 1) {
+                        layer.open({
+                            type: 2,
+                            title: '填报',
+                            offset: 'r',
+                            anim: 'slideLeft',
+                            area: ['1000px', '100%'],
+                            shade: 0.1,
+                            content: "../form/report.html?job_id=" + obj.data.job_id
+                        });
+                    } else {
+                        layer.open({
+                            type: 2,
+                            title: '填报',
+                            shade: 0.1,
+                            area: ['560px', '430px'],
+                            content: './report_excel.html?job_id=' + obj.data.job_id + '&file_name=' + obj.data.upload_excel_filename_finish
+                        });
+                    }
+                } else {
+                    layer.open({
+                        type: 2,
+                        title: '发布',
+                        offset: 'r',
+                        anim: 'slideLeft',
+                        area: ['1000px', '100%'],
+                        shade: 0.1,
+                        content: "./publish_person.html?job_id=" + obj.data.job_id
+                    });
+                }
+            }
+
+            window.download = function (obj) {
+                window.location = '/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=1';
+            }
+
+            window.view = function (obj) {
+                if (obj.data.is_finish === 0) {
+                    layer.open({
+                        type: 2,
+                        title: '查看',
+                        shade: 0.1,
+                        area: ['800px', '400px'],
+                        content: '../dis/job_view.html?job_id=' + obj.data.job_id
+                    });
+                } else {
+                    if (obj.data.job_type === 1) {
+                        layer.open({
+                            type: 2,
+                            title: '查看',
+                            offset: 'r',
+                            anim: 'slideLeft',
+                            area: ['1000px', '100%'],
+                            shade: 0.1,
+                            shadeClose: true,
+                            content: "../form/view.html?job_id=" + obj.data.job_id
+                        });
+                    } else {
+                        var base64Url = Base64.encode('/QingLong/collect/getJobBureauFillInfo?job_id=' + obj.data.job_id + '&type_id=2');
+                        window.open('../exportPdf.html?url=' + base64Url, '_blank');
+                    }
+                }
+            }
+
+            window.refresh = function (param) {
+                table.reload('data-table');
+            }
+
+            function GetQueryString(name, istop) {
+                var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+                var r = window.location.search.substr(1).match(reg);
+                if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
+
+                if (r != null) return unescape(r[2]);
+                return null;
+            }
+
+        });
+    </script>
+</body>
+
+</html>
\ No newline at end of file