Commit c3639430ae45e152a0b551bafa1a07dfdc222220

Authored by 孙向锦
1 parent 338594c8

修改页面bug

WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp
@@ -12,11 +12,12 @@ @@ -12,11 +12,12 @@
12 <head> 12 <head>
13 <base href="<%=basePath%>"> 13 <base href="<%=basePath%>">
14 <!-- 下拉框 --> 14 <!-- 下拉框 -->
  15 +<!--
15 <link rel="stylesheet" href="static/ace/css/chosen.css" /> 16 <link rel="stylesheet" href="static/ace/css/chosen.css" />
16 <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> 17 <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
17 <script type="text/javascript" src="http://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script> 18 <script type="text/javascript" src="http://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script>
18 <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 19 <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
19 -<!-- jsp文件头和头部 --> 20 + --><!-- jsp文件头和头部 -->
20 <%@ include file="../../system/index/top.jsp"%> 21 <%@ include file="../../system/index/top.jsp"%>
21 <!-- 日期框 --> 22 <!-- 日期框 -->
22 <link rel="stylesheet" href="static/ace/css/datepicker.css" /> 23 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
1 -<!DOCTYPE html>  
2 -<html> 1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%
  5 + String path = request.getContextPath();
  6 + String basePath = request.getScheme() + "://"
  7 + + request.getServerName() + ":" + request.getServerPort()
  8 + + path + "/";
  9 +%>
  10 +
  11 +<!DOCTYPE html>
  12 +
  13 +<html lang="en">
3 <head> 14 <head>
4 <title>创建试卷</title> 15 <title>创建试卷</title>
5 <!-- 最新版本的 Bootstrap 核心 CSS 文件 --> 16 <!-- 最新版本的 Bootstrap 核心 CSS 文件 -->
@@ -201,6 +212,7 @@ @@ -201,6 +212,7 @@
201 </div><!-- /.modal --> 212 </div><!-- /.modal -->
202 <script> 213 <script>
203 var testData = ${pd.JSON}; 214 var testData = ${pd.JSON};
  215 + var URL = "<%=basePath%>api/v1/uploadpaper";
204 //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]}; 216 //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"单选","option_num":"","option_content":"","answer":"","difficulty":"","analysis":"","question_from":"","score":1,"part_score":"","remark":"","rank":"1","no_name":"一、","questions":[{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.1"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"B","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.2"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"C","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.3"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"D","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.4"},{"chapter_id":"0","problem_type_id":"0","knowledge_id":"0","content":"","option_num":4,"option_content":"","answer":"A","difficulty":"0","analysis":"","question_from":"1","score":1,"part_score":"0","remark":"","rank":"2","no_name":"1.5"}]}]};
205 //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]}; 217 //var testData={"title":"TEST1","exam_time":46,"paper_type":"1","subject_id":"1","grade_id":"1","user_id":"1","score":5,"questions":[]};
206 </script> 218 </script>
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -60,10 +60,15 @@ @@ -60,10 +60,15 @@
60 src="plugins/websocketInstantMsg/ext4/ext-all-debug.js"></script> 60 src="plugins/websocketInstantMsg/ext4/ext-all-debug.js"></script>
61 <script type="text/javascript" 61 <script type="text/javascript"
62 src="plugins/websocketInstantMsg/websocket.js"></script> 62 src="plugins/websocketInstantMsg/websocket.js"></script>
  63 +<!-- 即时通讯 -->
  64 +<!--
63 <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous"> 65 <link rel="stylesheet" href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
64 -<script type="text/javascript" src="http://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script>  
65 <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script> 66 <script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
66 -<!-- 即时通讯 --> 67 + <script type="text/javascript" src="http://libs.baidu.com/jquery/1.11.1/jquery.min.js"></script>
  68 + -->
  69 +
  70 +
  71 +
67 72
68 </head> 73 </head>
69 <body class="no-skin"> 74 <body class="no-skin">
@@ -191,10 +196,10 @@ @@ -191,10 +196,10 @@
191 </div><!-- /.modal --> 196 </div><!-- /.modal -->
192 <script> 197 <script>
193 $("#time_submit").click(function(){ 198 $("#time_submit").click(function(){
194 - $(".title_time").modal("hide");  
195 var name = $("#enter_title").val(); 199 var name = $("#enter_title").val();
196 var time = $("#enter_time").val(); 200 var time = $("#enter_time").val();
197 window.open("<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time); 201 window.open("<%=basePath%>" + "paper/npaper.do?" + "name=" + name + "&time=" + time);
  202 + $(".title_time").hide();
198 }); 203 });
199 </script> 204 </script>
200 205
WebRoot/static/js/control.js
@@ -208,7 +208,7 @@ @@ -208,7 +208,7 @@
208 }) 208 })
209 /*提交保存数据*/ 209 /*提交保存数据*/
210 $("#save").click(function(){ 210 $("#save").click(function(){
211 - var url="http://192.168.0.240:8080/SunvoteEducation/api/v1/uploadpaper"; 211 + var url= URL;
212 var data={ 212 var data={
213 title: $(".text-center").text(), 213 title: $(".text-center").text(),
214 exam_time: parseInt($("#time").text()), 214 exam_time: parseInt($("#time").text()),