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

# Conflicts:
#	src/components/drawers/UnlockMode.vue
#	src/views/learningpath/LevelAddDetail.vue

.env

@@ -9,7 +9,7 @@ VUE_APP_PROXY_URL=//43.143.139.204/manageApi
 # 登录url
 VUE_APP_LOGIN_URL=//u-pre.boe.com/web
 # 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
 

src/api/indexLearningPath.js

@@ -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 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)

src/components/drawers/MemberList.vue

@@ -44,7 +44,7 @@
             style="margin-right: 20px; color: #fff"
           >
             <div class="img1"></div>
-            
+
             <div class="wz">添加组员</div>
           </div> -->
           <CommonStudent
@@ -320,7 +320,7 @@ export default {
       let obj = {
         projectGroupId: props.chooseGroupId,
         projectId: props.projectId,
-        studentIds: state.selectedRows,
+        ids: state.selectedRowKeys,
       };
 
       delGroupStudent(obj)
@@ -351,7 +351,7 @@ export default {
       let array = [];
       data.map((value) => {
         let obj = {
-          key: value.studentId,
+          key: value.id,
           projectId: value.projectId, //项目id
           groupId: value.groupId, //小组id
           group: value.groupName, //小组名

src/views/learningpath/LearningPath.vue

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

src/views/learningpath/LevelAdd.vue

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

vue.config.js

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