Merge branch 'master_20250319-lyc' into test20250220

# Conflicts:
#	src/views/portal/case/Index.vue
This commit is contained in:
joshen
2025-03-19 13:35:37 +08:00

View File

@@ -291,7 +291,8 @@
<!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
</div>
<!-- <div class="teacher-remark" v-html="item.authorInfo.sign"></div> -->
<div class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
<div v-if="item.teacherType === 1 " class="teacher-remark">{{cutOrgNamePath(item.authorInfo.orgInfo)}}</div>
<div v-else>{{item.supplier}}</div>
</div>
<div style="padding-top:15px;width:70px;">
<followButton v-if="item.teacherName!=='BOE教师'" :auto="true" size="small" :aid="item.teacherId"></followButton>
@@ -1165,7 +1166,7 @@
// }
// }
},
onFullscreen(full) {
let divId = 'videowatermark';
var div = document.getElementById('myVideoPlayer')