From 6f908cbe8f9f1cb19e9413a4a8bd27c8779fcb85 Mon Sep 17 00:00:00 2001 From: daihh Date: Mon, 3 Jul 2023 11:46:23 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=A4=B4=E5=83=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E4=B8=AA=E6=80=A7=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/userbasic.js | 30 +++++++++++++++++++++++++++++- src/views/user/Setting.vue | 21 +++++++++++++++++++++ 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js index 6170e2ce..80f625f2 100644 --- a/src/api/boe/userbasic.js +++ b/src/api/boe/userbasic.js @@ -3,6 +3,11 @@ import ajax from './boeAjax'; //const baseURL = process.env.VUE_APP_CESOURCE_BASE_API; const baseURL ="/userbasic"; +/**用于本地测试*/ +const login = function() { + return ajax.post(baseURL,'/org/userParentOrg',{}); +} + /** * 获取用户的组织机构 * organization_id @@ -19,6 +24,9 @@ const findOrgsByKeyword = function(keyword) { return ajax.postJson(baseURL,'/org/list',{keyword}); } +/** + * 此接口已经不再使用 + */ const findOrgTreeByOrgId = function(orgId) { return ajax.postJson(baseURL,'/org/childOrgs',{orgId}); } @@ -68,6 +76,24 @@ const getInAudienceIds = function() { return ajax.post(baseURL,'/audience/audienceByUser',{}); } +/** + * 更新用户信息，当前只是列新三个信息,根据aid来更新 + * aid + * avatar + * sign + */ +const updateUser = function(data) { + return ajax.postJson(baseURL,'/user/updateUserMessage',data); +} + +/** + * 根据用户的id集合，获取用户的姓名，工号，头像，组织机构，签名等信息 + * ids: 用户的id数组集合 + */ +const getUsersByIds = function(ids) { + return ajax.postJson(baseURL,'/user/getUserMessageToDai',ids); +} + export default { userParentOrg, findOrgsByKeyword, @@ -78,5 +104,7 @@ export default { getUserAudiences, getOrgHrbpInfo, modifyPassword, - getInAudienceIds + getInAudienceIds, + getUsersByIds, + updateUser } diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue index a08602f6..3e65317c 100644 --- a/src/views/user/Setting.vue +++ b/src/views/user/Setting.vue @@ -519,6 +519,16 @@ this.form.sign = this.signData.sign; this.signData.isEdit = false; this.checkAndSendFinish(); + let upinfo={ + aid:this.userInfo.aid, + sign:this.signData.sign, + avatar:'' + } + apiUserBasic.updateUser(upinfo).then(rs=>{ + if(rs.status!=200){ + console.error('更新用户中心用户像头失败'); + } + }) } else { this.$message.error('保存失败：'+res.message); } @@ -658,6 +668,17 @@ this.$message.success("保存图片成功") this.dialogVisibleAvatar=false; this.checkAndSendFinish(); + //同步保存到用户中心的数据库 + let upinfo={ + aid:this.userInfo.aid, + sign:'', + avatar:this.form.account.avatar + } + apiUserBasic.updateUser(upinfo).then(rs=>{ + if(rs.status!=200){ + console.error('更新用户中心用户像头失败'); + } + }) }else{ this.$message.error("保存图片失败") } From 8cf834b11cbab0ed9e45a7faeb99ffcce2ebe37a Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 5 Jul 2023 19:19:23 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=80=E5=87=BA?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/userbasic.js | 10 +++++++++- src/api/modules/course.js | 8 ++++---- src/components/Course/courseForm.vue | 1 + src/store/modules/user.js | 7 ++++--- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js index 80f625f2..29086e8f 100644 --- a/src/api/boe/userbasic.js +++ b/src/api/boe/userbasic.js @@ -8,6 +8,13 @@ const login = function() { return ajax.post(baseURL,'/org/userParentOrg',{}); } +/**退出*/ +const logout = function() { + return ajax.postJson(baseURL,'/userbasic/logout',{from:'pc'}); +} + + + /** * 获取用户的组织机构 * organization_id @@ -106,5 +113,6 @@ export default { modifyPassword, getInAudienceIds, getUsersByIds, - updateUser + updateUser, + logout } diff --git a/src/api/modules/course.js b/src/api/modules/course.js index 2637ad9d..3f4e503b 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -1,7 +1,7 @@ /** * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。 * 针对于管理员，教师的功能 - * + * **/ import ajax from '@/utils/xajax.js' @@ -68,7 +68,7 @@ const revokeSubmit = function(id) { /** * 复制课程 - * @param {Object} + * @param {Object} */ const copyCourse = function(data) { return ajax.post('/xboe/m/course/manage/copy',data); @@ -330,7 +330,7 @@ const auditPageRecords = function(data) { * { courseId:必须} */ const auditCourseRecords = function(data) { - return ajax.post('/xboe/m/course/audit/course-records', data); + return ajax.post('/xboe/m/course/audit/course-records',data); } /** @@ -347,7 +347,7 @@ const auditAndPublish=function(data) { /** * 设置top - * @param {Object} query {ids:课程id,多个使用逗号分隔,title:课程的名称, Boolean top 是否置顶} + * @param {Object} query {ids:课程id,多个使用逗号分隔,title:课程的名称,Boolean top 是否置顶} */ const setTop = function(data) { return ajax.post('/xboe/m/course/manage/top', data); diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index db592bff..81aac052 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1484,6 +1484,7 @@ export default { aid:rs.result.id, orgId:rs.result.orgId } + //下面的机构名称，路径不对，应该取课程的资源归属（机构）的路径 postData.course.orgName=rs.result.orgNamePath+'/'+rs.result.orgName; apiCourse.submitCourse(postData).then(res => { //this.btnLoading=false; diff --git a/src/store/modules/user.js b/src/store/modules/user.js index cb1fb17b..b2c27793 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,6 +7,7 @@ import apiCourse from "@/api/modules/course.js"; import apiBoeCourse from "@/api/boe/course.js"; import apiBoeLogout from "@/api/boe/login.js"; import apiStat from "@/api/phase2/stat.js"; +import apiUserbasic from '@/api/boe/userebasic.js'; const user = { state: { @@ -226,9 +227,9 @@ const user = { apiBoeLogout.logout(); commit('SET_PERMISSIONS', []) removeToken() - //resolve() - - apiLogin.logout().then(() => { + //resolve() + //apiLogin.logout(); + apiUserbasic.logout().then(() => { resolve() }).catch(error => { reject(error) From c02b6e006b07d56a84c68750178f0a2fbf4c3d6e Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 6 Jul 2023 10:45:36 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E4=B9=A6=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/modules/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index b2c27793..0cda6945 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -7,7 +7,7 @@ import apiCourse from "@/api/modules/course.js"; import apiBoeCourse from "@/api/boe/course.js"; import apiBoeLogout from "@/api/boe/login.js"; import apiStat from "@/api/phase2/stat.js"; -import apiUserbasic from '@/api/boe/userebasic.js'; +import apiUserbasic from '@/api/boe/userbasic.js'; const user = { state: { From cee14b372ea2aedee28e03b0af8fa0f51b2a87d5 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 6 Jul 2023 14:49:21 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E9=80=80=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/userbasic.js | 2 +- src/components/PortalHeader.vue | 5 ++--- src/store/modules/user.js | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js index 29086e8f..4818978f 100644 --- a/src/api/boe/userbasic.js +++ b/src/api/boe/userbasic.js @@ -10,7 +10,7 @@ const login = function() { /**退出*/ const logout = function() { - return ajax.postJson(baseURL,'/userbasic/logout',{from:'pc'}); + return ajax.postJson(baseURL,'/logout',{from:'pc'}); } diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index ca21b206..445bb86b 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -292,11 +292,10 @@ export default { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' - }) - .then(() => { + }).then(() => { this.$store.dispatch('LogOut').then(() => { //location.href = this.webBaseUrl + '/login'; - sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存 + sessionStorage.setItem('dialog_session_show'+this.userInfo.aid,null); // 清除兴趣采集的"关闭"缓存 location.href = process.env.VUE_APP_LOGIN_URL; }); }) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 0cda6945..6a25b875 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -224,7 +224,6 @@ const user = { // 退出系统 LogOut({ commit, state }) { return new Promise((resolve, reject) => { - apiBoeLogout.logout(); commit('SET_PERMISSIONS', []) removeToken() //resolve() From 8ab70783572ea4672c64b45fc24f3a16f4b90ef8 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 6 Jul 2023 15:59:02 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=A0=87=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/userbasic.js | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/api/boe/userbasic.js b/src/api/boe/userbasic.js index 4818978f..5e6bc615 100644 --- a/src/api/boe/userbasic.js +++ b/src/api/boe/userbasic.js @@ -3,28 +3,26 @@ import ajax from './boeAjax'; //const baseURL = process.env.VUE_APP_CESOURCE_BASE_API; const baseURL ="/userbasic"; -/**用于本地测试*/ +/**【未使用】用于本地测试*/ const login = function() { return ajax.post(baseURL,'/org/userParentOrg',{}); } -/**退出*/ +/** 2023年6月新增加，退出接口*/ const logout = function() { return ajax.postJson(baseURL,'/logout',{from:'pc'}); } - - /** - * 获取用户的组织机构 + * 【此接口已经不再使用】获取用户的组织机构 * organization_id */ const userParentOrg = function() { return ajax.post(baseURL,'/org/userParentOrg',{}); } -//https://u-pre.boe.com/userbasic/org/list /** + * /userbasic/org/list * 根据关键字查询机构 */ const findOrgsByKeyword = function(keyword) { @@ -32,24 +30,25 @@ const findOrgsByKeyword = function(keyword) { } /** - * 此接口已经不再使用 + * 【此接口已经不再使用】 */ const findOrgTreeByOrgId = function(orgId) { return ajax.postJson(baseURL,'/org/childOrgs',{orgId}); } +/** 获取机构信息 */ const getOrgInfo = function(orgId) { return ajax.postJson(baseURL,'/org/info',{orgId}); } -/**根据用户id获取用户的信息*/ +/**【已接口已经不再使用】根据用户id获取用户的信息*/ const getUserInfoById = function(id) { return ajax.postJson(baseURL,'/user/list',{id}); } /** * https://u-pre.boe.com/userbasic/audience/userAudiences - * 获取当前用户受众信息 + * 【当前代码中未查询到】获取当前用户受众信息 */ const getUserCrowds = function() { return ajax.postJson(baseURL,'/audience/userAudiences',{}); @@ -64,14 +63,15 @@ const getUserAudiences = function(data) { } /** - * 获取hrbp数据 + * 重要接口，获取hrbp数据，课程审核。 + * 此接口中的问题，返回的机构名称，namePath要是orgId的，邮件中体现 */ const getOrgHrbpInfo = function(orgId) { return ajax.postJson(baseURL,'/org/orgHrbpInfo',{orgId}); } /** - * 修改密码，不再使用，已转化为userbasic接口 + * 修改密码，已转化为userbasic接口 * {newPassword:'',oldPassword:''} */ const modifyPassword = function(data) { @@ -84,6 +84,7 @@ const getInAudienceIds = function() { } /** + * 2023年6月新增加 * 更新用户信息，当前只是列新三个信息,根据aid来更新 * aid * avatar @@ -94,6 +95,7 @@ const updateUser = function(data) { } /** + * 2023年6月新增加 * 根据用户的id集合，获取用户的姓名，工号，头像，组织机构，签名等信息 * ids: 用户的id数组集合 */ From a6054bb8634dc56ec1c3ae7463692a1914d8fad0 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 19 Jul 2023 22:05:13 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=B8=80=E4=B8=8B?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/security.js | 2 +- src/utils/token.js | 1 + src/views/Login.vue | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/security.js b/src/security.js index 742427cf..644f843b 100644 --- a/src/security.js +++ b/src/security.js @@ -41,7 +41,7 @@ router.beforeEach((to, from, next) => { // 判断当前控制台是否已拉取完数据 store.dispatch('InitData').then(res => { //加载白名单信息 - testUser.init(); + //testUser.init(); //加载信息资源归属，系统分类信息 store.dispatch('resOwner/loadResOwners'); store.dispatch('sysType/loadSysTypes'); diff --git a/src/utils/token.js b/src/utils/token.js index b3ec7f0d..8d7cf728 100644 --- a/src/utils/token.js +++ b/src/utils/token.js @@ -7,6 +7,7 @@ const TokenKey = 'token' export function getToken() { return Cookies.get(TokenKey) } + export function setToken(token) { return Cookies.set(TokenKey, token) } diff --git a/src/views/Login.vue b/src/views/Login.vue index fea0a8dd..5f976de2 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -99,7 +99,7 @@ if (valid) { this.$store.dispatch("Login", this.form).then(rs => { if(rs.status == 200){ - // 记住密码 + //记住密码 localStorage.setItem(this.$xpage.constants.newLoginKey,1); if(this.rememberMe){ let rememberMeOjb = {rememberMe:true,loginName:this.form.loginName,password:this.form.password}; From 231fe35ce5731b97d7e1616d8115c48f47f85817 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 10:58:22 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E8=B7=B3=E8=BD=AC=E5=9C=B0=E5=9D=80=20=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AB=AF=E6=8E=A5=E5=8F=A3=E8=B0=83=E7=94=A8=EF=BC=8C?= =?UTF-8?q?401=EF=BC=8C=E4=B8=8D=E5=86=8D=E8=B7=B3=E8=BD=AC=E7=99=BB?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E4=B8=8D=E8=BF=87=E6=89=93=E5=8D=B0=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/unionAjax.js | 8 +++++--- src/components/PortalHeader.vue | 2 +- src/components/UcHeader/Index.vue | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/api/unionAjax.js b/src/api/unionAjax.js index 2b80270a..db21e48c 100644 --- a/src/api/unionAjax.js +++ b/src/api/unionAjax.js @@ -53,9 +53,11 @@ const formRequest=axios.create({ return res.data }else{ if(code === 401){ - store.dispatch('LogOut').then(() => { - location.href = this.webBaseUrl + ReLoginUrl; - }) + // store.dispatch('LogOut').then(() => { + // location.href = this.webBaseUrl + ReLoginUrl; + // }) + console.error('',res.data); + return Promise.reject(new Error('接口返回未登录')) }else if(code===403){ var msg='当前操作没有权限'; Message({message: msg, type: 'error'}); diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 445bb86b..2a770c2e 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -91,7 +91,7 @@ 学员 教师 - 管理员 + 管理员 diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 896aad04..1097d66b 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -48,7 +48,7 @@
学员 教师 - 管理员 + 管理员
From 7bbfc8583337d33c1da23f2c9d240ef2d1e96e1a Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 14:54:07 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 2 +- src/components/UcHeader/Index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 2a770c2e..0be4aa0a 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -91,7 +91,7 @@ 学员 教师 - 管理员 + 管理员 diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 1097d66b..40f12af8 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -48,7 +48,7 @@
学员 教师 - 管理员 + 管理员
From 35c27729321bba39a2c6233754503ac59619d656 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 15:14:55 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 2 +- src/components/UcHeader/Index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 0be4aa0a..565641c6 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -91,7 +91,7 @@ 学员 教师 - 管理员 + 管理员 diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 40f12af8..a45c97e6 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -48,7 +48,7 @@
学员 教师 - 管理员 + 管理员
From 2c308d7c1587da91b11dfaf4a2e78ec82f204a0a Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 15:17:02 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=BF=9E=E6=8E=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 3 ++- src/components/UcHeader/Index.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 565641c6..0bd29e16 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -91,7 +91,7 @@ 学员 教师 - 管理员 + 管理员 @@ -171,6 +171,7 @@ export default { data() { return { popupConfig:{}, + ctx:process.env.VUE_APP_PUBLIC_PATH, fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, findType: '1', keyword: '', diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index a45c97e6..cb3c5d3e 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -48,7 +48,7 @@
学员 教师 - 管理员 + 管理员
@@ -103,6 +103,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; }, data(){ return { + ctx:process.env.VUE_APP_PUBLIC_PATH, fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, isTest:false, statData:{ From 8a66e18bf0c1bdb0bad5b088e769813a2e70c0c9 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 15:29:54 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 0bd29e16..c47fb67c 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -91,7 +91,7 @@ 学员 教师 - 管理员 + 管理员 From f335e4d19e12673984e79d8aa0dd12c8c82a613e Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 15:37:57 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/PortalHeader.vue | 3 ++- src/components/UcHeader/Index.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index c47fb67c..35c9a4d4 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -91,7 +91,7 @@ 学员 教师 - 管理员 + 管理员 @@ -172,6 +172,7 @@ export default { return { popupConfig:{}, ctx:process.env.VUE_APP_PUBLIC_PATH, + managerPath:process.env.VUE_APP_MANAGER_PATH, fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL, findType: '1', keyword: '', diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index cb3c5d3e..cc62f997 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -48,7 +48,7 @@
学员 教师 - 管理员 + 管理员
@@ -104,6 +104,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; data(){ return { ctx:process.env.VUE_APP_PUBLIC_PATH, + managerPath:process.env.VUE_APP_MANAGER_PATH, fileBaseUrl:process.env.VUE_APP_FILE_BASE_URL, isTest:false, statData:{ From e0a600f4512b5fb763073ee44029d52b19a6dade Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 28 Jul 2023 15:54:20 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=AB=AF=E8=BF=9E=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Navbar.vue | 12 ------------ src/layout/components/TopNav/Index.vue | 3 ++- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 51dd3ee2..1657f511 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -8,18 +8,6 @@