Browse Source

Merge branch 'master' into android

pengmi 4 years ago
parent
commit
befd8cedc3
2 changed files with 9 additions and 1 deletions
  1. 7 1
      EBook.Web/Common/tasklib_book.js
  2. 2 0
      EBook.Web/EBook.Web.csproj

+ 7 - 1
EBook.Web/Common/tasklib_book.js

@@ -738,6 +738,10 @@ function showHideAnswerEx(isShowYX, isShowAS) {
     }
     else {
         $(".yaoshi").hide();
+        // 视听说学生端原文、传统教材都是没有钥匙的(直接隐藏掉)
+        var JQStr = "*[showflag='1']";
+        $(JQStr).attr("showflag", "0");
+        $(".checkbox").find("input").prop('checked', false);
     }
     if (isShowAS) {
         $.each($(".yaoshi"), function (index, item) {
@@ -1834,7 +1838,9 @@ function backupAllAnswer(answerJson, statusType) {
             });
         }
     }
-    dealRecvShowFill();
+    if (statusType == 1 || statusType == 2) {
+        dealRecvShowFill();
+    }
 }
 
 //老师评阅学生作答

+ 2 - 0
EBook.Web/EBook.Web.csproj

@@ -184,6 +184,8 @@
     <Content Include="Service\terms_of_service.html" />
     <Content Include="Service\terms_of_service1.html" />
     <Content Include="source.html" />
+    <Content Include="Source\原文.txt" />
+    <Content Include="Source\混排测试原文.txt" />
     <Content Include="TagWord\AudioContent.html" />
     <Content Include="TagWord\AudioTraining.css" />
     <Content Include="TagWord\AudioTraining.js" />