diff --git a/WebRoot/html/dangjian/view/exam.html b/WebRoot/html/dangjian/view/exam.html index 289ecce..ebcd264 100644 --- a/WebRoot/html/dangjian/view/exam.html +++ b/WebRoot/html/dangjian/view/exam.html @@ -202,7 +202,7 @@
[{{:type_name}}] {{:content}}
- {{if type_id == 3}} + {{if type_id == 2}} {{for xuanxiang}}
diff --git a/WebRoot/html/dangjian/view/login.html b/WebRoot/html/dangjian/view/login.html index 739ed53..644737f 100644 --- a/WebRoot/html/dangjian/view/login.html +++ b/WebRoot/html/dangjian/view/login.html @@ -13,7 +13,7 @@ body { background-image: url("../images/bg_img.png"); } - + .title2_div { text-align: center; } @@ -57,7 +57,7 @@ .title1_p { font-weight: 400; font-style: normal; - font-size: 22px; + font-size: 20px; color: #F4D7A1; line-height: 30px; word-wrap: break-word; @@ -213,8 +213,6 @@
- -
diff --git a/WebRoot/html/dangjian/view/login_old.html b/WebRoot/html/dangjian/view/login_old.html index 72202fa..02ba5d1 100644 --- a/WebRoot/html/dangjian/view/login_old.html +++ b/WebRoot/html/dangjian/view/login_old.html @@ -64,7 +64,6 @@
-
@@ -102,7 +101,6 @@ } else { mui.alert(res.message, '提示'); } - }, error: function (xhr, type, errorThrown) { //异常处理; diff --git a/WebRoot/html/dangjian/view/result.html b/WebRoot/html/dangjian/view/result.html index 9f34838..505396e 100644 --- a/WebRoot/html/dangjian/view/result.html +++ b/WebRoot/html/dangjian/view/result.html @@ -202,7 +202,7 @@ {{/if}} 正确答案:{{:answer}}
- +
diff --git a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java index 6ebc20f..f381514 100644 --- a/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java +++ b/src/main/java/com/dsideal/FengHuang/Exam/Model/ExamModel.java @@ -154,7 +154,7 @@ public class ExamModel { * 功能:获取整体信息,比如有几种题型,都是啥,每种题型有几道题 */ public List getExamInfo() { - String sql = "select t1.type_id,t2.type_name,count(1) as count from t_exam_question as t1 inner join t_exam_question_type as t2 on t1.type_id=t2.type_id group by t1.type_id,t2.type_name"; + String sql = "select t1.type_id,t2.type_name,t2.count from t_exam_question as t1 inner join t_exam_question_type as t2 on t1.type_id=t2.type_id group by t1.type_id,t2.type_name,t2.count"; List list = Db.find(sql); return list; }