Merge branch 'master' of http://192.168.3.18:3000/CallPro/EBook.git

EBook.Web/Common/tasklib_book.js

@@ -500,23 +500,24 @@ function handleAnswerRange() {
     $.each($(".multipleStart").nextUntil(".multipleEnd").filter("[class*='group']"), function (index, item) {
         $(item).find('input').removeAttr("onclick");
         $(item).find('input').prop('checked', false);
-        $(item).find('checkbox').bind("click", function () {
+        $(item).find('input').bind("click", function () {
             var curObj = new Object();
-            curObj.Id = $(this).attr("answer-id");//答题点ID
-            curObj.pId = $(this).attr("parent-anid");//答题点ID
-            curObj.IsKY = $(this).attr("answer-isky");//是否是口语试题，0-不是口语题，1-是口语题，2-打勾题
-            curObj.Text = $(this).attr("answer-text");//用户作答内容
-            curObj.Score = $(this).attr("answer-score");//作答评分
-            curObj.AnsText = $(this).attr("answer-anstext");//参考答案
-            curObj.Comment = $(this).attr("answer-comment");//评语
+            curObj.Id = $(this).parent().attr("answer-id");//答题点ID
+            curObj.pId = $(this).parent().attr("parent-anid");//答题点ID
+            curObj.IsKY = $(this).parent().attr("answer-isky");//是否是口语试题，0-不是口语题，1-是口语题，2-打勾题
+            //curObj.Text = $(this).parent().attr("answer-text");//用户作答内容
+            curObj.Score = $(this).parent().attr("answer-score");//作答评分
+            curObj.AnsText = $(this).parent().attr("answer-anstext");//参考答案
+            curObj.Comment = $(this).parent().attr("answer-comment");//评语
             curObj.pId = curObj.pId ? curObj.pId : curObj.Id;//组ID
+            curObj.Text = $(this).prop("checked") ? "√" : "";//用户作答内容
 
             $(".checkbox").removeClass("select-answer");
             $(".answer-body").removeClass("select-answer");
-            $(this).addClass("select-answer");
+            $(this).parent().addClass("select-answer");
 
             //已作答，弹出作答答案
-            if ($(this).data("ans-status") == "1") {
+            if ($(this).parent().data("ans-status") == "1") {
                 //移动端添加外部处理
                 onClickAnswerPoint(JSON.stringify(curObj));
             }
@@ -1039,7 +1040,7 @@ function playVisiableAudioCallBack(type, url) {
 
 function onClickAnswerPoint(data) {
     //alert(JSON.stringify(data));
-    //console.log(JSON.stringify(data));
+    console.log(JSON.stringify(data));
     cancelBubble();
     plugin.onClickAnswerPoint(data);
 }

EBook.Web/Test.html

@@ -47,7 +47,7 @@
         }
         //加载听说课文
         $("#load-text").on("click", function () {
-            var data = $.ajax({ url: "lghp/gaicuo.lghp", async: false }).responseText;
+            var data = $.ajax({ url: "lghp/gouxuan.lghp", async: false }).responseText;
             $("#data").html(data);
 
             //Fill(JSON.parse(hightcodejson));