diff --git a/src/App.vue b/src/App.vue index d054fbda..9d385244 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本2.1.1------------"); + console.log("版本2.1.2------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); diff --git a/src/components/drawers/SeeStu.vue b/src/components/drawers/SeeStu.vue index 0a546d83..748f4191 100644 --- a/src/components/drawers/SeeStu.vue +++ b/src/components/drawers/SeeStu.vue @@ -302,6 +302,7 @@ export default { ? "投票" : "-", name: value.name, + projectTaskId: value.projectTaskId, complete: value.status == -1 ? "未开始" @@ -316,6 +317,8 @@ export default { }; array.push(obj); }); + array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId}) + console.log('我排序了吗--------------------------》', array) return array; }; const setStageList = (tableData) => { diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index aa755f2d..aac43099 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -858,12 +858,14 @@ export default { state.pathName = ""; state.pathBg = ""; state.pathBgId = ""; - if(store.state.userInfo.departId && store.state.userInfo.departName){ - state.organizationSelectName = store.state.userInfo.departName; - state.organizationSelectId = store.state.userInfo.departId; - } state.pathIntro = ""; state.out = !state.out; + setTimeout(() => { + if(store.state.userInfo.departId && store.state.userInfo.departName){ + state.organizationSelectName = store.state.userInfo.departName; + state.organizationSelectId = store.state.userInfo.departId; + } + }, 2000); }; const handleOut1 = () => { state.pathName = "";