diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 1d0f58ad..222488c1 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -677,55 +677,63 @@ export default { { href: "/learningpathmap", openKeys: "sub17", - // openKeyss:'sub17-2', + openKeys2: "sub17-2", selectedKeys: "sub17-2-1", pagename: "学习路径图", }, { href: "/project", openKeys: "sub17", + openKeys2: "sub17-2", selectedKeys: "sub17-2-2", pagename: "项目", }, { href: "/curriculum", openKeys: "sub17", + openKeys2: "sub17-2", selectedKeys: "sub17-2-3", pagename: "课程", }, { href: "/caseess", openKeys: "sub17", + openKeys2: "sub17-2", selectedKeys: "sub17-2-4", pagename: "案例", }, { href: "/article", openKeys: "sub17", + openKeys2: "sub17-2", selectedKeys: "sub17-2-5", pagename: "文章", }, { href: "/questionsandanswers", openKeys: "sub17", + openKeys2: "sub17-2", selectedKeys: "sub17-2-6", pagename: "问答", }, { href: "/examination", openKeys: "sub17", + openKeys2: "sub17-2", selectedKeys: "sub17-2-7", pagename: "考试", }, { href: "/overvoew", openKeys: "sub17", + openKeys2: "sub17-3", selectedKeys: "sub17-3-1", pagename: "概览", }, { href: "/employeelearning", openKeys: "sub17", + openKeys2: "sub17-3", selectedKeys: "sub17-3-2", pagename: "员工学习数据", }, @@ -738,12 +746,13 @@ export default { ); if (state.rootSubmenuKeys.indexOf(latestOpenKey) === -1) { state.openKeys = openKeys; + console.log('111',openKeys) } else { state.openKeys = latestOpenKey ? [latestOpenKey] : []; + console.log('222222222222222') } }; const selectItem = (e) => { - // console.log("onSelect", e, ); let arr = state.keysList; arr.map((value) => { if (e.key === value.selectedKeys) { @@ -752,9 +761,11 @@ export default { "selectedKeys", JSON.stringify([value.selectedKeys]) ); - state.openKeys = [value.openKeys]; + // console.log('2222',[value.openKeys,value.openKeys2]) + state.openKeys = [value.openKeys,value.openKeys2]; + // state.openKeys=['sub17', 'sub17-2'] state.selectedKeys = [value.selectedKeys]; - state.openKeys2 = [value.openKeys]; + state.openKeys2 = [value.openKeys,value.openKeys2]; state.selectedKeys2 = [value.openKeys]; } }); @@ -774,9 +785,9 @@ export default { "selectedKeys", JSON.stringify([value.selectedKeys]) ); - state.openKeys = [value.openKeys]; + state.openKeys = [value.openKeys,value.openKeys2]; state.selectedKeys = [value.selectedKeys]; - state.openKeys2 = [value.openKeys]; + state.openKeys2 = [value.openKeys2]; state.selectedKeys2 = [value.openKeys]; } }); diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue index ffacacc4..bbffe540 100644 --- a/src/views/report/Employeelearning.vue +++ b/src/views/report/Employeelearning.vue @@ -145,7 +145,7 @@ export default { token: Cookies.get("token"), }, }).then((res) => { - downLoad(res.data, "案例.xlsx"); + downLoad(res.data, "学习员工数据.xlsx"); }); } }; diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue index e871a7d1..85116ba7 100644 --- a/src/views/report/Overvoew.vue +++ b/src/views/report/Overvoew.vue @@ -73,13 +73,14 @@ :scroll="{ x: 700 }" :pagination="false" @expand="expandTable" + childrenColumnName="children" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange, }" >