diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit.jsp index 8703012..248c051 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit.jsp @@ -16,6 +16,8 @@ <%@ include file="../../system/index/top.jsp"%> + + @@ -30,7 +32,7 @@
- +
@@ -42,15 +44,7 @@ - - - - - - - - - + @@ -58,7 +52,7 @@
姓名:
密码:
所在学校:
权限:
联系电话:
保存 - 取消 + 取消
@@ -87,7 +81,7 @@ diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp index 90cb3cf..a81f77d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp @@ -36,23 +36,23 @@
- +
- + - + - + @@ -123,7 +123,7 @@ - +
练习标题
练习说明
指定班级完成时间
    -
  • +
@@ -109,7 +109,7 @@
题目数量+-题目数量+- 选项个数+- 分值+-
+ 确定布置 取消
@@ -182,7 +183,6 @@
- <%@ include file="../../system/index/foot.jsp"%> @@ -191,200 +191,50 @@ - + + } + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp index d3e4f0b..5a22421 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp @@ -93,8 +93,8 @@ ${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"} ${var.ALL_SCORE} - - + + @@ -150,18 +150,17 @@ function tosearch(){ $("#Form").submit(); } + function add(Id){ + var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id; + parent.$("#mainFrame").attr('src',path); + window.top.loading.show(); + } function edit(Id){ - window.top.modal.init({ - 'title':'布置练习', - 'width':1200, - 'height':600, - 'url':'<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id, - func:function() { - tosearch(); - } - }); - window.top.modal.show(); + var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id; + parent.$("#mainFrame").attr('src',path); + window.top.loading.show(); } + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index f27615f..c240a50 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -100,10 +100,10 @@
  • -

    练习列表

    +

    练习列表

  • -

    布置练习

    +

    布置练习

  • 练习报表

    @@ -176,7 +176,7 @@ window.top.loading.show(); } } - function homeWork(schoolId){ + function homeWorkList(schoolId){ //var path = "../school/goEdit2.do?ID=" + schoolId ; var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ; @@ -184,6 +184,14 @@ $("#mainFrame").attr('src',path); window.top.loading.show(); } + function homeWork(schoolId){ + //var path = "../school/goEdit2.do?ID=" + schoolId ; + + var path = '<%=basePath%>homework/goEdit2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ; + + $("#mainFrame").attr('src',path); + window.top.loading.show(); + } function report(classId){ //window.open('<%=basePath%>report/report.do?classid=' + classId); diff --git a/WebRoot/static/css/edit.css b/WebRoot/static/css/edit.css index d927de2..4d29e69 100644 --- a/WebRoot/static/css/edit.css +++ b/WebRoot/static/css/edit.css @@ -30,7 +30,7 @@ input[type="number"] { .homework_edit .subject_body_tabel .last img{width:24px;} .homework_edit .classBox{border:1px solid #ccc;padding-top:10px;} .homework_edit .classBox li{position:relative;text-align:left;float:left;width:275px;height:50px;list-style:none;padding:7px;margin-bottom:10px;margin-left:10px;font-size:18px;} -.homework_edit .classBox li span{vertical-align: text-bottom;} +.homework_edit .classBox li span{vertical-align: text-bottom;margin:0 5px;} .homework_edit .classBox li .date-picker{vertical-align: bottom;} .homework_edit .classBox li.checked{border:1px solid #1989FA;border-radius:4px;} .homework_edit .classBox li.checked span{color:#1989FA} diff --git a/WebRoot/static/js/control_homework.js b/WebRoot/static/js/control_homework.js new file mode 100644 index 0000000..09d7044 --- /dev/null +++ b/WebRoot/static/js/control_homework.js @@ -0,0 +1,318 @@ +var saveData={} //声明保存数据 + + $(document).on('click',"input[type='checkbox']",function(){ //选择班级 + console.log($(this).prop("checked")); + if($(this).prop('checked')){ + $(this).closest("li").attr("class","checked"); + }else{ + $(this).closest("li").removeClass("checked"); + } + + }); + var work={ //保存标题框中的数字框的值 + que_num:0, + ans_num:4, + score:0 + } + //点击+执行操作 + function creat_work(_id,index,num){//index:开始序号，num:目标序号 + + if(_id=="que_num"){ //新增题目 + for(j=index;j<=num;j++){ + $(".subject_body_tbody").append(''+j+'
      选项个数+-分值+-'); + for(i=0;i'+String.fromCharCode(0x41 + i)+'
      • ') + } + } + } + else if(_id=="ans_num"){//新增选项 + for(j=1;j<=work.que_num;j++){ //轮询每道题目 + var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目选项个数 + if(now_length'+String.fromCharCode(0x41 + i)+'') + } + } + if(now_length>work.ans_num){//当前题目选项个数大于数字框中个数，则把选项个数减少到数字框中的个数 + for(i=now_length;i>=work.ans_num;i--){ + $(".question"+j+" ul").find(".btn").eq(work.ans_num).remove(); + } + } + + } + + }else{ + if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id，但是class中含有ans_num，则为单个题目中的选项设置框 + var _index=_id.closest("tr").index()+1; + for(i=index;i<=num;i++){ + $(".question"+_index+" ul").append('
    • '+String.fromCharCode(0x41 + i-1)+'
      • ') + } + } + } + } + //点击-执行操作 + function remove_work(_id,index,num){ + + if(_id=="que_num"){ //减少题目 + for(i=index;i<=num;i++){ + $(".subject_body_tbody tr").eq(index).remove(); + } + } + if(_id=="ans_num"){ //减少选项 + for(j=1;j<=work.que_num;j++){ //轮询每道题目 + var now_length=$(".question"+j+" ul").find(".btn").length; //获取当前题目中的选项个数 + if(now_length>work.ans_num){ //如果当前选项个数大于数字框中的值，则减少选项个数到数字框中的个数 + for(i=now_length;i>=work.ans_num;i--){ + $(".question"+j+" ul").find(".btn").eq(work.ans_num).remove(); + } + } + if(now_length'+String.fromCharCode(0x41 + i)+'') + } + } + + } + }else{ + if(_id.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ //没有id值，但是类名中含有ans_num，则判断为单个题目中的选项设置框 + var _index=_id.closest("tr").index()+1; + for(i=index;i<=num;i++){ + $(".question"+_index+" ul").find(".btn").eq(index).remove(); + } + } + } + + } + //点击+按钮 + $(document).on("click",".add",function(){ + var _that=$(this); + var temp_num=0; + //获取当前按钮旁边数字框的值 + temp_num=parseInt(_that.siblings(".w_100").val()); + temp_num+=1; + //点击+号，数字框中的数字+1 + _that.siblings(".w_100").val(temp_num); + //如果数字框有id，则是标题栏上面的数字框 + if(_that.siblings(".w_100").attr("id")){ + //将下面的数字框的值设置成标题栏数字框的值 + var _class=_that.siblings(".w_100").attr("id"); + $("."+_class).val(temp_num); + //题目数 + if(_class=="que_num"){ + work.que_num=temp_num; + creat_work(_class,work.que_num,work.que_num); + } + //选项数 + if(_class=="ans_num"){ + work.ans_num=temp_num; + creat_work(_class,work.ans_num,work.ans_num); + } + } + else{ + if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ + creat_work(_that,temp_num,temp_num); + } + } + + }) + //点击-按钮 + $(document).on("click",".redu",function(){ + var _that=$(this); + var temp_num=0; + + temp_num=parseInt(_that.siblings(".w_100").val()); + temp_num-=1; + if(temp_num<0){ + temp_num=0; + return; + } + + _that.siblings(".w_100").val(temp_num); + + if(_that.siblings(".w_100").attr("id")){ + var _class=$(this).siblings(".w_100").attr("id"); + $("."+_class).val(temp_num); + + if(_class=="que_num"){ + work.que_num=temp_num; + remove_work(_class,work.que_num,work.que_num); + } + if(_class=="ans_num"){ + work.ans_num=temp_num; + remove_work(_class,work.ans_num,work.ans_num); + } + }else{ + if(_that.siblings(".w_100").attr("class").indexOf("ans_num")>-1){ + remove_work(_that,temp_num,temp_num); + } + } + + }) + $(document).on("click",".remove",function(){ + var _that=$(this); + _that.closest("tr").remove(); + work.que_num=$(".first").length; + $("#que_num").val(work.que_num); + for(i=0;i<$(".first").length;i++){ + //console.log($(".first").closest("tr").index()); + $(".first").eq(i).text(i+1); + $(".question").eq(i).attr("class","question question"+(i+1)); + } + }); + $(document).on("click","li.btn ",function(){ + if($(this).attr("class").indexOf("on")>-1) + $(this).removeClass("on"); + else + $(this).addClass("on"); + }); + $("#que_num").change(function(){ + var now_num=parseInt($("#que_num").val()); + var old_num=parseInt(work.que_num); + var _temp=now_num-old_num; + + if(_temp>0){ + creat_work($(this).attr("id"),(old_num+1),now_num); + }else{ + remove_work($(this).attr("id"),now_num,old_num); + } + + work.que_num=now_num; + + }) + $("#ans_num").change(function(){ + var now_num=parseInt($("#ans_num").val()); + var old_num=parseInt(work.ans_num); + var _temp=now_num-old_num; + + $(".ans_num").val(now_num); + work.ans_num=now_num; + + if(_temp>0){ + creat_work($(this).attr("id"),(old_num+1),now_num); + }else{ + remove_work($(this).attr("id"),now_num,old_num); + } + + + }); + + + + function save(){ + if($("#NAME").val()==""){ + $("#NAME").tips({ + side:3, + msg:'请输入练习标题', + bg:'#AE81FF', + time:2 + }); + $("#NAME").focus(); + return false; + } + if($("#HOMEWORK_DESC").val()==""){ + $("#HOMEWORK_DESC").tips({ + side:3, + msg:'请输入练习说明', + bg:'#AE81FF', + time:2 + }); + $("#HOMEWORK_DESC").focus(); + return false; + } + var all_score=0; + for(var i=0;i0){ + for(var j=0;j<$(".checked").length;j++){ + var _index=$(".checked").eq(j).index(); + console.log($(".date-picker").eq(_index).val()); + if($(".date-picker").eq(_index).val()==''){ + $(".date-picker").eq(_index).tips({ + side:3, + msg:'请指定时间', + bg:'#AE81FF', + time:2 + }); + return false; + } + + CLASSLIST[j]={ + CLASS_ID:$("#class"+_index).val(), + COMPLETE_DATE:$(".date-picker").eq(_index).val() + }; + + } + }else{ + $(".classBox").tips({ + side:3, + msg:'请选择班级和指定时间', + bg:'#AE81FF', + time:2 + }); + return false; + } + + if(work.que_num<=0){ + $('.subject').tips({ + side:3, + msg:'请添加题目', + bg:'#AE81FF', + time:2 + }); + return false; + } + var QUESTIONS=[]; + for(var k=0;k1){ + type=2; + }else{ + type=1; + } + + QUESTIONS[k].RIGHT_ANSWER=right_ans; + QUESTIONS[k].TYPE=type; + } + + + saveData.TEACHER_ID=$("#TEACHER_ID").val(); + saveData.NAME=$("#NAME").val(); + saveData.HOMEWORK_DESC=$("#HOMEWORK_DESC").val(); + saveData.ALL_SCORE=all_score; + saveData.CLASSLIST=CLASSLIST; + saveData.QUESTION_COUNT=work.que_num; + saveData.QUESTIONS=QUESTIONS; + + //console.log(saveData); + save_data(JSON.stringify(saveData)); + + + } + + \ No newline at end of file diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 2c5ab48..2110d50 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -175,6 +175,7 @@ public class HomeworkController extends BaseController { pd = this.getPageData(); pd = homeworkService.findById(pd); // 根据ID读取 pd.put("PROBLEMS", homeworkproblemService.listProblem(pd)); + pd.put("TEACHER_ID", geTeacherID()); mv.setViewName("sunvote/homework/homework_edit2"); mv.addObject("msg", "edit"); mv.addObject("pd", pd);