hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-16 14:26:45 +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-01-17 14:38:27 +08:00
parent d258104af1 1eb8989b8b
commit 3a06b06282
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -44,7 +44,7 @@ export default defineComponent({
const store = useStore(); const store = useStore();
const isLogin = ref(false); const isLogin = ref(false);
// console.log("router", router.getRoutes(), route); // console.log("router", router.getRoutes(), route);
console.log("版本2.1.1------------"); console.log("版本2.1.2------------");
const routes = computed(() => { const routes = computed(() => {
return router.getRoutes().filter((e) => e.meta?.isLink); return router.getRoutes().filter((e) => e.meta?.isLink);
}); });

3
src/components/drawers/SeeStu.vue
View File

@@ -302,6 +302,7 @@ export default {
? "投票" ? "投票"
: "-", : "-",
name: value.name, name: value.name,
projectTaskId: value.projectTaskId,
complete: complete:
value.status == -1 value.status == -1
? "未开始" ? "未开始"
@@ -316,6 +317,8 @@ export default {
}; };
array.push(obj); array.push(obj);
}); });
array.sort((a,b)=>{return a.projectTaskId - b.projectTaskId})
console.log('我排序了吗--------------------------》', array)
return array; return array;
}; };
const setStageList = (tableData) => { const setStageList = (tableData) => {

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

@@ -858,12 +858,14 @@ export default {
state.pathName = ""; state.pathName = "";
state.pathBg = ""; state.pathBg = "";
state.pathBgId = ""; 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.pathIntro = "";
state.out = !state.out; 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 = () => { const handleOut1 = () => {
state.pathName = ""; state.pathName = "";