diff --git a/src/api/signup/commonStudent.js b/src/api/signup/commonStudent.js new file mode 100644 index 00000000..0e29a5e8 --- /dev/null +++ b/src/api/signup/commonStudent.js @@ -0,0 +1,37 @@ +import ajax2 from "../unionAjax.js"; + +export const STUDENT_LIST = "/manageApi/admin/student/getStudent"; +export const USER_LIST_PAGE = "/manageApi/admin/thirdApi/user/list"; +export const ORG_LIST = "/manageApi/admin/thirdApi/org/list"; +export const ORG_CHILD_LIST = "/manageApi/admin/thirdApi/org/info"; +// 查询受众中的用户列表 +export const AUDIENCE_LIST = "/userbasic/audience/memberList"; + +export const USER_AUDIENCES = "/manageApi/admin/thirdApi/audience/userAudiences"; +export const fetchUserAudiences = (params) => + ajax2.get1(USER_AUDIENCES, params); +// 保存学员信息(走 manageApi,POST) +export const saveStu = (data) => + ajax2.postJson("/manageApi", "/admin/student/addStudent", data); + +// 获取项目学员列表(走 manageApi,GET)弃用 +export const fetchProjectStudents = (params = {}) => { + return ajax2.get1(STUDENT_LIST, params); +}; + +// 快速学员搜索(走 manageApi,POST) +export const fetchQuickStudents = (params) => + ajax2.get1(USER_LIST_PAGE, params); + +// 组织列表(走 manageApi,POST) +export const fetchOrgList = (params) => + ajax2.get1(ORG_LIST, params); + +// 子组织列表(走 manageApi,POST) +export const fetchOrgChildren = (params) => + ajax2.get1(ORG_CHILD_LIST, params); + +// 受众中的用户列表(POST,application/json) +export const fetchAudienceList = (data) => + ajax2.postJson("", AUDIENCE_LIST, data); + diff --git a/src/api/unionAjax.js b/src/api/unionAjax.js index 424c237a..63510c31 100644 --- a/src/api/unionAjax.js +++ b/src/api/unionAjax.js @@ -106,6 +106,15 @@ const get = function (baseURL, url) { }) } +const get1= function (baseURL, params) { + return request({ + baseURL, + method: 'get', + params: params, + headers: {'Content-Type': 'application/x-www-form-urlencoded'} + }) +} + /** * post请求 * @param {Object} url @@ -199,6 +208,7 @@ export default { tokenName: TokenName, request, get, + get1, post, postJson, postJsonToFile, diff --git a/src/assets/images/basicinfo/add.png b/src/assets/images/basicinfo/add.png new file mode 100644 index 00000000..4a173bdd Binary files /dev/null and b/src/assets/images/basicinfo/add.png differ diff --git a/src/assets/images/basicinfo/asterisk.png b/src/assets/images/basicinfo/asterisk.png new file mode 100644 index 00000000..49c7ac99 Binary files /dev/null and b/src/assets/images/basicinfo/asterisk.png differ diff --git a/src/assets/images/basicinfo/call.png b/src/assets/images/basicinfo/call.png new file mode 100644 index 00000000..5b2e4051 Binary files /dev/null and b/src/assets/images/basicinfo/call.png differ diff --git a/src/assets/images/basicinfo/ch.png b/src/assets/images/basicinfo/ch.png new file mode 100644 index 00000000..a36538bf Binary files /dev/null and b/src/assets/images/basicinfo/ch.png differ diff --git a/src/assets/images/basicinfo/check.png b/src/assets/images/basicinfo/check.png new file mode 100644 index 00000000..cc8fce54 Binary files /dev/null and b/src/assets/images/basicinfo/check.png differ diff --git a/src/assets/images/basicinfo/close.png b/src/assets/images/basicinfo/close.png new file mode 100644 index 00000000..26992042 Binary files /dev/null and b/src/assets/images/basicinfo/close.png differ diff --git a/src/assets/images/basicinfo/close22.png b/src/assets/images/basicinfo/close22.png new file mode 100644 index 00000000..897eb67b Binary files /dev/null and b/src/assets/images/basicinfo/close22.png differ diff --git a/src/assets/images/basicinfo/cloud.png b/src/assets/images/basicinfo/cloud.png new file mode 100644 index 00000000..06e258c7 Binary files /dev/null and b/src/assets/images/basicinfo/cloud.png differ diff --git a/src/assets/images/basicinfo/download.png b/src/assets/images/basicinfo/download.png new file mode 100644 index 00000000..2efba862 Binary files /dev/null and b/src/assets/images/basicinfo/download.png differ diff --git a/src/assets/images/basicinfo/edit.png b/src/assets/images/basicinfo/edit.png new file mode 100644 index 00000000..1bbecc7f Binary files /dev/null and b/src/assets/images/basicinfo/edit.png differ diff --git a/src/assets/images/basicinfo/exl.png b/src/assets/images/basicinfo/exl.png new file mode 100644 index 00000000..bd777bcb Binary files /dev/null and b/src/assets/images/basicinfo/exl.png differ diff --git a/src/assets/images/basicinfo/in.png b/src/assets/images/basicinfo/in.png new file mode 100644 index 00000000..413c902b Binary files /dev/null and b/src/assets/images/basicinfo/in.png differ diff --git a/src/assets/images/basicinfo/in2.png b/src/assets/images/basicinfo/in2.png new file mode 100644 index 00000000..71de74bf Binary files /dev/null and b/src/assets/images/basicinfo/in2.png differ diff --git a/src/assets/images/basicinfo/see.png b/src/assets/images/basicinfo/see.png new file mode 100644 index 00000000..9dd65373 Binary files /dev/null and b/src/assets/images/basicinfo/see.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index bf3e7799..09ad72f9 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -486,6 +486,150 @@ li{ } } -.custom-message-dialog { +.use-table { + td.el-table__cell { + border-bottom: 1px solid rgba(0, 0, 0, .1); + } + th.el-table__cell { + background: rgba(66, 132, 247, 0.1); + // padding: 3px 0; + + .cell { + font-weight: bold; + font-size: 14px; + color: #60769D; + } + .caret-wrapper { + .sort-caret { + border: 4px solid transparent; + &.ascending { + border-bottom-color: #C0C4CC; + top: 8px; + } + &.descending { + border-top-color: #C0C4CC; + bottom: 8px; + } + } + } + &.ascending .sort-caret.ascending { + border-bottom-color: #409EFF; + } + &.descending .sort-caret.descending{ + border-top-color: #409EFF; + } + + &.el-table--medium .el-table__cell { + padding: 5px 0; + } + } + + .course-name { + font-weight: 400; + font-size: 14px; + color: #000000; + line-height: 20px; + } + + .common-cell { + font-weight: 400; + font-size: 14px; + color: #000000; + } + .common-cell-right { + padding-right: 20px; + } + + .single-line-ellipsis { + display: inline-block; + max-width: 100%; + overflow: hidden; + white-space: nowrap; + text-overflow: ellipsis; + vertical-align: middle; + } + + ::v-deep .el-table--medium .el-table__cell { + padding: 5px 0; + } + } -} \ No newline at end of file + .pagination { + text-align: right; + padding-top: 20px; + .el-pagination { + .el-pagination__total { + font-size: 14px; + color: #000000; + } + .el-pagination__sizes { + margin-right: 4px; + .el-input{ + margin: 0; + width: 89px; + + } + .el-input__inner { + width: 89px; + background: #F5F9FF; + border-radius: 4px; + border: 1px solid #DFDFDF; + height: 28px; + font-size: 14px; + color: #000000; + } + } + .btn-prev, .btn-next { + width: 28px; + height: 28px; + background: #F5F9FF; + border-radius: 4px; + border: 1px solid #DFDFDF; + // &:hover { + // background: #4284F7; + // color: #FFFFFF; + // } + } + .btn-quicknext{ + background-color: transparent !important; + border: none; + line-height: 44px; + &:before { + content: '......'; + } + + } + .el-pager { + .number { + min-width: 28px; + height: 28px; + background: #F5F9FF; + border-radius: 4px; + border: 1px solid #DFDFDF; + font-weight: normal; + color: #000000; + margin: 0 4px; + &.active { + background-color: #4284F7 !important; + color: #FFFFFF; + border: none; + } + } + } + .el-pagination__jump { + font-size: 14px; + color: #000000; + margin-left: 4px; + .el-input__inner { + width: 28px; + height: 28px; + background: #F5F9FF; + border-radius: 4px; + border: 1px solid #DFDFDF; + font-size: 14px; + color: #000000; + } + } + + } + } \ No newline at end of file diff --git a/src/components/signup/AudienceModal.vue b/src/components/signup/AudienceModal.vue new file mode 100644 index 00000000..77ff76d8 --- /dev/null +++ b/src/components/signup/AudienceModal.vue @@ -0,0 +1,209 @@ + + + + + + + + + 查询 + 重置 + + + + + + + + + + + + + 取 消 + 确 定 + + + + + + + + diff --git a/src/components/signup/SignupModal.vue b/src/components/signup/SignupModal.vue new file mode 100644 index 00000000..04fba641 --- /dev/null +++ b/src/components/signup/SignupModal.vue @@ -0,0 +1,766 @@ + + + + + + + + + + + 姓名: + + + 搜索 + + 重置 + + + + + + + + + + + + + + + + + + + + + + + + 组织: + + + 搜索 + + 重置 + + + + + + + 受众名称: + + + 搜索 + + 重置 + + + + + + + + + + + + + + + + + 已选 + + + + + 项目内学员 + + + + {{ item.studentName }} + + + + + + + {{ item.studentName }} + + + + + + + 查看更多> + + + 收起< + + + + 快速选人 + + + + {{ item.realName }} + + + + + + + {{ item.realName }} + + + + + + + 查看更多> + + + 收起< + + + + 添加组织 + + + + {{ item.name }} + + + + + + + {{ item.name }} + + + + + + + 查看更多> + + + 收起< + + + + 受众关联 + + + + {{ item.audienceName }} + + + + + + + {{ item.audienceName }} + + + + + + + 查看更多> + + + 收起< + + + + + + + + 取 消 + 确 定 + + + + + + + + 已在其他关卡的学员,不会被添加到该关卡 + + + 取 消 + 确 定 + + + + + + + + + + diff --git a/src/views/course/CourseManageRemote.vue b/src/views/course/CourseManageRemote.vue index 5026c967..9d144d91 100644 --- a/src/views/course/CourseManageRemote.vue +++ b/src/views/course/CourseManageRemote.vue @@ -1,7 +1,7 @@ - +