附加样式渲染

EBook.Web/Common/mtm_passage.css

@@ -147,16 +147,6 @@ body {
 	opacity:0.5;
 }
 
-
-.wordStyle[data-setstatus='1']{
-	white-space:nowrap;
-    color: #db5d00;  /*单词选择颜色*/
-    font-weight: bold;
-	border-radius:4px;
-    cursor: pointer;
-    z-index: 10;
-}
-
 .wordStyle[data-setstatus='1']::before{
     content: "";
 }
@@ -164,20 +154,6 @@ body {
 .wordStyle[data-setstatus='1']::after{
     content: "";
 }
-
-.border1{
-    border: dashed 1px #ff6600;
-}
-
-.phraseStyle[data-setstatus='1']{
-    background-color: #f2db8b;  /*短语选择颜色*/
-	border-radius:2px;
-	padding-left:0px;
-	padding-right:0px;
-    cursor: pointer;
-    z-index: 10;
-}
-
 .phraseStyle[data-setstatus='1']::before{
     content: "";
 }
@@ -186,31 +162,6 @@ body {
     content: "";
 }
 
-.sentenceStyle[data-setstatus='1']{
-    border-bottom: 2px solid #78ae43;  /*句型*/
-    z-index: 5;
-}
-
-.wordStyle[data-setstatus='1']:hover{
-    color:#ff7d1e;
-    font-weight: bold;
-	/*background-color: #ffeeb2;*/
-}
-.wordStyle[data-setstatus='1'][showflag='0']{
-    color: #ffffff;
-}
-.wordStyle[data-setstatus='1'][showflag='0']:hover{
-    color: #ffffff;
-	background-color: #ffffff;
-}
-.phraseStyle[data-setstatus='1'][showflag='0'] .wordStyle[data-setstatus='1'][showflag='0'][data-scolor='5']{
-    color: #f2db8b;
-	background-color: #f2db8b;
-}
-.phraseStyle[data-setstatus='1'][showflag='0'] {
-    background-color: #ffffff;
-}
-
  @keyframes living { 0%{
                 transform: scale(1);
             } 50%{
@@ -420,10 +371,54 @@ ul {
 
 .ui-dialog a,a:-webkit-any-link,a:link,a:visited,a:hover,a:active{cursor:pointer !important;}
 
-/* 句子不需要黄色背景.sentenceStyle[data-nowclick='1'][data-setstatus='1'],.sentenceStyle[data-nowclick='1'][data-setstatus='1'] span */
-.wordStyle[data-nowclick='1'][data-setstatus='1'],.phraseStyle[data-nowclick='1'][data-setstatus='1'],.phraseStyle[data-nowclick='1'][data-setstatus='1'] span{
-    background-color: #ffeeb2 !important;
+/* 视听说重构后颜色渲染 */
+.border1{
+    border: dashed 1px #ff6600;
 }
-.wordStyle[data-nowclick='1'][data-setstatus='1'] .underlineContent[showflag='0'],.phraseStyle[data-nowclick='1'][data-setstatus='1'] .underlineContent[showflag='0'],.phraseStyle[data-nowclick='1'][data-setstatus='1'] .underlineContent[showflag='0'] span,.sentenceStyle[data-nowclick='1'][data-setstatus='1'] .underlineContent[showflag='0'],.sentenceStyle[data-nowclick='1'][data-setstatus='1'] .underlineContent[showflag='0'] span{
-    color: #ffeeb2 !important;  /* 关闭知识点卡片后取消背景渲染，对应这个已经无效果了 */
-}
+.wordStyle{
+	white-space:nowrap;
+    font-weight: bold;
+	border-radius:4px;
+    cursor: pointer;
+    z-index: 10;
+}
+.phraseStyle{
+	border-radius:2px;
+	padding-left:0px;
+	padding-right:0px;
+    cursor: pointer;
+    z-index: 10;
+}
+.sentenceStyle{
+    z-index:5;
+}
+.wordStyle[data-setstatus='0'] {
+    color:#ffffff;
+}
+.wordStyle[data-setstatus='1'] {
+    color:#db5d00;
+}
+.wordStyle[data-setstatus='1'][data-glclick='1']{
+    color:#ff7d1e;
+}
+.phraseStyle[data-setstatus='0'] {
+    background-color:#ffffff;
+}
+.phraseStyle[data-setstatus='1'] {
+    background-color:#f2db8b;
+}
+.phraseStyle[data-setstatus='1'][data-glclick='1']{
+    background-color:#ffeeb2;
+}
+.sentenceStyle[data-setstatus='0']{
+    border-bottom:none;
+}
+.sentenceStyle[data-setstatus='1']{
+    border-bottom:2px solid #78ae43;
+    background-color:#ffffff;
+}
+.sentenceStyle[data-setstatus='1'][data-glclick='1']{
+    border-bottom:2px solid #78ae43;
+    background-color:#83e600;
+}
+

EBook.Web/Common/new_tasklib_book.js

@@ -1,5 +1,5 @@
 //播放音频图片地址
-var PicInfo = {
+var PicInfo1 = {
     answerPointImgUrl: "file:///android_asset/js/update-answer.png",
     yaoshiShowImgUrl: "file:///android_asset/js/yaoshi-show.png",
     yaoshiHideImgUrl: "file:///android_asset/js/yaoshi-hide.png",
@@ -11,7 +11,7 @@ var PicInfo = {
 }
 
 //本地调用用的资源
-var PicInfo1 = {
+var PicInfo = {
     answerPointImgUrl: "../Images/update-answer.png",
     yaoshiShowImgUrl: "../Images/yaoshi-show.png",
     yaoshiHideImgUrl: "../Images/yaoshi-hide.png",
@@ -867,6 +867,8 @@ function Fill(data) {
             }
         }
     });
+    // 附加是否被点击属性data-glclick,0表示未被选中,1表示已选中
+    $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
 }
 
 // 嵌套式答题点不作高亮显示(只做隐藏)
@@ -1547,7 +1549,7 @@ function backupAllAnswer(answerJson, statusType) {
                                 do {
                                     var ClsName = PHandle.parent()[0].tagName.toUpperCase();
                                     var TFlag = PHandle.parent().attr("flag");
-                                    if (ClsName == "SPAN" && TFlag != null && (TFlag == "sentence" || TFlag == "phrase")) {
+                                    if (ClsName != "BODY" && TFlag != null && (TFlag == "sentence" || TFlag == "phrase")) {
                                         PHandle.parent().attr("data-setstatus", "0").attr("data-lstatus", "0")
                                         WTrue = false;
                                     }
@@ -1561,11 +1563,11 @@ function backupAllAnswer(answerJson, statusType) {
                                 do {
                                     var ClsName = PHandle.parent()[0].tagName.toUpperCase();
                                     var TFlag = PHandle.parent().attr("flag");
-                                    if (ClsName == "SPAN" && TFlag != null && TFlag == "sentence") {
+                                    if (ClsName != "BODY" && TFlag != null && TFlag == "sentence") {
                                         PHandle.parent().attr("data-setstatus", "1").attr("data-lstatus", "3");
                                         WTrue = false;
                                     }
-                                    else if (ClsName == "SPAN" && TFlag != null && TFlag == "phrase") {
+                                    else if (ClsName != "BODY" && TFlag != null && TFlag == "phrase") {
                                         PHandle.parent().attr("data-setstatus", "1").attr("data-lstatus", "2");
                                         WTrue = false;
                                     }
@@ -1681,7 +1683,7 @@ function backupAllAnswer(answerJson, statusType) {
                                     do {
                                         var ClsName = PHandle.parent()[0].tagName.toUpperCase();
                                         var TFlag = PHandle.parent().attr("flag");
-                                        if (ClsName == "SPAN" && TFlag != null && (TFlag == "sentence" || TFlag == "phrase")) {
+                                        if (ClsName != "BODY" && TFlag != null && (TFlag == "sentence" || TFlag == "phrase")) {
                                             PHandle.parent().attr("data-setstatus", "0").attr("data-lstatus", "0");
                                             WTrue = false;
                                         }
@@ -1854,6 +1856,7 @@ function AddClickEvent() {
         // 选中样式渲染
         $(".checkbox").removeClass("select-answer");
         $(".answer-body").removeClass("select-answer");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
         if (curObj.pId == undefined || curObj.pId == null || curObj.pId == '' || curObj.pId == 'undefined') {
             $(".answer-body[answer-id=" + curObj.Id + "]").addClass("select-answer");
         }
@@ -1905,6 +1908,7 @@ function AddClickEvent() {
         $(".checkbox").removeClass("select-answer");
         $(".answer-body").removeClass("select-answer");
         $(".ULCBGUse").attr("data-select", "0");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
         // 延迟渲染，防止重合
         window.setTimeout(function () {
             if (curObj.pId == undefined || curObj.pId == null || curObj.pId == '' || curObj.pId == 'undefined') {
@@ -1944,6 +1948,7 @@ function AddClickEvent() {
     // 绑定显示或隐藏答案
     $(".yaoshi").on("click", function () {
         $(".ULCBGUse").attr("data-select", "0");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
         var answerid = $(this).attr("answer-id");
         var parentanid = $(this).attr("parent-anid");
         var datastatus = $(this).attr("data-status");
@@ -1975,6 +1980,8 @@ function AddClickEvent() {
     // 绑定高亮
     $(".wordStyle").on("click", function () {
         $(".ULCBGUse").attr("data-select", "0");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
+        $(this).attr("data-glclick", "1");
         var datalstatus = $(this).attr("data-lstatus");
         if (datalstatus != "1") {
             return;  // 不能点击
@@ -1984,6 +1991,8 @@ function AddClickEvent() {
     });
     $(".phraseStyle").on("click", function () {
         $(".ULCBGUse").attr("data-select", "0");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
+        $(this).attr("data-glclick", "1");
         var datalstatus = $(this).attr("data-lstatus");
         if (datalstatus != "2") {
             return;  // 不能点击
@@ -1993,6 +2002,8 @@ function AddClickEvent() {
     });
     $(".sentenceStyle").on("click", function () {
         $(".ULCBGUse").attr("data-select", "0");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
+        $(this).attr("data-glclick", "1");
         var datalstatus = $(this).attr("data-lstatus");
         if (datalstatus != "3") {
             return;  // 不能点击
@@ -2002,11 +2013,13 @@ function AddClickEvent() {
     });
     // 绑定播放作答音频
     $(".audioImg").on("click", function () {
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
         audioPlayClick(this);
     });
     //点击播放事件,视频播放
     $(".videoImg").on("click", function () {
         $(".select-answer").removeClass("select-answer");
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
         $(this).attr("audiourl", "");
         var curHtml = $(this).parent().find(".videoUrl").html();
         var curAlt = $(this).attr("alt");//播放视频地址
@@ -2014,6 +2027,7 @@ function AddClickEvent() {
     });
     //作答录音播放按钮点击事件
     $(".answer-audio-range").on("click", function () {
+        $(".wordStyle,.phraseStyle,.sentenceStyle").attr("data-glclick", "0");
         $(".select-answer").removeClass("select-answer");
         var AudioID= $(this).parent(".underlineContent").attr("yaoshi-flag");
         var AudioUrl= $(this).attr("answer-url");

EBook.Web/Common/tasklib_book.css

@@ -409,13 +409,6 @@ img.cAStauts[showflag='0']{
     opacity:0;
 }
 
-.phraseStyle[data-setstatus='1'] .underlineContent[showflag='0'],.phraseStyle[data-setstatus='1'] .underlineContent[showflag='0'] span{
-    color:#f2db8b;
-}
-.phraseStyle[data-rsstatus='1']{
-    border:1px dashed red;
-}
-
 /* 重构后处理 */
 .yaoshi[showflag='1']{
     display:inline;