From 8d2a270fa7b3d11f73ee867908e397cd77deb18b Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 1 Mar 2023 16:27:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=A7=BB=E5=8A=A8=E7=AB=AF?= =?UTF-8?q?=E7=9A=84=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/boe/userbasic.js | 8 +- api/manage/manage.js | 27 ++++++ api/unionAjax.js | 170 ++++++++++++++++++++++++++++++++++++ config/index.js | 2 + manifest.json | 6 +- pages/study/courseStudy.vue | 14 ++- 6 files changed, 222 insertions(+), 5 deletions(-) create mode 100644 api/manage/manage.js create mode 100644 api/unionAjax.js diff --git a/api/boe/userbasic.js b/api/boe/userbasic.js index ce5df2a..8c0069a 100644 --- a/api/boe/userbasic.js +++ b/api/boe/userbasic.js @@ -55,6 +55,11 @@ const modifyPassword = function(data) { return ajax.postJson('/user/resetPassword',data); } +/**获取加入的受众的id集合*/ +const getInAudienceIds = function() { + return ajax.post(baseURL,'/audience/audienceByUser',{}); +} + export default { userParentOrg, findOrgsByKeyword, @@ -63,5 +68,6 @@ export default { getUserInfoById, getUserCrowds, getOrgHrbpInfo, - modifyPassword + modifyPassword, + getInAudienceIds } diff --git a/api/manage/manage.js b/api/manage/manage.js new file mode 100644 index 0000000..a827518 --- /dev/null +++ b/api/manage/manage.js @@ -0,0 +1,27 @@ +/** 管理端接口 **/ +import ajax from '../unionAjax.js'; +const baseURL ="/manageApi"; + +/**用户的待办任务数量*/ +const getTaskNum = function(){ + return ajax.get(baseURL+'/todoTask/queryTodoTaskCounts'); +} + +/**用户的待办任务数量 +{ +"pageNo":1, +"pageSize":10, +"cmtask_name":"",任务名称 +"cmtask_code":"",任务Id +"cmtask_status":"",状态 +"cmtask_id":"965341999643234304" 学员id，当前人的 +} +*/ +const userTaskList = function(data){ + return ajax.postJson(baseURL+'/todoTask/queryTodoTaskDetail',data); +} + +export default { + getTaskNum, + userTaskList +} diff --git a/api/unionAjax.js b/api/unionAjax.js new file mode 100644 index 0000000..9971dbe --- /dev/null +++ b/api/unionAjax.js @@ -0,0 +1,170 @@ +import config from '@/config/index.js' +import {getToken,removeToken} from '@/utils/token.js' +import qs from 'qs' + +const ReLoginUrl="/login"; + +const formatUrl=function(url){ + return url; + // if(url.startsWith('http') || url.startsWith('https')){ + // //console.log(url,"我拿到的url值，我想知道下面有啥方法") + // return url; + // }else{ + // return config.oldApiBaseUrl+url + // } +} +const formRequest=function(method,url,data){ + let token=getToken(); + if(!token){ + token=''; + } + let headers={ + 'content-type':'application/x-www-form-urlencoded', + 'token':token + } + let reUrl=formatUrl(url); + return new Promise(function(resolve, reject){ + uni.request({ + url: reUrl, + method, + data: data, + xhrFields: {withCredentials: true}, + dataType: 'json', + header: headers, + success:function(rs,statusCode){ + if(rs.statusCode==200){ + if(rs.data.status==6001){ + //uni.removeStorageSync('userInfo'); + removeToken(); + let loginPath=config.loginPath; + if(loginPath.startsWith('http')){ + // #ifdef APP-PLUS + plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开 + // #endif + // #ifdef H5 + //window.open(loginPath) + let returnUrl=window.location.protocol+'//'+window.location.host+config.context; + location.href=config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading'); + // #endif + }else{ + uni.redirectTo({ + url:loginPath + }) + } + }else{ + resolve(rs.data); + } + }else{ + reject("API请求错误"); + } + }, + fail:function(err){ + reject(err); + } + }); + }); + +} +const jsonRequest=function(method,url,data){ + let token=getToken(); + if(!token){ + token=''; + } + let headers={ + 'token':token + } + let reUrl=formatUrl(url); + return new Promise(function(resolve, reject){ + uni.request({ + url: reUrl, + method, + data: data, + xhrFields: {withCredentials: true}, + dataType: 'json', + header: headers, + success:function(rs,statusCode){ + if(rs.statusCode==200){ + if(rs.data.status==6001){ + removeToken(); + let loginPath=config.loginPath; + if(loginPath.startsWith('http')){ + // #ifdef APP-PLUS + plus.runtime.openURL(loginPath) //这里默认使用外部浏览器打开而不是内部web-view组件打开 + // #endif + // #ifdef H5 + //window.open(loginPath) + let returnUrl=window.location.protocol+'//'+window.location.host+config.context; + location.href=config.loginPath+"?returnUrl="+encodeURIComponent(returnUrl+'/pages/login/loading'); + // #endif + }else{ + uni.redirectTo({ + url:loginPath + }) + } + }else{ + resolve(rs.data); + } + }else{ + reject("API请求错误"); + } + }, + fail:function(err){ + reject(err); + } + }); + }); +} +//get请求 +const get=function(url){ + return formRequest('GET',url,''); +} +//post请求 +const post=function(url,data){ + if(data){ + data=qs.stringify(data); + } + return formRequest('POST',url,data); +} +//postJson请求 +const postJson=function(url,json){ + return jsonRequest('POST',url,json); +} +//put请求 +const put=function(url,data){ + if(data){ + data=qs.stringify(data); + } + return formRequest('PUT',url,data); +} +//putJson请求 +const putJson=function(url,json){ + return jsonRequest('PUT',url,json); +} +//patch请求 +const patch=function(url,data){ + if(data){ + data=qs.stringify(data); + } + return formRequest('PATCH',url,data); +} +//patchJson请求 +const patchJson=function(url,json){ + return jsonRequest('PATCH',url,json); +} +//delete请求 +const del=function(url,data){ + if(data){ + data=qs.stringify(data); + } + return formRequest('DELETE',url,data); +} +export default { + get, + post, + postJson, + put, + putJson, + patch, + patchJson, + del +} \ No newline at end of file diff --git a/config/index.js b/config/index.js index 2c62f6b..869b3af 100644 --- a/config/index.js +++ b/config/index.js @@ -1,6 +1,7 @@ /**系统的一些全局配置变量*/ let apiBaseUrl = ''; let oldApiBaseUrl ='/uboeApi'; +let manageApiBaseUrl ='/manageApi'; let statApiBaseUrl='/statApi'; let socialApiBaseUrl='/socialApi'; let loginPath='/pages/login/login'; @@ -53,6 +54,7 @@ if(process.env.NODE_ENV === 'development'){ export default { apiBaseUrl:apiBaseUrl, oldApiBaseUrl:oldApiBaseUrl, + manageApiBaseUrl:manageApiBaseUrl, statApiBaseUrl:statApiBaseUrl, socialApiBaseUrl:socialApiBaseUrl, context:context, diff --git a/manifest.json b/manifest.json index 869daed..961fcd6 100644 --- a/manifest.json +++ b/manifest.json @@ -74,7 +74,7 @@ "https" : false, "proxy" : { "/systemapi" : { - "target" : "http://192.168.0.11:9090", + "target" : "http://127.0.0.1:9090", "changeOrigin" : true, "secure" : false, "pathRewrite" : { @@ -91,7 +91,7 @@ }, "/statApi" : { // 目标代理服务器地址 - "target" : "http://192.168.0.11:9080", + "target" : "http://127.0.0.1:9080", "changeOrigin" : true, "logLevel" : "debug", "secure" : false, @@ -101,7 +101,7 @@ }, "/socialApi" : { // 目标代理服务器地址 - "target" : "http://192.168.0.11:9081", + "target" : "http://127.0.0.1:9081", "changeOrigin" : true, "logLevel" : "debug", "secure" : false, diff --git a/pages/study/courseStudy.vue b/pages/study/courseStudy.vue index 857db41..cd54f59 100644 --- a/pages/study/courseStudy.vue +++ b/pages/study/courseStudy.vue @@ -84,7 +84,7 @@
- +
@@ -577,6 +577,18 @@ window.clearTimeout(this.handleTimeout); } }, + iframeScormLoad(){ + setTimeout(function(){ + var scormIframe=document.getElementById('iframe-scorm'); + if (scormIframe) { + var iframeWin = scormIframe.contentWindow || scormIframe.contentDocument.parentWindow; + if (iframeWin.document.body) { + scormIframe.height = iframeWin.document.documentElement.scrollHeight || iframeWin.document.body.scrollHeight; + } + } + },500); + + }, loadMyScore(){ apiCourseGrade.score({courseId:this.courseId}).then(rs=>{ if(rs.status==200){