From 1bab523091f5e2af858996fb7b41db6eae48d1b9 Mon Sep 17 00:00:00 2001 From: Pengxiansen <2422914688@qq.com> Date: Thu, 23 Jan 2025 23:27:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E4=B8=9A=E5=8A=9B=E5=BF=85=E4=BF=AE?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/growthpath.js | 6 +- src/assets/images/navleft/pathIcon.png | Bin 0 -> 326 bytes src/components/NavLeft.vue | 2 +- .../growthpath/GrowthOnlineManage.vue | 156 +-- src/components/growthpath/GrowthProject.vue | 5 +- .../growthpath/GrowthTableModel.vue | 21 +- src/components/growthpath/ImportStu.vue | 115 +-- src/components/growthpath/OfficeSelect.vue | 4 +- src/components/growthpath/StudentManage.vue | 232 ++--- src/components/growthpath/UpdateRecord.vue | 27 +- src/views/growthpath/EditingTasks.vue | 482 ++++----- src/views/growthpath/GrowthPath.vue | 41 +- src/views/growthpath/PathManage.vue | 957 +++++++++--------- 13 files changed, 1028 insertions(+), 1020 deletions(-) create mode 100644 src/assets/images/navleft/pathIcon.png diff --git a/src/api/growthpath.js b/src/api/growthpath.js index c2be5864..9a44c166 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -41,7 +41,8 @@ export const deleteTask = (ids) => http.get('/professional/task/delete/' + ids) //获取岗位 export const getStdPosition = (obj) => http.get('/professional/compulsory/getStdPositionList', { params: obj }) - +//获取Band +export const getBandList = (obj) => http.get('/professional/compulsory/getBandList', { params: obj }) //获取职级 export const getQualsLevelCode = (obj) => http.get('/professional/compulsory/getQualsLevelCodeList', { params: obj }) @@ -74,7 +75,8 @@ export const getStudentTaskPage = (obj) => http.get('/professional/studentTask/g // 导出任务管理学员 export const exportStudentTaskPage = (obj) => http.post('/professional/studentTask/export', obj) - +// 任务管理概览 +export const taskInformation = (growthId) => http.get('/professional/managementOverview/taskInformation/' + growthId) diff --git a/src/assets/images/navleft/pathIcon.png b/src/assets/images/navleft/pathIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..a0edb303e8b9752714dd300f68cf1703158035e5 GIT binary patch literal 326 zcmV-M0lEH(P)Px$07*naR5(wqle;cNQ51&1e-f8UAvAgkg<@!DJcEZIq1AZ;i3-V3(DEQCg+g53 z0f|sClHXafCpi(xa%6V1i=Fjl{g*8o9^31{7;qq|ub8(z0jvRSU^HRQ0SmwbuqoR! zz!@-E?)L;RUjX+5z$vf@bR<1xifR&il0IXD7hp@$VK)5R`%nNUz!K1v^w@NZpC+DH zaxxS9z!h*L>9ro?>K|i_n3sX@uKNvWdTdVt7qQ8|0Hu5zRU@~D1F+pHRUVhLmr1fc zT_jva3Z1IP`^CVh=WPOrj}$Y{VP*hUfE{2KxC3qyzz1**97}o|#5e+kDJ@C6nS}cL Y7rDY==vRL6hX4Qo07*qoM6N<$g7~a|+5i9m literal 0 HcmV?d00001 diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index ffdff5ec..423c0fa9 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -90,7 +90,7 @@
专业力必修 diff --git a/src/components/growthpath/GrowthOnlineManage.vue b/src/components/growthpath/GrowthOnlineManage.vue index 6fe82fe7..5e4dd76e 100644 --- a/src/components/growthpath/GrowthOnlineManage.vue +++ b/src/components/growthpath/GrowthOnlineManage.vue @@ -31,41 +31,36 @@ -->
-
-
标准岗位：
- +
+
-
-
任职资格：
+
- -
-
姓名/工号：
- -
-
-
任务状态：
+
+
+ +
{ @@ -245,7 +240,7 @@ export default { title: "姓名", dataIndex: "userNickName", key: "userNickName", - width: 50, + width: 80, align: "center", className: "h head", customRender: (text) => { @@ -259,27 +254,11 @@ export default { ); }, }, - { - title: "归属组织", - dataIndex: "orgName", - key: "orgName", - width: 160, - align: "center", - ellipsis: true, - className: "h", - customRender: (text) => { - return ( -
- {text.record.orgName ? text.record.orgName : "-"} -
- ); - }, - }, { title: "标准岗位", dataIndex: "stdPositionName", key: "stdPositionName", - width: 60, + width: 150, align: "center", ellipsis: true, className: "h", @@ -300,7 +279,7 @@ export default { title: "任职资格", dataIndex: "qualsLevelDesr", key: "qualsLevelDesr", - width: 60, + width: 80, align: "center", ellipsis: true, className: "h", @@ -349,22 +328,6 @@ export default { 4: "添加", }[joinMethod]), }, - /** { - title: "学员关卡", - dataIndex: "currentStageName", - key: "currentStageName", - width: 60, - align: "center", - ellipsis: true, - className: "h", - customRender: () => { - return ( -
- {props.levelName} -
- ); - }, - },*/ { title: "完成时间", dataIndex: "finishTime", @@ -456,6 +419,8 @@ export default { state.name = ""; state.projectName = undefined; state.tabledata = []; + state.stdPosition = null; + state.qualsLevelCode = null; }; const afterVisibleChange = (bol) => { if (bol == true) { @@ -494,13 +459,13 @@ export default { // 获取数据 function getData() { getStudentTaskPage({ - pageNo: state.currentPage, + pageNum: state.currentPage, pageSize: state.pageSize, completionStatus: state.projectName, username: state.name, taskId: props.datasource.id, qualsLevelCode: state.qualsLevelCode, - stdPositionId: state.stdPositionId, + stdPosition: state.stdPosition, }) .then((res) => { console.log("在线课数据获取", res); @@ -528,6 +493,8 @@ export default { state.currentPage = 1; state.name = ""; state.projectName = null; + state.stdPosition = null; + state.qualsLevelCode = null; getData(); } @@ -540,56 +507,35 @@ export default { // 导出数据 function exportTaskStu() { - exportStudentTaskPage({ - pageNo: state.currentPage, - pageSize: state.pageSize, - completionStatus: state.projectName, - username: state.name, - taskId: props.datasource.id, - qualsLevelCode: state.qualsLevelCode, - stdPositionId: state.stdPositionId, - }).catch((err) => { - let blob = new Blob([err.data], { - type: "application/vnd.ms-excel", - }); - console.log(blob); - let url = window.URL.createObjectURL(blob); - - // 创建a标签并为其添加属性 - const link = document.createElement("a"); - link.href = url; - link.download = `【${ - state.TASK_TYPE[props.datasource.taskType].name - }】${props.datasource.taskName}.xlsx`; - // 触发点击事件执行下载 - document.body.appendChild(link); - link.click(); - // 下载完成就删掉a标签 - document.body.removeChild(link); - //释放blob对象 - window.URL.revokeObjectURL(url); - }); - // if(props.datasource.type==1){ - // {/* 在线课导出 */} - // window.open(`${process.env.VUE_APP_BASE_API}/admin/online/manage/exportOnline?chapterId=${props.datasource.stageId}&type=${1}&targetId=${props.datasource.projectId}&taskId=${props.datasource.courseId}`) - // }else if(props.datasource.taskType==11){ - // {/* 评估导出 */} - // window.open(`${process.env.VUE_APP_BASE_API}/admin/assessment/manage/exportAssessmentMessage?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.taskType}`) - // }else if(props.datasource.taskType==8){ - // {/* 讨论导出 */} - // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportDiscussStudent?chapterId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&courseId=${props.datasource.courseId}&taskId=${props.datasource.id}&taskType=${props.datasource.taskType}`) - // }else{ - // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.stageId}&type=${1}&pid=${props.datasource.projectId}&taskId=${props.datasource.id}&taskType=${props.datasource.taskType}`) - // } + let params = { + pageNo: state.currentPage || "", + pageSize: state.pageSize || "", + completionStatus: state.projectName || "", + username: state.name || "", + taskId: props.datasource.id || "", + qualsLevelCode: state.qualsLevelCode || "", + stdPosition: state.stdPosition || "", + }; // window.open( - // `${ - // process.env.VUE_APP_BASE_API - // }/admin/online/manage/exportOnline?type=${14}&targetId=${ - // props.datasource.targetId - // }&taskId=${props.datasource.courseId}` + // buildUrl( + // "http://192.168.18.141:32002/professional/studentTask/export", + // params + // ) // ); + window.open( + buildUrl( + `${process.env.VUE_APP_BOE_API_URL}${process.env.VUE_APP_BASE_API_GROWTH}/professional/studentTask/export`, + params + ) + ); + } + function buildUrl(url, params) { + const searchParams = new URLSearchParams(); + Object.keys(params).forEach((key) => { + searchParams.append(key, params[key]); + }); + return `${url}?${searchParams.toString()}`; } - return { ...toRefs(state), selectProjectName, diff --git a/src/components/growthpath/GrowthProject.vue b/src/components/growthpath/GrowthProject.vue index 06efce92..31bda7f7 100644 --- a/src/components/growthpath/GrowthProject.vue +++ b/src/components/growthpath/GrowthProject.vue @@ -56,9 +56,9 @@
-
+
-
搜索
+
搜索
@@ -321,7 +321,6 @@ defineExpose({ openDrawer }); margin-bottom: 20px; color: #fff; } - } } diff --git a/src/components/growthpath/GrowthTableModel.vue b/src/components/growthpath/GrowthTableModel.vue index 20f0e6a1..fbcf08ed 100644 --- a/src/components/growthpath/GrowthTableModel.vue +++ b/src/components/growthpath/GrowthTableModel.vue @@ -8,7 +8,7 @@ >
-
归属权转移
+
{{ title }}
删除移除权限
--
 @@ -161,13 +169,16 @@ import { assignPermissions, delAssignPermissions, } from "@/api/growthpath"; +import { useStore } from "vuex"; import { delStudentList } from "@/api/index1"; import { message } from "ant-design-vue"; import dialog from "@/utils/dialog"; - +const { state } = useStore(); +console.log(state, "sssssssssss"); const props = defineProps({ type: Number, id: String, + title: String, }); const visiable = ref(false); diff --git a/src/components/growthpath/ImportStu.vue b/src/components/growthpath/ImportStu.vue index 60e46892..b6d16149 100644 --- a/src/components/growthpath/ImportStu.vue +++ b/src/components/growthpath/ImportStu.vue @@ -93,21 +93,21 @@
-
+ +
-
@@ -117,26 +117,26 @@ downloadErrUrl == "" ? 0 : errNum }}条数据解析失败
-
-
+
--> + + -
-
+
-->
@@ -260,11 +267,6 @@ :courseId="id" :courseType="type" /> -