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

Merge branch 'master' into dev

Browse Source
This commit is contained in:
daihh
2022-12-12 17:29:33 +08:00
parent c5bde3d211 0d6bc355ae
commit a964382894
10 changed files with 181 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
api/boe/course.js
View File

@@ -59,10 +59,20 @@ const delLearning = function(ms_timeline_kid) {
return ajax.post('/b1/system/user/ms-timeline-delete',{ms_timeline_kid});
}
/**
* 根据用户的kid，获取用户的受众权限
*
* @param {Object} kid
*/
const audience = function(kid) {
return ajax.get('/b1/system/user/audience-by-user?userId='+kid);
}
export default {
myLearning,
cmtaskList,
reportList,
courseList,
delLearning
delLearning,
audience
}

68
components/gonggao/index.vue Normal file
View File

@@ -0,0 +1,68 @@
<template>
<view>
<u-overlay :show="showGonggao">
<view class="warp">
<view class="gonggao">
<view class="gonggao-title">最新公告</view>
<view class="gonggao-text">
为了保障信息安全，为您提供更优质的服务，学习平台计划在2022年11月9日0点-11月9日早6点进行服务器升级，
在此期间，您无法登录学习，给您带来不便，还请谅解，感谢您的理解与支持。
</view>
</view>
</view>
</u-overlay>
</view>
</template>
<script>
export default {
data(){
return {
showGonggao:false
}
},
mounted() {
let now=new Date();
let min=new Date(2022,10,9,0,0,0);
let max=new Date(2022,10,9,6,0,0);
//console.log(now,min,max);
//console.log(now.getTime(),min.getTime(),max.getTime());
if(now.getTime()>min.getTime() && now.getTime()<max.getTime()){
//console.log('open')
this.showGonggao=true;
}
}
}
</script>
<style scoped lang="scss">
.warp {
display: flex;
align-items: center;
justify-content: center;
height: 100%;
}
.gonggao{
background: url("/mobile/static/images/gonggao/dlg_bg.png") no-repeat;
background-size: cover;
width:471upx;
height:495upx;
padding: 40upx;
}
.gonggao-title{
color: #333333;
font-size: 32upx;
margin-top: 190upx;
padding: 10upx 0px;
text-align: center;
font-weight: 900;
font-family: PingFangSC-Regular, sans-serif;
}
.gonggao-text{
color: #333333;
font-size: 22upx;
line-height: 35upx;
padding: 10upx 20upx;
}
</style>

2
manifest.json
View File

@@ -74,7 +74,7 @@
"https" : false,
"proxy" : {
"/systemapi" : {
"target" : "http://127.0.0.1:9090",
"target" : "http://192.168.0.11:9090",
"changeOrigin" : true,
"secure" : false,
"pathRewrite" : {

7
pages/index/index.vue
View File

@@ -189,7 +189,7 @@
<view >
<uni-load-more :status="loadStatus"></uni-load-more>
</view>
<u-overlay :show="signInShow">
<!-- <u-overlay :show="signInShow">
<view style="padding-top: 180upx;">
<view style="margin-top: 180upx;width:624upx;margin: 0px auto;position: relative;">
<img usemap="#HotMap" src="/mobile/static/images/dlg.png" style="width:624upx;height: 864upx;">
@@ -197,7 +197,8 @@
<mapelement></mapelement>
</view>
</view>
</u-overlay>
</u-overlay> -->
<gonggao></gonggao>
</view>
</template>
<script>
@@ -212,6 +213,7 @@
import apiMessage from '@/api/system/message.js'
import {toScore} from '@/utils/tools.js'
import apiBoeCourse from '@/api/boe/course.js'
import gonggao from '@/components/gonggao/index.vue'
export default {
data(){
return {
@@ -281,6 +283,7 @@
this.countNoReadMsg();
},
components:{
gonggao,
'mapelement': {
render: function(createElement) {

19
pages/login/loading.vue
View File

@@ -30,8 +30,10 @@
window.open(this.$config.loginPath)
// #endif
}else{
console.log('获取用户信息');
apiLogin.boeLogin(token).then(rs=>{
if(rs.status==200){
console.log('获取用户信息成功');
//setToken(rs.result.access_token);
//加载用户信息
this.$store.dispatch("InitData").then(res => {
@@ -43,25 +45,39 @@
uni.setStorageSync("boe_new_login",1);//记录新登录
let openUrl=$this.toUrl;
if(openUrl){
console.log('跳转url='+openUrl);
if(openUrl.startsWith('http')){
//alert('跳转url0='+openUrl)
location.href=openUrl
}else{
if(openUrl=='/pages/index/index' || openUrl=='/pages/study/index' || openUrl=='/pages/plus/index' || openUrl=='/pages/my/index'){
//alert('跳转url1='+openUrl)
uni.switchTab({
url:openUrl
})
}else{
//alert('跳转url2='+openUrl)
uni.navigateTo({url:openUrl})
}
}
}else{
console.log('跳转到首页');
//alert('跳转到首页')
uni.switchTab({
url:'/pages/index/index'
})
}
});
}).catch(error => {
console.log('加载用户信息错误：',error);
//alert('加载用户信息错误')
uni.showModal({
title:'错误',
content:error
})
})
}else{
//alert('加载用户错误')
console.log(rs.message+','+rs.error);
//#ifdef APP-PLUS
plus.runtime.openURL(this.$config.loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开
@@ -73,6 +89,7 @@
}
}).catch(err=>{
//
//alert('请求超时')
uni.showToast({
title:'请求超时'
})

30
pages/resource/search.vue
View File

@@ -255,9 +255,12 @@
import apiOldCourse from '@/api/modules/course.js'
import apiCoursePortal from '@/api/modules/coursePortal.js'
import apiUser from '@/api/system/user.js'
import apiQa from '@/api/modules/qa.js'
import {toScore} from '@/utils/tools.js'
import apiArticle from '@/api/modules/article.js'
import apiBoeCourse from '@/api/boe/course.js'
import apiUserGroup from "@/api/modules/usergroup.js";
import { mapGetters } from 'vuex'
export default{
data(){
return{
@@ -312,9 +315,33 @@
onLoad(options){
if(options.type){
this.conType=parseInt(options.type);
}else{
this.conType=1;
}
this.loadSeachWords();
//let localKey="user_"+this.userInfo.sysId+"_gids";
if(this.audiences.length==0){
//let hasIds;
// let hasIds=sessionStorage.getItem(localKey);
// if(hasIds && hasIds.length>0){
// this.audiences=hasIds.split(",");
// this.search();
// }else{
console.log(this.userInfo,'this.userInfo')
Promise.all([apiBoeCourse.audience(this.userInfo.sysId),apiUserGroup.userGroupIds()]).then(rs=>{
//console.log(rs,'rs');
let aids=[];
if(rs[0].status==200){
aids.push(rs[0].result);
}
if(rs[1].status==200){
aids.push(rs[1].result);
}
this.audiences=aids;
//sessionStorage.setItem(localKey,this.audiences);
//this.search();
})
}
//}
}
},
computed:{
@@ -526,6 +553,7 @@
},
async loadCourseData(){
uni.showLoading({title:'加载中...'});
this.course.params.keyword=this.keyword;
//查询课程
let $this=this;
let dataList = [];

9
pages/study/exam.vue
View File

@@ -179,6 +179,7 @@
//console.log(this.paper.items);
let totalScore=0;
this.paper.items.forEach(item => {
item.score=parseInt(item.score);
totalScore+=item.score;//加到总分中
if(item.type != 102){
item.userAnswer='';
@@ -214,9 +215,15 @@
}
let allRight = true;
item.options.forEach(it =>{
if(it.answer && item.userAnswer.indexOf(it.id)==-1) {
if(it.answer){ //正确答案
if(item.userAnswer.indexOf(it.id)==-1){
allRight=false;
}
}else{
if(item.userAnswer.indexOf(it.id)>-1){
allRight=false;
}
}
});
if(allRight){
scoreNum+=item.score;

11
pages/study/index.vue
View File

@@ -292,20 +292,19 @@
</view>
</view>
</u-overlay>
<gonggao></gonggao>
</view>
</template>
<script>
import apicourseStudy from "../../api/modules/courseStudy.js"
import apiCoursePortal from '@/api/modules/coursePortal.js'
import apiBoeCourse from '@/api/boe/course.js';
import {
formatDate
} from '@/utils/tools.js';
import {formatDate} from '@/utils/tools.js';
import apiUser from '@/api/system/user.js'
import {
mapGetters
} from 'vuex'
import {mapGetters} from 'vuex'
import gonggao from '@/components/gonggao/index.vue'
export default {
components:{gonggao},
computed: {
...mapGetters(['userInfo', 'isOneStady'])
},

BIN
static/images/gonggao/dlg_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 KiB

3
store/modules/user.js
View File

@@ -97,7 +97,8 @@ const user = {
departFullName: res.result.departFullName,
studyTotal: res.result.studyTotal,
studyTotalH:studyTotalH,
sex:res.result.sex
sex:res.result.sex,
sysId:res.result.sysId
};
user.avatar = user.avatar == "" ? "" : config.fileUrl + user.avatar;
commit('SET_UserInfo', user);