hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-13 12:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source 
# Conflicts:
#	src/components/drawers/UnlockMode.vue
#	src/views/learningpath/LevelAddDetail.vue
This commit is contained in:
yuping
2023-02-16 18:32:49 +08:00
parent 6f3ac7b810 36f763559b
commit fffea9689d
7 changed files with 80 additions and 12531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -9,7 +9,7 @@ VUE_APP_PROXY_URL=//43.143.139.204/manageApi
# 登录url # 登录url
VUE_APP_LOGIN_URL=//u-pre.boe.com/web VUE_APP_LOGIN_URL=//u-pre.boe.com/web
# boe域名 # boe域名
VUE_APP_BOE_API_URL=//u-pre.boe.com VUE_APP_BOE_API_URL=https://u-pre.boe.com
#打包路径 #打包路径
VUE_APP_OUTPUT_DIR=./dist VUE_APP_OUTPUT_DIR=./dist

12582
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
src/api/indexLearningPath.js
View File

@@ -7,5 +7,8 @@ export const getRouterOverview = (routerId) => http.get(`/admin/router/overview?
export const editRoutered = (obj) => http.post('/admin/router/edit', obj) export const editRoutered = (obj) => http.post('/admin/router/edit', obj)
export const editRouterModel = (obj) => http.post('/admin/router/editModel', obj) export const editRouterModel = (obj) => http.post('/admin/router/editModel', obj)
// 路径图模式修改接口
export const editRouteredModel = (obj) => http.post('/admin/router/editModel', obj)
// 新建或编辑路径图共享文档 // 新建或编辑路径图共享文档
export const editRouteredDoc = (obj) => http.post('/admin/router/editShareRouter', obj) export const editRouteredDoc = (obj) => http.post('/admin/router/editShareRouter', obj)

4
src/components/drawers/MemberList.vue
View File

@@ -320,7 +320,7 @@ export default {
let obj = { let obj = {
projectGroupId: props.chooseGroupId, projectGroupId: props.chooseGroupId,
projectId: props.projectId, projectId: props.projectId,
studentIds: state.selectedRows, ids: state.selectedRowKeys,
}; };
delGroupStudent(obj) delGroupStudent(obj)
@@ -351,7 +351,7 @@ export default {
let array = []; let array = [];
data.map((value) => { data.map((value) => {
let obj = { let obj = {
key: value.studentId, key: value.id,
projectId: value.projectId, //项目id projectId: value.projectId, //项目id
groupId: value.groupId, //小组id groupId: value.groupId, //小组id
group: value.groupName, //小组名 group: value.groupName, //小组名

2
src/views/learningpath/LearningPath.vue
View File

@@ -1500,6 +1500,8 @@ export default {
} }
); );
function manage(id) { function manage(id) {
// TODO 为了点击顶部面包屑导航返回而存储
localStorage.setItem('routerId',id)
router.push({ router.push({
path: "/leveladd", path: "/leveladd",
query:{routerId:id} query:{routerId:id}

2
src/views/learningpath/LevelAdd.vue
View File

@@ -1424,7 +1424,7 @@ export default {
hasTask: false, hasTask: false,
stage: [], stage: [],
statess: [], statess: [],
routerId: route.query.routerId, //学习路径页面传的学习路径id routerId: route.query.routerId?route.query.routerId:localStorage.getItem('routerId'), //学习路径页面传的学习路径id
gatename: null, //关卡名称 gatename: null, //关卡名称
gatenamee: null, //学员管理关卡名称 gatenamee: null, //学员管理关卡名称
action: null, action: null,

14
vue.config.js
View File

@@ -12,24 +12,16 @@ module.exports = defineConfig({
publicPath: process.env.VUE_APP_BASE, publicPath: process.env.VUE_APP_BASE,
outputDir: process.env.VUE_APP_OUTPUT_DIR, outputDir: process.env.VUE_APP_OUTPUT_DIR,
devServer: { devServer: {
port: 8070, port: 8080,
proxy: { proxy: {
"/manageApi": { "/manageApi": {
target: 'http:' + process.env.VUE_APP_PROXY_URL, target: "http://localhost:30001",
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
pathRewrite: { pathRewrite: {
"^/manageApi": "", "^/manageApi": "",
}, },
}, "/userbasic": { }, "/userbasic": {
target: 'https:' + process.env.VUE_APP_BOE_API_URL, target: process.env.VUE_APP_BOE_API_URL,
changeOrigin: true, //表示是否改变原域名
},
"/systemapi": {
target: 'https:' + process.env.VUE_APP_BOE_API_URL,
changeOrigin: true, //表示是否改变原域名
},
"/api": {
target: 'https:' + process.env.VUE_APP_BOE_API_URL,
changeOrigin: true, //表示是否改变原域名 changeOrigin: true, //表示是否改变原域名
}, },
}, },