Merge remote-tracking branch '121/master-20251210' into master-20251210

This commit is contained in:
joshen
2025-12-15 11:34:23 +08:00
3 changed files with 33 additions and 18 deletions

View File

@@ -4,7 +4,7 @@
*
**/
import ajax from '@/utils/xajax.js'
import ajax2 from '../unionAjax.js';
/**
* 保存课程基本信息,新增和更新都是此方式
* @param {Object} data
@@ -493,6 +493,9 @@ const courseList = function(data) {
const benchAiSet=function(data){
return ajax.postJson('/xboe/m/course/manage/benchAiSet',data);
}
const listByUser=function(data){
return ajax2.get('/manageApi/admin/thirdApi/permission/listByUser?permissionType=PAGE');
}
export default {
saveBase,
submitCourse,
@@ -542,5 +545,7 @@ export default {
ids,
saveTip,
benchAiSet,
courseList
courseList,
listByUser,
}

View File

@@ -339,7 +339,7 @@ export default {
computed: {
...mapGetters(['selectableLang','currentLang','courseInfo']),
isAiTranslate () {
return this.courseInfo?.aiSet == 1 && this.courseInfo?.aiTranslate == 1;
return this.courseInfo?.aiSet == 1 && this.courseInfo?.aiTranslate == 1 && this.selectableLang && this.selectableLang.length > 0;
}
},
created() {
@@ -1073,24 +1073,21 @@ export default {
}
}
video::cue {
color: #fff;
background-color: transparent;
font-size: 0.85em;
font-family: 'Arial', sans-serif;
/* 1. WebKit内核粗描边Chrome/Safari/Edge */
-webkit-text-stroke: 4px #000; /* 宽度调至4px可继续加大如6px/8px */
text-stroke: 4px #000; /* 标准属性兜底 */
/* color: #fff; */
/* background-color: transparent; */
/* font-size: 0.85em; */
/* font-family: 'Arial', sans-serif;
-webkit-text-stroke: 4px #000;
text-stroke: 4px #000; */
/* 2. 多重阴影模拟粗描边(核心:增加偏移量+多层叠加) */
text-shadow:
/* text-shadow:
2px 2px 0 #000,
-2px 2px 0 #000,
2px -2px 0 #000,
-2px -2px 0 #000,
/* 追加外层阴影,让描边更厚 */
0 2px 0 #000,
2px 0 0 #000,
0 -2px 0 #000,
-2px 0 0 #000;
-2px 0 0 #000; */
}
</style>

View File

@@ -68,15 +68,15 @@
<el-col :span="24">
<!-- <el-button icon="el-icon-folder" type="primary" size="small">导出</el-button> -->
<el-button class="Create-coures" type="primary" @click="addNewCourse()" icon="el-icon-plus">新建课程</el-button>
<el-button type="primary" @click="setLanguage()" icon="el-icon-connection" :disabled="selectedCourses.length === 0">设置语种</el-button>
<el-button type="primary" @click="enableAI()" icon="el-icon-switch-button" :disabled="selectedCourses.length === 0">开启AI处理</el-button>
<el-button v-if="aiPermission" type="primary" @click="setLanguage()" icon="el-icon-connection" :disabled="selectedCourses.length === 0">设置语种</el-button>
<el-button v-if="aiPermission" type="primary" @click="enableAI()" icon="el-icon-switch-button" :disabled="selectedCourses.length === 0">开启AI处理</el-button>
</el-col >
</el-row>
</div>
<div style="margin-right:30px;">
<!-- ai播放器相关 -->
<el-table style="margin:10px 32px 10px 22px;" :data="pageData" border stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column v-if="aiPermission" type="selection" width="55"></el-table-column>
<el-table-column label="序号" type="index" width="50"></el-table-column>
<el-table-column v-if="forChoose" label="选择" width="80">
<template slot-scope="scope" v-if="scope.row.published">
@@ -142,7 +142,7 @@
<template slot-scope="scope" class="btn-gl">
<!-- 20240621 修改scope.row.isPermission = fasle 时不展示操作按钮-->
<!-- ai播放器相关 -->
<el-button v-if="scope.row.isPermission && scope.row.status != 2" type="text" size="mini" @click="setAI(scope.row)">AI设置</el-button>
<el-button v-if="aiPermission && scope.row.isPermission && scope.row.status != 2" type="text" size="mini" @click="setAI(scope.row)">AI设置</el-button>
<el-button type="text" size="mini" v-if="scope.row.isPermission && scope.row.status == 5 && !scope.row.published" @click="releaseData(scope.row)">发布</el-button>
<el-button v-if="scope.row.isPermission && pageManage && scope.row.published" @click="showStudent(scope.row)" type="text" size="mini">学员</el-button>
<el-button v-if="scope.row.isPermission && !forChoose && scope.row.published" @click="showManageStudy(scope.row)" type="text" size="mini">管理</el-button>
@@ -631,6 +631,7 @@ export default {
extendRefId:'',
extendRefType:'',
// ai播放器相关
aiPermission: false,
selectedCourses: [], //已选课程
languageSetting: { // 设置语种弹框
dlgShow: false,
@@ -659,6 +660,8 @@ export default {
};
},
mounted() {
// ai播放器相关
this.getAiPermission();
this.getAudiences()
let chooseFlag=this.$route.query.f;
this.extendRefId=this.$route.query.refId;
@@ -1285,6 +1288,16 @@ export default {
}
})
},
getAiPermission() {
apiCourse.listByUser({}).then(res => {
console.log('res', res);
if(res.code === 200){
let index = res.data.findIndex(item => item.permissionCode === 'KjbAiSetCode');
this.aiPermission = index !== -1;
console.log('index', index, this.aiPermission);
}
})
}
}
};
</script>