hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-17 14:56:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并分支

Browse Source
This commit is contained in:
nisen
2023-08-01 17:37:08 +08:00
parent adc5ed7afb
commit cf5a7ee4f8
22 changed files with 3525 additions and 2139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/components/Course/courseForm.vue
View File

@@ -132,8 +132,10 @@
<el-option v-for="item in tagList" :key="item.id" :label="item.name" :value="item.name"> </el-option>
</el-select>
</el-form-item> -->
<el-form-item v-if="!weike.onlyRequired" label="关键字">
<el-input v-model="courseInfo.keywords" maxlength="100" show-word-limit placeholder="请输入关键字(限100字以内)"></el-input>
<el-form-item v-if="!weike.onlyRequired" label="关键字">
<!-- <el-input v-model="courseInfo.keywords" maxlength="100" show-word-limit placeholder="请输入关键字(限100字以内)"></el-input> -->
<el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords" placeholder="请输入关键字"></el-input>
<el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">{{ tag }}</el-tag>
</el-form-item>
<el-form-item v-if="!weike.onlyRequired" label="观看设置">
<el-radio style="margin-right: 10px;" v-model="courseInfo.device" :label="1">PC端可见</el-radio>
@@ -251,6 +253,12 @@
</el-select> -->
<choice :teacherValue="teacherValues" @getTeacherList="getTeacherList"></choice>
</el-form-item>
<el-form-item label="关键字">
<el-input v-model.trim="keywords" maxlength="100" @keyup.enter.native="changeKeywords" placeholder="请输入关键字"></el-input>
<el-tag v-for="(tag,index) in tips" size="small" :key="index" closable type="info" @close="closeKeywordsTag(tag,index)">
{{ tag }}
</el-tag>
</el-form-item>
</el-col>
</el-form-item>
<el-form-item label="资源归属" required>
@@ -421,6 +429,8 @@ export default {
components: { weikeContent, catalogCourseware, imageUpload, WxEditor, catalogSort,agreement,filecloud,choice,chooseOrg},
data() {
return {
keywords:'',//关键字的定义
tips:[],
addOrder:1,
checked:false,
courseInfoFormCheckedShow:false,
@@ -571,6 +581,17 @@ export default {
this.loadUserGroup();
},
methods: {
// 关键字的更改
changeKeywords(option){
if(option.target.value){
this.tips.push(option.target.value)
}
this.keywords = ''
},
//关闭关键字
closeKeywordsTag(item,index){
this.tips.splice(index, 1);
},
showChooseOrg(){
this.$refs.refChooseOrg.dlgShow = true;
},
@@ -744,6 +765,8 @@ export default {
this.teacherValues = [];
this.courseCrowds=[];
this.courseCoverurl = '';
// 关键字的清空
this.tips=[];
if (!editData) {
//console.log("新建课程？");
@@ -862,6 +885,7 @@ export default {
this.courseCoverurl = '';
this.courseInfo.coverImg = '';
},
//获取课程信息
async getDetail(id) {
this.curCourseId = id;
this.orgName='';
@@ -873,6 +897,10 @@ export default {
if(result.course.visible==''){
result.course.visible=true;
}
// 给关键字赋值
if(result.course.keywords){
this.tips = result.course.keywords.split(',') || []
}
this.courseInfo = result.course;
this.checked = false;
this.contentInfo.list = result.contents;
@@ -1156,6 +1184,7 @@ export default {
if (this.showTags.length > 0) {
this.courseInfo.tags = this.showTags.join();
}
this.courseInfo.keywords = this.tips.join(',') || ''
//检查输入是否合法
//if(!this.requireSaveCourse){
// this.curStepIndex=2;//转到第二步处理

1
src/components/Portal/authorInfo.vue
View File

@@ -16,6 +16,7 @@
<span style="color: #333333;font-weight: 600;font-size: 16px;">{{userName}}</span>
<span class="author-text" v-if="userInfo && userInfo!=''"> {{userInfo}} </span>
</div>
<slot />
</div>
</template>
<script>

2
src/components/Portal/interactBar.vue
View File

@@ -35,7 +35,7 @@
<span class="interact-bar-value"> {{ data.praises? data.praises:0}}</span>
</div>
<div v-if="favorites" @click="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<div v-if="favorites" @click.stop="addFavorite()" :style="`min-width: ${nodeWidth};`" class="interact-bar-btn" :class="{cursor:!readonly}">
<el-tooltip effect="light" content="收藏" placement="top" :visible-arrow="false" popper-class="text-tooltip">
<svg-icon v-if="courseExclusive" style="font-size: 32px;margin-right: 0;" :icon-class="isFavorite?'collectedCourse':'collectionCourse'"></svg-icon>
<svg-icon v-else style="margin-right: 0;" :style="{'font-size':(size+2)+'px'}" :icon-class="isFavorite?'scactive2':'xihuan'"></svg-icon>

15
src/components/PortalHeader.vue
View File

@@ -76,9 +76,11 @@
<div class="person-action-item">
<el-badge class="person-action-index" :value="userMsg" :hidden="userMsg == 0">
<el-tooltip content="消息" placement="bottom" effect="light" :visible-arrow="false" popper-class="text-tooltip">
<el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false">
<svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
</el-link>
<!-- <el-link type="primary" :href="`${webBaseUrl}/message/center/index`" :underline="false"> -->
<router-link to="/message/center/index">
<svg-icon :style="{color:textColor}" style="margin-right: 0;font-size:22px;" icon-class="messfff"></svg-icon>
</router-link>
<!-- </el-link> -->
</el-tooltip>
</el-badge>
</div>
@@ -91,7 +93,7 @@
<el-dropdown-menu slot="dropdown">
<el-dropdown-item><router-link to="/index">学员</router-link></el-dropdown-item>
<el-dropdown-item v-if="identity == 2 || identity == 5" @click.native="setCurIdentity(2)"><router-link to="/need/waitaudit">教师</router-link></el-dropdown-item>
<el-dropdown-item v-if="identity == 3 || identity == 5" ><a :href="managerPath+'/learningpath'">管理员</a></el-dropdown-item>
<el-dropdown-item v-if="identity == 3 || identity == 5" @click.native="setCurIdentity(3)"><router-link to="/course/manage">管理员</router-link></el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>
@@ -274,7 +276,8 @@ export default {
} else if (this.goSearch == 2) {
if(this.keyword==''){return;}
// 案例
location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
// location.href=`${this.webBaseUrl}/case?keyword=${this.keyword}`;
this.$router.push(`/case?keyword=${this.keyword}`)
//window.open(`${this.webBaseUrl}/case?keyword=${this.keyword}`);
} else if (this.goSearch == 3) {
if(this.keyword==''){return;}
@@ -301,7 +304,7 @@ export default {
}).then(() => {
this.$store.dispatch('LogOut').then(() => {
//location.href = this.webBaseUrl + '/login';
sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存
location.href = process.env.VUE_APP_LOGIN_URL;
});
})

8
src/components/VideoPlayer/index.vue
View File

@@ -38,11 +38,11 @@
:biBarrageXml="biBarrageXml"
/>
<!-- 加载动画 -->
<div v-show="isShowLoading" class="player-loading" @click="videoDom.focus({preventScroll: true})">
<div v-show="isShowLoading && isCrowd" class="player-loading" @click="videoDom.focus({preventScroll: true})">
<img src="@/components/VideoPlayer/images/loading.svg" alt="loading"/>
</div>
<!-- 控制栏 -->
<div v-show="!isShowLoading" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
<div v-show="!isShowLoading && isCrowd" class="player-controls-container" @click="videoDom.focus({preventScroll: true})">
<div v-show="isShowVolumeHint" class="player-volumeHint">
<span class="player-volumeHint-text">当前音量:{{volumePercent}}%</span>
</div>
@@ -264,6 +264,10 @@ export default {
isDrag:{
type: Boolean,
default: null,
},
isCrowd:{
type: Boolean,
default: true,
}
},
data() {