|
@@ -3,7 +3,7 @@
|
|
:class="[
|
|
:class="[
|
|
'voicefull',
|
|
'voicefull',
|
|
bgIndex === 0 ? 'bg1' : 'bg2',
|
|
bgIndex === 0 ? 'bg1' : 'bg2',
|
|
- isLandscape ? 'voicefull-scape' : ''
|
|
|
|
|
|
+ isLandscape ? 'voicefull-scape' : '',
|
|
]"
|
|
]"
|
|
>
|
|
>
|
|
<div class="voicefull-top">
|
|
<div class="voicefull-top">
|
|
@@ -30,7 +30,7 @@
|
|
<span
|
|
<span
|
|
:class="[
|
|
:class="[
|
|
'font-jian-black',
|
|
'font-jian-black',
|
|
- bgIndex === 1 ? 'font-jian-yellow' : ''
|
|
|
|
|
|
+ bgIndex === 1 ? 'font-jian-yellow' : '',
|
|
]"
|
|
]"
|
|
@click="setFontSize('-')"
|
|
@click="setFontSize('-')"
|
|
/>
|
|
/>
|
|
@@ -41,21 +41,21 @@
|
|
'font-jian-black',
|
|
'font-jian-black',
|
|
bgIndex === 1
|
|
bgIndex === 1
|
|
? 'font-jian-yellow-disabled'
|
|
? 'font-jian-yellow-disabled'
|
|
- : 'font-jian-white-disabled'
|
|
|
|
|
|
+ : 'font-jian-white-disabled',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
</template>
|
|
</template>
|
|
<span
|
|
<span
|
|
:class="[
|
|
:class="[
|
|
'font-img-black',
|
|
'font-img-black',
|
|
- bgIndex === 1 ? 'font-img-yellow' : ''
|
|
|
|
|
|
+ bgIndex === 1 ? 'font-img-yellow' : '',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
<template v-if="hzSize <= 76">
|
|
<template v-if="hzSize <= 76">
|
|
<span
|
|
<span
|
|
:class="[
|
|
:class="[
|
|
'font-jia-black',
|
|
'font-jia-black',
|
|
- bgIndex === 1 ? 'font-jia-yellow' : ''
|
|
|
|
|
|
+ bgIndex === 1 ? 'font-jia-yellow' : '',
|
|
]"
|
|
]"
|
|
@click="setFontSize('+')"
|
|
@click="setFontSize('+')"
|
|
/>
|
|
/>
|
|
@@ -66,7 +66,7 @@
|
|
'font-jia-black',
|
|
'font-jia-black',
|
|
bgIndex === 1
|
|
bgIndex === 1
|
|
? 'font-jia-yellow-disabled'
|
|
? 'font-jia-yellow-disabled'
|
|
- : 'font-jia-white-disabled'
|
|
|
|
|
|
+ : 'font-jia-white-disabled',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
</template>
|
|
</template>
|
|
@@ -96,7 +96,7 @@
|
|
:class="[
|
|
:class="[
|
|
'repeat-icon',
|
|
'repeat-icon',
|
|
!isRepeat ? 'disabled' : 'auto-icon',
|
|
!isRepeat ? 'disabled' : 'auto-icon',
|
|
- isRepeat && bgIndex === 1 ? 'auto-icon-yellow' : ''
|
|
|
|
|
|
+ isRepeat && bgIndex === 1 ? 'auto-icon-yellow' : '',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
</div>
|
|
</div>
|
|
@@ -108,7 +108,9 @@
|
|
:class="[
|
|
:class="[
|
|
'pinyin-icon',
|
|
'pinyin-icon',
|
|
!isShowPY || !isHasPY ? 'disabled' : '',
|
|
!isShowPY || !isHasPY ? 'disabled' : '',
|
|
- isShowPY && isHasPY && bgIndex === 1 ? 'pinyin-icon-yellow' : ''
|
|
|
|
|
|
+ isShowPY && isHasPY && bgIndex === 1
|
|
|
|
+ ? 'pinyin-icon-yellow'
|
|
|
|
+ : '',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
</div>
|
|
</div>
|
|
@@ -120,7 +122,7 @@
|
|
:class="[
|
|
:class="[
|
|
'en-icon',
|
|
'en-icon',
|
|
!isShowEN || !isHasEN ? 'disabled' : '',
|
|
!isShowEN || !isHasEN ? 'disabled' : '',
|
|
- isShowEN && bgIndex === 1 && isHasEN ? 'en-icon-yellow' : ''
|
|
|
|
|
|
+ isShowEN && bgIndex === 1 && isHasEN ? 'en-icon-yellow' : '',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
</div>
|
|
</div>
|
|
@@ -141,7 +143,7 @@
|
|
class="matrix"
|
|
class="matrix"
|
|
:style="{
|
|
:style="{
|
|
'grid-template': `96px repeat(${curQue.voiceMatrix.matrix.length}, auto) minmax(1.5em, 1fr) / 112px repeat(${curQue.voiceMatrix.matrix[0].length}, auto) minmax(124px, 1fr)`,
|
|
'grid-template': `96px repeat(${curQue.voiceMatrix.matrix.length}, auto) minmax(1.5em, 1fr) / 112px repeat(${curQue.voiceMatrix.matrix[0].length}, auto) minmax(124px, 1fr)`,
|
|
- 'font-size': `${hzSize}px`
|
|
|
|
|
|
+ 'font-size': `${hzSize}px`,
|
|
}"
|
|
}"
|
|
@mouseleave="clearSelectCell"
|
|
@mouseleave="clearSelectCell"
|
|
>
|
|
>
|
|
@@ -157,15 +159,11 @@
|
|
v-if="
|
|
v-if="
|
|
row.type !== 'connection' && curQue.voiceMatrix.columnSelection
|
|
row.type !== 'connection' && curQue.voiceMatrix.columnSelection
|
|
"
|
|
"
|
|
- v-show="
|
|
|
|
- selectColumn === i ||
|
|
|
|
- (selectedLine.type === 'column' && selectedLine.index === i)
|
|
|
|
- "
|
|
|
|
:class="[
|
|
:class="[
|
|
`matrix-checkbox-row-${themeColor}`,
|
|
`matrix-checkbox-row-${themeColor}`,
|
|
selectedLine.type === 'column' && selectedLine.index === i
|
|
selectedLine.type === 'column' && selectedLine.index === i
|
|
? 'active'
|
|
? 'active'
|
|
- : ''
|
|
|
|
|
|
+ : '',
|
|
]"
|
|
]"
|
|
@click="selectRowOrColumn(i, 'column')"
|
|
@click="selectRowOrColumn(i, 'column')"
|
|
/>
|
|
/>
|
|
@@ -181,15 +179,11 @@
|
|
>
|
|
>
|
|
<span
|
|
<span
|
|
v-if="curQue.voiceMatrix.rowSelection"
|
|
v-if="curQue.voiceMatrix.rowSelection"
|
|
- v-show="
|
|
|
|
- selectRow === i ||
|
|
|
|
- (selectedLine.type === 'row' && selectedLine.index === i)
|
|
|
|
- "
|
|
|
|
:class="[
|
|
:class="[
|
|
`matrix-checkbox-column-${themeColor}`,
|
|
`matrix-checkbox-column-${themeColor}`,
|
|
selectedLine.type === 'row' && selectedLine.index === i
|
|
selectedLine.type === 'row' && selectedLine.index === i
|
|
? 'active'
|
|
? 'active'
|
|
- : ''
|
|
|
|
|
|
+ : '',
|
|
]"
|
|
]"
|
|
@click="selectRowOrColumn(i, 'row')"
|
|
@click="selectRowOrColumn(i, 'row')"
|
|
/>
|
|
/>
|
|
@@ -203,7 +197,7 @@
|
|
(i === 0 && curQue.voiceMatrix.firstLineHighlight) ||
|
|
(i === 0 && curQue.voiceMatrix.firstLineHighlight) ||
|
|
(j === row.length - 1 && curQue.voiceMatrix.lastColumnHighlight)
|
|
(j === row.length - 1 && curQue.voiceMatrix.lastColumnHighlight)
|
|
? `highlight-${themeColor}`
|
|
? `highlight-${themeColor}`
|
|
- : ''
|
|
|
|
|
|
+ : '',
|
|
]"
|
|
]"
|
|
@mouseenter="matrixCellMouseenter(i, j, column.type)"
|
|
@mouseenter="matrixCellMouseenter(i, j, column.type)"
|
|
>
|
|
>
|
|
@@ -225,7 +219,7 @@
|
|
column.lrc_data.end_time === -1)
|
|
column.lrc_data.end_time === -1)
|
|
? 'playing'
|
|
? 'playing'
|
|
: '',
|
|
: '',
|
|
- column.isTitle ? 'title' : ''
|
|
|
|
|
|
+ column.isTitle ? 'title' : '',
|
|
]"
|
|
]"
|
|
@click="matrixCellClick(i, j)"
|
|
@click="matrixCellClick(i, j)"
|
|
>
|
|
>
|
|
@@ -239,7 +233,7 @@
|
|
'connection',
|
|
'connection',
|
|
i === 0 && curQue.voiceMatrix.firstLineHighlight
|
|
i === 0 && curQue.voiceMatrix.firstLineHighlight
|
|
? `highlight-bc-${themeColor}`
|
|
? `highlight-bc-${themeColor}`
|
|
- : ''
|
|
|
|
|
|
+ : '',
|
|
]"
|
|
]"
|
|
/>
|
|
/>
|
|
<!-- 分词 -->
|
|
<!-- 分词 -->
|
|
@@ -260,10 +254,10 @@
|
|
column.lrc_data.end_time === -1)
|
|
column.lrc_data.end_time === -1)
|
|
? 'playing'
|
|
? 'playing'
|
|
: '',
|
|
: '',
|
|
- column.isTitle ? 'title' : ''
|
|
|
|
|
|
+ column.isTitle ? 'title' : '',
|
|
]"
|
|
]"
|
|
:style="{
|
|
:style="{
|
|
- 'grid-template-columns': `repeat(${column.sentence_data.wordsList.length}, auto)`
|
|
|
|
|
|
+ 'grid-template-columns': `repeat(${column.sentence_data.wordsList.length}, auto)`,
|
|
}"
|
|
}"
|
|
@click="matrixCellClick(i, j)"
|
|
@click="matrixCellClick(i, j)"
|
|
>
|
|
>
|
|
@@ -271,18 +265,16 @@
|
|
v-for="({ chs, pinyin }, w) in column.sentence_data.wordsList"
|
|
v-for="({ chs, pinyin }, w) in column.sentence_data.wordsList"
|
|
>
|
|
>
|
|
<span
|
|
<span
|
|
- :key="
|
|
|
|
- `${
|
|
|
|
- column.sentence_data.pyPosition === 'top'
|
|
|
|
- ? 'pinyin'
|
|
|
|
- : 'chs'
|
|
|
|
- }-${w}`
|
|
|
|
- "
|
|
|
|
|
|
+ :key="`${
|
|
|
|
+ column.sentence_data.pyPosition === 'top'
|
|
|
|
+ ? 'pinyin'
|
|
|
|
+ : 'chs'
|
|
|
|
+ }-${w}`"
|
|
:style="{
|
|
:style="{
|
|
visibility:
|
|
visibility:
|
|
column.sentence_data.pyPosition === 'top' && isShowPY
|
|
column.sentence_data.pyPosition === 'top' && isShowPY
|
|
? 'visible'
|
|
? 'visible'
|
|
- : 'hidden'
|
|
|
|
|
|
+ : 'hidden',
|
|
}"
|
|
}"
|
|
:class="
|
|
:class="
|
|
column.sentence_data.pyPosition === 'top'
|
|
column.sentence_data.pyPosition === 'top'
|
|
@@ -299,18 +291,16 @@
|
|
v-for="({ chs, pinyin }, w) in column.sentence_data.wordsList"
|
|
v-for="({ chs, pinyin }, w) in column.sentence_data.wordsList"
|
|
>
|
|
>
|
|
<span
|
|
<span
|
|
- :key="
|
|
|
|
- `${
|
|
|
|
- column.sentence_data.pyPosition === 'top'
|
|
|
|
- ? 'chs'
|
|
|
|
- : 'pinyin'
|
|
|
|
- }-${w}`
|
|
|
|
- "
|
|
|
|
|
|
+ :key="`${
|
|
|
|
+ column.sentence_data.pyPosition === 'top'
|
|
|
|
+ ? 'chs'
|
|
|
|
+ : 'pinyin'
|
|
|
|
+ }-${w}`"
|
|
:style="{
|
|
:style="{
|
|
visibility:
|
|
visibility:
|
|
column.sentence_data.pyPosition !== 'top' && isShowPY
|
|
column.sentence_data.pyPosition !== 'top' && isShowPY
|
|
? 'hidden'
|
|
? 'hidden'
|
|
- : 'visible'
|
|
|
|
|
|
+ : 'visible',
|
|
}"
|
|
}"
|
|
:class="
|
|
:class="
|
|
column.sentence_data.pyPosition === 'top'
|
|
column.sentence_data.pyPosition === 'top'
|
|
@@ -342,7 +332,7 @@
|
|
column.lrc_data.end_time === -1)
|
|
column.lrc_data.end_time === -1)
|
|
? 'playing'
|
|
? 'playing'
|
|
: '',
|
|
: '',
|
|
- column.isTitle ? 'title' : ''
|
|
|
|
|
|
+ column.isTitle ? 'title' : '',
|
|
]"
|
|
]"
|
|
@click="matrixCellClick(i, j)"
|
|
@click="matrixCellClick(i, j)"
|
|
>
|
|
>
|
|
@@ -376,7 +366,7 @@
|
|
column.lrc_data.end_time === -1)
|
|
column.lrc_data.end_time === -1)
|
|
? 'playing'
|
|
? 'playing'
|
|
: '',
|
|
: '',
|
|
- column.isTitle ? 'title' : ''
|
|
|
|
|
|
+ column.isTitle ? 'title' : '',
|
|
]"
|
|
]"
|
|
@click="matrixCellClick(i, j)"
|
|
@click="matrixCellClick(i, j)"
|
|
>
|
|
>
|
|
@@ -418,7 +408,7 @@ export default {
|
|
VoiceMatrixFullscreenAudio,
|
|
VoiceMatrixFullscreenAudio,
|
|
Soundrecorddiff,
|
|
Soundrecorddiff,
|
|
AudioCompare,
|
|
AudioCompare,
|
|
- Wordcard
|
|
|
|
|
|
+ Wordcard,
|
|
},
|
|
},
|
|
props: ["mp3", "curQue", "themeColor", "recordList"],
|
|
props: ["mp3", "curQue", "themeColor", "recordList"],
|
|
data() {
|
|
data() {
|
|
@@ -448,12 +438,12 @@ export default {
|
|
// 行、列选中
|
|
// 行、列选中
|
|
selectedLine: {
|
|
selectedLine: {
|
|
type: "",
|
|
type: "",
|
|
- index: 0
|
|
|
|
|
|
+ index: 0,
|
|
},
|
|
},
|
|
// 点击选中
|
|
// 点击选中
|
|
selectCell: {
|
|
selectCell: {
|
|
row: -1,
|
|
row: -1,
|
|
- column: -1
|
|
|
|
|
|
+ column: -1,
|
|
},
|
|
},
|
|
isRepeat: false,
|
|
isRepeat: false,
|
|
// 跟读所需属性
|
|
// 跟读所需属性
|
|
@@ -466,7 +456,7 @@ export default {
|
|
// 拼音、英文显隐判断
|
|
// 拼音、英文显隐判断
|
|
isShowPY: true,
|
|
isShowPY: true,
|
|
isShowEN: true,
|
|
isShowEN: true,
|
|
- isLandscape: window.innerWidth < window.innerHeight // 手机是否为竖屏
|
|
|
|
|
|
+ isLandscape: window.innerWidth < window.innerHeight, // 手机是否为竖屏
|
|
};
|
|
};
|
|
},
|
|
},
|
|
computed: {
|
|
computed: {
|
|
@@ -498,7 +488,7 @@ export default {
|
|
type: type.length > 0 && index >= 0 ? type : "cell",
|
|
type: type.length > 0 && index >= 0 ? type : "cell",
|
|
index,
|
|
index,
|
|
row,
|
|
row,
|
|
- column
|
|
|
|
|
|
+ column,
|
|
};
|
|
};
|
|
},
|
|
},
|
|
// 矩阵的行、列数从 0 开始
|
|
// 矩阵的行、列数从 0 开始
|
|
@@ -506,9 +496,9 @@ export default {
|
|
const matrixArr = this.curQue.voiceMatrix.matrix;
|
|
const matrixArr = this.curQue.voiceMatrix.matrix;
|
|
return {
|
|
return {
|
|
rows: matrixArr.length - 1,
|
|
rows: matrixArr.length - 1,
|
|
- columns: matrixArr.length > 0 ? matrixArr[0].length - 1 : -1
|
|
|
|
|
|
+ columns: matrixArr.length > 0 ? matrixArr[0].length - 1 : -1,
|
|
};
|
|
};
|
|
- }
|
|
|
|
|
|
+ },
|
|
},
|
|
},
|
|
watch: {
|
|
watch: {
|
|
isRecording(newVal) {
|
|
isRecording(newVal) {
|
|
@@ -532,7 +522,7 @@ export default {
|
|
}
|
|
}
|
|
}, 50);
|
|
}, 50);
|
|
}
|
|
}
|
|
- }
|
|
|
|
|
|
+ },
|
|
},
|
|
},
|
|
created() {
|
|
created() {
|
|
document.addEventListener("keyup", this.handleKeyup);
|
|
document.addEventListener("keyup", this.handleKeyup);
|
|
@@ -541,8 +531,8 @@ export default {
|
|
"fullscreenchange",
|
|
"fullscreenchange",
|
|
"mozfullscreenchange",
|
|
"mozfullscreenchange",
|
|
"webkitfullscreenchange",
|
|
"webkitfullscreenchange",
|
|
- "msfullscreenchange"
|
|
|
|
- ].forEach(event => {
|
|
|
|
|
|
+ "msfullscreenchange",
|
|
|
|
+ ].forEach((event) => {
|
|
document.addEventListener(event, this.handleFullscreen);
|
|
document.addEventListener(event, this.handleFullscreen);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -552,8 +542,8 @@ export default {
|
|
"fullscreenchange",
|
|
"fullscreenchange",
|
|
"mozfullscreenchange",
|
|
"mozfullscreenchange",
|
|
"webkitfullscreenchange",
|
|
"webkitfullscreenchange",
|
|
- "msfullscreenchange"
|
|
|
|
- ].forEach(event => {
|
|
|
|
|
|
+ "msfullscreenchange",
|
|
|
|
+ ].forEach((event) => {
|
|
document.removeEventListener(event, this.handleFullscreen);
|
|
document.removeEventListener(event, this.handleFullscreen);
|
|
});
|
|
});
|
|
},
|
|
},
|
|
@@ -596,13 +586,8 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
setRecordingFileName(row, column) {
|
|
setRecordingFileName(row, column) {
|
|
- let {
|
|
|
|
- type,
|
|
|
|
- text,
|
|
|
|
- sentence_data,
|
|
|
|
- pinyin_english_data,
|
|
|
|
- text_brackets
|
|
|
|
- } = this.curQue.voiceMatrix.matrix[row][column];
|
|
|
|
|
|
+ let { type, text, sentence_data, pinyin_english_data, text_brackets } =
|
|
|
|
+ this.curQue.voiceMatrix.matrix[row][column];
|
|
if (type === "text") this.fileName = text;
|
|
if (type === "text") this.fileName = text;
|
|
if (type === "SentenceSegwordChs") this.fileName = sentence_data.sentence;
|
|
if (type === "SentenceSegwordChs") this.fileName = sentence_data.sentence;
|
|
if (type === "PinyinEnglish") this.fileName = pinyin_english_data.pinyin;
|
|
if (type === "PinyinEnglish") this.fileName = pinyin_english_data.pinyin;
|
|
@@ -651,7 +636,7 @@ export default {
|
|
this.lrcArray = [];
|
|
this.lrcArray = [];
|
|
let { type, index } = this.selectedLine;
|
|
let { type, index } = this.selectedLine;
|
|
if (type.length > 0 && index >= 0 && type === "row") {
|
|
if (type.length > 0 && index >= 0 && type === "row") {
|
|
- this.curQue.voiceMatrix.matrix[index].forEach(item => {
|
|
|
|
|
|
+ this.curQue.voiceMatrix.matrix[index].forEach((item) => {
|
|
let data = this.getLrcData(item);
|
|
let data = this.getLrcData(item);
|
|
if (data) this.lrcArray.push(data);
|
|
if (data) this.lrcArray.push(data);
|
|
});
|
|
});
|
|
@@ -660,7 +645,7 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
if (type.length > 0 && index >= 0 && type === "column") {
|
|
if (type.length > 0 && index >= 0 && type === "column") {
|
|
- this.curQue.voiceMatrix.matrix.forEach(item => {
|
|
|
|
|
|
+ this.curQue.voiceMatrix.matrix.forEach((item) => {
|
|
let data = this.getLrcData(item[index]);
|
|
let data = this.getLrcData(item[index]);
|
|
if (data) this.lrcArray.push(data);
|
|
if (data) this.lrcArray.push(data);
|
|
});
|
|
});
|
|
@@ -683,7 +668,7 @@ export default {
|
|
this.$refs.audioLine.PlayAudio();
|
|
this.$refs.audioLine.PlayAudio();
|
|
if (end_time === -1) return;
|
|
if (end_time === -1) return;
|
|
let end = end_time / 1000 - 0.01;
|
|
let end = end_time / 1000 - 0.01;
|
|
- this.unWatch = this.$watch("curTime", val => {
|
|
|
|
|
|
+ this.unWatch = this.$watch("curTime", (val) => {
|
|
if (val >= end) {
|
|
if (val >= end) {
|
|
if (!this.hasSelectedCell) return this.unWatch();
|
|
if (!this.hasSelectedCell) return this.unWatch();
|
|
this.handleParentPlay();
|
|
this.handleParentPlay();
|
|
@@ -733,7 +718,7 @@ export default {
|
|
}
|
|
}
|
|
let arr = [];
|
|
let arr = [];
|
|
if (type.length > 0 && index >= 0 && type === "row") {
|
|
if (type.length > 0 && index >= 0 && type === "row") {
|
|
- this.curQue.voiceMatrix.matrix[index].forEach(item => {
|
|
|
|
|
|
+ this.curQue.voiceMatrix.matrix[index].forEach((item) => {
|
|
let data = this.getLrcData(item);
|
|
let data = this.getLrcData(item);
|
|
if (data) arr.push(data);
|
|
if (data) arr.push(data);
|
|
});
|
|
});
|
|
@@ -742,7 +727,7 @@ export default {
|
|
}
|
|
}
|
|
|
|
|
|
if (type.length > 0 && index >= 0 && type === "column") {
|
|
if (type.length > 0 && index >= 0 && type === "column") {
|
|
- this.curQue.voiceMatrix.matrix.forEach(item => {
|
|
|
|
|
|
+ this.curQue.voiceMatrix.matrix.forEach((item) => {
|
|
let data = this.getLrcData(item[index]);
|
|
let data = this.getLrcData(item[index]);
|
|
if (data) arr.push(data);
|
|
if (data) arr.push(data);
|
|
});
|
|
});
|
|
@@ -768,7 +753,7 @@ export default {
|
|
return {
|
|
return {
|
|
begin_time: lrc_data.begin_time,
|
|
begin_time: lrc_data.begin_time,
|
|
end_time: this.mp3Duration,
|
|
end_time: this.mp3Duration,
|
|
- text: lrc_data.text
|
|
|
|
|
|
+ text: lrc_data.text,
|
|
};
|
|
};
|
|
}
|
|
}
|
|
return lrc_data;
|
|
return lrc_data;
|
|
@@ -789,7 +774,7 @@ export default {
|
|
// 监听是否已到结束时间,为了选中效果 - 0.01
|
|
// 监听是否已到结束时间,为了选中效果 - 0.01
|
|
if (end_time === -1) return;
|
|
if (end_time === -1) return;
|
|
let end = end_time / 1000 - 0.01;
|
|
let end = end_time / 1000 - 0.01;
|
|
- this.unWatch = this.$watch("curTime", val => {
|
|
|
|
|
|
+ this.unWatch = this.$watch("curTime", (val) => {
|
|
if (val >= end) {
|
|
if (val >= end) {
|
|
this.handleParentPlay();
|
|
this.handleParentPlay();
|
|
this.$refs.audioLine.onTimeupdateTime(end);
|
|
this.$refs.audioLine.onTimeupdateTime(end);
|
|
@@ -923,7 +908,7 @@ export default {
|
|
audio.length > 0 &&
|
|
audio.length > 0 &&
|
|
window.location.href.indexOf("GCLS-Learn") == -1
|
|
window.location.href.indexOf("GCLS-Learn") == -1
|
|
) {
|
|
) {
|
|
- audio.forEach(item => {
|
|
|
|
|
|
+ audio.forEach((item) => {
|
|
item.pause();
|
|
item.pause();
|
|
});
|
|
});
|
|
}
|
|
}
|
|
@@ -935,8 +920,8 @@ export default {
|
|
changeFullScreen() {
|
|
changeFullScreen() {
|
|
this.pauseAudio();
|
|
this.pauseAudio();
|
|
this.$emit("changeIsFull");
|
|
this.$emit("changeIsFull");
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ },
|
|
|
|
+ },
|
|
};
|
|
};
|
|
</script>
|
|
</script>
|
|
|
|
|
|
@@ -1119,6 +1104,7 @@ $dark-color-play: #fff2c6;
|
|
> span {
|
|
> span {
|
|
width: 24px;
|
|
width: 24px;
|
|
height: 24px;
|
|
height: 24px;
|
|
|
|
+ white-space: nowrap;
|
|
border-radius: 100%;
|
|
border-radius: 100%;
|
|
|
|
|
|
cursor: pointer;
|
|
cursor: pointer;
|
|
@@ -1484,6 +1470,7 @@ $dark-color-play: #fff2c6;
|
|
transition: 0.2s;
|
|
transition: 0.2s;
|
|
cursor: pointer;
|
|
cursor: pointer;
|
|
user-select: none;
|
|
user-select: none;
|
|
|
|
+ white-space: nowrap;
|
|
|
|
|
|
&:hover {
|
|
&:hover {
|
|
border-color: #8c8c8c;
|
|
border-color: #8c8c8c;
|