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

EBook.Web/Common/tasklib_book.css

@@ -84,5 +84,5 @@ p .answer-body:first-child{
     overflow-y:hidden !important;
 }
 .container-table td{
-    min-width:90px;
+    min-width:135px;
 }

EBook.Web/Common/tasklib_book.js

@@ -614,7 +614,8 @@ function bindEventYS() {
     $("td").attr("style", "");
     $(".container-table").on("touchstart", function () {
         pressTableFlag = true;
-    }).on("touchend", function () {
+    });
+    $(document).on("touchend", function () {
         pressTableFlag = false;
     });
 }
@@ -833,16 +834,18 @@ function handleAnswerRange() {
     //添加答题点的点击UI及交互
     $.each($(".tag-span"), function (index, item) {
         var answerText = "";
+        var parentId = "";
         var isky = $(item).attr('answer-isky');
         var answerid = $(item).attr('answer-id');
 
         for (var i = 0; i < answerData.length; i++) {
             if (answerid == answerData[i].Id) {
+                parentId = answerData[i].pId;
                 answerText = answerData[i].AnsText;
                 break;
             }
         }
-        $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' answer-anstext='" + answerText + "' answer-isky='" + isky + "' answer-showanswer='0'><div class='answer-audio-range'><img src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range'><img src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text'></buttom></div>");
+        $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentId + "' answer-anstext='" + answerText + "' answer-isky='" + isky + "' answer-showanswer='0'><div class='answer-audio-range'><img src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range'><img src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text'></buttom></div>");
         //删除钥匙节点
         var prev = $("img[answer-id='" + answerid + "']");
         if (prev.length > 0) {
@@ -1019,7 +1022,6 @@ function backupAllAnswer(answerJson, statusType) {
                     recordAudioClick(this, answerList[index].Id, answerList[index].AudioUrl);
                 });
             }
-
             //可作答状态，作答还原
             if (statusType == 0) {
                 //已作答过，还原作答，增加作答后的UI节点
@@ -1055,7 +1057,6 @@ function backupAllAnswer(answerJson, statusType) {
             }
             //已评阅，查看评阅详情
             if (statusType == 2) {
-                $(item).attr("answer-showanswer", "1");  // 修改显示格式
                 //添加音频控制
                 if ((answerList[index].Type == 3 || answerList[index].Type == 4) && answerList[index].AudioUrl != "") {
                     //独立绑定事件
@@ -1084,6 +1085,14 @@ function backupAllAnswer(answerJson, statusType) {
                     $(item).children(".answer-text").addClass("good-answer");
                 }
             }
+            // 添加answer-boy的样式判断
+            var DStatusFlag = $(item).find(".answer-point-range").css("display") != "none";
+            if (DStatusFlag) {
+                $(item).attr("answer-showanswer", "0");  // 修改显示格式
+            }
+            else {
+                $(item).attr("answer-showanswer", "1");  // 修改显示格式
+            }
         });
         //打勾题的还原
         $.each($(".checkbox"), function (num, item) {

EBook.Web/Test.html

@@ -125,8 +125,8 @@
         });
         //定位滚动数据
         $("#scroll-review").on("click", function () {
-            //scrollAnswer(randomNum(0,answerData.length-1));
-            scrollAnswer(91);
+            scrollAnswer(randomNum(0,answerData.length-1));
+            //scrollAnswer(91);
         });
         //测试UI效果
         $("#test-ui").on("click", function () {