namejr пре 4 година
родитељ
комит
8f41319c58
1 измењених фајлова са 40 додато и 9 уклоњено
  1. 40 9
      EBook.Web/Common/new_tasklib_book.js

+ 40 - 9
EBook.Web/Common/new_tasklib_book.js

@@ -1630,12 +1630,26 @@ function backupAllAnswer(answerJson, statusType) {
                                     }
                                     else if (TFlag == "phrase" && IndexVal > -1) {
                                         var TNHtmlArr = NHtmlStr.split(TText);
-                                        var RHtml = TNHtmlArr[0] + ' <span id="' + aItem.HightCode + '" class="phraseStyle" name="P' + aItem.HightCode + '" flag="phrase" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" data-setstatus="1" data-lstatus="2" onselectstart="return true">' + TText + '</span> ' + TNHtmlArr[1];
+                                        var ThitCode = "";
+                                        if (aItem.HightCode != 'undefined' && aItem.HightCode != null && aItem.HightCode != "") {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        else {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        var RHtml = TNHtmlArr[0] + ' <span id="' + aItem.HightCode + '" class="phraseStyle" name="P' + aItem.HightCode + '" flag="phrase" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" data-setstatus="1" data-lstatus="2" hitCode="' + ThitCode + '" onselectstart="return true">' + TText + '</span> ' + TNHtmlArr[1];
                                         NHtmlStr = NHtmlStr.replace(TText, RHtml);
                                     }
                                     else if (TFlag == "word" && IndexVal > -1) {
                                         var TNHtmlArr = NHtmlStr.split(TText);
-                                        var RHtml = TNHtmlArr[0] + ' <span id="' + aItem.HightCode + '" class="wordStyle" name="W' + aItem.HightCode + '" flag="word" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" data-setstatus="1" data-lstatus="1" onselectstart="return true">' + TText + '</span> ' + TNHtmlArr[1];
+                                        var ThitCode = "";
+                                        if (aItem.HightCode != 'undefined' && aItem.HightCode != null && aItem.HightCode != "") {
+                                            ThitCode = aItem.HightCode + "|" +aItem.SourceCode;
+                                        }
+                                        else {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        var RHtml = TNHtmlArr[0] + ' <span id="' + aItem.HightCode + '" class="wordStyle" name="W' + aItem.HightCode + '" flag="word" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" data-setstatus="1" data-lstatus="1" hitCode="' +ThitCode + '" onselectstart="return true">' +TText + '</span> ' +TNHtmlArr[1];
                                         NHtmlStr = NHtmlStr.replace(TText, RHtml);
                                     }
                                 }
@@ -1739,7 +1753,14 @@ function backupAllAnswer(answerJson, statusType) {
                                     var TText = $(".underlineContent[yaoshi-flag='" + answerid + "']").find("span[id='" + aItem.HightCode + "']").text();
                                     TText = ChangeSpaceStr(TText);
                                     if (TFlag == "sentence" && NHtmlStr.indexOf(TText) > -1) {
-                                        var RHtml = '<span id="' + aItem.HightCode + '" name="S' + aItem.HightCode + '" flag="sentence" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" onselectstart="return true"></span>';
+                                        var ThitCode = "";
+                                        if (aItem.HightCode != 'undefined' && aItem.HightCode != null && aItem.HightCode != "") {
+                                            ThitCode = aItem.HightCode + "|" +aItem.SourceCode;
+                                        }
+                                        else {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        var RHtml = '<span id="' + aItem.HightCode + '" name="S' + aItem.HightCode + '" flag="sentence" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" hitCode="' + ThitCode + '" onselectstart="return true"></span>';
                                         NHtmlStr = NHtmlStr.replace(TText, RHtml);
                                         if (NHtmlArr != null && NHtmlArr.indexOf(TText) > -1) {
                                             // 存在的话,同时替换便于一会更新
@@ -1751,7 +1772,14 @@ function backupAllAnswer(answerJson, statusType) {
                                         }
                                     }
                                     else if (TFlag == "phrase" && NHtmlStr.indexOf(TText) > -1) {
-                                        var RHtml = '<span id="' + aItem.HightCode + '" name="P' + aItem.HightCode + '" flag="phrase" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" onselectstart="return true"></span>';
+                                        var ThitCode = "";
+                                        if (aItem.HightCode != 'undefined' && aItem.HightCode != null && aItem.HightCode != "") {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        else {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        var RHtml = '<span id="' + aItem.HightCode + '" name="P' + aItem.HightCode + '" flag="phrase" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" hitCode="' +ThitCode + '" onselectstart="return true"></span>';
                                         NHtmlStr = NHtmlStr.replace(TText, RHtml);
                                         if (NHtmlArr != null && NHtmlArr.indexOf(TText) > -1) {
                                             // 存在的话,同时替换便于一会更新
@@ -1763,7 +1791,14 @@ function backupAllAnswer(answerJson, statusType) {
                                         }
                                     }
                                     else if (TFlag == "word" && NHtmlStr.indexOf(TText) > -1) {
-                                        var RHtml = '<span id="' + aItem.HightCode + '" name="W' + aItem.HightCode + '" flag="word" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" onselectstart="return true"></span>';
+                                        var ThitCode = "";
+                                        if (aItem.HightCode != 'undefined' && aItem.HightCode != null && aItem.HightCode != "") {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        else {
+                                            ThitCode = aItem.HightCode + "|" + aItem.SourceCode;
+                                        }
+                                        var RHtml = '<span id="' + aItem.HightCode + '" name="W' + aItem.HightCode + '" flag="word" iskeyklg="' + TIskeyklg + '" espflag="' + TEspflag + '" ktype="' + TKtype + '" kcode="' + aItem.HightCode + "|" + aItem.SourceCode + '" hitCode="' +ThitCode + '" onselectstart="return true"></span>';
                                         NHtmlStr = NHtmlStr.replace(TText, RHtml);
                                         if (NHtmlArr != null && NHtmlArr.indexOf(TText) > -1) {
                                             // 存在的话,同时替换便于一会更新
@@ -2026,7 +2061,6 @@ function AddClickEvent() {
         if (datalstatus != "1") {
             return;  // 不能点击
         }
-        //var ThitCode = $(this).attr("hitCode");
         hitCodeFunc($(this).attr("hitCode"));
     });
     $(".phraseStyle").on("click", function () {
@@ -2038,7 +2072,6 @@ function AddClickEvent() {
         if (datalstatus != "2") {
             return;  // 不能点击
         }
-        //var ThitCode = $(this).attr("hitCode");
         hitCodeFunc($(this).attr("hitCode"));
     });
     $(".sentenceStyle").on("click", function () {
@@ -2050,7 +2083,6 @@ function AddClickEvent() {
         if (datalstatus != "3") {
             return;  // 不能点击
         }
-        //var ThitCode = $(this).attr("hitCode");
         hitCodeFunc($(this).attr("hitCode"));
     });
     $(".sentImagcs").on("click", function () {
@@ -2062,7 +2094,6 @@ function AddClickEvent() {
         if (datalstatus != "3") {
             return;  // 不能点击
         }
-        //var ThitCode = $(this).attr("hitCode");
         hitCodeFunc($(this).next(".sentenceStyle").attr("hitCode"));
     });
     // 绑定播放作答音频