|
@@ -91,17 +91,17 @@
|
|
|
<div @click="$emit('review')" v-if="tType == 1">
|
|
|
<el-tooltip class="item" effect="dark" content="评论" placement="top">
|
|
|
<img
|
|
|
- :src="require('../../assets/icon/course/comment.png')"
|
|
|
+ :src="require('../../assets/icon/course/comment2.svg')"
|
|
|
alt=""
|
|
|
style="width: 22px;height: 22px;"
|
|
|
/>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
|
|
|
- <div @click="$emit('startRecording')" v-if="!videoStart && (tType == 1 || tType == 4)">
|
|
|
+ <div @click="startRecording()" v-if="!videoStart && (tType == 1 || tType == 4)">
|
|
|
<el-tooltip class="item" effect="dark" content="录制" placement="top">
|
|
|
<img
|
|
|
- :src="require('../../assets/icon/course/record.svg')"
|
|
|
+ :src="require('../../assets/icon/course/record3.svg')"
|
|
|
alt=""
|
|
|
style="width: 22px;height: 22px;"
|
|
|
/>
|
|
@@ -111,7 +111,7 @@
|
|
|
<div @click="$emit('stopRecording')" v-else-if="(tType == 1 || tType == 4)" style="background:#f63564">
|
|
|
<el-tooltip class="item" effect="dark" content="下载" placement="top">
|
|
|
<img
|
|
|
- :src="require('../../assets/icon/course/record2.svg')"
|
|
|
+ :src="require('../../assets/icon/course/record4.svg')"
|
|
|
alt=""
|
|
|
style="width: 22px;height: 22px;"
|
|
|
/>
|
|
@@ -187,7 +187,8 @@
|
|
|
content="批注"
|
|
|
placement="top"
|
|
|
>
|
|
|
- <img :src="require('../../assets/icon/course/edit.svg')" />
|
|
|
+ <img :src="require('../../assets/icon/course/edit2.svg')" v-if="!AnnotationCanvasShow"/>
|
|
|
+ <img :src="require('../../assets/icon/course/edit3.svg')" v-else/>
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
|
|
@@ -210,8 +211,8 @@
|
|
|
:content="recordType==0?'开启语音助手':'关闭语音助手'"
|
|
|
placement="top"
|
|
|
>
|
|
|
- <img v-if="recordType!=1" :src="require('../../assets/icon/course/robot.svg')" />
|
|
|
- <img v-else :src="require('../../assets/icon/course/robot2.svg')" />
|
|
|
+ <img v-if="recordType!=1" :src="require('../../assets/icon/course/robot3.svg')" />
|
|
|
+ <img v-else :src="require('../../assets/icon/course/robot3.svg')" />
|
|
|
</el-tooltip>
|
|
|
</div>
|
|
|
|
|
@@ -251,7 +252,7 @@
|
|
|
</div>
|
|
|
<levitatedSphere ref="levitatedSphereRef" @startTime="startTime" />
|
|
|
<timepiece ref="timepieceRef" />
|
|
|
- <AnnotationCanvas ref="AnnotationCanvasRef"/>
|
|
|
+ <AnnotationCanvas ref="AnnotationCanvasRef" @close="endCommentAndAnnotate" @changeStatus="changeAnnotationCanvasShow"/>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -316,6 +317,8 @@ export default {
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
+ userid: this.$route.query.userid,
|
|
|
+ courseId: this.$route.query.courseId,
|
|
|
type: 0,
|
|
|
itemType: 0, //0--无 1-搜索 2-任务 3-对话
|
|
|
fileId: [],
|
|
@@ -323,7 +326,8 @@ export default {
|
|
|
recordLoading:false,
|
|
|
fold: false,
|
|
|
openMegaphone:false,//是否打开喇叭
|
|
|
- getFileIdLoading: false
|
|
|
+ getFileIdLoading: false,
|
|
|
+ AnnotationCanvasShow:false,
|
|
|
};
|
|
|
},
|
|
|
mounted() {
|
|
@@ -331,6 +335,33 @@ export default {
|
|
|
this.getFileId();
|
|
|
},
|
|
|
methods: {
|
|
|
+ changeAnnotationCanvasShow(newValue){
|
|
|
+ this.AnnotationCanvasShow = newValue;
|
|
|
+ },
|
|
|
+ startRecording(){
|
|
|
+ this.$emit('startRecording');
|
|
|
+ this.insertMemorandum(`使用<span class="btn">录制</span>功能,录制课堂`);
|
|
|
+ },
|
|
|
+ insertMemorandum(_html){//保存行为操作
|
|
|
+ //variable
|
|
|
+ //btn
|
|
|
+ let params = [{
|
|
|
+ uid:this.userid,
|
|
|
+ courseId:this.courseId,
|
|
|
+ content:_html
|
|
|
+ }]
|
|
|
+
|
|
|
+ this.ajax.post(this.$store.state.api+'insert_systemOperation_countdownBehavior',params).then(res=>{
|
|
|
+ if(res.data==1){
|
|
|
+ console.log('保存操作成功')
|
|
|
+ }else{
|
|
|
+ console.log('保存操作失败')
|
|
|
+ }
|
|
|
+ }).catch(e=>{
|
|
|
+ console.log('保存操作失败')
|
|
|
+ console.log(e)
|
|
|
+ })
|
|
|
+ },
|
|
|
setWidth() {
|
|
|
let w = this.$refs.ch_box;
|
|
|
let w2 = w.offsetWidth + 30 + "px";
|
|
@@ -359,6 +390,10 @@ export default {
|
|
|
if(this.itemType==4 && this.recordType==1){//关闭悬浮语音助手
|
|
|
this.$refs.levitatedSphereRef.stopRecord();
|
|
|
}
|
|
|
+
|
|
|
+ if(this.itemType==3){
|
|
|
+ this.insertMemorandum(`打开<span class="btn">倒计时</span>面板`)
|
|
|
+ }
|
|
|
});
|
|
|
},
|
|
|
//计时
|
|
@@ -440,6 +475,10 @@ export default {
|
|
|
},
|
|
|
commentAndAnnotate(){
|
|
|
this.$refs.AnnotationCanvasRef.open();
|
|
|
+ this.insertMemorandum(`开始使用<span class="btn">批注</span>功能`)
|
|
|
+ },
|
|
|
+ endCommentAndAnnotate(){
|
|
|
+ this.insertMemorandum(`结束使用<span class="btn">批注</span>功能`)
|
|
|
}
|
|
|
}
|
|
|
};
|
|
@@ -465,8 +504,8 @@ export default {
|
|
|
display: flex;
|
|
|
flex-direction: column;
|
|
|
align-items: center;
|
|
|
- overflow-y: auto;
|
|
|
- overflow-x: hidden; /* 确保横向溢出内容可见 */
|
|
|
+ overflow-y: auto !important; /* 上下溢出显示滚动条 */
|
|
|
+ overflow-x: visible !important; /* 左右溢出正常溢出 */
|
|
|
position: relative;
|
|
|
}
|
|
|
|
|
@@ -532,6 +571,7 @@ export default {
|
|
|
|
|
|
.ch_nav_box_top {
|
|
|
width: 100%;
|
|
|
+ height:auto;
|
|
|
margin-top: auto;
|
|
|
}
|
|
|
|
|
@@ -554,7 +594,7 @@ export default {
|
|
|
.itemFold {
|
|
|
position: absolute;
|
|
|
width: 65px;
|
|
|
- left:0px;
|
|
|
+ left:0;
|
|
|
top: 65px;
|
|
|
background: rgb(255, 255, 255);
|
|
|
box-sizing: border-box;
|