diff --git a/web/src/main/resources/templates/jlw/teacher/studentLogin.html b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
index 6043becb..e2e8ef2e 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentLogin.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentLogin.html
@@ -83,8 +83,8 @@
             even:true,
             // skin:'nob',
             size:"lg",
-            method : 'post',
-            url : Common.ctxPath + '/jlw/student/logList.json' // 数据接口
+            method : 'get',
+            url : Common.ctxPath + '/jlw/student/studentLogList.json' // 数据接口
             ,page : Lib.tablePage // 开启分页
             ,limit : 10,
             cols : [ [ // 表头
diff --git a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
index 627b0147..b2534dd2 100644
--- a/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
+++ b/web/src/main/resources/templates/jlw/teacher/studentUsageLog.html
@@ -9,100 +9,132 @@
         color: white!important;
     }
     .xxmc{
-        white-space: nowrap;text-overflow:ellipsis;line-height: 37px;font-size: 16px;padding-left: 10px;width: auto !important;min-width: 200px;max-width: 300px;overflow: hidden;height: 37px;
+        white-space: nowrap;
+        text-overflow:ellipsis;
+        line-height: 37px;font-size: 16px;
+        padding-left: 10px;
+        width: auto !important;
+        min-width: 200px;
+        max-width: 300px;
+        overflow: hidden;
+        height: 37px;
     }
+    .layui-form-item .layui-input-inline,.layui-form-item .layui-inline {
+        margin-right: 0px;
+    }
+
 </style>
-<div class="layui-row" style="margin-bottom:10px;"><h2>使用日志</h2></div>
-<form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
-    <div class="layui-form-item" style="margin-bottom: 0;">
-        <!--beTeacher :1是院校老师 2：不是-->
-        <!--#if(beTeacher == 1){ -->
-        <div class="layui-input-inline xxmc">
-            学校名称：${universitiesCollegesName}
-        </div>
-        <div class="layui-input-inline xxmc">
-            所属平台：${resourcesApplicationList[0].applicationName}
-        </div>
-        <label class="layui-form-label">教师工号</label>
-        <!--#}else{ -->
-        <div class="layui-inline" style="float: left;">
-            <label class="layui-form-label">所属院校</label>
-            <div class="layui-input-inline">
-                <layui:simpleDictSelect style='layui-input-inline' type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
-                                        id="universitiesCollegesId" name="universitiesCollegesId" layFilter="select_universitiesColleges"/>
+
+
+<div class="layui-col-md9">
+    <form id="searchForm" class="layui-form" style="background-color: #fdfdfd;padding: 10px 0;margin-bottom: 10px;">
+        <div class="layui-form-item" style="margin-bottom: 0;">
+            <div class="layui-inline">
+                <label class="layui-form-label">用户名：</label>
+                <div class="layui-input-inline">
+                    <input type="text" name="name" placeholder="请输入建设条件" autocomplete="off" class="layui-input">
+                </div>
             </div>
-        </div>
-        <div class="layui-inline" style="float: left;">
-            <label class="layui-form-label">所属平台</label>
-            <div class="layui-input-inline">
-                <select name="resourcesApplicationId">
-                    <option value="">全部</option>
-                    <!--#for(item in resourcesApplicationList){ -->
-                    <option value="${item.resourcesApplicationId}">${item.applicationName}</option>
-                    <!--#} -->
-                </select>
+
+            <!--isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student-->
+            <!--#if(isSignRole.get()!''== 2){ -->
+            <div class="layui-inline">
+                <label class="layui-form-label">所属班级：</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline' type="school_class.class_name.class_status=1"
+                                            id="classId" name="classId"/>
+                </div>
             </div>
+            <!--#}else{ -->
+            <div class="layui-inline">
+                <label class="layui-form-label">所属院校</label>
+                <div class="layui-input-inline">
+                    <layui:simpleDictSelect style='layui-input-inline'
+                                            type="universities_colleges.universities_colleges_name.universities_colleges_status=1"
+                                            id="universitiesCollegesId" name="universitiesCollegesId"
+                                            layFilter="select_universitiesColleges"/>
+                </div>
+            </div>
+            <!--#} -->
+
+            <div class="layui-inline">
+                <label class="layui-form-label">登录时间</label>
+                <div class="layui-input-inline">
+                    <input type="text" class="layui-input" id="test5" name="loginTime"
+                           placeholder="请输入登录时间">
+                </div>
+            </div>
+
         </div>
-        <!--#} -->
-        <label class="layui-form-label">教师名称：</label>
-        <div class="layui-input-inline">
-            <input type="text" name="teacherName" placeholder="请输入教师名称" autocomplete="off" class="layui-input">
-        </div>
-        <div class="layui-input-inline">
-            <input type="text" name="teacherJobNumber" placeholder="请输入教师工号" autocomplete="off" class="layui-input">
-        </div>
+    </form>
+</div>
+<div class="layui-col-md2">
+    <div class="layui-form-item" style="margin-top: 10px;">
+        <layui:accessButton function="teacher.query" id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索
+        </layui:accessButton>
+        <layui:accessButton function="teacher.add" action="export">导出</layui:accessButton>
     </div>
-</form>
-<div class="layui-btn-group">
-    <layui:accessButton function="teacher.query"  id="searchFormSearch" action="search"><i class="layui-icon">&#xe615;</i>搜索</layui:accessButton>
-<!--    <layui:accessButton function="teacher.add"  action="export">导出</layui:accessButton>-->
-    <layui:accessButton function="teacher.query"  action="refresh"><i class="layui-icon">&#xe669;</i>刷新</layui:accessButton>
+</div>
+<div class="layui-col-md12" style="padding-top: 35px">
+    <table id="teacherTable" lay-filter="teacherTable"></table>
 </div>
 
-<table id="teacherTable" lay-filter="teacherTable"></table>
 <!--#} -->
 <script>
 
-    layui.use([ 'form', 'laydate', 'table' ], function(){
+    layui.use(['form', 'laydate', 'table', 'laydate'], function () {
         var form = layui.form;
         var laydate = layui.laydate;
         var table = layui.table;
         var teacherTable = null;
+        var laydate = layui.laydate;
+        //日期时间选择器
+        laydate.render({
+            elem: '#test5'
+            , type: 'datetime'
+        });
+        console.log("${isSignRole.get()!''}" != 2)
         teacherTable = table.render({
             elem : '#teacherTable',
             height : Lib.getTableHeight(),
             cellMinWidth: 100,
             even:true,
             // skin:'nob',
-            method : 'post',
+            method: 'get',
             size:"lg",
-            url : Common.ctxPath + '/jlw/teacher/logList.json' // 数据接口
+            url: Common.ctxPath + '/jlw/student/studentUseLogList.json' // 数据接口
             ,page : Lib.tablePage // 开启分页
             ,limit : 10,
-            cols : [ [ // 表头
+            cols: [[ // 表头//isSignRole.get()!'' :1：admin+管理员 2:uniAdmin学院管理员 3:teacher 4student
                 {
-                    field : 'universitiesCollegesIdText', title : '院校名称',align: "center",hide:'${beTeacher}' != 1?false:true
+                    field: 'code0rName', title: '用户名', align: "center",
                 },
                 {
-                    field : 'teacherName', title : '教师名称',align: "center"
+                    field: 'code', title: '用户编号', align: "center",
                 },
                 {
-                    field : 'teacherJobNumber', title : '教师工号',align: "center"
+                    field: 'universitiesCollegesName', title: '所属院校', align: "center",
+                    hide: "${isSignRole.get()!''}" != 2 ? false : true
                 },
                 {
-                    field : 'platform', title : '平台',align: "center"
+                    field: 'universitiesCollegesProvince', title: '所属省份', align: "center",
+                    hide: "${isSignRole.get()!''}" != 2 ?  false: true,
                 },
                 {
-                    field : 'lastLoginTime', title : '登录时间',align: "center"
+                    field: 'className', title: '所属班级', align: "center",
+                    hide: "${isSignRole.get()!''}" != 2 ?  true: false
                 },
                 {
-                    field : 'onlineDuration', title : '在线时长',align: "center"
+                    field: 'platform', title: '使用子系统名称', align: "center",
                 },
                 {
-                    field : 'ip', title : '登录IP',align: "center"
+                    field: 'loginTime', title: '登入子系统时间', align: "center",
                 },
                 {
-                    field : 'ipAddress', title : 'IP归属地',align: "center"
+                    field: 'logoutTime', title: '登出子系统时间', align: "center",
+                },
+                {
+                    field: 'onlineDuration', title: '使用时长', align: "center",
                 }
             ] ]
         });
@@ -121,6 +153,12 @@
             },import:function (){
                 var url = "/jlw/teacher/importPage.do";
                 Common.openDlg(url,"");
+            },export:function () {//导出 /jlw/student/studentLogListExport.json
+                layer.confirm('是否确定导出学生信息？', function (index) {
+
+                    window.open(Common.ctxPath + "/jlw/student/studentLogListExport.json");
+                    layer.close(index);
+                });
             }
         };
         $('.ext-toolbar').on('click', function() {