From 2ce09a2057114e026925bbd917b82f2a7f60f1e1 Mon Sep 17 00:00:00 2001 From: jack-rabbit <376168706@qq.com> Date: Tue, 20 Aug 2019 11:19:47 +0800 Subject: [PATCH] 1.修改bug --- WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp | 16 +++++++++------- WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper1.jsp | 2 +- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp | 9 ++++++++- WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp | 7 +++++-- WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp | 3 ++- WebRoot/WEB-INF/jsp/system/index/login.jsp | 11 +++-------- WebRoot/static/js/teach_paper.js | 31 +++++++++++++++++-------------- WebRoot/static/js/teach_paper1.js | 2 +- WebRoot/static/js/test_list.js | 32 ++++++++++++++++++-------------- 11 files changed, 66 insertions(+), 51 deletions(-) diff --git a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp index 8ff55c3..b6c01cf 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/grade/grade_edit2.jsp @@ -34,7 +34,7 @@
- +
科目名称:年级名称:
+ + + @@ -57,7 +60,11 @@ - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp index 28e9cdb..8d53835 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp @@ -53,7 +53,10 @@ - + @@ -106,7 +109,7 @@ - + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp index 6d00e96..423d807 100644 --- a/WebRoot/WEB-INF/jsp/system/index/login.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp @@ -175,7 +175,7 @@ body{ $("#loginname").tips({ side : 2, msg : '用户名不得为空', - bg : '#AE81FF', + bg : '#FF5080', time : 3 }); showfh(); @@ -188,7 +188,7 @@ body{ $("#password").tips({ side : 2, msg : '密码不得为空', - bg : '#AE81FF', + bg : '#FF5080', time : 3 }); showfh(); @@ -196,12 +196,7 @@ body{ return false; } - $("#loginbox").tips({ - side : 1, - msg : '正在登录 , 请稍后 ...', - bg : '#68B500', - time : 10 - }); + return true; } diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js index a0a1f25..82e03b5 100644 --- a/WebRoot/static/js/teach_paper.js +++ b/WebRoot/static/js/teach_paper.js @@ -4,7 +4,6 @@ subject_id="", class_id=""; $(document).ready(function(){ - timeList(); $.ajax({ url:url+"/teacher/info", @@ -12,21 +11,25 @@ type:"post", success:function(data){ console.log(data); - if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){ - subject_id=data.data.subjectList[0].SUBJECT_ID; - } - user_id=data.data.ID; - - if(data.data.classInfoList.length>0){ - for(var i=0;i'+data.data.classInfoList[i].CLASS_NAME+''; - option_html += '' + if(data!=null){ + if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){ + subject_id=data.data.subjectList[0].SUBJECT_ID; } - $(".classList").html(class_html+'
'); - $(".classList li").eq(0).addClass("active"); - $("#dealer_id_2").html(option_html); + user_id=data.data.ID; + + if(data.data.classInfoList.length>0){ + for(var i=0;i'+data.data.classInfoList[i].CLASS_NAME+''; + option_html += '' + } + $(".classList").html(class_html+'
'); + $(".classList li").eq(0).addClass("active"); + $("#dealer_id_2").html(option_html); + } + getList(); + }else{ + window.top.loading.remove(); } - getList(); }, error: function (XMLHttpRequest, textStatus, errorThrown) { // wrong massage diff --git a/WebRoot/static/js/teach_paper1.js b/WebRoot/static/js/teach_paper1.js index ecef41f..328bd46 100644 --- a/WebRoot/static/js/teach_paper1.js +++ b/WebRoot/static/js/teach_paper1.js @@ -5,7 +5,7 @@ subject_id="", class_id=""; $(document).ready(function(){ - + $(".table_box").css("padding-top",$(".head_box").height()); timeList(); $.ajax({ url:url+"/SunvoteEducation/teacher/info", diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js index 53765ad..780d2d0 100644 --- a/WebRoot/static/js/test_list.js +++ b/WebRoot/static/js/test_list.js @@ -65,21 +65,25 @@ function getList(start_date, end_date, class_id) { // 获取测验列表 }, success : function(data) { console.log(data); - for (var i = 0; i < data.data.length; i++) { - tab_html += '' + if(data.length>0){ + for (var i = 0; i < data.data.length; i++) { + tab_html += '' + } + $("#tab_body").html(tab_html); + }else{ + $("#tab_body").html(''); } - $("#tab_body").html(tab_html); }, error: function (XMLHttpRequest, textStatus, errorThrown) { // 错误信息 -- libgit2 0.21.4
姓名:
密码: + + + +
性别:
原密码: + + +
新密码:
' - + (i + 1) - + '' - + data.data[i].name - + '' - + getClassName(data.data[i].classId) - + '' - + data.data[i].createDate - + '查看详情     
' + + (i + 1) + + '' + + data.data[i].name + + '' + + getClassName(data.data[i].classId) + + '' + + data.data[i].createDate + + '查看详情     
暂无数据