diff --git a/src/api/indexOvervoew.js b/src/api/indexOvervoew.js
index 327bf0aa..e638f734 100644
--- a/src/api/indexOvervoew.js
+++ b/src/api/indexOvervoew.js
@@ -10,7 +10,8 @@ export const boeuExamPageList = (obj) => http.post('/boeu/exam/pageList', obj)
export const boeuCasePageList = (obj) => http.post('/boeu/case/pageList', obj)
// 请求组织接口
export const userGetUserOrg = (obj) => https.post('/user/getUserOrg', obj)
-
+// 请求所属组织接口
+export const userInfo = (obj) => https.post('/user/info', obj)
// 课程列表接口
export const boeuCoursePageList = (obj) => http.post('/boeu/course/pageList', obj)
// 授课列表
diff --git a/src/views/report/Employeelearning.vue b/src/views/report/Employeelearning.vue
index bbffe540..c1840acf 100644
--- a/src/views/report/Employeelearning.vue
+++ b/src/views/report/Employeelearning.vue
@@ -129,6 +129,7 @@ export default {
};
});
state.option = list;
+ getOrgId()
}
};
//导出
@@ -270,19 +271,19 @@ export default {
},
},
]);
- // 行内单条下载
- const oneExport = (record) => {
+ // 行内单条下载
+ const oneExport = (record) => {
axios({
- method: "get",
- url: "/report/boeu/studyData/export",
- params: { ids: `${record.record.id}` },
- responseType: "blob",
- headers: {
- token: Cookies.get("token"),
- },
- }).then((res) => {
- downLoad(res.data, "案例.xlsx");
- });
+ method: "get",
+ url: "/report/boeu/studyData/export",
+ params: { ids: `${record.record.id}` },
+ responseType: "blob",
+ headers: {
+ token: Cookies.get("token"),
+ },
+ }).then((res) => {
+ downLoad(res.data, "案例.xlsx");
+ });
};
//table 分页事件
const changePagination = (page) => {
@@ -291,7 +292,7 @@ export default {
};
// 获取数据
const getTableData = async () => {
- state.tableLoading=true
+ state.tableLoading = true;
const res = await api.boeuStudyDataPageList({
page: state.pageNo,
size: state.pageSize,
@@ -309,7 +310,7 @@ export default {
};
});
tableData.value = list;
- state.tableLoading=false
+ state.tableLoading = false;
}
};
// 重置按钮
@@ -320,9 +321,17 @@ export default {
state.userNo = "";
getTableData();
};
+ // 获取登录人员组织
+ const getOrgId = async () => {
+ const res = await api.userInfo({});
+ if (res) {
+ state.orgId = res.data.result.departId;
+ getTableData();
+ }
+ };
onMounted(() => {
- getTableData();
getOrgList();
+ state.tableLoading=true
});
return {
onSelectChange,
diff --git a/src/views/report/Overvoew.vue b/src/views/report/Overvoew.vue
index ca0923d8..dfa0fd15 100644
--- a/src/views/report/Overvoew.vue
+++ b/src/views/report/Overvoew.vue
@@ -95,10 +95,25 @@
record.status == "0"
? "草稿"
: record.status == "1"
- ? "已发布"
+ ? "提交待审核"
+ : record.status == "2"
+ ? "审核通过"
+ : record.status == "3"
+ ? '已经发布'
+ : record.status == "4"
+ ? '发布'
: record.status == "-1"
- ? "已结束"
- : ""
+ ? '已结束'
+ : record.status == "-2"
+ ? '删除'
+ : record.status == "-3"
+ ? '撤回审核'
+ : record.status == "-4"
+ ? '撤回发布'
+ : record.status == "-5"
+ ? '拒绝'
+ : record.status == "-6"
+ ? '撤回已结束':''
}}
@@ -128,9 +143,9 @@
{{
- record.published == "0"
+ record.publishStatus == "0"
? "未发布"
- : record.published == "1"
+ : record.publishStatus == "1"
? "已发布"
: ""
}}
@@ -188,6 +203,19 @@
}}
+
+