Compare commits

..

19 Commits

Author SHA1 Message Date
王卓煜
1b6f50a19a Merge remote-tracking branch 'origin/20250708_add_wzy' into 20250708_add_wzy 2025-09-09 14:25:06 +08:00
王卓煜
e81d81a3ee 修复标签模块的分类关联标签搜索以及清除按钮问题 2025-09-09 14:23:36 +08:00
13d698ad97 feat: 右侧菜单高度调整为 650 2025-09-08 19:21:10 +08:00
114ce94f0a Merge remote-tracking branch 'origin/20250708_add_wzy' into 20250708_add_wzy 2025-09-08 18:47:15 +08:00
6031f79b6f feat: 溢出控制高度的代码, 防止内容塌陷 2025-09-08 18:46:37 +08:00
王卓煜
a265c226fb Merge remote-tracking branch 'origin/20250708_add_wzy' into 20250708_add_wzy 2025-09-03 10:44:01 +08:00
王卓煜
d8d858764d 修复学员前端标签点击样式错误的问题 2025-09-03 10:29:09 +08:00
joshen
2738ea9b8f Merge remote-tracking branch 'aliyun/20250708_add_wzy' into 20250708_add_wzy 2025-08-29 11:42:05 +08:00
b4a0261f8a feat: 溢出控制高度的代码, 防止内容塌陷 2025-08-29 11:31:09 +08:00
王卓煜
6ed7201159 课程详情暂时不展示标签 2025-08-28 09:44:00 +08:00
王卓煜
9e9ccf0b3a 修复新建标签的显示模式 2025-08-25 15:23:50 +08:00
王卓煜
60625d8058 修复新建标签没有courseId 2025-08-25 15:03:00 +08:00
王卓煜
fadd4c5006 修复标签模块查询不显示以及新建标签 2025-08-22 15:16:01 +08:00
王卓煜
32cae2aee4 修复管理端创建标签时字数限制为8个字 2025-08-20 13:47:02 +08:00
王卓煜
2c2f666c4a 修复管理端在线课程添加标签没有传递数据 2025-08-20 13:46:19 +08:00
王卓煜
6302157e12 修复学员端并没有展示10个最新的标签 2025-08-20 11:24:14 +08:00
王卓煜
9d7bf92d48 Merge remote-tracking branch 'origin/20250708_add_wzy' into 20250708_add_wzy 2025-08-18 09:50:36 +08:00
王卓煜
7f5f478bde 修复案例的浏览记录中,时间戳显示格式问题 2025-08-11 17:15:48 +08:00
joshen
4eebcf6c22 Merge branch 'master-0626' into 20250708_add_wzy 2025-07-21 20:17:17 +08:00
9 changed files with 441 additions and 376 deletions

View File

@@ -1,10 +1,9 @@
/**
* 课程的操作,课程的添加,修改,列表查询,课程的审核发布等操作。
* 针对于管理员,教师的功能
*
*
**/
import ajax from '@/utils/xajax.js'
import request from "../unionAjax";
/**
* 保存课程基本信息,新增和更新都是此方式
@@ -171,9 +170,6 @@ const updateContentOrders = function(cid,items) {
const detail = function(id) {
return ajax.get('/xboe/m/course/manage/detail?id=' + id);
}
const getDictIds = function(pid,type) {
return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`);
}
/**
* 更新内容的名称
@@ -278,7 +274,7 @@ const countWaitAudit = function() {
}
/**
* [已用courseAudit中的hrbpAuditList替换]
* [已用courseAudit中的hrbpAuditList替换]
* 当前用户需要审核的课程列表
* @param {Object} query 同pageList
*/
@@ -287,9 +283,9 @@ const auditList = function(query) {
}
/**
* 【已移到courseAudit中】
* 教师需要审核的课程列表
/**
* 【已移到courseAudit中】
* 教师需要审核的课程列表
*/
const teacherAuditList = function(query) {
return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -450,7 +446,6 @@ export default {
findUpdateLogs,
getUpdateLog,
detail,
getDictIds,
saveContent,
pageList,
setEnabled,

View File

@@ -141,7 +141,6 @@
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="2">移动端可见</el-radio>
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="3">多端可见</el-radio>
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
</el-form-item>
<el-form-item v-if="!weike.onlyRequired" label="课程来源">
<el-radio-group v-model="courseInfo.source">
@@ -255,7 +254,7 @@
<choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
</el-form-item>
<el-form-item label="标签" required>
<courseTag :courseId="curCourseId" :sysTypeList="sysTypeList"></courseTag>
<courseTag ref="courseTag" :courseId="curCourseId" :sysTypeList="sysTypeList" :initialTags="courseTags" @change="handleTagsChange"></courseTag>
</el-form-item>
<el-form-item label="关键字">
<el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords" placeholder="请输入关键字"></el-input>
@@ -309,7 +308,6 @@
<el-radio v-model="courseInfo.device" :label="1">PC端可见</el-radio>
<el-radio v-model="courseInfo.device" :label="2">移动端可见</el-radio>
<el-radio v-model="courseInfo.device" :label="3">多端可见</el-radio>
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" v-if="isPermission" :label="4">仅内网访问</el-radio>
</el-col>
<el-col :span="10">
<el-form-item label="课程来源">
@@ -424,6 +422,7 @@ import apiCourse from '../../api/modules/course.js';
import apiCourseAudit from '../../api/modules/courseAudit.js';
import apiOrg from '../../api/system/organiza.js';
import apiUser from '../../api/system/user.js';
import apiCourseTag from '../../api/modules/courseTag.js';
import WxEditor from '@/components/Editor/index.vue';
import catalogSort from '@/components/Course/catalogSort.vue';
import { courseType, getType } from '../../utils/tools.js';
@@ -472,6 +471,7 @@ export default {
orgName:'',
orgNamePath:'',
orgKid:'',
courseTags:[],
courseInfo: {
id: '',
name: '',
@@ -494,8 +494,6 @@ export default {
refType:''
},
visibleShow:false,
isPermission:false,
dicts:[],
extendRefId:'',
extendRefType:'',
courseTeachers: [], //课程的老师
@@ -535,11 +533,7 @@ export default {
dlgShow: false
},
rightTypeId: {},
catalogSortDialogShow: false,
selectedOrg: {
orgId: null,
name: ''
}
catalogSortDialogShow: false
};
},
created() {
@@ -564,18 +558,14 @@ export default {
},
watch: {
courseInfo: {
handler(newVal, oldVal) {
// 需要保存
handler(newVal) {
//需要保存
this.requireSaveCourse = true;
console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId);
this.checkOrgPermission(newVal.orgId);
},
deep: true
}
},
mounted() {
this.getDictIds();
let extendFlag=this.$route.query.f; //是否是管理端过来的
this.extendRefId=this.$route.query.refId;
this.extendRefType=this.$route.query.refType;
@@ -597,19 +587,6 @@ export default {
this.loadUserGroup();
},
methods: {
// 检查机构权限
checkOrgPermission(orgId) {
console.log("--- 监测组织id orgId = ",orgId)
console.log("--- this.isPermission = ",this.isPermission)
console.log("--- device = ",this.courseInfo.device)
if (!orgId) {
this.isPermission = false;
return;
}
console.log("--- dicts = ",this.dicts)
this.isPermission = this.dicts.includes(orgId);
console.log("--- 监听结束 this.isPermission = ",this.isPermission)
},
// 关键字的更改
changeKeywords(option){
if(option.target.value){
@@ -621,6 +598,15 @@ export default {
closeKeywordsTag(item,index){
this.tips.splice(index, 1);
},
// 处理标签变化事件
handleTagsChange(tags) {
console.log("父组件:",tags)
let ids = "";
tags.forEach(tag=>{
ids += tag.id + ',';
})
this.courseInfo.tags = ids;
},
showChooseOrg(){
this.$refs.refChooseOrg.dlgShow = true;
},
@@ -751,6 +737,7 @@ export default {
this.$emit('close');
},
initShow(editData) {
console.log('初始化显示内容============', editData)
//console.log(this.$refs.weikePanel,'this.$refs.weikePanel');
//this.$refs.weikePanel.init();
//this.$refs.onlineCourse.resetData();
@@ -798,6 +785,8 @@ export default {
this.tips=[];
if (!editData) {
this.tips=[];
this.courseTags=[],
//console.log("新建课程?");
//以下为了保证初始化处理
this.weikeReset = Math.round(Math.random()) + '';
@@ -894,6 +883,8 @@ export default {
if (rs.status == 200) {
this.courseChooseShow = false;
this.courseInfo = rs.result;
this.curCourseId = this.courseInfo.id
console.log('保存课程成功',this.curCourseId)
if (this.courseChooseId == 1) {
this.weike.dlgShow = true;
} else {
@@ -914,29 +905,16 @@ export default {
this.courseCoverurl = '';
this.courseInfo.coverImg = '';
},
//获取字典信息
async getDictIds() {
console.log("--- 获取字典信息 1 = ", this.dicts);
try {
const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise
console.log("--- 获取字典信息 2 result= ", response);
if (response.status === 200) {
this.dicts = response.result.dicts; // 正确提取 dicts
console.log("--- 获取字典信息 3 = ", this.dicts);
}
} catch (error) {
console.error("获取字典信息失败:", error);
}
},
//获取课程信息
async getDetail(id) {
this.curCourseId = id;
this.orgName='';
this.isPermission = false;
let $this = this;
let $this = this;
try {
const { result, status } = await apiCourse.detail(id);
if (status === 200) {
this.courseTags = result.tagList;
console.log('获取课程信息成功', this.courseTags);
//把数据附给三个对象
if(result.course.visible==''){
result.course.visible=false;
@@ -950,10 +928,7 @@ export default {
this.contentInfo.list = result.contents;
this.sectionInfo.list = result.sections;
this.courseTeachers = result.teachers; //课程的老师信息
this.isPermission = result.isPermission; //课程的老师信息
this.dicts = result.dicts; //课程的老师信息
console.log("--- 编辑查看 this.isPermission = ",this.isPermission)
console.log("--- 编辑查看 this.dicts = ",this.dicts)
if(!this.courseInfo.orgId){
//根据课程创建者获取机构id
apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{
@@ -1005,7 +980,6 @@ export default {
}
});
}
this.resOwnerArray=[];
if (result.course.resOwner1 == '') {
this.resOwnerArray.push(result.course.resOwner1);
@@ -1290,7 +1264,7 @@ export default {
teachers: saveTeachers,
crowds:crowds
};
//console.log(postData);
console.log(postData);
//this.btnLoading=false;
apiCourse
.saveBase(postData)

View File

@@ -13,6 +13,7 @@
:disabled="sysTypeList.length===0"
placeholder="按回车键Enter创建标签"
@remove-tag="handleTagRemove"
@change="handleSelectionChange"
@keyup.enter.native="handleEnterKey"
>
<el-option
@@ -22,18 +23,6 @@
:value="item"
/>
</el-select>
<!-- 预览 ---
<div class="tag-preview">
<el-tag
v-for="tag in displayTags"
:key="tag.id"
closable
@close="removeTag(tag.id)"
>
{{ tag.tagName }}
</el-tag>
</div>
-->
</div>
</template>
@@ -56,6 +45,11 @@ export default {
maxTags: {
type: Number,
default: 10
},
// 添加接收初始标签数据的props
initialTags: {
type: Array,
default: () => []
}
},
data() {
@@ -65,7 +59,8 @@ export default {
loading: false,
tagMap: new Map(),
inputBuffer: '',
params: {}
params: {},
tag: {}
}
},
computed: {
@@ -81,7 +76,43 @@ export default {
console.log("----------sysTypeList.length---------->"+this.sysTypeList.length)
console.log("----------sysTypeList.length---------->"+(this.sysTypeList.length===0))
},
// 添加:挂载时初始化标签数据
mounted() {
if (this.initialTags && this.initialTags.length > 0) {
this.selectedTags = this.initialTags;
this.searchResults = this.initialTags;
// 将初始标签添加到tagMap中确保删除功能正常
this.initialTags.forEach(tag => {
if (tag.id) {
this.tagMap.set(tag.id, tag);
}
});
}
},
watch: {
// 监听课程ID变化重置所有状态
courseId(newVal) {
this.resetTagState();
},
// 监听初始标签变化,重新加载
initialTags(newVal) {
this.selectedTags = newVal || [];
this.searchResults = newVal || [];
this.tagMap.clear(); // 清空旧缓存
newVal.forEach(tag => {
if (tag.id) this.tagMap.set(tag.id, tag);
});
}
},
methods: {
// 新增:重置标签状态的方法
resetTagState() {
this.selectedTags = [];
this.searchResults = [];
this.tagMap.clear();
this.loading = false;
this.params = {};
},
async doSearch(query) {
if (!query.trim()) {
this.searchResults = []
@@ -116,8 +147,17 @@ export default {
}
},
// 新增:处理选择变化事件
handleSelectionChange() {
this.$emit('change', this.displayTags)
},
//创建新标签
async createNewTag(tagName) {
// 标签不能超过八个字
if (tagName.length > 8) {
this.$message.error('标签不能超过8个字')
return;
}
this.loading = true
try {
this.params.courseId = this.courseId;
@@ -133,9 +173,11 @@ export default {
this.params.sysType3 = this.sysTypeList[2]; //三级的id
}
const {result:newTag} = await apiCourseTag.createTag(this.params)
this.$message.success('标签创建成功');
this.searchResults.push(newTag)
console.log("----------newTag---------->",this.searchResults)
this.tagMap.set(newTag.id, newTag)
this.selectedTags.push(newTag.tagName)
this.$emit('change', this.selectedTags.map(tag => tag.id))
this.$emit('change', this.displayTags)
} finally {
this.loading = false
}

View File

@@ -317,7 +317,7 @@ export default {
}
setInterval(() => {
// console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration)
// 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行
if(!this.isDrag){
var time = localStorage.getItem('videoProgressData')
@@ -364,10 +364,10 @@ export default {
}
// 根据视频的readyState判断下一帧是否已加载并控制loading的显示
this.isShowLoading = this.videoDom.readyState < 3;
// console.log("当前缓存:"+this.videoDom.readyState)
console.log("当前缓存:"+this.videoDom.readyState)
if (this.videoDom.readyState < 3){
// console.log("详细信息",this.videoDom)
// console.log("卡了",this.videoDom.readyState)
console.log("详细信息",this.videoDom)
console.log("卡了",this.videoDom.readyState)
}
//if()
//console.log(this.videoDom.readyState,'this.videoDom.readyState');

View File

@@ -37,6 +37,7 @@ export default {
},
isDrag:{
type: Boolean,
default: true,
},
blobId:{
type: String,
@@ -72,58 +73,51 @@ export default {
},
methods: {
down(e) {
// if(this.isDrag) {
this.$emit("getMouseDownStatus", true);
this.is_mousedown_progress = true;
// 获取完整进度条的clientXdom左上角
let init_clientX = this.dom_full.getBoundingClientRect().left;
// 计算调整后的当前进度条的长度
this.current_width_px = e.clientX - init_clientX;
// 设置当前的播放进度(同时作用于当前进度条的样式)
let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
if(current>1) current = 1;
if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {}
console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
// 禁止拖动 true:禁止拖动false:允许拖动
if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
// }
if (!this.isDrag) return;
this.$emit("getMouseDownStatus", true);
this.is_mousedown_progress = true;
// 获取完整进度条的clientXdom左上角
let init_clientX = this.dom_full.getBoundingClientRect().left;
// 计算调整后的当前进度条的长度
this.current_width_px = e.clientX - init_clientX;
// 设置当前的播放进度(同时作用于当前进度条的样式)
let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
if(current>1) current = 1;
if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {}
// 禁止拖动
if(time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
},
move(e) {
if (this.is_mousedown_progress) {
let init_clientX = this.dom_full.getBoundingClientRect().left;
this.current_width_px = e.clientX - init_clientX;
let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
if(current>1) current = 1;
if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {}
console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
// 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
}
if (!this.isDrag || !this.is_mousedown_progress) return;
let init_clientX = this.dom_full.getBoundingClientRect().left;
this.current_width_px = e.clientX - init_clientX;
let current = (e.clientX - init_clientX) / this.dom_full.clientWidth;
if(current>1) current = 1;
if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {}
// 禁止拖动
if(time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
},
up() {
if (this.is_mousedown_progress) {
// 标记鼠标不处于按下的状态了
this.is_mousedown_progress = false;
// 松开鼠标后即调整进度条后此时的进度0-1
let current = this.current_width_px / this.dom_full.clientWidth;
if(current>1) current = 1;
if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {}
console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current)
this.$emit("getMouseDownStatus", false);
// 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
this.$emit("getMouseDownStatus", false);
}
if (!this.isDrag || !this.is_mousedown_progress) return;
// 标记鼠标不处于按下的状态了
this.is_mousedown_progress = false;
// 松开鼠标后即调整进度条后此时的进度0-1
let current = this.current_width_px / this.dom_full.clientWidth;
if(current>1) current = 1;
if(current<0) current = 0;
var time = localStorage.getItem('videoProgressData');
var arr = time&&JSON.parse(time) || {}
this.$emit("getMouseDownStatus", false);
// 禁止拖动
if(time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current);
},
},
};

View File

@@ -664,12 +664,6 @@ export default {
return !this.speciData.some(item => item.fielclass);
}
},
formatDateTime(dateArray) {
if (!dateArray || dateArray.length !== 6) return '';
const [year, month, day, hour, minute, second] = dateArray;
const pad = (num) => num.toString().padStart(2, '0');
return `${year}-${pad(month)}-${pad(day)} ${pad(hour)}:${pad(minute)}:${pad(second)}`;
},
beforeRouteLeave (to, from, next) {
const isScroll = 'caseDetail,caseCharts,caseExcellent'
if(!isScroll.includes(to.name)){
@@ -868,6 +862,12 @@ export default {
this.popularityName = this.switch[e]
this.getPopularity()
},
formatDateTime(dateArray) {
if (!dateArray || dateArray.length !== 6) return '';
const [year, month, day, hour, minute, second] = dateArray;
const pad = (num) => num.toString().padStart(2, '0');
return `${year}-${pad(month)}-${pad(day)} ${pad(hour)}:${pad(minute)}:${pad(second)}`;
},
handleType(msg){
// this.queryCondition.type = msg
},
@@ -2811,3 +2811,4 @@ export default {
}
}
</style>

View File

@@ -35,7 +35,7 @@
<!-- <div><span style="font-size:20px;color:#ff8e00">{{courseInfo.score ? courseInfo.score.toFixed(1) : 0}}</span><span style="font-size:12px;color:#ff8e00"></span></div> -->
</div>
<div class="label-div">
<el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>
<!-- <el-tag class="label-item" effect="plain" v-for="(item,tagIdx) in tagArray" :key="tagIdx">{{item}}</el-tag>-->
</div>
<!-- <div style="width:160px;height:50px"> -->
<!-- </div> -->

View File

@@ -43,7 +43,7 @@
:disabled="!twoList.children.length" :open-delay="0" :close-delay="0" trigger="hover"
:visible-arrow="false" @hide="leaveIndex" @show="changeIndex(twoList.id)" transition="none">
<div class="course-two-content" slot="reference">{{
twoList.name }}</div>
twoList.name }}</div>-
<!-- 内容 -->
<div class="course-three-box">
<div class="course-three-box-title">
@@ -315,7 +315,7 @@
<div class="option-item" style="padding-top: 2px"
v-for="tag in hotTagsList" :key="tag.id"
@click="handleTagClick(tag, hotTagsList)">
<a class="custom" :class="tag.checked ? 'custom2' : ''">{{tag.name}}</a>
<a class="custom" :class="tag.checked ? 'custom2' : ''">{{tag.tagName}}</a>
</div>
</div>
</div>
@@ -333,9 +333,9 @@
<div v-if="stagList.length > 0 && !newData" class="search-div" style="padding: 0;margin-bottom: 20px;">
<div class="searchbar" style="background-color:#f6f7fb;display: flex;justify-content: space-between;">
<div style="line-height: 30px;">
<span class="item-title"> 搜索条件</span>
<span class="item-title"> 搜索条件:</span>
<el-tag closable v-for="(tag, tagIdx) in stagList" :key="'t' + tagIdx" @close="stagClose(tag, tagIdx)">{{
tag.name }}</el-tag>
tag.tagName }}</el-tag>
</div>
<div>
<el-button type="primary" size="mini" @click="handleClearTags">清除</el-button>
@@ -570,26 +570,43 @@ export default {
},
stagList() { //计算出选择的内容
let list = [];
// 关键词
if (this.keyword) {
list.push({
type: 0,
id: 'keyword',
name: this.keyword,
tagName: this.keyword,
checked: true
})
});
}
// 课程类型
this.ctypeList.forEach(item => {
if (item.checked) {
list.push(item);
list.push({
...item,
tagName: item.name
});
}
});
// 热点标签 - 这是关键修复
this.hotTagsList.forEach(item => {
if (item.checked) {
list.push(item);
list.push({
...item,
name: item.tagName || item.name,
tagName: item.tagName || item.name,
type: 14
});
}
});
// 三级分类
this.oneList.forEach(one => {
var twoChildChecked = false;//是否有下级
var twoChildChecked = false;
one.children.forEach(two => {
if (two.checked) {
twoChildChecked = true;
@@ -597,34 +614,28 @@ export default {
var threeChildChecked = false;
two.children.forEach(three => {
if (three.checked) {
list.push(three);
list.push({
...three,
tagName: three.name
});
threeChildChecked = true;
}
});
if (two.checked && !threeChildChecked) {
list.push(two);
list.push({
...two,
tagName: two.name
});
}
});
if (one.checked && !twoChildChecked) {
list.push(one);
list.push({
...one,
tagName: one.name
});
}
})
// this.oneList.forEach(item=>{
// if(item.checked){
// list.push(item);
// }
// });
// this.twoList.forEach(item=>{
// if(item.checked){
// list.push(item);
// }
// });
// this.threeList.forEach(item=>{
// if(item.checked){
// list.push(item);
// }
// });
//console.log(list,'list');
});
return list;
},
ctypeTagAll() {
@@ -654,18 +665,7 @@ export default {
},
data() {
return {
hotTagsList: [ //热点标签
{id:1,name:"数据库", checked: false },
{id:2,name:"Python", checked: false },
{id:3,name:"Java", checked: false },
{id:4,name:"Vue3.0", checked: false },
{id:5,name:"大数据", checked: false },
{id:6,name:"Bootstrap", checked: false },
{id:7,name:"营销学", checked: false },
{id:8,name:"芯片", checked: false },
{id:9,name:"火箭", checked: false },
{id:10,name:"感悟", checked: false }
],
hotTagsList: [],
newData: false,//线上品牌系列隐藏
navTitle: [],
// 设置高亮
@@ -744,7 +744,10 @@ export default {
//初始化:获取最新前10个热点标签
apiCourseTag.getHotTagList(null).then(rs => {
if (rs.status == 200) {
this.hotTagsList = rs.result;
this.hotTagsList = rs.result.map(tag => ({
...tag,
checked: false
}));
} else {
console.log(rs.message);
}
@@ -932,10 +935,54 @@ export default {
//搜索条件
stagClose(tag, tagIndex) {
tag.checked = false;
// 根据标签类型处理不同的清除逻辑
if (tag.type == 0) {
// 关键词类型
this.keyword = '';
} else if (tag.type == 1) {
// 课程类型(录播课、线下课、学习项目)
this.ctypeList.forEach(item => {
if (item.id == tag.id) {
item.checked = false;
}
});
} else if (tag.type == 14) {
// 热点标签类型
this.hotTagsList.forEach(item => {
if (item.id == tag.id) {
item.checked = false;
}
});
// 更新course.tags移除被删除的热点标签
const checkedHotTags = this.hotTagsList.filter(tag => tag.checked);
let tagIds = checkedHotTags.map(tag => tag.id).join(',');
this.course.tags = tagIds;
} else if (tag.type == 11 || tag.type == 12 || tag.type == 13) {
// 三级分类标签
this.oneList.forEach(one => {
if (one.id == tag.id) {
one.checked = false;
}
one.children.forEach(two => {
if (two.id == tag.id) {
two.checked = false;
}
two.children.forEach(three => {
if (three.id == tag.id) {
three.checked = false;
}
});
});
});
}
this.navTitle = []
// 重置导航标题
this.navTitle = [];
// 触发搜索更新
this.searchData();
},
@@ -973,31 +1020,33 @@ export default {
this.searchData();
},
// 清除
handleClearTags() {
//清空所有的条件
this.keyword = '';
this.ctypeList.forEach(item => {
item.checked = false;
handleClearTags() {
//清空所有的条件
this.keyword = '';
this.ctypeList.forEach(item => {
item.checked = false;
});
this.hotTagsList.forEach(item => {
item.checked = false;
});
this.course.tags = ''; // 清空标签ID
// 添加清除三级分类的逻辑
this.oneList.forEach(one => {
one.checked = false;
one.children.forEach(two => {
two.checked = false;
two.children.forEach(three => {
three.checked = false;
});
this.hotTagsList.forEach(item => {
item.checked = false;
});
this.oneList.forEach(one => {
one.checked = false;
one.children.forEach(two => {
two.checked = false;
two.children.forEach(three => {
three.checked = false;
})
})
});
this.twoList = [];
this.threeList = [];
this.navTitle = [];
this.newData = false;
sessionStorage.removeItem(this.localSessionKey)
this.searchData();
},
});
});
// 清空导航标题
this.navTitle = [];
this.searchData();
},
// 导航切换(录播课,线下课,学习项目)
handleTypeClick(item, list) {
item.checked = !item.checked;
@@ -1012,13 +1061,21 @@ export default {
//点击标签
handleTagClick(item, list) {
item.checked = !item.checked;
this.searchData();
// 更新course.tags
const checkedTags = this.hotTagsList.filter(tag => tag.checked);
let tagIds = checkedTags.map(tag => tag.id).join(',');
this.course.tags = tagIds;
// 强制触发stagList重新计算
this.$nextTick(() => {
this.searchData();
});
},
//三级分类
handleOptionClick(item, level, list) {
// 线上品牌展示效果
this.newData = item.newData;
console.log(this.newData);
// 单选,排除法
this.oneList.forEach(one => {
one.checked = false;
@@ -1493,7 +1550,18 @@ export default {
that.course.sysType3 += item.id;
}
});
apiCourseTag.getHotTagList(that.course).then(rs => {
if (rs.status == 200) {
// 保留已选中标签的状态
const currentCheckedTags = this.hotTagsList.filter(tag => tag.checked);
this.hotTagsList = rs.result.map(tag => ({
...tag,
checked: currentCheckedTags.some(checkedTag => checkedTag.id === tag.id)
}));
} else {
console.log(rs.message);
}
}),
this.isFind = true;
this.course.device = 1;
if (this.course.pageIndex == 1) {

View File

@@ -22,101 +22,99 @@
<div class="course-playbox" ref="coursePlayerBox" id="id_course_player_box">
<div class="course-player" ref="coursePlayer" id="id_course_player">
<div>
<div v-if="Internet != 2">
<div v-if="resType == null || resType == 0">
<!--先显示视频图片-->
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
</div>
<div v-if="resType == 10" style="position: relative;">
<videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
:initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
:isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
@onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
<div class="player-box" v-if="playerBoxShow">
<div class="player-praise" style="cursor: pointer;">
<div @click="praiseContent">
<img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
<img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
<!-- {{ courseInfo.praises }} -->
<div style="color:#fff;cursor: pointer;"></div>
</div>
<div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
<img class="icon-small" v-if="isTrample"
:src="require('@/assets/images/icon/trample-active.png')" />
<img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
<!-- {{ courseInfo.trampleCount }} -->
<div style="color:#fff;cursor: pointer;"></div>
</div>
<div v-if="resType == null || resType == 0">
<!--先显示视频图片-->
<course-image v-if="courseInfo.id != ''" :course="courseInfo"></course-image>
</div>
<div v-if="resType == 10" style="position: relative;">
<videoPlayer ref="myVideoPlayer" id="myVideoPlayer" @progress="progress" :src="blobUrl" :blobId="blobId" @onPlayerPlaying="onPlayerPlaying"
:initTime="contentData.lastStudyTime" :notePlay="notePlay" @onPlayerPlay="onPlayerPlay"
:isDrag="curriculumData.isDrag" @onFullscreen="onFullscreen" @onPlayerPause="onPlayerPause"
@onPlayerEnded="onPlayerEnded" :isCrowd="isCrowd" @onTimeUpdate="handleAudioTimeUpdate"></videoPlayer>
<div class="player-box" v-if="playerBoxShow">
<div class="player-praise" style="cursor: pointer;">
<div @click="praiseContent">
<img class="icon-small" v-if="isPraise" :src="require('@/assets/images/icon/praise-active.png')" />
<img class="icon-small" v-else :src="require('@/assets/images/icon/zhan.png')" />
<!-- {{ courseInfo.praises }} -->
<div style="color:#fff;cursor: pointer;"></div>
</div>
<div v-if="!scoreInfo.has" class="player-rate">
<div style="margin-left: 15px;cursor: pointer;" @click="treadContent">
<img class="icon-small" v-if="isTrample"
:src="require('@/assets/images/icon/trample-active.png')" />
<img class="icon-small" v-else :src="require('@/assets/images/icon/cai.png')" />
<!-- {{ courseInfo.trampleCount }} -->
<div style="color:#fff;cursor: pointer;"></div>
</div>
</div>
<div v-if="!scoreInfo.has" class="player-rate">
<el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></el-rate>
<el-rate v-model="scoreInfo.score" text-color="#ff9900" score-template="{value}" void-color="#fff" @change="addScore"></el-rate>
</div>
<div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
<div class="player-rate" style="padding-left: 35px;">
<el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
</div>
<div v-if="scoreInfo.has" style="padding-top: 5px;display: flex;">
<div class="player-rate" style="padding-left: 35px;">
<el-rate disabled v-model="courseInfo.score" :allow-half="true"></el-rate>
</div>
<span class="score-text" style="margin-top:35px">
<span class="score-text" style="margin-top:35px">
<span style="color:#ffb30f;">{{ toScore(courseInfo.score) }}</span>
<span style="font-size: 12px;color: #fff"></span>
</span>
</div>
</div>
</div>
<div v-if="resType == 20">
<div class="con-audio">
<div class="con-audio-title">{{ contentData.contentName }}</div>
<div class="con-audio-player">
<audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
@onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
</div>
</div>
</div>
<div v-if="resType == 40">
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
<div>此课程内容无法预览请联系管理员</div>
</div>
<div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
此课程内容无法预览请联系管理员
</div>
<pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
</pdfPreview>
</div>
<div v-if="resType == 41">
<div style="padding: 20px;" v-html="contentData.content"></div>
</div>
<div v-if="resType == 50" style="min-height: 500px;">
<iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:500px;border:0px;"></iframe>
</div>
<div v-if="resType == 52">
<div v-if="contentData.content != ''">
<div class="hyper-link" v-if="conLink.openType == 2">
<div class="hyper-link-row">{{ contentData.contentName }}</div>
<div class="hyper-link-row">{{ conLink.url }}</div>
</div>
<div v-if="conLink.openType == 1"><iframe :src="conLink.url"
style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
</div>
</div>
<div v-if="resType == 60">
<homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
</div>
<div v-if="resType == 61">
<exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
</div>
<div v-if="resType == 62" style="padding:5px">
<assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
</assess>
</div>
</div>
<div v-if="Internet == 2 || Internet == 3" style="margin:350px 250px" class="jianjie pdftext" id="pdfPreview">
<div style="margin-top:40px;font-weight:700;font-size: 22px;color: #ccc">
<span>十分抱歉您当前的网络环境不符合观看要求为了保障案例信息的安全您需要接入公司内网才能观看</span>
<div v-if="resType == 20">
<div class="con-audio">
<div class="con-audio-title">{{ contentData.contentName }}</div>
<div class="con-audio-player">
<audioPlayer v-if="resType == 20" :url="blobUrl" :name="contentData.contentName" @onPlaying="audioPlaying" :isDrag="curriculumData.isDrag"
@onPlay="audioPlay" @onPause="audioPause" @onPlayEnd="audioEnd"></audioPlayer>
</div>
</div>
<div style="margin-top:20px;text-align:center" @click="()=>window.location.reload();">
<el-button type="primary">重新检测</el-button>
</div>
<div v-if="resType == 40">
<div style="padding: 10px;color: #ed0000; " v-if="curCFile.converStatus < 2 && !contentData.content">
<div>此课程内容无法预览请联系管理员</div>
</div>
<div style="padding: 10px;color: #ed0000;" v-if="curCFile.converStatus == 3 && !contentData.content">
此课程内容无法预览请联系管理员
</div>
<pdfPreview :autoScroll="true" v-if="resType == 40" :filePath="fileBaseUrl + contentData.content">
</pdfPreview>
</div>
<div v-if="resType == 41">
<div style="padding: 20px;" v-html="contentData.content"></div>
</div>
<div v-if="resType == 50" style="min-height: 500px;">
<iframe v-if="scormUrl" :src="scormUrl" frameborder="0" border="0px" style="width:100%;height:500px;border:0px;"></iframe>
</div>
<div v-if="resType == 52">
<div v-if="contentData.content != ''">
<div class="hyper-link" v-if="conLink.openType == 2">
<div class="hyper-link-row">外链名称: {{ contentData.contentName }}</div>
<!-- <button class="copy-button" @click="copyUrl(conLink.url)">复制外链</button>-->
<!-- <div class="hyper-link-row">外链地址: {{ conLink.url }}</div>-->
<!-- <button class="copy-button" @click="copyUrl(conLink.url)">复制外链</button>-->
<div class="hyper-link-url-container">
<!-- <span class="hyper-link-url" @click="copyUrl(conLink.url)" >外链地址: {{ conLink.url }}</span>-->
<div class="hyper-link-url">
<el-button @click="widthOpen(conLink.url)" type="primary" style="margin-left: 15px">点击前往</el-button>
</div>
</div>
</div>
<div v-if="conLink.openType == 1"><iframe :src="conLink.url"
style="width: 100%;border:0px;min-height: 473px;" frameborder="0"></iframe></div>
</div>
</div>
<div v-if="resType == 60">
<homework @submit="homeWorkSubmit" v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
</div>
<div v-if="resType == 61">
<exam @startTest="startTest" v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
</div>
<div v-if="resType == 62" style="padding:5px">
<assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
</assess>
</div>
</div>
<!--交互部分-->
@@ -169,15 +167,15 @@
<div class="course-control">
<div class="control-tab" v-if="contentList.length>0" >
<div v-if="contentList.length>1" @click="heartabone" :class="tab == 1 ? 'control-tab-active' : ' '">
<i class="el-icon-reading" style="margin-right:9px;margin-left:9px"></i>课程单元
<i class="el-icon-reading" style="margin-right:9px;margin-left:9px"></i>
</div>
<div @click="heartabtwo" :class="tab == 2 ? 'control-tab-active' : ' '">
<i class="el-icon-edit" style="margin-right:9px;margin-left:9px"></i>我的笔记
</div>
</div>
<!-- 课程单元 -->
<!-- -->
<div class="course-units" v-if="tab == 1">
<div :style="`height: ${controlHeight}px;overflow-y: auto;`">
<div style="min-height: 350px;max-height: 650px ;overflow-y: auto;">
<div class="catalog" v-if="courseInfo.type == 20">
<div v-for="(item, index) in catalogTree" :key="index" :name="index">
<el-menu
@@ -287,15 +285,18 @@
<div class="teacher" v-for="(item, idx) in teachers" :key="idx">
<div class="teacher-avator" @click="toUserHome(item)" title="点击进入他的主页">
<!-- <div class="teacher-text" v-if="item.authorInfo.avatar == ''">{{userAvatarText(item.teacherName)}}</div> -->
<div v-if="item.authorInfo.avatar !== ''">
<div v-if="item.authorInfo && item.authorInfo.avatar">
<el-avatar :src="fileBaseUrl + item.authorInfo.avatar" shape="circle" :size="50"></el-avatar>
</div>
<div v-else-if="item.photo">
<el-avatar :src="item.photo" shape="circle" :size="50"></el-avatar>
</div>
<div v-else class="teacher-text">
<div v-if="item.authorInfo.sex === 1 "><img src="../../../public/images/Avatarman.png" alt=""></div>
<div v-if="item.authorInfo && item.authorInfo.sex === 1"><img src="../../../public/images/Avatarman.png" alt=""></div>
<div v-else><img src="../../../public/images/Avatarwoman.png" alt=""></div>
</div>
</div>
<div class="teacher-info">
<div class="teacher-info" @click="toUserHome(item)" title="点击进入他的主页">
<div class="teacher-name">
<span> {{ item.teacherName }}</span>
<!-- <span style="font-size: 12px; color:#666666 ;">( {{cutOrgNamePath(item.authorInfo.orgInfo)}} )</span> -->
@@ -313,17 +314,6 @@
</div>
</div>
</div>
<el-dialog class="protocol" :close-on-click-modal="false" :visible="protocolDialogVisible" width="30%"
:show-close="false">
<div class="protocol-title">{{warnTitle}}</div>
<div class="protocol-content">
&emsp;&emsp;{{warn}}
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="protocolDialogVisible = false">
</el-button>
</span>
</el-dialog>
<!-- <div><portal-footer></portal-footer></div> -->
</div>
</template>
@@ -390,7 +380,6 @@
},
data() {
return {
protocolDialogVisible: false,
tentative: false,
isContentTypeTwo: null,
isContentType: null,
@@ -412,7 +401,6 @@
curCFile: {
converStatus: 4,
},
Internet: 3,//1是成功 2是是失败 3是检测中
radio: '',
interactRuning: false,
playerBoxShow: false,
@@ -477,8 +465,6 @@
cumulativeDuration:0, //非音频累计时长
maxDuration:0, //非音频最大时长
defaultMaxTime:1800, //非音频默认最大时间
warn:"测试内容",
warnTitle:"测试标题",
}
},
mounted() {
@@ -731,6 +717,7 @@
configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
this.scormUrl=configUrl+pars;//播放的首页
console.log('scormUrl',this.scormUrl);
}
});
@@ -818,7 +805,8 @@
}else if(h>500){
h=h+60;
}
$this.controlHeight=h-95;
// 移除高度控制 防止内容塌陷
// $this.controlHeight=h-95;
})
@@ -1324,11 +1312,6 @@
audiences:this.audiences
}).then(rs => {
if (rs.status == 200) {
if (rs.result.isPermission){
// if (true){
this.getInternet()
console.log('需要内网环境')
}
if(rs.result.contents.length==0){
$this.$message.error('课程内容已删除或课程已不再使用');
return;
@@ -1387,8 +1370,7 @@
}
}
this.courseInfo = rs.result.course;
this.warn = rs.result.warn;
this.warnTitle = rs.result.warnTitle;
if (rs.result.teachers && rs.result.teachers.length > 0) {
let userIds = [];
let ctoUsers = [];
@@ -1417,47 +1399,12 @@
this.totalContent = rs.result.contents.length;
//加载学习的数据
this.loadStudyData(rs.result);
} else {
this.$message.error(rs.message);
}
});
},
getXmlHttpRequest() {
if (window.XMLHttpRequest) {
return new XMLHttpRequest();
}
else if (window.ActiveXObject) {
return new ActiveXObject("Microsoft.XMLHTTP");
}
},
// 检测是否为内网
getInternet() {
this.Internet = 3;
let $this = this;
let xmlhttp = this.getXmlHttpRequest();
let timedOut = false;
let timer = setTimeout(function () {
timedOut = true;
xmlhttp.abort();
}, 1);
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
xmlhttp.send();
xmlhttp.onreadystatechange = function () {
if (xmlhttp.readyState == 4) {
if (xmlhttp.status == 200) {
clearTimeout(timer);
$this.Internet = 1;
} else {
clearTimeout(timer);
$this.protocolDialogVisible=true
$this.Internet = 2;
}
} else {
if (timedOut) return;//忽略中止请求
clearTimeout(timer);//取消等待的超时
}
}
},
loadStudyData(result) {
let $this=this;
this.loadScorePraiseAndTrample();
@@ -1749,7 +1696,21 @@
this.trueFalse = false
}
},
copyUrl(currentUrl) {
const urlToCopy = currentUrl;
navigator.clipboard.writeText(urlToCopy)
.then(() => {
this.$message.success('链接已成功复制到剪贴板');
})
.catch(err => {
this.$message.error('复制失败,请手动复制:' + urlToCopy);
console.error('复制错误:', err);
});
},
},
}
</script>
@@ -1786,16 +1747,20 @@
margin: 20px auto;
.course-playbox {
background-color: #fff;
min-height: 400px;
//min-height: 400px;
display: flex;
justify-content: space-between;
.course-player-container {
display: flex;
flex-direction: column;
height: 100%;
}
.course-player{ //内容播放区域
background-color: #f5f7fa;
flex:1;
flex: 4; // 80%高度
min-width: 700px;
min-height: 400px;
max-height: 800px;
//height: 100%;
// min-height: 400px;
// max-height: 800px;
height: 80%;
border: 1px solid #ffffff;
padding-right: 20px;
// overflow: auto;
@@ -1804,6 +1769,23 @@
width: 420px;
}
}
@media screen and (max-width: 1200px) {
.course-playbox,
.course-infobox {
flex-direction: column;
}
.course-player,
.course-info {
min-width: 100%;
padding-right: 0;
}
.course-control,
.course-teacher {
width: 100%;
margin-top: 20px;
}
}
.course-infobox {
margin-top: 20px;
display: flex;
@@ -1923,13 +1905,10 @@
}
.player-box {
position: absolute;
// top: 62px;
// left: 184px;
width: 300px;
left: 50%;
top: 50%;
transform: translate(-50%, -50%);
position: relative;
width: 100%;
max-width: 300px;
margin: 20px auto;
height: 187px;
background: rgba(74, 74, 74, .5);
border-radius: 33px;
@@ -2072,7 +2051,8 @@
}
.course-interact {
height: 54px;
flex: 1; // 20%高度
min-height: 54px;
// padding-top: 10px;
// padding-right: 10px;
padding: 0 20px;
@@ -2435,18 +2415,29 @@
height: 200px;
background: url('../../../public/images/couresdetail.png');
}
.protocol {
.protocol-title {
font-size: 20px;
font-weight: 600;
text-align: center;
margin-bottom: 25px;
.copy-button {
background-color: #409EFF;
color: white;
border: none;
padding: 8px 12px;
border-radius: 4px;
cursor: pointer;
}
.protocol-content {
font-size: 14px;
line-height: 25px;
.copy-button:hover {
background-color: #66b1ff;
}
}
.hyper-link-url-container {
display: flex;
align-items: center;
gap: 10px;
}
.hyper-link-url {
max-width: calc(100% - 80px); /* 留出按钮空间 */
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
</style>