diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 5692e525..7fe0a2fb 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -75,7 +75,7 @@ @@ -2958,26 +2958,26 @@ const columns1 = [ return text ? text : "-"; }, }, - { - title: "学习人数", - width: 130, - dataIndex: "stunum", - key: "4", - align: "center", - customRender: ({ text }) => { - return text ? text : "0"; - }, - }, - { - title: "评分", - width: 130, - dataIndex: "grade", - key: "5", - align: "center", - customRender: ({ text }) => { - return text ? text : "0"; - }, - }, + // { + // title: "学习人数", + // width: 130, + // dataIndex: "stunum", + // key: "4", + // align: "center", + // customRender: ({ text }) => { + // // return text ? text : "0"; + // }, + // }, + // { + // title: "评分", + // width: 130, + // dataIndex: "grade", + // key: "5", + // align: "center", + // customRender: ({ text }) => { + // return text ? text : "0"; + // }, + // }, { title: "状态", width: 130, @@ -3632,7 +3632,7 @@ export default defineComponent({ imageUrl: "", imgList: [], - validate: false, + validate:true, pageSize2: 10, currentPage2: 0, @@ -3984,8 +3984,16 @@ export default defineComponent({ let startTime = ""; let endTime = ""; if (state.projectTime) { - startTime = state.projectTime[0]; - endTime = state.projectTime[1]; + + startTime = toDate( + new Date(state.projectTime[0].$d).getTime() / 1000, + "Y-M-D" + ); + endTime = toDate( + new Date(state.projectTime[1].$d).getTime() / 1000, + "Y-M-D" + ); + } let res = await list({ pageNo: state.currentPage1, diff --git a/src/views/learningpath/LevelAdd.vue b/src/views/learningpath/LevelAdd.vue index 644ef532..f5ee9805 100644 --- a/src/views/learningpath/LevelAdd.vue +++ b/src/views/learningpath/LevelAdd.vue @@ -1499,14 +1499,14 @@ export default { align: "center", className: "h", }, - // { - // title: "进度", - // dataIndex: "jin", - // key: "jin", - // width: 110, - // align: "center", - // className: "h", - // }, + { + title: "进度", + dataIndex: "jin", + key: "jin", + width: 110, + align: "center", + className: "h", + }, { title: "开始时间", dataIndex: "time", diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index 91f232bd..5092963e 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -1547,14 +1547,14 @@ export default { align: "center", className: "h", }, - // { - // title: "进度", - // dataIndex: "jin", - // key: "jin", - // width: 110, - // align: "center", - // className: "h", - // }, + { + title: "进度", + dataIndex: "jin", + key: "jin", + width: 110, + align: "center", + className: "h", + }, { title: "开始时间", dataIndex: "time", diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 0a549a0a..74c173c3 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -47,12 +47,7 @@
创建时间:
{ diff --git a/src/views/projectcenter/TaskPage.vue b/src/views/projectcenter/TaskPage.vue index bafc50b7..dc01134e 100644 --- a/src/views/projectcenter/TaskPage.vue +++ b/src/views/projectcenter/TaskPage.vue @@ -3108,7 +3108,7 @@ export default { title: "姓名", dataIndex: "name", key: "name", - // width: 30, + width:"20%", align: "left", className: "h", // scopedSlots: { customRender: "action" }, //引入的插槽 @@ -3145,9 +3145,10 @@ export default { title: "部门", dataIndex: "bum", key: "bum", - // width: 50, + width:"10%", align: "center", className: "h", + ellipsis: true, }, // { // title: "岗位", @@ -3165,14 +3166,15 @@ export default { // align: "center", // className: "h", // }, - // { - // title: "进度", - // dataIndex: "progress", - // key: "progress", - // width: 30, - // align: "center", - // className: "h", - // }, + { + title: "进度", + dataIndex: "progress", + key: "progress", + width:"10%", + align: "center", + className: "h", + ellipsis: true, + }, // { // title: "证书", // dataIndex: "diploma", @@ -3185,7 +3187,7 @@ export default { title: "最近学习时间", dataIndex: "stutime", key: "stutime", - // width: 50, + width:"20%", align: "center", className: "h", // sorter: { @@ -3197,15 +3199,16 @@ export default { title: "加入方式", dataIndex: "putin", key: "putin", - // width: 40, + width:"10%", align: "center", className: "h", + ellipsis: true, }, { title: "操作", dataIndex: "operation", key: "operation", - // width: 60, + width:"20%", align: "center", className: "h", scopedSlots: { customRender: "action" }, //引入的插槽