|
|
@@ -195,15 +195,13 @@
|
|
|
]"
|
|
|
:style="{
|
|
|
color:
|
|
|
- pItem.chstimeList &&
|
|
|
- pItem.chstimeList[wIndex] &&
|
|
|
- curTime >= pItem.chstimeList[wIndex].wordBg &&
|
|
|
- curTime < item.timeList[pItem.sentIndex].ed &&
|
|
|
- attrib
|
|
|
- ? attrib.topic_color
|
|
|
- : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
- ? pItem.matchNotesObj.notesColor
|
|
|
- : pItem.config.color,
|
|
|
+ newWordList.indexOf(pItem.chs) > -1 || pItem.words
|
|
|
+ ? attrib
|
|
|
+ ? attrib.topic_color
|
|
|
+ : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
+ ? pItem.matchNotesObj.notesColor
|
|
|
+ : pItem.config.color
|
|
|
+ : pItem.config.color,
|
|
|
}"
|
|
|
@click.stop="viewNotes($event, pItem.chs[wIndex], pItem.chs, pItem)"
|
|
|
>{{ convertText(pItem.chs[wIndex]) }}</span
|
|
|
@@ -258,15 +256,13 @@
|
|
|
]"
|
|
|
:style="{
|
|
|
color:
|
|
|
- pItem.chstimeList &&
|
|
|
- pItem.chstimeList[wIndex] &&
|
|
|
- curTime >= pItem.chstimeList[wIndex].wordBg &&
|
|
|
- curTime < item.timeList[pItem.sentIndex].ed &&
|
|
|
- attrib
|
|
|
- ? attrib.topic_color
|
|
|
- : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
- ? pItem.matchNotesObj.notesColor
|
|
|
- : pItem.config.color,
|
|
|
+ newWordList.indexOf(pItem.chs) > -1 || pItem.words
|
|
|
+ ? attrib
|
|
|
+ ? attrib.topic_color
|
|
|
+ : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
+ ? pItem.matchNotesObj.notesColor
|
|
|
+ : pItem.config.color
|
|
|
+ : pItem.config.color,
|
|
|
}"
|
|
|
@click.stop="viewNotes($event, pItem.chs[wIndex], pItem.chs, pItem)"
|
|
|
>{{ convertText(pItem.chs[wIndex]) }}</span
|
|
|
@@ -695,15 +691,13 @@
|
|
|
]"
|
|
|
:style="{
|
|
|
color:
|
|
|
- pItem.chstimeList &&
|
|
|
- pItem.chstimeList[wIndex] &&
|
|
|
- curTime >= pItem.chstimeList[wIndex].wordBg &&
|
|
|
- curTime < item.timeList[pItem.sentIndex].ed &&
|
|
|
- attrib
|
|
|
- ? attrib.topic_color
|
|
|
- : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
- ? pItem.matchNotesObj.notesColor
|
|
|
- : pItem.config.color,
|
|
|
+ newWordList.indexOf(pItem.chs) > -1 || pItem.words
|
|
|
+ ? attrib
|
|
|
+ ? attrib.topic_color
|
|
|
+ : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
+ ? pItem.matchNotesObj.notesColor
|
|
|
+ : pItem.config.color
|
|
|
+ : pItem.config.color,
|
|
|
}"
|
|
|
@click.stop="viewNotes($event, pItem.chs[wIndex], pItem.chs, pItem)"
|
|
|
>{{ convertText(pItem.chs[wIndex]) }}</span
|
|
|
@@ -757,15 +751,13 @@
|
|
|
]"
|
|
|
:style="{
|
|
|
color:
|
|
|
- pItem.chstimeList &&
|
|
|
- pItem.chstimeList[wIndex] &&
|
|
|
- curTime >= pItem.chstimeList[wIndex].wordBg &&
|
|
|
- curTime < item.timeList[pItem.sentIndex].ed &&
|
|
|
- attrib
|
|
|
- ? attrib.topic_color
|
|
|
- : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
- ? pItem.matchNotesObj.notesColor
|
|
|
- : pItem.config.color,
|
|
|
+ newWordList.indexOf(pItem.chs) > -1 || pItem.words
|
|
|
+ ? attrib
|
|
|
+ ? attrib.topic_color
|
|
|
+ : pItem.matchNotesObj.con && pItem.matchNotesObj.notesColor
|
|
|
+ ? pItem.matchNotesObj.notesColor
|
|
|
+ : pItem.config.color
|
|
|
+ : pItem.config.color,
|
|
|
}"
|
|
|
@click.stop="viewNotes($event, pItem.chs[wIndex], pItem.chs, pItem)"
|
|
|
>{{ convertText(pItem.chs[wIndex]) }}</span
|
