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

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

Browse Source
This commit is contained in:
yuping
2023-04-07 02:00:54 +08:00
parent 49c6e0756c 6c5dbd8a1b
commit ec6398a7f3
6 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -34,7 +34,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi";
const store = useStore();
const isLogin = ref(false);
console.log("版本2.4.3------------");
console.log("版本2.4.4------------");

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

@@ -1451,7 +1451,7 @@ export default {
createId: null,
permissions: "",
hasTask: false,
stage: [],
stage: [],
statess: [],
routerId: route.query.routerId
? route.query.routerId
@@ -2072,6 +2072,11 @@ export default {
//学员管理------------------------------------------------
onMounted(() => {
// 是否是从编辑跳转过来的
if(route.query.routerEdit==="true"){
state.activeKey = "2";
}
state.addLoading = true;
getOverview();
myGetRouterDetail();

4
src/views/learningpath/LevelAddDetail.vue
View File

@@ -129,7 +129,7 @@
</unlock-mode>
</div>
<div class="line"></div>
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId, routerEdit: true } }">
<div style="display: flex">
<img class="img2" style="margin-right: 22px" src="../../assets/images/leveladd/back.png"/>
<div class="return">返回</div>
@@ -335,7 +335,7 @@
<div class="btnbox">
<a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
<a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId } }">
<router-link :to="{ path: '/leveladd', query:{ routerId: routerId, routerEdit: true } }">
<!-- @click="cancelStorage" -->
<a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
</router-link>

4
src/views/projectcenter/TaskAdd.vue
View File

@@ -88,7 +88,7 @@
</unlock-mode>
</div>
<div class="line"></div>
<router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId } }">
<router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId, routerEdit: true } }">
<div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png"/>
<div class="return">返回</div>
@@ -289,7 +289,7 @@
<div class="btnbox">
<a-button class="btn btn1" @click="temporaryStorage" :loading="confirmLoading">暂存</a-button>
<a-button class="btn btn1" @click="submitStorage" :loading="confirmLoading">确定</a-button>
<router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId } }">
<router-link :to="{ path: `/taskpage`, query: { projectId: route.query.projectId, routerEdit: true } }">
<!-- @click="cancelStorage" -->
<a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
</router-link>

4
src/views/projectcenter/TaskPage.vue
View File

@@ -4540,6 +4540,10 @@ export default {
}
);
onMounted(() => {
// 是否是从编辑跳转过来的
if(route.query.routerEdit==="true"){
state.activeKey = "2";
}
// getStu();
getTaskList();
getTaskInfo();

7
src/views/projectcenter/temTask.vue
View File

@@ -86,7 +86,7 @@
<!-- </unlock-mode>-->
<!-- </div>-->
<div class="line"></div>
<router-link :to="{ path: `/libraryAdd`, query: { projectId: route.query.projectId } }">
<router-link :to="{ path: `/libraryAdd`, query: { projectTemplateId: route.query.projectId } }">
<div style="display: flex">
<img class="img2" src="../../assets/images/leveladd/back.png" />
<div class="return">返回</div>
@@ -280,7 +280,10 @@
<div class="footbtn">
<div class="btnbox">
<a-button class="btn btn1" @click="submitStorage" :loading="templateLoading">确定</a-button>
<a-button class="btn btn1" @click="cancelStorage" :loading="cancleLoading">取消</a-button>
<router-link :to="{ path: `/libraryAdd`, query: { projectTemplateId: route.query.projectId } }">
<!-- @click="cancelStorage" -->
<a-button class="btn btn1" :loading="cancleLoading">取消</a-button>
</router-link>
</div>
</div>