diff --git a/.env.boe b/.env.boe index eee9fdba..32e7e9fa 100644 --- a/.env.boe +++ b/.env.boe @@ -1,6 +1,7 @@ NODE_ENV=boe VUE_APP_BASE=/manage -VUE_APP_BASE_API= +VUE_APP_BASE_API=/manageApi +VUE_APP_BASE_API_GROWTH=/growth VUE_APP_LOGIN_URL=//u-pre.boe.com/web?returnUrl= VUE_APP_BOE_API_URL=//u-pre.boe.com diff --git a/src/api/configGrowth.js b/src/api/configGrowth.js new file mode 100644 index 00000000..ab3fedbe --- /dev/null +++ b/src/api/configGrowth.js @@ -0,0 +1,87 @@ +/* + * @Author: lixg lixg@dongwu-inc.com + * @Date: 2022-11-21 14:32:52 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2023-01-04 13:49:54 + * @FilePath: /fe-manage/src/api/config.js + * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE + */ +import { message } from "ant-design-vue"; +import axios from "axios"; +import router from "@/router"; +import { REFRESH_TOKEN_API } from "@/api/ThirdApi"; +import { boeRequest } from "@/api/request"; +// import { getCookie } from '../api/method' +// const Qs = require("qs"); + +// axios.defaults.headers.post["Content-Type"] = +// "application/x-www-form-urlencoded"; +axios.defaults.withCredentials = true; +const http = axios.create({ + // baseURL: '/growth', + baseURL: process.env.VUE_APP_BASE_API_GROWTH, + timeout: 1000 * 15, + // headers: { "Content-Type": "multipart/form-data" }, + headers: { "Content-Type": "application/json" }, +}); + +http.interceptors.request.use( + (config) => { + // console.log("config", config); + // const token = localStorage.getItem("token"); + // // const token = getCookie('token') + // // console.log('token', token) + // if (token) { + // config.headers.token = token; //测试1111 + // } else { + // console.log("当前请求页面无token,请执行操作！！！"); + + // // 此处测试默认配置token + // config.headers.token = + // "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJodHRwOlwvXC91LmJvZS5jb20iLCJpYXQiOjE2NzAxNTMxMDMsImV4cCI6MTY3MDE2MDMwMywiR2l2ZW5OYW1lIjoiYm9ldSIsInVzZXJJZCI6IjZCMDQ5RkFGLUMzMTQtN0NDRi0wRDI4LTBEMjNGNEM0MjUzMSIsInVJZCI6Ijk2NTM0MjAyNzQ5NzYwNzE2OCIsInBlcm1pc3Npb24iOiIifQ==.c937b2d3a59cbab2136fdde55fd38f06bdff041212aab0fa6741bc4be41e28a7"; + // // } + return config; + }, + (err) => { + console.log("登陆前拦截", err); + return Promise.reject(err); + } +); + +http.interceptors.response.use( + (response) => { + // console.log('response', response) + const { + data: { code, msg, show }, + } = response; + if (code === 0 || code === 200) { + return response; + } else if (code === 1000) { + window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath) + // TODO token过期后退出登录 清空当前用户标记 - 为了刷新页面使用 + localStorage.removeItem('refreshPage') + return Promise.reject(response); + } else if (code === 1001) { + window.location.href = process.env.VUE_APP_LOGIN_URL + encodeURIComponent(window.location.protocol + process.env.VUE_APP_BOE_API_URL + process.env.VUE_APP_BASE + router.currentRoute.value.fullPath) + return Promise.reject(response); + } else { + message.error(msg) + } + // show ? message.error(msg):message.error('系统接口数据异常，请联系管理员'); + console.log("api %o", msg); + return Promise.reject(response); + }, + function (error) { + if (error.message == "timeout of 1ms exceeded") { + message.destroy(); + message.error("请求超时"); + } + console.log("api error %o", error); + return Promise.reject(error); + } +); + +export default http; +export function setHttpTimeout(newTimeout) { + http.defaults.timeout = newTimeout; +} diff --git a/src/api/growthpath.js b/src/api/growthpath.js index 4b684f9f..c2be5864 100644 --- a/src/api/growthpath.js +++ b/src/api/growthpath.js @@ -1,38 +1,84 @@ -import http from "./config"; +import http from "./configGrowth"; import https from './configPublic' -const API_URL = "/growth" + + //查询专业力必修列表 -export const listData = (obj) => http.get(API_URL + '/professional/compulsory/list', { params: obj }) +export const listData = (obj) => http.get('/professional/compulsory/list', { params: obj }) //基本信息 -export const getBasicInfo = (obj) => http.get(API_URL + '/professional/compulsory/details/' + obj.growId) +export const getBasicInfo = (obj) => http.get('/professional/compulsory/details/' + obj.growId) //专业力必修发布 -export const published = (obj) => http.get(API_URL + '/professional/compulsory/publish/' + obj.growId) +export const published = (obj) => http.get('/professional/compulsory/publish/' + obj.growId) +//专业力必修撤回 +export const withdrawal = (id) => http.get('/professional/compulsory/withdrawal/' + id) //专业力必修修改 -export const updatePostInfomation = (obj) => http.post(API_URL + '/professional/compulsory/updatePostInfomation', obj) +export const updatePostInfomation = (obj) => http.post('/professional/compulsory/updatePostInformation', obj) +//专业力必修分配权限 +export const assignPermissions = (obj) => http.post('/professional/compulsory/assignPermissions', obj) +//专业力必修修改列表 +export const modifyList = (obj) => http.get('/professional/modify/records/list', { params: obj }) +//任务概览 +export const manangementOverview = (obj) => http.get('/professional/managementOverview/taskOverview/' + obj.growId) +//学员列表 +export const allocationList = (obj) => http.get('/professional/allocation/list', { params: obj }) + +//学员列表新增学员 +export const addLearners = (obj) => http.post('/professional/allocation/addLearners', obj) //获取任务列表 -export const taskOutline = (obj) => http.get(API_URL + '/professional/task/list', { params: obj }) +export const taskOutline = (obj) => http.get('/professional/task/list', { params: obj }) //新增任务 -export const saveTask = (obj) => http.post(API_URL + '/professional/task/saveTask', obj) +export const saveTask = (obj) => http.post('/professional/task/saveTask', obj) //获取未发布编辑任务列表 -export const notPublishedTaskList = (obj) => http.get(API_URL + '/professional/task/notPublishedTaskList', { params: obj }) +export const notPublishedTaskList = (obj) => http.get('/professional/task/notPublishedTaskList', { params: obj }) //发布学习任务 -export const publishedTask = (id) => http.get(API_URL + '/professional/task/published/' + id) +export const publishedTask = (id) => http.get('/professional/task/published/' + id) //撤回学习任务 -export const withdrawTask = (id) => http.get(API_URL + '/professional/task/withdrawal/' + id) +export const withdrawTask = (id) => http.get('/professional/task/withdrawal/' + id) //批量删除学习任务 -export const deleteTask = (ids) => http.get(API_URL + '/professional/task/delete/' + ids) +export const deleteTask = (ids) => http.get('/professional/task/delete/' + ids) //获取岗位 -export const getStdPosition = (obj) => http.get(API_URL + '/professional/compulsory/getStdPositionList', { params: obj }) +export const getStdPosition = (obj) => http.get('/professional/compulsory/getStdPositionList', { params: obj }) //获取职级 -export const getQualsLevelCode = (obj) => http.get(API_URL + '/professional/compulsory/getQualsLevelCodeList', { params: obj }) +export const getQualsLevelCode = (obj) => http.get('/professional/compulsory/getQualsLevelCodeList', { params: obj }) + +//学员导入模板下载 +export const downLoadImpTemplate = () => http.post(`/professional/allocation/downloadTemplate.do`) //列表排序 -export const toSortTask = (ids) => http.get(API_URL + `/professional/task/sortTask/` + ids) +export const toSortTask = (ids) => http.get(`/professional/task/sortTask/` + ids) + +//删除学员 +export const batchDelStudents = (ids) => http.get(`/professional/allocation/batchDelStudents/` + ids) + +//获取专业力必修人员 +export const getGrowthUserList = (obj) => http.get(`/professional/compulsory/getGrowthUserList`, { params: obj }) +//获取学员详情 +export const getGrowStudentDetail = (obj) => http.get('/professional/allocation/getStudentMsg', { params: obj }) + +// 删除权限 +export const delAssignPermissions = (obj) => http.post('/professional/compulsory/delAssignPermissions', obj) + +// 设置需解锁的任务 +export const saveSuperiorTask = (obj) => http.get('/professional/task/saveSuperiorTask', { params: obj }) + +// 删除需解锁的任务 +export const delSuperiorTask = (id) => http.get('/professional/task/delSuperiorTask/' + id) + +// 获取任务管理学员 +export const getStudentTaskPage = (obj) => http.get('/professional/studentTask/getStudentTaskPage', { params: obj }) + +// 导出任务管理学员 +export const exportStudentTaskPage = (obj) => http.post('/professional/studentTask/export', obj) + + + + + + //新增、编辑成长路径 // export const addEdit = (obj) => http.post('/admin/grow/edit', obj) //编辑获取路径信息 @@ -52,6 +98,7 @@ export const getOverview = (obj) => http.get('/admin/grow/overview', { params: o //发布、撤回、删除 -- 1发布 0撤回 -2删除 export const handleGrowth = (obj) => http.post('/admin/grow/handle', obj) + //复制路径信息 export const getCopyData = (obj) => http.get('/admin/grow/getCopyData', { params: obj }) //保存复制的路径信息 @@ -65,8 +112,7 @@ export const isRequiredTask = (obj) => http.post(`/admin/grow/isRequiredTask?tas //获取学员列表 export const getGrowStudent = (obj) => http.get('/admin/student/getGrowStudent', { params: obj }) -//获取查看详情 -export const getGrowStudentDetail = (obj) => http.get('/admin/student/getGrowStudentDetail', { params: obj }) + //获取考试管理列表 export const queryExamManagementMessage = (obj) => http.post('/admin/exam/manage/queryExamManagementMessageOfGrow', obj) //获取外部考试 diff --git a/src/assets/scss/common.scss b/src/assets/scss/common.scss index 95df1ef7..8b115487 100644 --- a/src/assets/scss/common.scss +++ b/src/assets/scss/common.scss @@ -132,22 +132,18 @@ body { /*定义右下角汇合处的样式*/ ::-webkit-scrollbar-corner { background: rgba(239, 244, 252, 1); - ; } ::-moz-scrollbar-corner { background: rgba(239, 244, 252, 1); - ; } ::-o-scrollbar-corner { background: rgba(239, 244, 252, 1); - ; } .scrollbar-corner { background: rgba(239, 244, 252, 1); - ; } //隐藏滚动条---------------------------------------------------------------- @@ -183,7 +179,7 @@ textarea { .select .ant-select-selector { height: 40px !important; border-radius: 8px !important; - border: 1px solid #C7CBD2 !important; + border: 1px solid #c7cbd2 !important; } .select .ant-select-selector .ant-select-selection-search-input { @@ -199,19 +195,18 @@ textarea { .select .ant-picker { height: 40px !important; border-radius: 8px !important; - border: 1px solid #C7CBD2 !important; + border: 1px solid #c7cbd2 !important; } // 下拉框---------------------------------------------------------- - // 表格--------------------------------- .tableBox { .ant-table-row .ant-table-cell { height: 48px; font-size: 14px; font-weight: 400; - color: #4F5156; + color: #4f5156; line-height: 36px; padding: 0px; // overflow: hidden; @@ -262,7 +257,6 @@ textarea { } .ant-pagination-options { - // .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector{ // font-size: 14px; // font-weight: 400; @@ -298,7 +292,9 @@ textarea { margin-left: 21px; display: inline-block; - .ant-select:not(.ant-select-customize-input) .ant-select-selector .ant-select-selection-search-input { + .ant-select:not(.ant-select-customize-input) + .ant-select-selector + .ant-select-selection-search-input { background-color: rgba(255, 255, 255, 0); border: none; } @@ -312,7 +308,10 @@ textarea { padding: 0; } - .ant-select-focused:not(.ant-select-disabled).ant-select:not(.ant-select-customize-input) .ant-select-selector { + .ant-select-focused:not(.ant-select-disabled).ant-select:not( + .ant-select-customize-input + ) + .ant-select-selector { box-shadow: none; } @@ -343,10 +342,8 @@ textarea { //表格下拉框------------------------------------------- - //抽屉-------------------------------------------------------- .drawerStyle { - // transform: translateX(0px) !important; .ant-drawer-content-wrapper { max-width: 1050px; @@ -372,236 +369,238 @@ textarea { flex: 1; overflow-y: auto; } - } .drawerMain { - .header { - height: 73px; - border-bottom: 1px solid #e8e8e8; - display: flex; - justify-content: space-between; - align-items: center; + .header { + height: 73px; + border-bottom: 1px solid #e8e8e8; + display: flex; + justify-content: space-between; + align-items: center; + flex-shrink: 0; - .headerTitle { - font-size: 18px; - font-weight: 600; - color: #333333; - line-height: 25px; - margin-left: 24px; - } - } + .headerTitle { + font-size: 18px; + font-weight: 600; + color: #333333; + line-height: 25px; + margin-left: 24px; + } + } - .contentMain { - .main_items { - display: flex; + .contentMain { + .main_items { + display: flex; - margin-bottom: 12px; - margin-top: 32px; - flex-wrap: wrap; + margin-bottom: 12px; + margin-top: 32px; + flex-wrap: wrap; - .mi_ipts { - display: flex; - margin-bottom: 20px; + .mi_ipts { + display: flex; + margin-bottom: 20px; - .mii_ipt { - display: flex; - align-items: center; - margin-right: 24px; + .mii_ipt { + display: flex; + align-items: center; + margin-right: 24px; - .ipt_name { - white-space: nowrap; - } - } - } + .ipt_name { + white-space: nowrap; + } + } + } - .mi_btns { - display: flex; - margin-left: 38px; - margin-bottom: 20px; - cursor: pointer; + .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; + .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%; - } + .search { + background-size: 100%; + } - .btnText { - font-size: 14px; - font-weight: 400; - line-height: 36px; - margin-left: 5px; - } - } + .btnText { + font-size: 14px; + font-weight: 400; + line-height: 36px; + margin-left: 5px; + } + } - .btn1 { - background: rgb(64, 158, 255); + .btn1 { + background: rgb(64, 158, 255); - .search { - width: 15px; - height: 17px; - background-image: url("@/assets/images/coursewareManage/search0.png"); - } + .search { + width: 15px; + height: 17px; + background-image: url("@/assets/images/coursewareManage/search0.png"); + } - .btnText { - color: rgb(255, 255, 255); - } - } + .btnText { + color: rgb(255, 255, 255); + } + } - .btn2 { - background: rgb(255, 255, 255); + .btn2 { + background: rgb(255, 255, 255); - .search { - width: 15px; - height: 17px; - background-image: url("@/assets/images/coursewareManage/reset1.png"); - } + .search { + width: 15px; + height: 17px; + background-image: url("@/assets/images/coursewareManage/reset1.png"); + } - .btnText { - color: rgb(64, 158, 255); - } - } + .btnText { + color: rgb(64, 158, 255); + } + } - .btn1:hover { - background: rgb(255, 255, 255); + .btn1:hover { + background: rgb(255, 255, 255); - .search { - background-image: url("@/assets/images/courseManage/search1.png"); - } + .search { + background-image: url("@/assets/images/courseManage/search1.png"); + } - .btnText { - color: #4ea6ff; - } - } + .btnText { + color: #4ea6ff; + } + } - .btn2:hover { - background: rgba(64, 158, 255, 1); + .btn2:hover { + background: rgba(64, 158, 255, 1); - .search { - background-image: url("@/assets/images/courseManage/reset0.png"); - } + .search { + background-image: url("@/assets/images/courseManage/reset0.png"); + } - .btnText { - color: #ffffff; - } - } - } - } + .btnText { + color: #ffffff; + } + } + } + } - .main_notice { - display: flex; - justify-content: space-between; - align-items: center; - margin-bottom: 32px; - height: 40px; - background-color: #e9f6fe; + .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; + .mntc_left { + display: flex; + align-items: center; - .title { - color: rgba(0, 0, 0, 0.65); - margin-right: 17px; - } + .title { + color: rgba(0, 0, 0, 0.65); + margin-right: 17px; + } - .data { - color: #4ea6ff; - } + .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%; - } - } + .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; - } - } - } + .mntc_right { + cursor: pointer; + } + } + } - .main_table { - position: relative; - padding-bottom: 80px; + .main_table { + position: relative; + padding-bottom: 80px; - .ant-checkbox-wrapper { - align-items: center; - margin-top: -2px; - } + .ant-checkbox-wrapper { + align-items: center; + margin-top: -2px; + } - .ant-table-selection-column { - padding: 0px !important; - padding-left: 5px !important; - } + .ant-table-selection-column { + padding: 0px !important; + padding-left: 5px !important; + } - .ant-table-thead>tr>th { - background-color: rgba(239, 244, 252, 1); - } + .ant-table-thead > tr > th { + background-color: rgba(239, 244, 252, 1); + } - th.h { - background-color: #eff4fc !important; - } + th.h { + background-color: #eff4fc !important; + } - .ant-table-tbody>tr:hover:not(.ant-table-expanded-row):not(.ant-table-row-selected)>td { - background: #f6f9fd; - } + .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; - } - } + .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); + .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; - } + .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; - } - } - } + .btn2 { + cursor: pointer; + width: 100px; + height: 40px; + background: #4ea6ff; + border-radius: 8px; + border: 0; + margin-left: 15px; + color: #fff; + } + } + } } //抽屉-------------------------------------------------------- @@ -615,7 +614,6 @@ textarea { .ant-drawer-body { padding: 0; - } } @@ -625,13 +623,11 @@ textarea { overflow-x: auto; display: flex; flex-direction: column; - } } //大型抽屉 - //弹窗-------------------------------------------------------- .modalStyle { height: 100%; @@ -667,9 +663,11 @@ textarea { .modalHeader { width: 100%; height: 68px; - background: linear-gradient(0deg, - rgba(78, 166, 255, 0) 0%, - rgba(78, 166, 255, 0.2) 100%); + background: linear-gradient( + 0deg, + rgba(78, 166, 255, 0) 0%, + rgba(78, 166, 255, 0.2) 100% + ); } .modalMain { @@ -678,23 +676,33 @@ textarea { overflow-y: auto; margin-top: 7px; margin: 0px 52px; - - } } } .ant-modal { .modalHeader { - background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important; + background: linear-gradient( + 180deg, + rgba(103, 64, 255, 0.2) 0%, + rgba(166, 168, 255, 0) 100% + ) !important; } .top { - background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important; + background: linear-gradient( + 180deg, + rgba(103, 64, 255, 0.2) 0%, + rgba(166, 168, 255, 0) 100% + ) !important; } .del_header { - background: linear-gradient(180deg, rgba(103, 64, 255, 0.2) 0%, rgba(166, 168, 255, 0) 100%) !important; + background: linear-gradient( + 180deg, + rgba(103, 64, 255, 0.2) 0%, + rgba(166, 168, 255, 0) 100% + ) !important; } } @@ -711,7 +719,7 @@ textarea { position: absolute; left: 0; top: 0; - z-index: 100 + z-index: 100; } -//loading-------------------------------------------------------- \ No newline at end of file +//loading-------------------------------------------------------- diff --git a/src/components/growthpath/GrowShowText.vue b/src/components/growthpath/GrowShowText.vue index 6f95fd6d..18a66aa7 100644 --- a/src/components/growthpath/GrowShowText.vue +++ b/src/components/growthpath/GrowShowText.vue @@ -9,7 +9,7 @@ >
-
报名记录
+
导入记录
-
+
- {{ { 1: "添加学员", 2: "添加学员", 3: "添加学员" }[type] || title }} + {{ title }}
- -
-
- - - - - 搜索 - - 重置 - - -
-
- -
-
-
@@ -140,98 +101,6 @@
- -
-
- - - - - 搜索 - - 重置 - - -
-
- - -
-
- - -
-
- - - - - 搜索 - - - 重置 - - -
-
- -
-
-
@@ -244,37 +113,6 @@ :style="{ 'max-height': screenHeight - 235 + 'px' }" style="overflow-y: auto; padding-bottom: 10px" > -
-
项目内学员
-
-
-
- {{ item.studentName }} -
-
-
-
-
-
- {{ item.studentName }} -
-
-
-
-
-
-
查看更多>
-
-
-
收起<
-
-
快速选人
@@ -300,67 +138,12 @@
收起<
-
-
添加组织
-
-
-
-
{{ item.name }}
-
-
-
-
-
-
-
{{ item.name }}
-
-
-
-
-
-
-
查看更多>
-
-
-
收起<
-
-
- -
-
受众关联
-
-
-
-
{{ item.audienceName }}
-
-
-
-
-
-
-
{{ item.audienceName }}
-
-
-
-
-
-
-
查看更多>
-
-
-
收起<
-
-
- +
@@ -368,87 +151,18 @@
- -
-
-
-
{{ type === 1 ? "选择阶段" : "添加学员到关卡" }}
-
-
-
-
-
-
- - {{ item.name || "默认" }} - - -
- 已在其他关卡的学员，不会被添加到该关卡 -
- - -
-
-
-
- @@ -1032,12 +529,6 @@ watch(visiable, () => { } } - .group { - width: 100%; - margin-top: 30px; - border-top: 1px solid #f2f6fe; - } - .chose2 { //width: 120px; height: 24px; diff --git a/src/components/growthpath/GrowthHomeworkManage.vue b/src/components/growthpath/GrowthHomeworkManage.vue index 8531bce3..59f58445 100644 --- a/src/components/growthpath/GrowthHomeworkManage.vue +++ b/src/components/growthpath/GrowthHomeworkManage.vue @@ -1,34 +1,56 @@ + diff --git a/src/components/growthpath/GrowthLive.vue b/src/components/growthpath/GrowthLive.vue index a1eb14f1..f907f50a 100644 --- a/src/components/growthpath/GrowthLive.vue +++ b/src/components/growthpath/GrowthLive.vue @@ -1,325 +1,327 @@ @@ -327,15 +329,17 @@ import { computed, defineEmits, defineProps, ref } from "vue"; import dayjs from "dayjs"; import ProjectManager from "@/components/project/ProjectManagerNew"; -import AddInvistRoot from "@/components/drawers/AddInvistRoot.vue"; +import GrowthInvistRoot from "@/components/growthpath/GrowthInvistRoot.vue"; import { Form, message } from "ant-design-vue"; import { fileUp } from "../../api/indexEval"; import { useResetRef } from "@/utils/useCommon"; import { getCookieForName } from "@/api/method"; +const step = ref(1); + const removePG = () => { - formData.value.assessmentId = ""; - formData.value.assessmentName = ""; + formData.value.info.assessmentId = ""; + formData.value.info.assessmentName = ""; }; const getchange = (mess) => { console.log(mess); //输出true或者false @@ -350,25 +354,26 @@ const props = defineProps({ const visible = ref(false); const headers = { token: getCookieForName("token") }; const formData = useResetRef({ - liveName: "", - liveLink: "", - liveStartTime: "", - liveEndTime: "", - liveNotice: "", - liveDuration: "", - liveTeacherId: "", - liveTeacherName: "", - liveCover: "", - beforeSignIn: "", - afterSignIn: "", - isEvaluate: false, - assessmentId: "", - assessmentName: "", - livePlayback: "", - liveExplain: "", + info: { + liveName: "", + liveLink: "", + liveStartTime: "", + liveEndTime: "", + liveNotice: "", + liveDuration: "", + liveTeacherId: "", + liveTeacherName: "", + liveCover: "", + beforeSignIn: "", + afterSignIn: "", + isEvaluate: false, + assessmentId: "", + assessmentName: "", + livePlayback: "", + liveExplain: "", + }, }); const emit = defineEmits({}); -const taskIndex = ref(-1); const dateTime = ref([]); const rulesRef = ref({ @@ -429,7 +434,7 @@ const rulesRef = ref({ ], }); -const { resetFields, validate } = Form.useForm(formData, rulesRef); +const { resetFields, validate } = Form.useForm(formData.info, rulesRef); const durationText = computed(() => dateTime.value?.length ? dayjs(dateTime.value[1]).diff(dayjs(dateTime.value[0]), "minute") @@ -439,14 +444,14 @@ const durationText = computed(() => const closeDrawer = () => { imageUrl.value = ""; visible.value = false; - taskIndex.value = -1; dateTime.value = []; formData.reset(); + formData.value.info = {}; resetFields(); }; function timeChange(time, timeStr) { - formData.value.liveStartTime = timeStr[0]; - formData.value.liveEndTime = timeStr[1]; + formData.value.info.liveStartTime = timeStr[0]; + formData.value.info.liveEndTime = timeStr[1]; // formData.value.liveDuration || (formData.value.liveDuration = dayjs(timeStr[1]).diff(dayjs(timeStr[0]),'minute')) } const disabledDate = (current) => { @@ -459,6 +464,8 @@ async function confirm() { message.warning(errorFields[0].errors.join()); throw Error("数据校验不通过"); }); + console.log(formData.value); + return; if (taskIndex.value === -1) { let list = props.taskList; list.push({ @@ -484,12 +491,11 @@ async function confirm() { closeDrawer(); } -function openDrawer(i, row) { - console.log(i, row); - row && (formData.value = { ...row.info }); +function openDrawer(row) { + console.log(row); + row && (formData.value = row); row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]); row && (imageUrl.value = row.info.liveCover); - i >= 0 && (taskIndex.value = i); visible.value = true; } @@ -522,7 +528,8 @@ const beforeUpload = (file) => { if (res.data.code === 200) { console.log(res.data.data, 45); imageUrl.value = process.env.VUE_APP_FILE_PATH + res.data.data; - formData.value.liveCover = process.env.VUE_APP_FILE_PATH + res.data.data; + formData.value.info.liveCover = + process.env.VUE_APP_FILE_PATH + res.data.data; // state.hasImgName = file.name; // emit("src", { id: '', src: res.data.data }); @@ -537,8 +544,8 @@ const beforeUpload = (file) => { } .growth-live > .ant-drawer-content-wrapper { - min-width: 800px !important; - width: 800px !important; + min-width: 1200px !important; + width: 1200px !important; } .ant-table-striped :deep(.table-striped) td { @@ -565,9 +572,6 @@ const beforeUpload = (file) => { } .contentMain { - display: flex; - justify-content: space-between; - .main_left { flex: 1; border-right: 1px solid #e8e8e8; diff --git a/src/components/growthpath/GrowthOnlineManage.vue b/src/components/growthpath/GrowthOnlineManage.vue index 6cecedbb..c44db1d4 100644 --- a/src/components/growthpath/GrowthOnlineManage.vue +++ b/src/components/growthpath/GrowthOnlineManage.vue @@ -9,24 +9,8 @@ >
-
- 【{{ - datasource.type === 1 - ? "在线" - : datasource.type === 3 - ? "案例" - : datasource.type === 6 - ? "直播" - : datasource.type === 7 - ? "外链" - : datasource.type === 8 - ? "讨论" - : datasource.type === 9 - ? "活动" - : datasource.type === 11 - ? "评估" - : "-" - }}】{{ title }} +
+ 【{{ TASK_TYPE[datasource.taskType].name }}】{{ datasource.taskName }}
-
+
+
+
标准岗位：
+ + +
+
+
任职资格：
+ +
+
姓名/工号：
-
-
+
+
催促学习
@@ -121,7 +123,7 @@
- - +
@@ -188,14 +176,14 @@ :pagination="stuPagination" :loading="tableData.loading" :scroll="{ x: 1000 }" - row-key="sid" + row-key="id" :row-selection="stuRowSelection" :row-class-name="getRowClass" >