Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

This commit is contained in:
dongruihua
2022-09-06 10:10:12 +08:00
3 changed files with 5 additions and 5 deletions

View File

@@ -88,9 +88,9 @@
keyword: '', keyword: '',
comTypes:[ comTypes:[
{id:'1',type:'video',name:'视频',img:'el-icon-video-camera',resType:10,maxSize:1024,maxSizeName:"1G",fileTypes:['mp4']}, {id:'1',type:'video',name:'视频',img:'el-icon-video-camera',resType:10,maxSize:1024,maxSizeName:"1G",fileTypes:['mp4']},
{id:'2',type:'sound',name:'音频',img:'el-icon-service',resType:20,maxSize:200,maxSizeName:"200M",fileTypes:['mp3']}, {id:'2',type:'sound',name:'音频',img:'el-icon-service',resType:20,maxSize:1024,maxSizeName:"1G",fileTypes:['mp3']},
{id:'3',type:'image',name:'图片',img:'el-icon-picture-outline',resType:30,maxSize:10,maxSizeName:"10M",fileTypes:["png","jpg","gif","bmp"]}, {id:'3',type:'image',name:'图片',img:'el-icon-picture-outline',resType:30,maxSize:10,maxSizeName:"10M",fileTypes:["png","jpg","gif","bmp"]},
{id:'4',type:'doc',name:'文档',img:'el-icon-document',resType:40,maxSize:500,maxSizeName:"500M",fileTypes:["doc", "xls", "ppt","docx", "xlsx", "pptx","txt","pdf"]} {id:'4',type:'doc',name:'文档',img:'el-icon-document',resType:40,maxSize:1024,maxSizeName:"1G",fileTypes:["doc", "xls", "ppt","docx", "xlsx", "pptx","txt","pdf"]}
], ],
curComType:{id:'',type:'',name:'',maxSizeName:'',fileTypes:[]}, curComType:{id:'',type:'',name:'',maxSizeName:'',fileTypes:[]},
findState:1, findState:1,

View File

@@ -818,6 +818,8 @@ export default {
pushResults(row){ pushResults(row){
this.pushData.dlgTitle='推送【'+row.testName+'】'; this.pushData.dlgTitle='推送【'+row.testName+'】';
this.pushData.row = row; this.pushData.row = row;
this.pushData.keyword = '';
this.pushData.id = '';
this.pushData.pushResultsShow = true; this.pushData.pushResultsShow = true;
this.getUserGroup(); this.getUserGroup();
this.getFindPage(); this.getFindPage();

View File

@@ -86,9 +86,7 @@
<div :title="cinfo.title" class="course-title title-line-ellipsis" v-html="cinfo.name"> <div :title="cinfo.title" class="course-title title-line-ellipsis" v-html="cinfo.name">
</div> </div>
<div class="course-author"> <div class="course-author">
<div class="course-author-left" v-if="cinfo.teacher"> <div class="course-author-left" v-if="cinfo.teacher" v-html="cinfo.teacher=='BOE教师'? '':cinfo.teacher"></div>
{{cinfo.teacher=='BOE教师'? '':cinfo.teacher}}
</div>
<div style="flex:1;text-align: center;"> <div style="flex:1;text-align: center;">
<span class="study-num">{{cinfo.studies}}人学习</span> <span class="study-num">{{cinfo.studies}}人学习</span>
</div> </div>