Merge branch 'PCAssist'

EBook.Web/Common/tasklib_book.css

@@ -4,11 +4,11 @@ p{word-break: break-word;word-wrap: break-word;clear:both;line-height: 22px;}
 .answer-body {border-radius: 5px;display:inline-block;margin-bottom:-1px;margin-top:8px;}
 .answer-body[answer-showanswer='1']{display:inline;}
 .answer-body[data-astatus='0'] {
+    height: 22px;
     border: 1px solid #6ab7ff;
     margin-bottom: 5px;
 }
 .answer-body[data-astatus='3'] {
-    /*border-bottom: 1px solid #979797;*/
     margin-bottom: 5px;
 }
 p .answer-body{
@@ -25,19 +25,13 @@ p .answer-body:first-child{
 .answer-audio-range span { float:left;margin-left:4px; margin-right:5px;color:#6ab7ff;line-height:19px;font-size:15px;}
 
 /*答题点区域*/
-.answer-point-range { border-radius: 5px;height:20px;display:inline-block;}
-.answer-point-range img {float:left;margin-left:3px;margin-top:4px;width:16px;height:16px;}
-.answer-point-range span { float:left;margin-left:3px; margin-right:7px;color:#6ab7ff;line-height:27px;font-size:16px;}
-table .answer-point-range {margin-top:5px;}
-table .answer-point-range span {line-height:22px;}
-table .answer-point-range img {margin-top:2px;}
-.answer-body[mobile-type='2'] .answer-point-range { border-radius: 5px;height:25px;display:inline-block;}
+.answer-point-range { border-radius: 5px;height:22px;display:inline-block;}
+.answer-point-range img {float:left;margin-left:3px;margin-top:3px;width:16px;height:16px;}
+.answer-point-range span { float:left;margin-left:3px; margin-right:7px;color:#6ab7ff;line-height:22px;font-size:16px;}
 /*作答内容*/
-.answer-text { margin-left:5px; margin-right:8px;color:#6ab7ff;height:20px;line-height:25px;font-size:16px;word-break:break-word;word-wrap:break-word;display:inline-block;text-indent:0;display:none;border-bottom: 1px solid #979797;margin-bottom:5px;}
+.answer-text { margin-left:5px; margin-right:8px;color:#6ab7ff;font-size:16px;word-break:break-word;word-wrap:break-word;display:inline-block;text-indent:0;display:none;border-bottom: 1px solid #979797;margin-bottom:5px;padding-bottom:1px;}
 /*评阅及点击相关样式*/
 .no-answer { color:#ff6600;text-decoration:none;border-bottom: 1px solid #979797;}
-/*.bad-answer { color:red; }
-.good-answer { color:green; }*/
 .select-answer{
     border: none !important;
     background:#eaf6ff !important;
@@ -133,12 +127,13 @@ table .answer-point-range img {margin-top:2px;}
     bottom: 0px;
     background-color: #ccc;
     z-index: 3;
+    border-radius:5px;
 }
 .TableContainer td{
     min-width:205px !important;
 }
 td p{
-    line-height: 35px !important;
+    padding: 5px 0px;
 }
 td p .answer-body{
     height:27px;
@@ -173,10 +168,10 @@ table tr td:last-child{
 /*#region音频插件*/
 .ListenDiv{
     height:48px;
-    margin-top: 15px;
-    margin-bottom: 5px;
     border-radius:5px;
     margin: 0 auto;
+    margin-top: 15px;
+    margin-bottom: 5px;
 }
 .ListenDiv[data-status='1']{
     height:80px;

EBook.Web/Common/tasklib_book.js

@@ -270,7 +270,7 @@ var AdjustTableFunc = function (sWidthVal) {
         });
         // 判断表格是否只有一行
         if ($(item).find("tr").length == 1 && $(item).find("tr").eq(0).find("td").length == 1) {
-            $(item).find("tr").eq(0).find("td").eq(0).css("width", (ScreenWidth - 4 - GetPadVal(document.body)) + "px");
+            $(item).find("tr").eq(0).find("td").eq(0).css("width", (ScreenWidth - 14 - GetPadVal(document.body)) + "px");
             $(item).css("width", (ScreenWidth - 4 - GetPadVal(document.body)) + "px");
         }
         else {
@@ -284,8 +284,14 @@ var AdjustTableFunc = function (sWidthVal) {
             var OneFlag = false;
             for (var i = 0; i < ArrMaxLen.length; i++) {
                 if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length > 1 && RuleFlag) {
-                    $(item).find("tr").eq(0).find("td").eq(i).css("width", ArrMaxLen[i] + "px");
-                    TableWidth += ArrMaxLen[i];
+                    if (i < ArrMaxLen.length - 1) {
+                        $(item).find("tr").eq(0).find("td").eq(i).css("width", ArrMaxLen[i] + "px");
+                        TableWidth += ArrMaxLen[i];
+                    }
+                    else {
+                        $(item).find("tr").eq(0).find("td").eq(i).css("width", (ArrMaxLen[i] - 10) + "px");
+                        TableWidth += (ArrMaxLen[i] - 10);
+                    }
                 }
                 else if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length > 1 && !RuleFlag) {
                     if (i == ArrMaxLen.length - 1) {
@@ -301,15 +307,25 @@ var AdjustTableFunc = function (sWidthVal) {
                                 AWidthVal += ArrMaxLen[AIndex];
                                 AIndex += 1;
                             }
-                            //AWidthVal += 100;  // 不规则加上100防止错乱
-                            TableWidth += AWidthVal;
-                            $(item).find("tr").eq(0).find("td").eq(j).css("width", AWidthVal + "px");
+                            if (j == FLenVal - 1) {
+                                TableWidth += AWidthVal - 10;
+                                $(item).find("tr").eq(0).find("td").eq(j).css("width", (AWidthVal - 10) + "px");
+                            }
+                            else {
+                                TableWidth += AWidthVal;
+                                $(item).find("tr").eq(0).find("td").eq(j).css("width", AWidthVal + "px");
+                            }
                         }
                     }
                 }
                 else if (ArrMaxLen[i] != undefined && $(item).find("tr").eq(0).find("td").length == 1) {
                     OneFlag = true;
-                    TableWidth += ArrMaxLen[i];
+                    if (ArrMaxLen.length - 1 == i) {
+                        TableWidth += ArrMaxLen[i] - 10;
+                    }
+                    else {
+                        TableWidth += ArrMaxLen[i];
+                    }
                 }
             }
             if (OneFlag) {
@@ -383,6 +399,7 @@ var AdjustTableFunc = function (sWidthVal) {
 // #endregion
 
 //#region 听力音频处理
+var LimitPreFlag = false;  // 限制点击过宽
 var AddListenDiv = function (NodeHandle, NIndex, sWidthVal) {
     var UrlStr = $(NodeHandle).attr("alt");
     sWidthVal = sWidthVal > $(document.body).width() ? sWidthVal : $(document.body).width()
@@ -416,6 +433,16 @@ var cLSourceFunc = function (iIndex, oIndex) {
 }
 // 暂停播放处理
 var playMusicFunc = function (iIndex) {
+    if (LimitPreFlag) {
+        return;
+    }
+    else {
+        LimitPreFlag = true;
+        window.setTimeout(function () {
+            LimitPreFlag = false;
+        }, 500);
+    }
+    $(".select-answer").removeClass("select-answer");
     var jQStr = ".LDFPlayS_" + iIndex;
     var playStatus = $(jQStr).attr("data-playstatus");  // 检测当前状态，0表示暂停
     var AudioUrl = $(jQStr).parent().prev(".LDivTop").find(".LDivTItem[data-selected='1']").attr("data-auduourl");
@@ -438,6 +465,7 @@ var playMusicFunc = function (iIndex) {
 }
 // 重置播放处理
 var pauseMusicFunc = function (iIndex) {
+    $(".select-answer").removeClass("select-answer");
     var jQStr = ".LDFPlayS_" + iIndex;
     $(jQStr).attr("data-playstatus", 0);
     var jQStr = ".LDFPWhite_" + iIndex;
@@ -900,7 +928,8 @@ function bindEventTeaOrignalYS(sWidthVal) {
     $.each($(".yaoshi"), function (index, item) {
         var parent = $(item).parent();
         var prev = $(item).nextUntil(".yaoshi").filter(".underlineContent");
-        if (prev.length == 0) {
+        var prevF = $(item).nextUntil(".yaoshi").find(".underlineContent");
+        if (prev.length == 0 && prevF.length == 0) {
             var spanHtml = document.createElement("span");
             //添加子节点
             var uHtml = document.createElement("u");
@@ -1549,7 +1578,7 @@ function getAllAnswer() {
             $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
         }
         else {
-            $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text' style='display:block;'>" + mytext + "</buttom></div>");
+            $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text' style='display:inline-block;'>" + mytext + "</buttom></div>");
         }
         if (mytext == "未作答") {
             $(".answer-body[answer-id='" + answerid + "']").attr("data-errstatus", "1");
@@ -1769,7 +1798,7 @@ function backupAllAnswer(answerJson, statusType) {
                     $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
                 }
                 else {
-                    $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text' style='display:block;'>" + mytext + "</buttom></div>");
+                    $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text' style='display:inline-block;'>" + mytext + "</buttom></div>");
                 }
                 if (mytext == "未作答") {
                     $(".answer-body[answer-id='" + answerid + "']").attr("data-errstatus", "1");
@@ -2003,7 +2032,7 @@ function backupAllReview(answerJson) {
             }
             //mytext = mytext == "" ? "&nbsp;&nbsp;&nbsp;" : mytext;
             if (!isanswer) {
-                $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='2' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text' style='display:block;'>" + mytext + "</buttom></div>");
+                $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='2' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text' style='display:inline-block;'>" + mytext + "</buttom></div>");
             }
             else {
                 $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='2' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
@@ -2134,6 +2163,8 @@ function audioPlayClick(myobj) {
 
 //作答录音播放按钮点击事件
 function recordAudioClick(myobj, id, url) {
+    $(".select-answer").removeClass("select-answer");
+    $(myobj).parent().parent("answer-body").addClass("select-answer");
     //处理当前按钮的状态
     if ($(myobj).parent().attr("play-status") == "0") {
         //停止其他作答音频播放
@@ -2262,10 +2293,14 @@ function adjustFontSize(FontSize) {
         $(this).find("span").css("font-size", TFontSize + "px");
     });
     $(".LDFTimerS").css("line-height", TFontSize + "px");
+    // 正相关
+    TFontSize = 0;
+    TFontSize = 16 * FontSize / 100;
+    $("td").find("p").css("line-height", (TFontSize + 6) + "px");
 }
 // 音频进度条按下回调
 function mobileTSFunc(ID) {
-    pressTableFlag =true;
+    pressTableFlag = true;
     // 移动端回调处理
 }
 // 音频进度条松开回调

EBook.Web/EBook.Web.csproj

@@ -147,6 +147,7 @@
     <Content Include="Lghp\data202116.lghp" />
     <Content Include="Lghp\err.lghp" />
     <Content Include="Lghp\22518.lghp" />
+    <Content Include="Lghp\22788.lghp" />
     <None Include="Lghp\gaicuo.lghp" />
     <Content Include="NK\tasklib_book.css" />
     <Content Include="NK\tasklib_book.js" />