diff --git a/src/main/resources/templates/atte/newreport/index.html b/src/main/resources/templates/atte/newreport/index.html
index 2cd476f..035105e 100644
--- a/src/main/resources/templates/atte/newreport/index.html
+++ b/src/main/resources/templates/atte/newreport/index.html
@@ -174,360 +174,360 @@
                     </el-table-column>
                     <el-table-column
                             prop="a1"
-                            label="1(am)"
+                            label="1(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p1"
-                            label="1(pm)"
+                            label="1(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a2"
-                            label="2(am)"
+                            label="2(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p2"
-                            label="2(pm)"
+                            label="2(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a3"
-                            label="3(am)"
+                            label="3(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p3"
-                            label="3(pm)"
+                            label="3(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a4"
-                            label="4(am)"
+                            label="4(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p4"
-                            label="4(pm)"
+                            label="4(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a5"
-                            label="5(am)"
+                            label="5(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p5"
-                            label="5(pm)"
+                            label="5(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a6"
-                            label="6(am)"
+                            label="6(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p6"
-                            label="6(pm)"
+                            label="6(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a7"
-                            label="7(am)"
+                            label="7(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p7"
-                            label="7(pm)"
+                            label="7(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a8"
-                            label="8(am)"
+                            label="8(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p9"
-                            label="9(pm)"
+                            label="9(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a10"
-                            label="10(am)"
+                            label="10(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p10"
-                            label="10(pm)"
+                            label="10(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a11"
-                            label="11(am)"
+                            label="11(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p11"
-                            label="11(pm)"
+                            label="11(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="a12"
-                            label="12(am)"
+                            label="12(上午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                             prop="p12"
-                            label="12(pm)"
+                            label="12(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column><el-table-column
                         prop="a13"
-                        label="13(am)"
+                        label="13(上午)"
                         :formatter="stateTypeform"
                 >
                 </el-table-column>
                     <el-table-column
                             prop="p13"
-                            label="13(pm)"
+                            label="13(下午)"
                             :formatter="stateTypeform"
                     >
                     </el-table-column>
                     <el-table-column
                         prop="a14"
-                        label="14(am)"
+                        label="14(上午)"
                         :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p14"
-                            label="14(pm)"
+                            label="14(下午)"
                             :formatter="stateTypeform" >
 
                     </el-table-column>
                     <el-table-column
                             prop="a15"
-                            label="15(am)"
+                            label="15(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p15"
-                            label="15(pm)"
+                            label="15(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a16"
-                            label="16(am)"
+                            label="16(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p16"
-                            label="16pm)"
+                            label="16(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a17"
-                            label="17(am)"
+                            label="17(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p17"
-                            label="17(pm)"
+                            label="17(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a18"
-                            label="18(am)"
+                            label="18(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p18"
-                            label="18(pm)"
+                            label="18(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a19"
-                            label="19(am)"
+                            label="19(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p19"
-                            label="19(pm)"
+                            label="19(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a20"
-                            label="20(am)"
+                            label="20(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p20"
-                            label="20(pm)"
+                            label="20(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a21"
-                            label="21(am)"
+                            label="21(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p21"
-                            label="21(pm)"
+                            label="21(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a22"
-                            label="22(am)"
+                            label="22(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p22"
-                            label="22(pm)"
+                            label="22(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a23"
-                            label="23(am)"
+                            label="23(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p23"
-                            label="23(pm)"
+                            label="23(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a24"
-                            label="24(am)"
+                            label="24(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p24"
-                            label="24(pm)"
+                            label="24(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a25"
-                            label="25(am)"
+                            label="25(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p25"
-                            label="25(pm)"
+                            label="25(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a26"
-                            label="26(am)"
+                            label="26(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p26"
-                            label="26(pm)"
+                            label="26(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a27"
-                            label="27(am)"
+                            label="27(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p27"
-                            label="27(pm)"
+                            label="27(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a28"
-                            label="28(am)"
+                            label="28(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p28"
-                            label="28(pm)"
+                            label="28(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a29"
-                            label="29(am)"
+                            label="29(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p29"
-                            label="29(pm)"
+                            label="29(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a30"
-                            label="30(am)"
+                            label="30(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p30"
-                            label="30(pm)"
+                            label="30(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="a31"
-                            label="31(am)"
+                            label="31(上午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
                     <el-table-column
                             prop="p31"
-                            label="31(pm)"
+                            label="31(下午)"
                             :formatter="stateTypeform">
 
                     </el-table-column>
@@ -731,7 +731,7 @@
             layer.msg("姓名丶卡号丶人员类别丶部门四个查询条件至少选择一个！", {icon: 1, time: 2000});
             return ;
         }
-        layer.msg("正在生成报表,请稍等！", {icon: 1, time: 5000});
+        layer.msg("正在生成报表,请稍等！", {icon: 1, time: 3000});
         $.ajax({
             type:"post",
             dataType:"json",
@@ -746,7 +746,7 @@
             success:function(ret){
                 _self.totSize=ret.PageResult.totalCount;
                 _self.tableData=ret.PageResult.list;
-                alert(_self.tableData)
+            //    alert(_self.tableData)
                 if(_self.totSize == 0 ){
                     layer.msg("暂无数据", {icon: 2, time: 1000});
                 }