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

EBook.Web/AnsText/21255.json

@@ -8,7 +8,7 @@
     "Type": 3
   },
   {
-    "AudioLength": 10,
+    "AudioLength": 999,
     "AudioUrl": "http://172.16.41.241:10103/http_TBookEditor51/exerciseAnswerAudio/2020-12-04_04-52-14.wav",
     "Id": "1",
     "Score": 0.0,

EBook.Web/Common/tasklib_book.js

@@ -614,9 +614,12 @@ function bindEventYS() {
     $("td").attr("style", "");
     $(".container-table").on("touchstart", function () {
         pressTableFlag = true;
-    });
-    $(document).on("touchend", function () {
+        var HtmlStr = "<div class='TextShow' style='width:200px;height:20px;position:fixed;left:100px;top:100px;background-color:red;color:#fff;'>true</div>";
+        $(this).after(HtmlStr);
+    }).on("touchend", function () {
         pressTableFlag = false;
+        var HtmlStr = "<div class='TextShow' style='width:200px;height:20px;position:fixed;left:100px;top:100px;background-color:black;color:#fff;'>false</div>";
+        $(this).after(HtmlStr);
     });
 }
 var pressTableFlag = false;
@@ -1000,8 +1003,10 @@ function backupAllAnswer(answerJson, statusType) {
             answerList[index].IsKY = $(item).attr("answer-isky");//是否是口语试题，0-不是口语题，1-是口语题
 
             //添加音频控制
+            var hasAudio = false;
             var audioElement = $(item).children(".answer-audio-range").children("img").eq(0);
             if ((answerList[index].Type == 3 || answerList[index].Type == 4) && answerList[index].AudioUrl != "") {
+                hasAudio = true;
                 $(item).children(".answer-point-range").hide();
                 $(item).children(".answer-audio-range").css("display", "inline-block");
                 $(item).children(".answer-audio-range").children("span").text("作答音频(" + answerList[index].AudioLength + "s)");
@@ -1047,12 +1052,19 @@ function backupAllAnswer(answerJson, statusType) {
                 $(item).unbind('click');
                 //填充作答内容
                 $(item).attr("answer-text", mytext);
-                if (mytext == "") {
+                if (mytext == "" && !hasAudio) {
                     mytext = "未作答";
+                    $(item).children(".answer-text").show();
+                    $(item).children(".answer-text").text(mytext);
                     $(item).children(".answer-text").addClass("no-answer");
                 }
-                $(item).children(".answer-text").show();
-                $(item).children(".answer-text").text(mytext);
+                else if (mytext == "" && hasAudio) {
+                    $(item).children(".answer-text").hide();
+                }
+                else {
+                    $(item).children(".answer-text").show();
+                    $(item).children(".answer-text").text(mytext);
+                }
                 $(item).children(".answer-point-range").hide();
             }
             //已评阅，查看评阅详情
@@ -1068,12 +1080,19 @@ function backupAllAnswer(answerJson, statusType) {
                 }
                 else {
                     $(item).attr("answer-text", mytext);//填充作答内容
-                    if (mytext == "") {
+                    if (mytext == "" && !hasAudio) {
                         mytext = "未作答";
+                        $(item).children(".answer-text").show();
+                        $(item).children(".answer-text").text(mytext);
                         $(item).children(".answer-text").addClass("no-answer");
                     }
-                    $(item).children(".answer-text").show();
-                    $(item).children(".answer-text").text(mytext);
+                    else if (mytext == "" && hasAudio) {
+                        $(item).children(".answer-text").hide();
+                    }
+                    else {
+                        $(item).children(".answer-text").show();
+                        $(item).children(".answer-text").text(mytext);
+                    }
                     $(item).children(".answer-point-range").hide();
                 }
 

EBook.Web/Test.html

@@ -41,13 +41,13 @@
         //加载数据
         window.onload = function () {
             //加载听说课文
-            answerjson = $.ajax({ url: "AnsText/duogouxuan.json", async: false }).responseText;
+            answerjson = $.ajax({ url: "AnsText/21255.json", async: false }).responseText;
             reviewjson = $.ajax({ url: "AnsText/anstext.txt", async: false }).responseText;
             hightcodejson = $.ajax({ url: "HightCode/210511.json", async: false }).responseText;
         }
         //加载听说课文
         $("#load-text").on("click", function () {
-            var data = $.ajax({ url: "lghp/gaicuo.lghp", async: false }).responseText;
+            var data = $.ajax({ url: "lghp/21255.lghp", async: false }).responseText;
             $("#data").html(data);
 
             Fill(JSON.parse(hightcodejson));
@@ -104,7 +104,7 @@
         });
         //回显习题答案
         $("#backup-answer").on("click", function () {
-            backupAllAnswer(answerjson, 0);
+            backupAllAnswer(answerjson, 1);
             //var answerJson = "{\"AudioLength\":3,\"AudioUrl\":\"http://172.16.41.241:10103/http_TBookEditor51/exerciseAnswerAudio/2020-11-06_09-31-19.wav\",\"Id\":\"18\",\"Text\":\"\",\"Type\":3}";
             //reviewAnswer(answerJson);
         });