diff --git a/src/App.vue b/src/App.vue index 97e997d7..5bf642a0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -155,8 +155,8 @@ const getDictList = (param) => api1.getDictTree({code: param,}).then((res) => re } .white { - background: #fff; - color: #4ea6ff; + // background: #fff; + // color: #4ea6ff; } .cus-input { diff --git a/src/api/ThirdApi.js b/src/api/ThirdApi.js index ca3f8f34..88a85ba3 100644 --- a/src/api/ThirdApi.js +++ b/src/api/ThirdApi.js @@ -1,14 +1,15 @@ //学员列表带分页 -export const USER_LIST_PAGE = '/userbasic/user/list post' +export const USER_LIST_PAGE = "/userbasic/user/list post"; //学员列表 没有分页数据 只能通过名称检索 速度较快 -export const USER_LIST = '/userbasic/user/searchList post' -export const ORG_LIST = '/userbasic/org/list post' -export const ORG_CHILD_LIST = '/userbasic/org/info post' +export const USER_LIST = "/userbasic/user/searchList post"; +export const ORG_LIST = "/userbasic/org/list post"; +export const ORG_CHILD_LIST = "/userbasic/org/info post"; // export const AUDIENCE_LIST = '/userbasic/audience/list post' //当前用户可以查看的受众接口 -export const AUDIENCE_LIST = '/userbasic/audience/userAudiencesFilter post' -export const USER_PERMISSION = '/userbasic/permission/listByUser post' -export const CASE_PAGE = '/systemapi/xboe/m/boe/cases/pagelist post formData' -export const EXAM_PAPER_PAGE = '/systemapi/xboe/m/exam/paper/querylist post formData' -export const TEST_PAGE = '/api/b1/system/quiz/quiz-list post formData' -export const ONLINE_PAGE = '/systemapi/xboe/m/course/manage/pagelist post formData' \ No newline at end of file +export const AUDIENCE_LIST = "/userbasic/audience/userAudiencesFilter post"; +export const USER_PERMISSION = "/userbasic/permission/listByUser post"; +export const CASE_PAGE = "/systemapi/xboe/m/boe/cases/pagelist post formData"; +export const EXAM_PAPER_PAGE = "/systemapi/xboe/m/exam/paper/querylist post formData"; +export const TEST_PAGE = "/api/b1/system/quiz/quiz-list post formData"; +export const ONLINE_PAGE = "/systemapi/xboe/m/course/manage/pagelist post formData"; +export const ONLINE_COURSE_DEL = (id, courseId) => `/systemapi/xboe/school/study/course/delete-signup?id=${id}&couserId=${courseId} post`; \ No newline at end of file diff --git a/src/api/apis.js b/src/api/apis.js index fb053205..a136ade9 100644 --- a/src/api/apis.js +++ b/src/api/apis.js @@ -6,3 +6,4 @@ export const ROUTER_DETAIL_MODIFY = '/admin/router/routerInfoTemp post'; export const PROJECT_DETAIL_MODIFY = '/admin/project/projectInfoTemp post'; export const PROJECT_TEMPLATE_DETAIL_MODIFY = '/admin/project/template/editStageAndTask post'; export const PROJECT_RELEASE = '/admin/project/realease'; +export const ASYNC_STUDENT_STATUS = '/admin/cache/getStudentAsyncStatus'; diff --git a/src/api/request.js b/src/api/request.js index 945daf79..18d527f0 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -237,7 +237,7 @@ export function useRequest(_url, params = {}, init = true) { }; } -export async function boeRequest(_url, params) { +export async function boeRequest(_url, params = {}) { const s = _url.split(' ') let url = s[0] const method = s[1]?.toLowerCase() || 'get' diff --git a/src/components/NavLeft.vue b/src/components/NavLeft.vue index 277ef48a..21964c12 100644 --- a/src/components/NavLeft.vue +++ b/src/components/NavLeft.vue @@ -192,7 +192,7 @@ 评估管理 - + - + 旧版管理员界面 - + 业务支援读书会管理 - - - 受众管理 - - + + + + + + + 受众管理 + + + +
diff --git a/src/components/common/CommonAlert.vue b/src/components/common/CommonAlert.vue index f2847e0b..0a8aee89 100644 --- a/src/components/common/CommonAlert.vue +++ b/src/components/common/CommonAlert.vue @@ -1,13 +1,13 @@ \ No newline at end of file diff --git a/src/views/research/ResearchAdd.vue b/src/views/research/ResearchAdd.vue index 8b5fbbaf..40f92151 100644 --- a/src/views/research/ResearchAdd.vue +++ b/src/views/research/ResearchAdd.vue @@ -82,6 +82,8 @@ height: 40px; margin-left: 14px; border-radius: 8px; + color:#fff; + background-color: #4ea6ff; " @click="handleAllCancel" > @@ -665,7 +667,8 @@ export default { cursor: pointer; width: 80px; height: 40px; - color: #4ea6ff; + color: #fff; + background: #4ea6ff; border: 1px solid #4ea6ff; border-radius: 4px; display: flex; diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue index 997e46e1..21eab1d3 100644 --- a/src/views/research/ResearchManage.vue +++ b/src/views/research/ResearchManage.vue @@ -76,7 +76,7 @@ @click=" handleEditPage(record.id)" type="link">基础信息 管理 + @click=" toManage(record.id, record)" type="link">管理 复制 @@ -144,7 +144,7 @@
- + {{ !formData.id ? "下一步" : "确定" }} @@ -369,9 +369,10 @@ function handleEditPage(id) { router.push("/researchadd/" + id); } -function toManage(id) { - router.push("/managepage/" + id); +function toManage(id, record) { + router.push({ path: `/managepage/${id}`, query: { createName:record.createName, createTime:record.createTime } }); } + const handleNext = async () => { await validate().catch(({ errorFields }) => { message.warning(errorFields[0].errors.join()); @@ -588,7 +589,7 @@ const handleNext = async () => { .btnn { padding: 0px 26px 0px 26px; height: 38px; - background: #ffffff; + background: #4ea6ff; border-radius: 8px; border: 1px solid rgba(64, 158, 255, 1); display: flex; @@ -605,7 +606,7 @@ const handleNext = async () => { .btnText { font-size: 14px; font-weight: 400; - color: #4ea6ff; + color: #fff; line-height: 36px; margin-left: 5px; } @@ -623,29 +624,29 @@ const handleNext = async () => { .search { width: 16px; height: 18px; - background-image: url("../../assets/images/courseManage/reset1.png"); + background-image: url("../../assets/images/courseManage/reset0.png"); } } - .btn1:hover { - background: rgba(64, 158, 255, 0.76); + // .btn1:hover { + // background: rgba(64, 158, 255, 0.76); - .search { - background-image: url("../../assets/images/courseManage/search0.png"); - } + // .search { + // background-image: url("../../assets/images/courseManage/search0.png"); + // } - .btnText { - color: #ffffff; - } - } + // .btnText { + // color: #ffffff; + // } + // } .btn1:active { background: #0982ff; } - .btn2:hover { - background: rgba(64, 158, 255, 0.1); - } + // .btn2:hover { + // background: rgba(64, 158, 255, 0.1); + // } .btn2:active { background: rgba(64, 158, 255, 0.2); @@ -691,17 +692,17 @@ const handleNext = async () => { } } - .btn3:hover { - background: rgba(64, 158, 255, 0.76); + // .btn3:hover { + // background: rgba(64, 158, 255, 0.76); - .search { - background-image: url("../../assets/images/courseManage/add0.png"); - } + // .search { + // background-image: url("../../assets/images/courseManage/add0.png"); + // } - .btnText { - color: #ffffff; - } - } + // .btnText { + // color: #ffffff; + // } + // } .btn3:active { background: #0982ff;