diff --git a/WebRoot/view/tb/zbdc/examine/data_submit.html b/WebRoot/view/tb/zbdc/examine/data_submit.html
index 8acd0c91..bfda9fce 100644
--- a/WebRoot/view/tb/zbdc/examine/data_submit.html
+++ b/WebRoot/view/tb/zbdc/examine/data_submit.html
@@ -1462,7 +1462,7 @@
                     $.ajax({
                         type: "POST",
                         dataType: "json",
-                        url: "/QingLong/zbdc/saveReport",
+                        url: "/QingLong/zbdc/CheckReportSave",
                         async: false,
                         success: function (result) {
                             if (result.success) {
diff --git a/WebRoot/view/tb/zbdc/examine/examine_area.html b/WebRoot/view/tb/zbdc/examine/examine_area.html
index 24b0002d..0c538e50 100644
--- a/WebRoot/view/tb/zbdc/examine/examine_area.html
+++ b/WebRoot/view/tb/zbdc/examine/examine_area.html
@@ -4,335 +4,205 @@
 <head>
     <meta charset="utf-8">
     <title></title>
-    <link rel="stylesheet" href="../../../../component/layui/css/layui.css" />
-
+    <link rel="stylesheet" href="../../../../component/pear/css/pear.css" />
     <style>
-        th {
-            color: #303133;
-            background-color: #f5f7fa;
+        html,
+        body,
+        form {
+            height: 100%;
+            margin: 0;
+            overflow: hidden;
         }
 
         .layui-card {
-            box-shadow: 0 0 0 0 rgba(0, 0, 0, 0) !important;
-            margin-bottom: 0 !important;
+            height: calc(100% - 20px);
+            overflow: auto;
         }
 
-        .layui-form-item {
-            margin-bottom: 0;
+        .require-star {
+            position: absolute;
+            width: 3px;
+            height: 14px;
+            background-color: #ea4335;
+            top: 12px;
+            right: 8px;
+            border-radius: 1.5px;
         }
 
-        .layui-table td,
-        .layui-table th {
-            font-size: 12px;
+        .input-width {
+            max-width: 230px
         }
 
-        .bp {
-            background-color: rgba(23, 179, 163, .1);
-            padding: 5px 10px;
-            height: 32px;
-            line-height: 30px;
-            font-size: 12px;
-            color: #17b3a3;
-            border-radius: 4px;
-            -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-            border: 1px solid rgba(23, 179, 163, .2);
-            white-space: nowrap;
+        .layui-row {
+            width: 800px;
+            margin: 10px auto;
         }
 
-        .xp {
-            background-color: rgba(144, 147, 153, .1);
-            padding: 5px 10px;
-            height: 32px;
-            line-height: 30px;
-            font-size: 12px;
-            color: #909399;
-            border-radius: 4px;
-            -webkit-box-sizing: border-box;
-            box-sizing: border-box;
-            border: 1px solid rgba(144, 147, 153, .2);
-            white-space: nowrap;
-        }
+        .text {
 
-        .woo-tool-text-delimiter {
-            width: 1px;
-            height: 12px;
-            background: #EEEEEE;
-            display: inline-block;
-            margin: 0 6px 0 4px;
-        }
+            display: block;
+            padding: 9px 15px;
+            width: 230px;
+            font-weight: 400;
+            line-height: 20px;
 
-        .woo-theme-color {
-            color: #16baaa !important;
-        }
-
-        .woo-tool-span {
-            margin: 0 3px;
-            position: relative;
-            top: -1px;
-            cursor: pointer;
         }
     </style>
 </head>
 
-<body class="layui-form">
-
-    <div class="layui-card">
-        <div class="layui-card-body">
+<body class="pear-container">
+    <form class="layui-form" action="">
 
-            <div class="layui-form-item layui-inline">
-                <label class="layui-form-label" style="width: auto;">状态：</label>
-                <div class="layui-input-inline">
-                    <select id="statusId" lay-filter="status">
-                        <option value="0">待审核</option>
-                        <option value="1">已审核</option>
-                        <option value="-1">未提交</option>
-                    </select>
+        <div class="layui-card">
+            <div class="layui-card-body">
+                <div class="layui-row" style="margin-top: 50px;">
+                    <i class="layui-icon layui-icon-note" style="color: #16BAAA;" id="title"></i>
                 </div>
-            </div>
-
-            <div class="layui-form-item layui-inline">
-                <label class="layui-form-label" style="width: auto;">学校类型：</label>
-                <div class="layui-input-inline" id="xxlxView"></div>
-
-                <script id="xxlxScript" type="text/html">
-                    <select id="xxlxId" lay-filter="xxlx">
-                        <option value="0">全部</option>
-                        {{#  layui.each(d, function(index, item){ }}
-                            <option value="{{item.school_type_id}}">{{item.school_type_name}}</option>
-                        {{#  }); }}
-                    </select>
-                </script>
-            </div>
-
-
-            <div class="layui-form-item layui-inline">
-                <label class="layui-form-label" style="width: auto;">学校名称：</label>
-                <div class="layui-input-inline">
-                    <input type="text" lay-affix="clear" id="xxmc" placeholder="请输入学校名称" class="layui-input">
+                <div class="layui-row" style="margin-top: 20px;">
+                    <div class="layui-col-xs6">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 115px !important;">状态：</label>
+                            <div class="layui-input-block">
+                                <span class="text" id="a1"></span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-xs6">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 115px !important;">应提交数：</label>
+                            <div class="layui-input-block">
+                                <span class="text" id="a2">单位类型</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row" style="margin-top: 10px;">
+                    <div class="layui-col-xs6">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 115px !important;">已提交数：</label>
+                            <div class="layui-input-block">
+                                <span class="text" id="a3"></span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-xs6">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 115px !important;">未提交数：</label>
+                            <div class="layui-input-block">
+                                <span class="text" id="a4">单位类型</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="layui-row" style="margin-top: 10px;">
+                    <div class="layui-col-xs6">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 115px !important;">退回未提交数：</label>
+                            <div class="layui-input-block">
+                                <span class="text" id="a5"></span>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="layui-col-xs6">
+                        <div class="layui-form-item">
+                            <label class="layui-form-label" style="width: 115px !important;">退回已提交数：</label>
+                            <div class="layui-input-block">
+                                <span class="text" id="a6">单位类型</span>
+                            </div>
+                        </div>
+                    </div>
                 </div>
-            </div>
 
 
-            <div class="layui-form-item layui-inline">
-                <button class="layui-btn layui-btn-sm" lay-submit lay-filter="user-query">
-                    <i class="layui-icon layui-icon-search"></i>
-                    查询
-                </button>
+                <div class="layui-row" style="text-align: center;margin-top: 50px;">
+                    <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="save" style="margin-right: 25px;">
+                        <i class="layui-icon layui-icon-ok"></i>
+                        上 报
+                    </button>
+                    <button type="submit" class="pear-btn pear-btn-primary pear-btn-sm" lay-submit="" lay-filter="save" style="margin-left: 25px;">
+                        <i class="layui-icon layui-icon-return"></i>
+                        选择退回学校
+                    </button>
+                </div>
             </div>
+        </div>
 
-            <button class="layui-btn layui-bg-orange layui-btn-sm" lay-submit lay-filter="shenhe" id="shenhe"
-                style="position: absolute;top: 15px;right: 17px;z-index: 999;"><i class="layui-icon layui-icon-ok">
-                </i>一键审核通过</button>
-
-            <button class="layui-btn layui-bg-orange layui-btn-sm" lay-submit lay-filter="shangji" id="shangji"
-                style="position: absolute;top: 15px;right: 17px;z-index: 999;"><i class="layui-icon layui-icon-home">
-                </i>提交上级单位</button>
-
-            <table class="layui-table" id="myTable"></table>
+    </form>
 
-            <script type="text/html" id="table-bar">
-                {{#  if(d.check_type_id != -1) { }}
-                    <span class="woo-tool-span woo-tool-text-span" lay-event="view"><a
-                        class="woo-theme-color">查看详情</a></span>
-                {{#  } }}    
-            </script>
-        </div>
-    </div>
 
     <script src="../../../../component/layui/layui.js"></script>
+    <script src="../../../../component/pear/pear.js"></script>
 
     <script>
         layui.use(function () {
-            var $ = layui.jquery;
-            var table = layui.table;
             var form = layui.form;
-            var laytpl = layui.laytpl;
+            var $ = layui.jquery;
+
+            var isXX = true;
 
             $.ajax({
                 type: "GET",
                 async: false,
-                url: "/QingLong/zbdc/getQuerySchoolType",
+                url: "/QingLong/zbdc/CheckViewByArea",
                 success: function (res) {
-                    var xxlxTpl = xxlxScript.innerHTML,
-                        xxlxView = document.getElementById('xxlxView');
-                    laytpl(xxlxTpl).render(res.data, function (html) {
-                        xxlxView.innerHTML = html;
-                    });
-                    form.render();
+                    $("#title").html(" " + res.data.name);
+                    $("#a1").html(" " + res.data.check_type_name);
+                    $("#a2").html(" " + res.data.yingtijiao_count);
+                    $("#a3").html(" " + res.data.yitijiao_count);
+                    $("#a4").html(" " + res.data.weitijiao_count);
+                    $("#a5").html(" " + res.data.tuihuiweitijiao_count);
+                    $("#a6").html(" " + res.data.tuihui_commit_count);
+
                 }
             });
 
-            if ($("#statusId").val() == 0) {
-                $("#shenhe").show();
-                $("#shangji").hide();
-            } else if ($("#statusId").val() == 1) {
-                $("#shenhe").hide();
-                $("#shangji").show();
-            } else {
-                $("#shenhe").hide();
-                $("#shangji").hide();
-            }
-
-            tableRender();
-
-            function tableRender() {
-
-                table.render({
-                    elem: '#myTable',
-                    url: '/QingLong/zbdc/listSchool',
-                    where: {
-                        check_type_id: $("#statusId").val(),
-                        school_type_id: $("#xxlxId").val(),
-                        keyword: $("#xxmc").val()
-                    },
-                    cellExpandedMode: "tips",
-                    height: 'full-70',
-                    page: {
-                        limit: 15
-                        , layout: ['count', 'prev', 'page', 'next', 'skip']
-                        , prev: "上一页"
-                        , next: "下一页"
-                    },
-                    cols: [[
-                        { title: '序号', align: 'center', width: "10%", type: 'numbers' },
-                        { title: '学校名称', field: 'org_name', align: 'center', width: "25%" },
-                        { title: '学校类型', field: 'school_type_name', align: 'center', width: "20%" },
-                        { title: '状态', field: 'status_name', align: 'center', width: "20%" },
-                        { title: '操作', toolbar: '#table-bar', align: 'center', width: "25%" }
-
-                    ]],
-                    // skin: 'line',
-                    defaultToolbar: [],
-                    parseData: function (res) {
-                        var dataArr = res.data;
-                        for (var i = 0; i < dataArr.length; i++) {
-                            if (dataArr[i].check_type_id == 0) {
-                                dataArr[i].status_name = "待审核";
-                            } else if (dataArr[i].check_type_id == 1) {
-                                dataArr[i].status_name = "已审核";
-                            } else {
-                                dataArr[i].status_name = "未提交";
-                            }
-                        }
-                        return res;
-                    }
+            $("#a2").click(function(){
+                layer.open({
+                    type: 2,
+                    title: "应提交数",
+                    shade: 0.1,
+                    area: ['800px', '512px'],
+                    content: './school_list.html?flag=2'
                 });
-            }
-
-            form.on('submit(user-query)', function () {
-
-                tableRender()
 
-                // 阻止表单的默认提交行为
-                return false;
             });
 
-            form.on('submit(shenhe)', function () {
-                layer.confirm('确定一键审核通过吗？', {
-                    icon: 3,
-                    title: '提示'
-                }, function (index) {
-                    layer.close(index);
-                    $.ajax({
-                        type: "POST",
-                        dataType: "json",
-                        url: "/QingLong/zbdc/oneKeyPass",
-                        async: false,
-                        success: function (result) {
-                            if (result.success) {
-                                layer.msg('一键审核通过成功!', {
-                                    icon: 1,
-                                    time: 1500
-                                }, function () {
-                                    table.reload('myTable');
-                                });
-                            } else {
-                                layer.msg(result.message, {
-                                    icon: 2,
-                                    time: 2000
-                                });
-                            }
-                        }
-                    });
+            $("#a3").click(function(){
+                layer.open({
+                    type: 2,
+                    title: "未提交数",
+                    shade: 0.1,
+                    area: ['800px', '512px'],
+                    content: './school_list.html?flag=0'
                 });
-                // 阻止表单的默认提交行为
-                return false;
-            });
 
-            form.on('submit(shangji)', function () {
-                layer.confirm('确定提交上级单位吗？', {
-                    icon: 3,
-                    title: '提示'
-                }, function (index) {
-                    layer.close(index);
-                    $.ajax({
-                        type: "POST",
-                        dataType: "json",
-                        url: "/QingLong/zbdc/saveReport",
-                        async: false,
-                        success: function (result) {
-                            if (result.success) {
-                                layer.msg('提交上级单位成功!', {
-                                    icon: 1,
-                                    time: 1500
-                                });
-                            } else {
-                                layer.msg(result.message, {
-                                    icon: 2,
-                                    time: 2000
-                                });
-                            }
-                        }
-                    });
-                });
-                // 阻止表单的默认提交行为
-                return false;
             });
 
-            form.on('select(status)', function (data) {
-                if (data.value == 0) {
-                    $("#shenhe").show();
-                    $("#shangji").hide();
-                } else if (data.value == 1) {
-                    $("#shenhe").hide();
-                    $("#shangji").show();
-                } else {
-                    $("#shenhe").hide();
-                    $("#shangji").hide();
-                }
 
-                tableRender();
-                // 阻止表单的默认提交行为
-                return false;
-            });
 
-            form.on('select(xxlx)', function () {
-                tableRender();
-                // 阻止表单的默认提交行为
-                return false;
-            });
-
-            table.on('tool(myTable)', function (obj) {
-                console.log(obj.data.school_type_id)
-                if (obj.event === 'view') {
-                    if (obj.data.school_type_id == 211) {
-                        window.location.href = "/QingLong/view/tb/zbdc/examine/data_all_xx.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
-                    } else if (obj.data.school_type_id == 311) {
-                        window.location.href = "/QingLong/view/tb/zbdc/examine/data_all_cz.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
-                    }
-                    else if (obj.data.school_type_id == 312) {
-                        window.location.href = "/QingLong/view/tb/zbdc/examine/data_all_jnygz.html?bureau_id=" + obj.data.bureau_id + "&flag=1";
+            form.on('submit(save)', function (data) {
+                $.ajax({
+                    url: '/QingLong/zbdc/saveSchool',
+                    data: data.field,
+                    type: 'post',
+                    success: function (result) {
+                        if (result.success) {
+                            layer.msg("保存成功！", {
+                                icon: 1,
+                                time: 1300
+                            });
+                        } else {
+                            layer.msg(result.message, {
+                                icon: 2,
+                                time: 2000
+                            });
+                        }
                     }
-
-                }
+                });
+                return false;
             });
-
-
-
         });
     </script>
-
 </body>
 
 </html>
\ No newline at end of file
diff --git a/WebRoot/view/tb/zbdc/examine/examine_search_details.html b/WebRoot/view/tb/zbdc/examine/examine_search_details.html
index 6cb42a76..fdeee629 100644
--- a/WebRoot/view/tb/zbdc/examine/examine_search_details.html
+++ b/WebRoot/view/tb/zbdc/examine/examine_search_details.html
@@ -106,7 +106,7 @@
 
             table.render({
                 elem: '#myTable',
-                url: '/QingLong/zbdc/CheckViewDetail?year=' + year,
+                url: '/QingLong/zbdc/CheckViewDetailBySchool?year=' + year,
                 height: 'full-40',
                 cellExpandedMode: "tips",
                 page: false,
diff --git a/WebRoot/view/tb/zbdc/examine/examine_search_xx.html b/WebRoot/view/tb/zbdc/examine/examine_search_xx.html
index a973fe16..31b415ff 100644
--- a/WebRoot/view/tb/zbdc/examine/examine_search_xx.html
+++ b/WebRoot/view/tb/zbdc/examine/examine_search_xx.html
@@ -104,7 +104,7 @@
 
             table.render({
                 elem: '#myTable',
-                url: '/QingLong/zbdc/CheckViewList',
+                url: '/QingLong/zbdc/CheckViewListBySchool',
                 height: 'full-30',
                 page: {
                     limit: 15
diff --git a/WebRoot/view/tb/zbdc/examine/school_list.html b/WebRoot/view/tb/zbdc/examine/school_list.html
new file mode 100644
index 00000000..fdeee629
--- /dev/null
+++ b/WebRoot/view/tb/zbdc/examine/school_list.html
@@ -0,0 +1,140 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8">
+    <title></title>
+    <link rel="stylesheet" href="../../../../component/layui/css/layui.css" />
+
+    <style>
+        th {
+            color: #303133;
+            background-color: #f5f7fa;
+        }
+
+        .layui-card {
+            box-shadow: 0 0 0 0 rgba(0, 0, 0, 0) !important;
+            margin-bottom: 0 !important;
+        }
+
+        .layui-form-item {
+            margin-bottom: 0;
+        }
+
+        .layui-table td,
+        .layui-table th {
+            font-size: 12px;
+        }
+
+        .bp {
+            background-color: rgba(23, 179, 163, .1);
+            padding: 5px 10px;
+            height: 32px;
+            line-height: 30px;
+            font-size: 12px;
+            color: #17b3a3;
+            border-radius: 4px;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            border: 1px solid rgba(23, 179, 163, .2);
+            white-space: nowrap;
+        }
+
+        .xp {
+            background-color: rgba(144, 147, 153, .1);
+            padding: 5px 10px;
+            height: 32px;
+            line-height: 30px;
+            font-size: 12px;
+            color: #909399;
+            border-radius: 4px;
+            -webkit-box-sizing: border-box;
+            box-sizing: border-box;
+            border: 1px solid rgba(144, 147, 153, .2);
+            white-space: nowrap;
+        }
+
+        .woo-tool-text-delimiter {
+            width: 1px;
+            height: 12px;
+            background: #EEEEEE;
+            display: inline-block;
+            margin: 0 6px 0 4px;
+        }
+
+        .woo-theme-color {
+            color: #16baaa !important;
+        }
+
+        .woo-tool-span {
+            margin: 0 3px;
+            position: relative;
+            top: -1px;
+            cursor: pointer;
+        }
+    </style>
+</head>
+
+<body class="layui-form">
+
+    <div class="layui-card">
+        <div class="layui-card-body">
+
+            <table class="layui-table" id="myTable"></table>
+
+            <script type="text/html" id="table-bar">
+                {{#  if(d.check_type_id != -1) { }}
+                    <span class="woo-tool-span woo-tool-text-span" lay-event="view"><a
+                        class="woo-theme-color">审核详情</a></span>
+                {{#  } }}    
+            </script>
+        </div>
+    </div>
+
+    <script src="../../../../component/layui/layui.js"></script>
+
+    <script>
+        layui.use(function () {
+            var $ = layui.jquery;
+            var table = layui.table;
+            var form = layui.form;
+            var laytpl = layui.laytpl;
+
+            var year = GetQueryString("year");
+
+
+
+            table.render({
+                elem: '#myTable',
+                url: '/QingLong/zbdc/CheckViewDetailBySchool?year=' + year,
+                height: 'full-40',
+                cellExpandedMode: "tips",
+                page: false,
+                cols: [[
+                    { title: '序号', align: 'center', width: "5%", type: 'numbers' },
+                    { title: '提交记录', field: 'create_time', align: 'center', width: "30%" },
+                    { title: '审核状态', field: 'check_type_name', align: 'center', width: "15%" },
+                    { title: '审核意见', field: 'message', align: 'center', width: "47%" },
+
+                ]],
+                // skin: 'line',
+                defaultToolbar: []
+            });
+
+            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
