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

Merge branch 'stat' of https://codeup.aliyun.com/6265f483e4166464dc2f9c14/boeu/portal into stat

Browse Source
This commit is contained in:
daihh
2022-10-05 13:56:18 +08:00
parent 0a68cf94bd 37aab3f8e6
commit f0f860473a
5 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Course/myNote.vue
View File

@@ -25,7 +25,7 @@
<div v-if="noteList.length > 0">
<div style="border-bottom:1px solid #4444;padding-bottom:25px;" v-for="note in noteList"
:key="note.id">
<span class="mycote-time">{{note.sysCreateTime}}
<span class="mycote-time">{{note.sysUpdateTime}}
<span class="sm">{{note.openType == 9?'公开':'私密'}}</span>
<span class="more">
<el-dropdown>

2
src/utils/tools.js
View File

@@ -324,6 +324,8 @@ export function experienceValue(total) {
data.endValue = 30000;
data.percentage = parseFloat((total / 30000) * 100);
}
console.log("&&&&&&&&&&&&&&&&&&&&&&&");
console.log(data);
return data;
}
export function translate(field) {

23
src/views/ucurrency/Index.vue
View File

@@ -57,7 +57,7 @@
</div>
<div class="exp-bar">
<h6> {{current.total}}/{{current.endValue}}</h6>
<div class="exp-barbox" v-if="current.percentage">
<div class="exp-barbox">
<el-progress :percentage="current.percentage" color="#387DF7"></el-progress>
<!-- <div class="exp-bar-cont"></div> -->
</div>
@@ -261,19 +261,16 @@
sex: null
}
this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;}
if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;}
if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;}
this.currentUserRankingData = res.result.currentUserRankingData;
if(res.result.currentUserRankingData.total) {
this.current = this.experienceValue(res.result.currentUserRankingData.total);
}
if(res.result.currentUserRankingData.weeks) {
this.current = this.experienceValue(res.result.currentUserRankingData.weeks);
}
if(res.result.currentUserRankingData.months) {
this.current = this.experienceValue(res.result.currentUserRankingData.months);
}
if(res.result.currentUserRankingData.years) {
this.current = this.experienceValue(res.result.currentUserRankingData.years);
}
if(res.result.currentUserRankingData.total>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.total);}
if(res.result.currentUserRankingData.weeks>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.weeks);}
if(res.result.currentUserRankingData.months>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.months);}
if(res.result.currentUserRankingData.years>=0) {this.current = this.experienceValue(res.result.currentUserRankingData.years);}
}
const ids= [];

24
src/views/user/Noteedit.vue
View File

@@ -24,10 +24,8 @@
</div>
</div>
<div class="edit-footer">
<el-radio-group v-model="editdata.openType">
<el-radio :label="9">公开</el-radio>
<el-radio :label="1">私密</el-radio>
</el-radio-group>
<el-radio-group v-if="editdata.openType == 9" v-model="editdata.openType"><el-radio :label="9">公开</el-radio><el-radio :label="1">私密</el-radio></el-radio-group>
<el-radio-group v-if="editdata.openType == 1" v-model="editdata.openType"><el-radio :label="1">私密</el-radio></el-radio-group>
<el-button style="margin-right:40%" type="primary" @click="savedata">保存</el-button>
<el-button @click="comeback">取消</el-button>
</div>
@@ -104,7 +102,7 @@ export default {
this.editdata = res.result;
this.editdata.openTypeBackups = res.result.openType;
this.histId = res.result.id;
this.hist();
})
},
@@ -123,9 +121,9 @@ export default {
this.$message({
type: 'info',
message: '已取消还原'
});
});
});
// apiNote.restore(item.id).then(res=>{
// this.$message({
// message: '还原成功',
@@ -141,7 +139,7 @@ export default {
res.result.forEach(item=>{
item.beforeContent = item.beforeContent.split(',');
})
}
this.histdata = res.result
})
@@ -156,7 +154,7 @@ export default {
}
if(num == 1) {
this.editdata.isAuto = true;
}
if(this.imgContent.length > 0) {
this.editdata.content = this.imgContent.join();
@@ -197,7 +195,7 @@ export default {
clearInterval(this.timer)
this.timer = null
}
}
</script>
@@ -257,7 +255,7 @@ export default {
display: flex;
font-size: 16px;
font-weight: 600;
color: #666666;
color: #666666;
div{
flex: 1;
}
@@ -267,7 +265,7 @@ export default {
color: #387DF7;
font-weight: 400;
font-size: 16px;
}
}
}
}
.hist-top{
@@ -398,4 +396,4 @@ export default {
}
</style>
</style>

11
src/views/user/ranking.vue
View File

@@ -327,17 +327,20 @@ export default {
sex: null
}
this.getUserData([res.result.currentUserRankingData.aid],[res.result.currentUserRankingData])
if(res.result.currentUserRankingData.weeks == undefined){res.result.currentUserRankingData.weeks = 0;}
if(res.result.currentUserRankingData.months == undefined){res.result.currentUserRankingData.months = 0;}
if(res.result.currentUserRankingData.years == undefined){res.result.currentUserRankingData.years = 0;}
this.experience.data = res.result.currentUserRankingData;
if(res.result.currentUserRankingData.total) {
if(res.result.currentUserRankingData.total>=0) {
this.current = this.experienceValue(res.result.currentUserRankingData.total);
}
if(res.result.currentUserRankingData.weeks) {
if(res.result.currentUserRankingData.weeks>=0) {
this.current = this.experienceValue(res.result.currentUserRankingData.weeks);
}
if(res.result.currentUserRankingData.months) {
if(res.result.currentUserRankingData.months>=0) {
this.current = this.experienceValue(res.result.currentUserRankingData.months);
}
if(res.result.currentUserRankingData.years) {
if(res.result.currentUserRankingData.years>=0) {
this.current = this.experienceValue(res.result.currentUserRankingData.years);
}
}