diff --git a/package-lock.json b/package-lock.json index 9ecda927..b5f3909e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -83,9 +83,9 @@ } }, "node_modules/@ant-design/icons-svg": { - "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz", - "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==" + "version": "4.4.2", + "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz", + "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==" }, "node_modules/@ant-design/icons-vue": { "version": "6.1.0", @@ -12570,9 +12570,9 @@ } }, "@ant-design/icons-svg": { - "version": "4.2.1", - "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.2.1.tgz", - "integrity": "sha512-EB0iwlKDGpG93hW8f85CTJTs4SvMX7tt5ceupvhALp1IF44SeUFOMhKUOYqpsoYWQKAOuTRDMqn75rEaKDp0Xw==" + "version": "4.4.2", + "resolved": "https://registry.npmmirror.com/@ant-design/icons-svg/-/icons-svg-4.4.2.tgz", + "integrity": "sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==" }, "@ant-design/icons-vue": { "version": "6.1.0", diff --git a/src/api/index.js b/src/api/index.js index 215b7666..f3f684d2 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -53,6 +53,7 @@ export const getProjectList = (obj) => http.post('/admin/project/list', obj) // 获取项目详情信息(包含阶段及任务列表) export const getProjectDetail = (obj) => http.get('/admin/project/detail', {params: obj}) +export const getDraftTask = (obj) => http.get('/admin/project/detailDraft', { params: obj }) //发布项目 export const releaseProject = (obj) => http.post('/admin/project/publish', obj) //获取项目学员 diff --git a/src/api/index1.js b/src/api/index1.js index ac32f578..fd519e53 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -133,7 +133,7 @@ export const getStuList = (obj) => http.post('/admin/orgStruct/getStudentRef', o //获取用户登录 export const getUser = () => http.post('/admin/CheckUser/login', { withCredentials: true }) //公共信息--------------------------------------------------- - +export const courseData =(obj)=> http.post("/admin/offcourse/allPlanList",obj); //添加项目学员 export const addStudentProject = (obj) => http.post('/admin/project/addStudent', obj) //添加课程学员 @@ -178,6 +178,7 @@ export const exportHomeWork = (obj) => http.get('/admin/student/exportHomeWork', export const exportHomeWorkTemplate = (obj) => http.get('/admin/student/exportHomeWorkTemplate', { params: obj }) //签到 export const attendanceSign = (obj) => http.post('/stu/task/attendance/sign', obj) +export const attendanceSignAll = (obj) => http.post('/stu/task/all/sign', obj) //请假 export const attendanceLeave = (obj) => http.post('/stu/task/attendance/leave', obj) diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 6d09f7d9..95df1ef7 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -374,6 +374,234 @@ textarea { } } + .drawerMain { + .header { + height: 73px; + border-bottom: 1px solid #e8e8e8; + display: flex; + justify-content: space-between; + align-items: center; + + .headerTitle { + font-size: 18px; + font-weight: 600; + color: #333333; + line-height: 25px; + margin-left: 24px; + } + } + + .contentMain { + .main_items { + display: flex; + + margin-bottom: 12px; + margin-top: 32px; + flex-wrap: wrap; + + .mi_ipts { + display: flex; + margin-bottom: 20px; + + .mii_ipt { + display: flex; + align-items: center; + margin-right: 24px; + + .ipt_name { + white-space: nowrap; + } + } + } + + .mi_btns { + display: flex; + margin-left: 38px; + margin-bottom: 20px; + cursor: pointer; + + .btn { + padding: 0px 26px 0px 26px; + height: 38px; + border-radius: 8px; + border: 1px solid rgba(64, 158, 255, 1); + display: flex; + align-items: center; + justify-content: center; + margin-left: 14px; + flex-shrink: 0; + + .search { + background-size: 100%; + } + + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } + + .btn1 { + background: rgb(64, 158, 255); + + .search { + width: 15px; + height: 17px; + background-image: url("@/assets/images/coursewareManage/search0.png"); + } + + .btnText { + color: rgb(255, 255, 255); + } + } + + .btn2 { + background: rgb(255, 255, 255); + + .search { + width: 15px; + height: 17px; + background-image: url("@/assets/images/coursewareManage/reset1.png"); + } + + .btnText { + color: rgb(64, 158, 255); + } + } + + .btn1:hover { + background: rgb(255, 255, 255); + + .search { + background-image: url("@/assets/images/courseManage/search1.png"); + } + + .btnText { + color: #4ea6ff; + } + } + + .btn2:hover { + background: rgba(64, 158, 255, 1); + + .search { + background-image: url("@/assets/images/courseManage/reset0.png"); + } + + .btnText { + color: #ffffff; + } + } + } + } + + .main_notice { + display: flex; + justify-content: space-between; + align-items: center; + margin-bottom: 32px; + height: 40px; + background-color: #e9f6fe; + + .mntc_left { + display: flex; + align-items: center; + + .title { + color: rgba(0, 0, 0, 0.65); + margin-right: 17px; + } + + .data { + color: #4ea6ff; + } + + .notice_icon { + width: 14px; + height: 14px; + margin-right: 9px; + margin-left: 9px; + background-image: url(@/assets/images/coursewareManage/gan.png); + background-size: 100% 100%; + } + } + + .mntc_right { + cursor: pointer; + } + } + } + + .main_table { + position: relative; + padding-bottom: 80px; + + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } + + .ant-table-selection-column { + padding: 0px !important; + padding-left: 5px !important; + } + + .ant-table-thead>tr>th { + background-color: rgba(239, 244, 252, 1); + } + + th.h { + background-color: #eff4fc !important; + } + + .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { + background: #f6f9fd; + } + + .pa { + left: 0; + width: 100%; + display: flex; + justify-content: center; + position: absolute; + bottom: 20px; + } + } + + .main_btns { + height: 72px; + width: 100%; + bottom: 0; + left: 0; + display: flex; + align-items: center; + justify-content: center; + box-shadow: 0px 1px 35px 0px rgba(118, 136, 166, 0.16); + + .btn1 { + width: 100px; + height: 40px; + border: 1px solid #4ea6ff; + border-radius: 8px; + color: #4ea6ff; + background-color: #fff; + cursor: pointer; + } + + .btn2 { + cursor: pointer; + width: 100px; + height: 40px; + background: #4ea6ff; + border-radius: 8px; + border: 0; + margin-left: 15px; + color: #fff; + } + } + } } //抽屉-------------------------------------------------------- diff --git a/src/components/TwoDimensionalCode.vue b/src/components/TwoDimensionalCode.vue index 4000fa25..20b1dbe0 100644 --- a/src/components/TwoDimensionalCode.vue +++ b/src/components/TwoDimensionalCode.vue @@ -21,8 +21,16 @@
授课教师
- {{ item.teacher }}
+ {{ item.offteachers.map(item => item.teacherName).join(',') }}
-
- 添加学员
-