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

Merge branch '250321-bugfix-shl' into test20250220

Browse Source
This commit is contained in:
joshen
2025-03-24 10:21:57 +08:00
parent 374dfb6b3d 0989360183
commit da481c72c5
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/Login.vue
View File

@@ -1,3 +1,4 @@
<!--
<template> <template>
<div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`"> <div class="login" :style="`background: url(${webBaseUrl}/temp/background.jpg) no-repeat`">
<el-form :model="form" ref="form" :rules="rules"> <el-form :model="form" ref="form" :rules="rules">
@@ -24,7 +25,7 @@
<el-form-item> <el-form-item>
<section> <section>
<el-checkbox v-model="rememberMe">记住密码</el-checkbox> <el-checkbox v-model="rememberMe">记住密码</el-checkbox>
<!-- <span>忘记密码</span> --> &lt;!&ndash; <span>忘记密码</span> &ndash;&gt;
</section> </section>
</el-form-item> </el-form-item>
<el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item> <el-form-item><el-button type="primary" @click="loginSubmit">点击登录</el-button></el-form-item>
@@ -194,3 +195,4 @@
} }
} }
</style> </style>
-->

16
src/views/course/ManageList.vue
View File

@@ -195,14 +195,14 @@
</template> </template>
</el-dialog> </el-dialog>
<!--课程管理--> <!--课程管理-->
<el-dialog <el-dialog
custom-class="g-dialog" custom-class="g-dialog"
title="课程学习管理" title="课程学习管理"
width="900px" width="900px"
height="900px" height="900px"
:visible.sync="manageStudy.dlgShow" :visible.sync="manageStudy.dlgShow"
:close-on-click-modal="false" :close-on-click-modal="false"
> >
<manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager> <manager :manageStudyData="manageStudyData" :isShowDialog="manageStudy.dlgShow"></manager>
<template #footer> <template #footer>
@@ -676,8 +676,10 @@ export default {
} }
apiCourse.pageList(this.params).then(rs=>{ apiCourse.pageList(this.params).then(rs=>{
if(rs.status==200){ if(rs.status==200){
this.pageData = rs.result.list; this.pageData = rs.result.list ? rs.result.list : [];
// this.pageData = rs.result.list;
this.page.count = rs.result.count; this.page.count = rs.result.count;
this.page.pageSize = rs.result.pageSize;
}else{ }else{
return this.$message.error(rs.message); return this.$message.error(rs.message);
} }