Compare commits

..

6 Commits

Author SHA1 Message Date
zhangsir
00d272c3d0 数据导致的报错 2025-01-10 14:29:54 +08:00
zhangsir
398bbc675b 数据导致的报错 2025-01-10 09:49:25 +08:00
zhangsir
d0a6807d2c 数据导致的报错 2025-01-09 17:30:40 +08:00
joshen
f01283f530 10.251.132.75 2025-01-09 11:49:44 +08:00
joshen
b9ec8ed534 Merge branch 'master_1202' into master-video-0930
# Conflicts:
#	src/components/VideoPlayer/index.vue
#	src/components/VideoPlayer/progress-bar.vue
#	src/views/study/coursenew.vue
2025-01-08 18:38:07 +08:00
joshen
6b6e8a4096 pc视频播放器禁止拖动 2024-10-10 23:07:46 +08:00
7 changed files with 5936 additions and 9344 deletions

View File

@@ -16,19 +16,19 @@ VUE_APP_CESOURCE_BASE_API = '/socialApi'
VUE_APP_STAT_BASE_API = '/statApi' VUE_APP_STAT_BASE_API = '/statApi'
# BOE系统网址 # BOE系统网址
VUE_APP_BOE_WEB_URL = 'https://u.boe.com' VUE_APP_BOE_WEB_URL = 'http://10.251.132.75'
# BOE 移动端url # BOE 移动端url
VUE_APP_BOE_MOBILE_URL = 'https://u.boe.com' VUE_APP_BOE_MOBILE_URL = 'http://10.251.132.75'
# File路径的基础url # File路径的基础url
VUE_APP_FILE_BASE_URL='https://u.boe.com/upload' VUE_APP_FILE_BASE_URL='http://10.251.132.75/upload'
# File路径的基础url的相对路径加此项是为了不影响之前的路径配置 # File路径的基础url的相对路径加此项是为了不影响之前的路径配置
VUE_APP_FILE_RELATIVE_PATH = '/upload' VUE_APP_FILE_RELATIVE_PATH = '/upload'
# 受众批量导入人员信息URL # 受众批量导入人员信息URL
VUE_APP_AUDIENCE_IMPORT_URL = 'https://u.boe.com/userbasic/audience/import' VUE_APP_AUDIENCE_IMPORT_URL = 'http://10.251.132.75/userbasic/audience/import'
@@ -39,10 +39,10 @@ VUE_APP_STUDENT_PATH='/fe-student'
VUE_APP_MANAGER_API_PATH='/manageApi' VUE_APP_MANAGER_API_PATH='/manageApi'
# 登录地址 # 登录地址
VUE_APP_LOGIN_URL='https://u.boe.com/web/' VUE_APP_LOGIN_URL='http://10.251.132.75/web/'
# scorm课件的播放url地址 # scorm课件的播放url地址
VUE_APP_SCORM_URL = 'https://u.boe.com/newscorm/scorm-player' VUE_APP_SCORM_URL = 'http://10.251.132.75/newscorm/scorm-player'
#案例组织领域类型 #案例组织领域类型
VUE_APP_CASE_TYPE = '155' VUE_APP_CASE_TYPE = '155'

15246
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -16,7 +16,6 @@
}, },
"dependencies": { "dependencies": {
"axios": "^0.21.4", "axios": "^0.21.4",
"BOE-Online": "file:",
"core-js": "^3.6.5", "core-js": "^3.6.5",
"driver.js": "^0.9.8", "driver.js": "^0.9.8",
"echarts": "^5.3.0", "echarts": "^5.3.0",

View File

@@ -92,7 +92,7 @@ export default {
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
// } // }
}, },
move(e) { move(e) {
if (this.is_mousedown_progress) { if (this.is_mousedown_progress) {
@@ -124,7 +124,7 @@ export default {
// 禁止拖动 // 禁止拖动
if(!this.isDrag && time && arr[this.blobId] < current) return; if(!this.isDrag && time && arr[this.blobId] < current) return;
this.$emit("updateProgress", current); this.$emit("updateProgress", current);
} }
}, },
}, },
@@ -176,4 +176,4 @@ export default {
.progress-bar:hover .progress-current::after { .progress-bar:hover .progress-current::after {
opacity: 1; opacity: 1;
} }
</style> </style>

View File

@@ -826,7 +826,6 @@ export default {
if (this.refId) { if (this.refId) {
this.queryCondition.type = 'recommend' this.queryCondition.type = 'recommend'
} }
this.searchPageView();
this.loadTypeData();//加载分类 this.loadTypeData();//加载分类
this.getAnkingData(); this.getAnkingData();
this.searchterm(); this.searchterm();
@@ -1508,7 +1507,7 @@ export default {
}; };
}); });
res.result.list.forEach(item=>{ res.result.list.forEach(item=>{
item.viewRankTags = item.viewRankTags.slice(0,2)||[] item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
}) })
this.caseList.list = res.result.list this.caseList.list = res.result.list
this.getCaseUserData(res.result.list); this.getCaseUserData(res.result.list);
@@ -1563,7 +1562,7 @@ export default {
}; };
}); });
res.result.list.forEach(item=>{ res.result.list.forEach(item=>{
item.viewRankTags = item.viewRankTags.slice(0,2) item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
}) })
this.caseList.list = res.result.list this.caseList.list = res.result.list
this.getCaseUserData(res.result.list); this.getCaseUserData(res.result.list);
@@ -1602,7 +1601,7 @@ export default {
} }
// console.log(res?.result?.list ,'有没有数据'); // console.log(res?.result?.list ,'有没有数据');
res.result.list.forEach(item=>{ res.result.list.forEach(item=>{
item.viewRankTags = item.viewRankTags.slice(0,2) item.viewRankTags = item.viewRankTags?.slice(0,2)||[]
}) })
this.caseList.list = res.result.list this.caseList.list = res.result.list
this.getCaseUserData(res.result.list); this.getCaseUserData(res.result.list);

View File

@@ -254,7 +254,7 @@ export default {
let localCourseIds=[];//本地在线课程的id集合 let localCourseIds=[];//本地在线课程的id集合
res.result.list.forEach(item=>{ res.result.list.forEach(item=>{
if(item.courseImage?.startsWith('/upload')){ if(item.courseImage?.startsWith('/upload')){
item.courseImage=$this.fileUrl+item.courseImage.substring(7) item.courseImage=$this.fileUrl+item.courseImage?.substring(7)
} }
if(item.source==2){ if(item.source==2){
localCourseIds.push(item.id); localCourseIds.push(item.id);

View File

@@ -755,7 +755,7 @@
if (this.contentData.status < 2) { if (this.contentData.status < 2) {
// this.contentData.status = 2; //进行中 // this.contentData.status = 2; //进行中
if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){ if(r.contentType != 61&&r.contentType != 20 && r.contentType != 10){
setTimeout(() => { setTimeout(() => {
this.isContentTypeTwo = r.contentType this.isContentTypeTwo = r.contentType
$this.isShowTime() $this.isShowTime()
}, 2000); }, 2000);
@@ -817,7 +817,7 @@
//console.log(h,$this.controlHeight,'$this.controlHeight'); //console.log(h,$this.controlHeight,'$this.controlHeight');
}) })
//console.log('this.contentData11:',this.contentData,this.curriculumData) //console.log('this.contentData11:',this.contentData,this.curriculumData)
// 视频设置禁用处理逻辑,如果用户已全部观看完该视频则设置为能全部拖动的逻辑把isDrag设置为true即可,同时删除本地存储的数据 // 视频设置禁用处理逻辑,如果用户已全部观看完该视频则设置为能全部拖动的逻辑把isDrag设置为true即可,同时删除本地存储的数据
if(this.contentData.progressVideo ===1){ if(this.contentData.progressVideo ===1){
@@ -1546,7 +1546,7 @@
} }
} }
}, },
progress(val) { progress(val) {
const progressValue = parseFloat(val) * 100; const progressValue = parseFloat(val) * 100;
this.sendEventProgress = Number(progressValue.toFixed(2)); this.sendEventProgress = Number(progressValue.toFixed(2));
}, },