Compare commits

...

9 Commits

6 changed files with 41 additions and 21 deletions

View File

@@ -97,7 +97,7 @@
<a style="display: flex;align-items: center;" @click="showReply(com)">
<!-- <svg-icon icon-class="comment" style="margin-right: 0px;font-size: 16px;"></svg-icon> -->
<div class="is_comment"></div>
<span>回复</span>
<span>回复</span>
</a>
<!--必须当前登录人是一个人-->
<a style="display: flex;align-items: center;" v-if="userInfo.aid==com.sysCreateAid" @click="delCommnet(com,comIdx)">
@@ -558,7 +558,7 @@
this.$message.error(res.message);
}
});
this.loadData(false);
}
},
@@ -633,6 +633,7 @@
this.$message.error(res.message);
}
});
this.loadData(false);
},
delCommnet(com,idx){
if(com.replyList!='' && com.replyList.length>0){

View File

@@ -9,7 +9,7 @@
<el-button @click="recordList()" type="primary" icon="el-icon-search">搜索</el-button>
</div>
<div style="padding: 0px 5px;">
<el-button icon="el-icon-refresh-right" @click="keyword = ''" type="primary">重置</el-button>
<el-button icon="el-icon-refresh-right" @click="reset()" type="primary">重置</el-button>
</div>
<div style="padding: 0px 5px;">
<el-button type="primary" @click="exportFile()" icon="el-icon-search" size="small" round>导出</el-button>
@@ -25,8 +25,9 @@
<!-- <div style="padding: 0px 5px;"><el-button icon="el-icon-refresh-right" type="primary" size="small" round>导出学员信息</el-button></div> -->
</div>
<div style="margin-top:20px;">
<el-table :data="pageData" border stripe>
<el-table :data="pageData" border stripe style="width: 100%">
<el-table-column
fixed
label="序号"
prop="index"
width="100px">
@@ -252,6 +253,26 @@ export default {
}
})
},
reset(){
let req = {
courseName: "",
pageNo: this.pageInfo.pageIndex,
pageSize: this.pageInfo.pageSize
}
apiCourse.getListByToken(req).then(res => {
if (res.status == 200) {
this.pageData = res.data.records;
this.pageInfo.pageSize = Number(res.data.size);
this.pageInfo.total = Number(res.data.total);
this.pageInfo.page = Number(res.data.current);
} else {
this.$message({
type: 'error',
message: res.message
});
}
})
},
// 每页显示的条数事件
handleSizeChange(val) {

View File

@@ -285,7 +285,7 @@
<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> -->

View File

@@ -88,9 +88,9 @@
<div>
<div class="textbut-box">
<div style="padding-top: 8px;">
<interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true" :type="6" :data="item" :shares="false" :comments="false" :answers="true" :clickAnswer="true" :views="false"></interactBar>
<interactBar v-if="item.type == 1" nodeWidth="60px" :readonly="true" :type="6" :data="item" :shares="false" :comments="true" :answers="false" :clickAnswer="true" :views="false"></interactBar>
</div>
<el-button @click="deleteNote(item)" style=" margin-right: 10px;" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
<el-button @click="deleteNote(item)" style=" margin-right: 10px;margin-left: 15px" class="textbut" type="text"><svg-icon icon-class="notedel" ></svg-icon>删除</el-button>
<el-button @click="edit(item)" class="textbut" type="text"><svg-icon icon-class="noteedit" ></svg-icon> 编辑</el-button>
</div>
</div>

View File

@@ -195,9 +195,7 @@ export default {
if(num == 1) {
this.editdata.isAuto = true;
}
if(this.imgContent.length > 0) {
this.editdata.content = this.imgContent.join();
}
this.editdata.content = this.imgContent.join();
apiNote.update(this.editdata).then(res=>{
if(res.status == 200) {
localStorage.removeItem(this.localStorageKey); //清空本地缓存

View File

@@ -23,7 +23,7 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item>
<el-dropdown-item command="now">当前</el-dropdown-item>
<el-dropdown-item command="now">当前</el-dropdown-item>
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -33,10 +33,10 @@
</div>
<div class="myselftext">
<div class="myranking">
{{isNow ? '当前' : '累计'}}排名 : <span> {{currentUserRankingTotalData.rankNo}}</span>
{{isNow ? '当前' : '累计'}}排名 : <span> {{currentUserRankingTotalData.rankNo}}</span>
</div>
<div class="myexperience">
{{isNow ? '当前' : '累计'}}经验值 : <span>{{currentUserRankingTotalData.rankValue}}</span>
{{isNow ? '当前' : '累计'}}经验值 : <span>{{currentUserRankingTotalData.rankValue}}</span>
</div>
</div>
@@ -117,7 +117,7 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item>
<el-dropdown-item command="now">当前</el-dropdown-item>
<el-dropdown-item command="now">当前</el-dropdown-item>
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -127,10 +127,10 @@
</div>
<div class="myselftext">
<div class="myranking">
{{isStudyTime ? '当前' : '累计'}}排名 : <span> {{learningDurationTotalData.rankNo}}</span>
{{isStudyTime ? '当前' : '累计'}}排名 : <span> {{learningDurationTotalData.rankNo}}</span>
</div>
<div class="myexperience">
{{isStudyTime ? '当前' : '累计'}}学习时长: <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
{{isStudyTime ? '当前' : '累计'}}学习时长: <span> {{formatSecondToHour(learningDurationTotalData.rankValue)}}</span> h
</div>
</div>
<div class="exp-table" style="margin-top:20px;">
@@ -206,7 +206,7 @@
</span>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item command="total">累计</el-dropdown-item>
<!-- <el-dropdown-item command="now">当前</el-dropdown-item> -->
<el-dropdown-item command="now">当前</el-dropdown-item>
<!-- <el-dropdown-item command="weeks">本周</el-dropdown-item>
<el-dropdown-item command="months">本月</el-dropdown-item>
<el-dropdown-item command="years">本年</el-dropdown-item> -->
@@ -216,10 +216,10 @@
</div>
<div class="myselftext">
<div class="myranking">
{{isStudyDay ? '当前' : '累计'}}排名 : <span> {{learningDaysTotalData.rankNo}}</span>
{{isStudyDay ? '当前' : '累计'}}排名 : <span> {{learningDaysTotalData.rankNo}}</span>
</div>
<div class="myexperience">
{{isStudyDay ? '当前' : '累计'}}学习天数 : <span>{{learningDaysTotalData.rankValue}}</span>
{{isStudyDay ? '当前' : '累计'}}学习天数 : <span>{{learningDaysTotalData.rankValue}}</span>
</div>
</div>
<div class="exp-table" style="margin-top:20px;">
@@ -311,7 +311,7 @@ export default {
formatSecondToHour:formatSecondToHour,
experience:{
field:'now',
name:'当前',
name:'当前',
data:{
rankingNo:0,
total:0
@@ -320,7 +320,7 @@ export default {
},
learningDuration:{
field:'now',
name:'当前',
name:'当前',
data:{
rankingNo:0,
total:0