Merge branch 'dev_m' into 'develop'

fix: 左侧导航更改,概览页面tab总数更改

See merge request !42
This commit is contained in:
huangshengfa
2023-02-21 17:07:02 +08:00
3 changed files with 21 additions and 7 deletions

View File

@@ -23,3 +23,5 @@ export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList',
// 学习数据列表
export const boeuStudyDataPageList = (obj) => http.post('/boeu/studyData/pageList', obj)
// 概览页面 tab头数据
export const boeuAllTotal = (obj) => http.get('/boeu/all/total', obj)

View File

@@ -817,9 +817,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.openKeys,value.openKeys2];
state.selectedKeys2 = [value.openKeys];
}
});

View File

@@ -232,6 +232,21 @@ export default {
selectedRowKeys: [], // 选中的列
option: [],
});
// 获取tab数据
const getTabData = async () => {
const res = await api.boeuAllTotal({});
if (res) {
const list = [
{ text: "项目", num: res.data?.projectTotal },
{ text: "学习路径图", num: res.data?.routerTotal },
{ text: "授课", num: res.data?.teachingTotal },
{ text: "课程", num: res.data?.courseTotal },
{ text: "考试", num: res.data?.examTotal },
{ text: "案例", num: res.data?.caseTotal },
];
tabData.value = list;
}
};
// 重置按钮
const reset = async () => {
state.creator = "";
@@ -1061,10 +1076,12 @@ export default {
console.log("e", e, a);
};
onMounted(() => {
getTabData();
getOrgList();
getTableData();
});
return {
getTabData,
reset,
getOrgList,
onSelectChange,
@@ -1251,7 +1268,6 @@ export default {
.btn3 {
margin-right: 0px;
.search {
width: 17px;
height: 18px;
@@ -1263,10 +1279,6 @@ export default {
// background: rgba(64, 158, 255, 0.76);
background: rgba(64, 158, 255, 0.2);
}
// .btn3:active {
// background: #0982ff;
// }
}
}