diff --git a/src/api/index.js b/src/api/index.js
index 5cfb059..1cda0e0 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -9,175 +9,175 @@ export default {
     logins: `users/users/user/login`, //登录
     verification: `${host}users/users/user/captcha`,// 验证码图片
     isClient: `users/users/user/isClient`,// 是否为客户
-    getUserAllRoleByToken : `users/role/getUserAllRoleByToken`,
+    getUserAllRoleByToken : `users/users/role/getUserAllRoleByToken`,
     getSchoolIdByToken : `users/users/data/user/getSchoolIdByToken`,
     
-    platformLogList: `nakadai/log/platformLogList`,
-    logNotification: `nakadai/log/logNotification`,
+    platformLogList: `nakadai/nakadai/log/platformLogList`,
+    logNotification: `nakadai/nakadai/log/logNotification`,
     //实验台
     curriculumDetail: `nakadai/nakadai/curriculum/curriculumDetail`, // 课程详情
-    curriculumChapter: `nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
-    curriculumGetSubsection: `nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址
+    curriculumChapter: `nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections`, // 根据课程id查询章节小节,树状结构
+    curriculumGetSubsection: `nakadai/nakadai/curriculum/subsection/getSubsection`, // 根据小节id获取预览文件地址
 
     // 权限管理
-    getUserRolesPermissionMenu: `users/user-role/getUserRolesPermissionMenu`,
+    getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`,
 
     //学生管理
     resetPassword: `users/users/userAccount/resetPwd`, // 密码重置
-    updateAccountEnable: `occupationlab/architecture/updateAccountEnable`, // 密码重置
-    checkEmailOrPhone: `occupationlab/architecture/checkEmailOrPhone`, // 新增学生前:校验手机号或者邮箱
-    checkWorkNumOrAccount: `occupationlab/architecture/checkWorkNumOrAccount`, // 新增/编辑学生前:校验学号或者学生账号
-    delStudent: `occupationlab/architecture/delStudent`, // 单个、批量删除学生
-    addStudent: `occupationlab/architecture/addStudent`, // 新增学生
-    modifyStudent: `occupationlab/architecture/modifyStudent`, // 编辑学生
-    getStudentInfoByAccountId: `occupationlab/architecture/getStudentInfoByAccountId`, // 查看学生信息
-    getDetailByAccount: `occupationlab/architecture/getDetailByAccount`, // 新增用户前调用：按帐户获取详细信息
-    importStudent: `${host}occupationlab/architecture/importStudent`, // 批量导入学生
-    exportFailure: `${host}occupationlab/architecture/exportFailure`, // 批量导入学生失败数据导出
-    removeStudent: `occupationlab/architecture/removeStudent`, // 移除学生
-    organizationalStudentList: `occupationlab/architecture/organizationalStudentList`, // 根据组织架构筛选学生列表
-    studentList: `occupationlab/architecture/studentList`, // 学生列表
-    stuOrganizationTree: `occupationlab/architecture/stuOrganizationTree`, // 学生组织架构树
-    treeList: `occupationlab/architecture/treeList`, // 学生组织架构树形列表
-    saveOrg: `occupationlab/architecture/save`, // 新增组织架构
-    updateOrg: `occupationlab/architecture/update`, // 编辑组织架构
-    deleteOrg: `occupationlab/architecture/delete`, // 删除组织架构
+    updateAccountEnable: `occupationlab/occupationlab/architecture/updateAccountEnable`, // 密码重置
+    checkEmailOrPhone: `occupationlab/occupationlab/architecture/checkEmailOrPhone`, // 新增学生前:校验手机号或者邮箱
+    checkWorkNumOrAccount: `occupationlab/occupationlab/architecture/checkWorkNumOrAccount`, // 新增/编辑学生前:校验学号或者学生账号
+    delStudent: `occupationlab/occupationlab/architecture/delStudent`, // 单个、批量删除学生
+    addStudent: `occupationlab/occupationlab/architecture/addStudent`, // 新增学生
+    modifyStudent: `occupationlab/occupationlab/architecture/modifyStudent`, // 编辑学生
+    getStudentInfoByAccountId: `occupationlab/occupationlab/architecture/getStudentInfoByAccountId`, // 查看学生信息
+    getDetailByAccount: `occupationlab/occupationlab/architecture/getDetailByAccount`, // 新增用户前调用：按帐户获取详细信息
+    importStudent: `${host}occupationlab/occupationlab/architecture/importStudent`, // 批量导入学生
+    exportFailure: `${host}occupationlab/occupationlab/architecture/exportFailure`, // 批量导入学生失败数据导出
+    removeStudent: `occupationlab/occupationlab/architecture/removeStudent`, // 移除学生
+    organizationalStudentList: `occupationlab/occupationlab/architecture/organizationalStudentList`, // 根据组织架构筛选学生列表
+    studentList: `occupationlab/occupationlab/architecture/studentList`, // 学生列表
+    stuOrganizationTree: `occupationlab/occupationlab/architecture/stuOrganizationTree`, // 学生组织架构树
+    treeList: `occupationlab/occupationlab/architecture/treeList`, // 学生组织架构树形列表
+    saveOrg: `occupationlab/occupationlab/architecture/save`, // 新增组织架构
+    updateOrg: `occupationlab/occupationlab/architecture/update`, // 编辑组织架构
+    deleteOrg: `occupationlab/occupationlab/architecture/delete`, // 删除组织架构
     studentTemplate: `http://121.37.12.51/template/学生导入模板.xlsx`, // 学生导入模板
 
     // 测评管理
-    questionsList: `occupationlab/questions/list`, // 题库列表查询
-    questionsSave: `occupationlab/questions/save`, // 新增题目
-    questionsUpdate: `occupationlab/questions/update`, // 根据试题id修改试题信息
-    questionsDetail: `occupationlab/questions/detail`, // 查看当前题库信息
-    questionsDelete: `occupationlab/questions/delete`, // 根据主键删除
-    questionsIsDisable: `occupationlab/questions/isDisable`, // 是否禁用试题
+    questionsList: `occupationlab/occupationlab/questions/list`, // 题库列表查询
+    questionsSave: `occupationlab/occupationlab/questions/save`, // 新增题目
+    questionsUpdate: `occupationlab/occupationlab/questions/update`, // 根据试题id修改试题信息
+    questionsDetail: `occupationlab/occupationlab/questions/detail`, // 查看当前题库信息
+    questionsDelete: `occupationlab/occupationlab/questions/delete`, // 根据主键删除
+    questionsIsDisable: `occupationlab/occupationlab/questions/isDisable`, // 是否禁用试题
     questionsTemplate: `http://121.37.12.51/template/试题导入模板.xlsx`, //excel模板文件下载
-    questionsImport: `${host}occupationlab/questions/importQuestion`, // 批量导入题库
-    questionsExportFailure: `${host}occupationlab/questions/exportFailure`, // 批量导入题库失败数据导出
-    questionsInfo: `occupationlab/questions/info`, // 测评规则信息的展示
-    questionsUpdateRules: `occupationlab/questions/updateEvaluationRules`, // 修改测评规则信息
+    questionsImport: `${host}occupationlab/occupationlab/questions/importQuestion`, // 批量导入题库
+    questionsExportFailure: `${host}occupationlab/occupationlab/questions/exportFailure`, // 批量导入题库失败数据导出
+    questionsInfo: `occupationlab/occupationlab/questions/info`, // 测评规则信息的展示
+    questionsUpdateRules: `occupationlab/occupationlab/questions/updateEvaluationRules`, // 修改测评规则信息
 
     // 考核管理
-    pageByCondition: `occupationlab/assessment/pageByCondition`, // 考核管理列表
-    saveAssessment: `occupationlab/assessment/saveAssessment`, // 创建考核
-    modifyAssessment: `occupationlab/assessment/modifyAssessment`, // 编辑考核
-    enableAssessment: `occupationlab/assessment/enableAssessment`, // 修改考核状态
-    getDetailById: `occupationlab/assessment/getDetailById`, // 根据考核Id查询考核详情
-    deleteAssessment: `occupationlab/assessment/deleteAssessment`, // 单个、批量删除
-    collectPaper: `occupationlab/assessment/collectPaper`, // 收卷（提前结束）
+    pageByCondition: `occupationlab/occupationlab/assessment/pageByCondition`, // 考核管理列表
+    saveAssessment: `occupationlab/occupationlab/assessment/saveAssessment`, // 创建考核
+    modifyAssessment: `occupationlab/occupationlab/assessment/modifyAssessment`, // 编辑考核
+    enableAssessment: `occupationlab/occupationlab/assessment/enableAssessment`, // 修改考核状态
+    getDetailById: `occupationlab/occupationlab/assessment/getDetailById`, // 根据考核Id查询考核详情
+    deleteAssessment: `occupationlab/occupationlab/assessment/deleteAssessment`, // 单个、批量删除
+    collectPaper: `occupationlab/occupationlab/assessment/collectPaper`, // 收卷（提前结束）
     schoolCourse: `nakadai/nakadai/curriculum/schoolCourse`, // 获取学校购买订单后的课程
-    projectListByCourseId: `occupationlab/projectManage/getSchoolProjectByAssessent`, // 根据课程id获取实训项目列表
+    projectListByCourseId: `occupationlab/occupationlab/projectManage/getSchoolProjectByAssessent`, // 根据课程id获取实训项目列表
 
     // 成绩管理
-    deleteExperimentalReport: `occupationlab/achievement/deleteExperimentalReport`, // 单个、批量删除实验报告
-    exportAssessmentInfo: `${host}occupationlab/achievement/exportAssessmentInfo`, // 批量导出考核成绩
-    exportPracticeInfo: `${host}occupationlab/achievement/exportPracticeInfo`, // 批量导出练习成绩
-    getAchievementInfo: `occupationlab/achievement/getAchievementInfo`, // 管理端成绩管理
-    getAssessmentDetail: `occupationlab/achievement/getAssessmentDetail`, // 管理端考核成绩详情
-    getPracticeDetail: `occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情
-    myClass: `occupationlab/achievement/myClass`, // 教师端:我的班级
-    deleteReportById: `occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核
-    reportDetail: `occupationlab/achievement/reportDetail`, // 查看实验报告
+    deleteExperimentalReport: `occupationlab/occupationlab/achievement/deleteExperimentalReport`, // 单个、批量删除实验报告
+    exportAssessmentInfo: `${host}occupationlab/occupationlab/achievement/exportAssessmentInfo`, // 批量导出考核成绩
+    exportPracticeInfo: `${host}occupationlab/occupationlab/achievement/exportPracticeInfo`, // 批量导出练习成绩
+    getAchievementInfo: `occupationlab/occupationlab/achievement/getAchievementInfo`, // 管理端成绩管理
+    getAssessmentDetail: `occupationlab/occupationlab/achievement/getAssessmentDetail`, // 管理端考核成绩详情
+    getPracticeDetail: `occupationlab/occupationlab/achievement/getPracticeDetail`, // 管理端练习成绩详情
+    myClass: `occupationlab/occupationlab/achievement/myClass`, // 教师端:我的班级
+    deleteReportById: `occupationlab/occupationlab/achievement/deleteReportById`, // 批量删除成绩管理中的项目/批量删除成绩管理中的考核
+    reportDetail: `occupationlab/occupationlab/achievement/reportDetail`, // 查看实验报告
     schoolCourseByAchievement: `nakadai/nakadai/curriculum/schoolCourseByAchievement`, // 获取学校购买订单后的课程
-    spliceClass: `occupationlab/achievement/spliceClass`,
+    spliceClass: `occupationlab/occupationlab/achievement/spliceClass`,
 
     // 项目管理
-    getSystemIdBySchool: `occupationlab/projectManage/getSystemIdBySchool`, // 获取学校下拥有的系统
-    avgValues: `occupationlab/projectManage/avgValues`, // 平均分分配值
-    deleteProjectManage: `occupationlab/projectManage/deleteProjectManage`, // 新增项目管理
-    getProjectBySystemId: `occupationlab/projectManage/getProjectBySystemId`, // 根据系统id获取全部项目(项目中没有用上这个接口)
-    queryNameIsExist: `occupationlab/projectManage/queryNameIsExist`, // 新增/编辑项目管理名称判重
-    queryProjectManage: `occupationlab/projectManage/queryProjectManage`, // 项目管理列表(分页、筛选)
-    updateIsOpen: `occupationlab/projectManage/updateIsOpen`, // 更新开启状态
-    getProjectDetail: `occupationlab/projectManage/getProjectDetail`, // 根据项目id查询详情
-    saveProjectDraft: `occupationlab/projectManage/saveProjectDraft`, // 新增项目管理
-    addProjectManage: `occupationlab/projectManage/addProjectManage`, // 新增项目管理
-    updateProjectManage: `occupationlab/projectManage/updateProjectManage`, // 修改项目管理
-    editProjectDraft: `occupationlab/projectManage/editProjectDraft`, // 修改项目管理
-    copyProjectManage: `occupationlab/projectManage/copyProjectManage`, // 复制项目管理
+    getSystemIdBySchool: `occupationlab/occupationlab/projectManage/getSystemIdBySchool`, // 获取学校下拥有的系统
+    avgValues: `occupationlab/occupationlab/projectManage/avgValues`, // 平均分分配值
+    deleteProjectManage: `occupationlab/occupationlab/projectManage/deleteProjectManage`, // 新增项目管理
+    getProjectBySystemId: `occupationlab/occupationlab/projectManage/getProjectBySystemId`, // 根据系统id获取全部项目(项目中没有用上这个接口)
+    queryNameIsExist: `occupationlab/occupationlab/projectManage/queryNameIsExist`, // 新增/编辑项目管理名称判重
+    queryProjectManage: `occupationlab/occupationlab/projectManage/queryProjectManage`, // 项目管理列表(分页、筛选)
+    updateIsOpen: `occupationlab/occupationlab/projectManage/updateIsOpen`, // 更新开启状态
+    getProjectDetail: `occupationlab/occupationlab/projectManage/getProjectDetail`, // 根据项目id查询详情
+    saveProjectDraft: `occupationlab/occupationlab/projectManage/saveProjectDraft`, // 新增项目管理
+    addProjectManage: `occupationlab/occupationlab/projectManage/addProjectManage`, // 新增项目管理
+    updateProjectManage: `occupationlab/occupationlab/projectManage/updateProjectManage`, // 修改项目管理
+    editProjectDraft: `occupationlab/occupationlab/projectManage/editProjectDraft`, // 修改项目管理
+    copyProjectManage: `occupationlab/occupationlab/projectManage/copyProjectManage`, // 复制项目管理
 
     // 判分点
-    getBcJudgmentPoint: `judgment/bcJudgmentPoint/getTeacherJudgmentPoint`, // 获取编程类判分点列表(分页)
-    getLcJudgmentPoint: `judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页)
-    addProjectJudgment: `occupationlab/projectJudgment/addProjectJudgment`, // 添加项目管理、判分点中间表
-    updateProjectJudgment: `occupationlab/projectJudgment/updateProjectJudgment`, // 判分点中间表批量更新
-    deleteProjectJudgment: `occupationlab/projectJudgment/deleteProjectJudgment`, // 判分点中间表批量删除
+    getBcJudgmentPoint: `judgment/judgment/bcJudgmentPoint/getTeacherJudgmentPoint`, // 获取编程类判分点列表(分页)
+    getLcJudgmentPoint: `judgment/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页)
+    addProjectJudgment: `occupationlab/occupationlab/projectJudgment/addProjectJudgment`, // 添加项目管理、判分点中间表
+    updateProjectJudgment: `occupationlab/occupationlab/projectJudgment/updateProjectJudgment`, // 判分点中间表批量更新
+    deleteProjectJudgment: `occupationlab/occupationlab/projectJudgment/deleteProjectJudgment`, // 判分点中间表批量删除
 
     
     // 赛事
-    contestPageConditionQueryByOccupationlab: `occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlab`,
-    addContest: `occupationlab/enterprise/match/contest/addContest`,
-    editContest: `occupationlab/enterprise/match/contest/editContest`,
-    deleteContest: `occupationlab/enterprise/match/contest/deleteContest`,
-    getContest: `occupationlab/enterprise/match/contest/getContest`,
-    deleteAnnex: `occupationlab/contest/annex/delete`,
-    saveAnnex: `occupationlab/contest/annex/save`,
+    contestPageConditionQueryByOccupationlab: `occupationlab/occupationlab/enterprise/match/contest/contestPageConditionQueryByOccupationlab`,
+    addContest: `occupationlab/occupationlab/enterprise/match/contest/addContest`,
+    editContest: `occupationlab/occupationlab/enterprise/match/contest/editContest`,
+    deleteContest: `occupationlab/occupationlab/enterprise/match/contest/deleteContest`,
+    getContest: `occupationlab/occupationlab/enterprise/match/contest/getContest`,
+    deleteAnnex: `occupationlab/occupationlab/contest/annex/delete`,
+    saveAnnex: `occupationlab/occupationlab/contest/annex/save`,
     getSchoolsByProvince: `nakadai/nakadai/school/getSchoolsByProvince`,
-    disabledEvents: `occupationlab/enterprise/match/contest/disabledEvents`,
+    disabledEvents: `occupationlab/occupationlab/enterprise/match/contest/disabledEvents`,
     
     // 竞赛进展
-    addContestProgress: `occupationlab/enterprise/match/contest-progress/addContestProgress`,
-    deleteContestProgress: `occupationlab/enterprise/match/contest-progress/deleteContestProgress`,
-    getContestProgress: `occupationlab/enterprise/match/contest-progress/getContestProgress`,
-    editContestProgress: `occupationlab/enterprise/match/contest-progress/editContestProgress`,
+    addContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/addContestProgress`,
+    deleteContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/deleteContestProgress`,
+    getContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/getContestProgress`,
+    editContestProgress: `occupationlab/occupationlab/enterprise/match/contest-progress/editContestProgress`,
     // 报名人员
-    addApplicant: `occupationlab/enterprise/match/applicant/addApplicant`,
-    disableContests: `occupationlab/enterprise/match/applicant/disableContests`,
-    excelExport: `${host}occupationlab/enterprise/match/applicant/excelExport`,
-    queryApplicantByCondition: `occupationlab/enterprise/match/applicant/queryApplicantByCondition`,
-    disableApplicant: `occupationlab/enterprise/match/applicant/disableApplicant`,
-    exportDataInBatches: `${host}occupationlab/enterprise/match/applicant/exportDataInBatches`,
+    addApplicant: `occupationlab/occupationlab/enterprise/match/applicant/addApplicant`,
+    disableContests: `occupationlab/occupationlab/enterprise/match/applicant/disableContests`,
+    excelExport: `${host}occupationlab/occupationlab/enterprise/match/applicant/excelExport`,
+    queryApplicantByCondition: `occupationlab/occupationlab/enterprise/match/applicant/queryApplicantByCondition`,
+    disableApplicant: `occupationlab/occupationlab/enterprise/match/applicant/disableApplicant`,
+    exportDataInBatches: `${host}occupationlab/occupationlab/enterprise/match/applicant/exportDataInBatches`,
     // 赛事公告
-    addAnnouncement: `occupationlab/contest/announcement/addAnnouncement`,
-    amendmentAnnouncement: `occupationlab/contest/announcement/amendmentAnnouncement`,
-    deleteAnnouncement: `occupationlab/contest/announcement/deleteAnnouncement`,
-    disableAnnouncement: `occupationlab/contest/announcement/disableAnnouncement`,
-    queryAnnouncementByContestId: `occupationlab/contest/announcement/queryAnnouncementByContestId`,
-    queryAnnouncementDetails: `occupationlab/contest/announcement/queryAnnouncementDetails`,
-    deleteAnnouncementAnnex: `occupationlab/contestAnnouncementAnnex/delete`,
-    saveAnnouncementAnnex: `occupationlab/contestAnnouncementAnnex/save`,
+    addAnnouncement: `occupationlab/occupationlab/contest/announcement/addAnnouncement`,
+    amendmentAnnouncement: `occupationlab/occupationlab/contest/announcement/amendmentAnnouncement`,
+    deleteAnnouncement: `occupationlab/occupationlab/contest/announcement/deleteAnnouncement`,
+    disableAnnouncement: `occupationlab/occupationlab/contest/announcement/disableAnnouncement`,
+    queryAnnouncementByContestId: `occupationlab/occupationlab/contest/announcement/queryAnnouncementByContestId`,
+    queryAnnouncementDetails: `occupationlab/occupationlab/contest/announcement/queryAnnouncementDetails`,
+    deleteAnnouncementAnnex: `occupationlab/occupationlab/contestAnnouncementAnnex/delete`,
+    saveAnnouncementAnnex: `occupationlab/occupationlab/contestAnnouncementAnnex/save`,
 
     // 栏目管理
-    addColumn: `occupationlab/enterprise/information/column/addColumn`,
-    deleteColumn: `occupationlab/enterprise/information/column/deleteColumn`,
-    editColumn: `occupationlab/enterprise/information/column/editColumn`,
-    queryAllColumns: `occupationlab/enterprise/information/column/queryAllColumns`,
-    columnReorder: `occupationlab/enterprise/information/column/reorder`,
+    addColumn: `occupationlab/occupationlab/enterprise/information/column/addColumn`,
+    deleteColumn: `occupationlab/occupationlab/enterprise/information/column/deleteColumn`,
+    editColumn: `occupationlab/occupationlab/enterprise/information/column/editColumn`,
+    queryAllColumns: `occupationlab/occupationlab/enterprise/information/column/queryAllColumns`,
+    columnReorder: `occupationlab/occupationlab/enterprise/information/column/reorder`,
     // 内容管理
-    addArticle: `occupationlab/enterprise/information/article/addArticle`,
-    deleteArticles: `occupationlab/enterprise/information/article/deleteArticles`,
-    editArticle: `occupationlab/enterprise/information/article/editArticle`,
-    enableArticle: `occupationlab/enterprise/information/article/enableArticle`,
-    getArticle: `occupationlab/enterprise/information/article/getArticle`,
-    getArticles: `occupationlab/enterprise/information/article/getArticles`,
-    queryArticleByCondition: `occupationlab/enterprise/information/article/queryArticleByCondition`,
-    articleSort: `occupationlab/enterprise/information/article/articleSort`,
+    addArticle: `occupationlab/occupationlab/enterprise/information/article/addArticle`,
+    deleteArticles: `occupationlab/occupationlab/enterprise/information/article/deleteArticles`,
+    editArticle: `occupationlab/occupationlab/enterprise/information/article/editArticle`,
+    enableArticle: `occupationlab/occupationlab/enterprise/information/article/enableArticle`,
+    getArticle: `occupationlab/occupationlab/enterprise/information/article/getArticle`,
+    getArticles: `occupationlab/occupationlab/enterprise/information/article/getArticles`,
+    queryArticleByCondition: `occupationlab/occupationlab/enterprise/information/article/queryArticleByCondition`,
+    articleSort: `occupationlab/occupationlab/enterprise/information/article/articleSort`,
 
     // 课程管理
-    queryCourseByCondition: `occupationlab/management/edu/course/queryCourseByCondition`, // 课程列表分页条件查询
-    addCourse: `occupationlab/management/edu/course/addCourse`, // 添加课程
-    deleteCourse: `occupationlab/management/edu/course/deleteCourse`, // 根据id删除课程
-    deleteCourses: `occupationlab/management/edu/course/deleteCourses`, // 批量删除课程
-    editCourse: `occupationlab/management/edu/course/editCourse`, // 修改课程
-    enableCourse: `occupationlab/management/schoolCourse/enableGlCourse`, // 是否启用管理端课程
-    getCourse: `occupationlab/management/edu/course/getCourse`, // 根据id查询课程
+    queryCourseByCondition: `occupationlab/occupationlab/management/edu/course/queryCourseByCondition`, // 课程列表分页条件查询
+    addCourse: `occupationlab/occupationlab/management/edu/course/addCourse`, // 添加课程
+    deleteCourse: `occupationlab/occupationlab/management/edu/course/deleteCourse`, // 根据id删除课程
+    deleteCourses: `occupationlab/occupationlab/management/edu/course/deleteCourses`, // 批量删除课程
+    editCourse: `occupationlab/occupationlab/management/edu/course/editCourse`, // 修改课程
+    enableCourse: `occupationlab/occupationlab/management/schoolCourse/enableGlCourse`, // 是否启用管理端课程
+    getCourse: `occupationlab/occupationlab/management/edu/course/getCourse`, // 根据id查询课程
     // 分类管理
-    queryGlClassification: `occupationlab/management/edu/courseClassification/queryGlClassification`,
-    deleteClassification: `occupationlab/management/edu/courseClassification/deleteClassification`,
-    addClassification: `occupationlab/management/edu/courseClassification/addClassification`,
-    editClassification: `occupationlab/management/edu/courseClassification/editClassification`,
+    queryGlClassification: `occupationlab/occupationlab/management/edu/courseClassification/queryGlClassification`,
+    deleteClassification: `occupationlab/occupationlab/management/edu/courseClassification/deleteClassification`,
+    addClassification: `occupationlab/occupationlab/management/edu/courseClassification/addClassification`,
+    editClassification: `occupationlab/occupationlab/management/edu/courseClassification/editClassification`,
     // 课程章节管理
-    addChapter: `occupationlab/management/edu/courseChapter/addChapter`,
-    chapterReorder: `occupationlab/management/edu/courseChapter/chapterReorder`,
-    deleteChapter: `occupationlab/management/edu/courseChapter/deleteChapter`,
-    editChapter: `occupationlab/management/edu/courseChapter/editChapter`,
-    queryChaptersAndSubsections: `occupationlab/management/edu/courseChapter/queryChaptersAndSubsections`,
-    reorder: `occupationlab/management/edu/courseChapter/reorder`,
+    addChapter: `occupationlab/occupationlab/management/edu/courseChapter/addChapter`,
+    chapterReorder: `occupationlab/occupationlab/management/edu/courseChapter/chapterReorder`,
+    deleteChapter: `occupationlab/occupationlab/management/edu/courseChapter/deleteChapter`,
+    editChapter: `occupationlab/occupationlab/management/edu/courseChapter/editChapter`,
+    queryChaptersAndSubsections: `occupationlab/occupationlab/management/edu/courseChapter/queryChaptersAndSubsections`,
+    reorder: `occupationlab/occupationlab/management/edu/courseChapter/reorder`,
     // 课程小节管理
-    addSubsection: `occupationlab/management/edu/courseSubsection/addSubsection`, // 添加小节
-    deleteSubsection: `occupationlab/management/edu/courseSubsection/deleteSubsection`, // 根据id删除小节
-    editSubsection: `occupationlab/management/edu/courseSubsection/editSubsection`, // 修改小节
-    getSubsection: `occupationlab/management/edu/courseSubsection/getSubsection`, // 根据小节id获取预览文件地址
+    addSubsection: `occupationlab/occupationlab/management/edu/courseSubsection/addSubsection`, // 添加小节
+    deleteSubsection: `occupationlab/occupationlab/management/edu/courseSubsection/deleteSubsection`, // 根据id删除小节
+    editSubsection: `occupationlab/occupationlab/management/edu/courseSubsection/editSubsection`, // 修改小节
+    getSubsection: `occupationlab/occupationlab/management/edu/courseSubsection/getSubsection`, // 根据小节id获取预览文件地址
 
     // 阿里云文件/视频管理
     fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件
@@ -204,52 +204,52 @@ export default {
 
     // 系统设置
     // 员工组织架构
-    professionalList: `occupationlab/staff/professionalList`, //查询专业列表
-    staffGradeList: `occupationlab/staff/staffGradeList`, //根据专业id查询年级
-    saveProfessional: `occupationlab/staff/saveProfessional`, //新增专业
-    updateProfessional: `occupationlab/staff/updateProfessional`, //编辑专业
-    deleteProfessional: `occupationlab/staff/deleteProfessional`, //删除专业
-    saveGrade: `occupationlab/staff/saveGrade`, //新增年级
-    updateGrade: `occupationlab/staff/updateGrade`, //编辑年级
-    deleteGrade: `occupationlab/staff/deleteGrade`, //删除年级
+    professionalList: `occupationlab/occupationlab/staff/professionalList`, //查询专业列表
+    staffGradeList: `occupationlab/occupationlab/staff/staffGradeList`, //根据专业id查询年级
+    saveProfessional: `occupationlab/occupationlab/staff/saveProfessional`, //新增专业
+    updateProfessional: `occupationlab/occupationlab/staff/updateProfessional`, //编辑专业
+    deleteProfessional: `occupationlab/occupationlab/staff/deleteProfessional`, //删除专业
+    saveGrade: `occupationlab/occupationlab/staff/saveGrade`, //新增年级
+    updateGrade: `occupationlab/occupationlab/staff/updateGrade`, //编辑年级
+    deleteGrade: `occupationlab/occupationlab/staff/deleteGrade`, //删除年级
     // 员工管理
-    saveStaff: `occupationlab/staff/saveStaff`, //新增员工
-    staffDetail: `occupationlab/staff/staffDetail`, //员工详情
-    modifyStaff: `occupationlab/staff/modifyStaff`, //编辑员工
-    delStaff: `occupationlab/staff/delStaff`, //删除员工
-    staffList: `occupationlab/staff/staffList`, //员工列表
+    saveStaff: `occupationlab/occupationlab/staff/saveStaff`, //新增员工
+    staffDetail: `occupationlab/occupationlab/staff/staffDetail`, //员工详情
+    modifyStaff: `occupationlab/occupationlab/staff/modifyStaff`, //编辑员工
+    delStaff: `occupationlab/occupationlab/staff/delStaff`, //删除员工
+    staffList: `occupationlab/occupationlab/staff/staffList`, //员工列表
     staffTemplate: `http://121.37.12.51/template/员工用户导入模板.xlsx`, //员工用户导入模板
-    exportFailureStaff: `${host}occupationlab/staff/exportFailure`, //批量导入员工失败数据导出
-    importStaff: `${host}occupationlab/staff/importStaff`, //批量导入员工
+    exportFailureStaff: `${host}occupationlab/occupationlab/staff/exportFailure`, //批量导入员工失败数据导出
+    importStaff: `${host}occupationlab/occupationlab/staff/importStaff`, //批量导入员工
     // 角色管理
-    batchRemove: `users/role/batchRemove`, //批量删除角色
-    checkRoleIsExist: `users/role/checkRoleIsExist`, //判断该角色是否存在
-    delRoleByAccountId: `users/role/delRoleByAccountId`, //删除某用户下的某个角色
-    roleList: `users/role/list`, //角色分页列表查询
-    obtainDetails: `users/role/obtainDetails`, //获取角色详情
-    saveOrUpdate: `users/role/saveOrUpdate`, //新增或更新角色
+    batchRemove: `users/users/role/batchRemove`, //批量删除角色
+    checkRoleIsExist: `users/users/role/checkRoleIsExist`, //判断该角色是否存在
+    delRoleByAccountId: `users/users/role/delRoleByAccountId`, //删除某用户下的某个角色
+    roleList: `users/users/role/list`, //角色分页列表查询
+    obtainDetails: `users/users/role/obtainDetails`, //获取角色详情
+    saveOrUpdate: `users/users/role/saveOrUpdate`, //新增或更新角色
     queryAllMenus: `users/users/permission/queryAllMenus`, //查询所有菜单
     // 系统logo设置
-    logoDetail: `occupationlab/sys/logo/detail`, //查看系统设置信息
-    logoSave: `occupationlab/sys/logo/save`, //新增系统设置信息
-    logoUpdate: `occupationlab/sys/logo/update`, //编辑系统设置信息
+    logoDetail: `occupationlab/occupationlab/sys/logo/detail`, //查看系统设置信息
+    logoSave: `occupationlab/occupationlab/sys/logo/save`, //新增系统设置信息
+    logoUpdate: `occupationlab/occupationlab/sys/logo/update`, //编辑系统设置信息
 
 
 
 
     // 教师评语
-    addComment: `evaluation/comment/addComment`,
-    queryComment: `evaluation/comment/queryComment`,
-    updateComment: `evaluation/comment/updateComment`,
+    addComment: `evaluation/cevaluation/comment/addComment`,
+    queryComment: `evaluation/evaluation/ccomment/queryComment`,
+    updateComment: `evaluation/evaluation/ccomment/updateComment`,
 
     // 老师签名照
-    daleteSignature: `evaluation/signature/daleteSignature`,
-    querySignature: `evaluation/signature/querySignature`,
-    uploadSignature: `evaluation/signature/uploadSignature`,
+    daleteSignature: `evaluation/evaluation/csignature/daleteSignature`,
+    querySignature: `evaluation/evaluation/csignature/querySignature`,
+    uploadSignature: `evaluation/evaluation/csignature/uploadSignature`,
 
     // 判分点
-    queryListTrading: `judgment/tradingJudgmentPoints/query`,
-    queryDetailsTrading: `judgment/tradingJudgmentPoints/queryDetails`,
+    queryListTrading: `judgment/judgment/tradingJudgmentPoints/query`,
+    queryDetailsTrading: `judgment/judgment/tradingJudgmentPoints/queryDetails`,
     // 科大
     queryPoint: `kdSys/queryPoint`,
     querySubject: `kdSys/querySubject`,
diff --git a/src/pages/match/add/index.vue b/src/pages/match/add/index.vue
index 9ec13a2..34c3349 100644
--- a/src/pages/match/add/index.vue
+++ b/src/pages/match/add/index.vue
@@ -193,7 +193,7 @@ export default {
             form: {
               id: '',
               platformSource: 1, // 平台来源(0:中台，1：职站)
-              ztOpen: 0, // 中台是否开启(0开启 1未开启 默认0)
+              isOpen: 0, // 职站是否开启(0开启 1未开启 默认0)
               name: '',
               sponsor: '',
               undertaker: '',
@@ -404,10 +404,7 @@ export default {
         }).catch(res => {})
       },
       handleAnnexRemove(file, fileList) {
-        debugger
-        this.$del(`${this.api.fileDeletion}?keys=${this.coverUrl}`).then(res => {
-          this.carouselUrl = ''
-        }).catch(res => {})
+        file.url && this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {})
       },
       // 预览
       preview() {
@@ -446,6 +443,7 @@ export default {
 
           this.submiting = true
           form.publishStatus = status
+          form.isOpen = status ? 0 : 1 // 保存则禁用，发布则启用
           if (this.form.id) {
               this.$put(this.api.editContest, form).then(res => {
                   this.submiting = false;
@@ -637,7 +635,7 @@ $upload-lg-height: 150px;
     display: flex;
     align-items: center;
     margin-bottom: 12px;
-    font-size: 14px;
+    font-size: 18px;
     color: #333;
     img{
       margin-right: 5px;
@@ -658,6 +656,13 @@ $upload-lg-height: 150px;
   }
   .texts {
     margin-bottom: 30px;
+    font-size: 14px;
+    line-height: 1.6;
+    text-indent: 2em;
+    overflow: hidden;
+    /deep/img{
+        max-width: 100%;
+    }
   }
   .files {
     li {
diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue
index 3d53d91..a146ae0 100644
--- a/src/pages/match/list/index.vue
+++ b/src/pages/match/list/index.vue
@@ -51,33 +51,29 @@
             </el-table-column>
             <el-table-column prop="competitionName" label="竞赛名称" align="center"></el-table-column>
             <el-table-column prop="applicantNum" label="报名人数" align="center" width="150"></el-table-column>
-            <el-table-column prop="status" label="状态" align="center" width="150">
+            <el-table-column prop="status" label="状态" align="center" width="90">
               <template slot-scope="scope">
                 {{ scope.row.publishStatus ? '已发布' : '未发布' }}
               </template>
             </el-table-column>
-            <el-table-column prop="time" label="竞赛时间" align="center" width="300">
+            <el-table-column prop="time" label="竞赛时间" align="center" width="270">
                 <template slot-scope="scope">
                     {{ scope.row.playStartTime }} ~ {{ scope.row.playEndTime }}
                 </template>
             </el-table-column>
-            <el-table-column prop="createTime" label="创建时间" align="center" width="200"></el-table-column>
-            <el-table-column prop="founderName" label="创建人" align="center" width="200">
+            <el-table-column prop="createTime" label="创建时间" align="center" width="160"></el-table-column>
+            <el-table-column prop="founderName" label="创建人" align="center" width="130">
               <template slot-scope="scope">
                 {{ scope.row.founderName || '学校超管' }}
               </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="100">
+            <el-table-column label="操作" align="center" width="170">
                 <template slot-scope="scope">
                     <el-button v-if="auth('管理')" type="text" @click="manage(scope.row)">管理</el-button>
                     <el-divider v-if="auth('管理')" direction="vertical"></el-divider>
                     <el-button v-if="auth('删除')" type="text" @click="delData(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-            <el-table-column label="发布状态" align="center" width="120">
-                <template slot-scope="scope">
-                  <!-- 列表展示中台的禁启用依据zt_open展示，职站的禁启用依据is_open展示 -->
-                  <!-- 中台禁用了这个学校发布的学校这边还能看到，但是学校这边不能启用。 -->
+                    <!-- 列表展示中台的禁启用依据zt_open展示，职站的禁启用依据is_open展示 -->
+                    <!-- 中台禁用了这个学校发布的学校这边还能看到，但是学校这边不能启用。 -->
                     <el-switch
                         v-if="auth('禁用')"
                         v-model="scope.row.isOpen"
@@ -100,6 +96,7 @@
 <script>
 import util from "@/libs/util";
 import Setting from "@/setting";
+import { mapMutations } from "vuex";
 
 export default {
     name: "match",
@@ -187,6 +184,9 @@ export default {
         })
     },
     methods: {
+        ...mapMutations('match', [
+          'SET_PAGE'
+        ]),
         getList() {
           const { form } = this
           this.$post(this.api.contestPageConditionQueryByOccupationlab, {
@@ -214,10 +214,10 @@ export default {
         },
         getData() {
           this.getList()
-          if (!Setting.isDev) {
-            clearInterval(this.timer)
-            this.timer = setInterval(this.getList, 1000)
-          }
+          // if (!Setting.isDev) {
+            // clearInterval(this.timer)
+            // this.timer = setInterval(this.getList, 1000 * 60)
+          // }
         },
         initData() {
             this.page = 1;
@@ -227,7 +227,7 @@ export default {
             this.$router.push("/match/add");
         },
         manage(row) {
-            this.$router.push(`/match/manage?id=${row.id}`);
+            this.$router.push(`/match/manage?id=${row.id}&name=${row.competitionName}`)
         },
 
         changeType() {
@@ -275,7 +275,8 @@ export default {
         handleCurrentChange(val) {
             this.page = val;
             this.$router.push(`list?page=${val}`)
-            this.getData();
+            this.getData()
+            this.SET_PAGE(val)
         },
         transferTime(date, type) {
             if (date == "0000-00-00 00:00:00") return "---";
diff --git a/src/pages/match/list/manage/matchDetail.vue b/src/pages/match/list/manage/matchDetail.vue
deleted file mode 100644
index 1f41419..0000000
--- a/src/pages/match/list/manage/matchDetail.vue
+++ /dev/null
@@ -1,450 +0,0 @@
-<template>
-    <!-- 大赛详情 -->
-    <div style="padding: 24px">
-        <div class="page-content">
-            <el-form label-width="170px" label-suffix=":" size="small">
-                <el-form-item label="竞赛封面（选填）">
-                    <el-upload
-                        class="avatar-uploader"
-                        accept=".jpg,.png,.jpeg,.gif"
-                        :on-remove="handleRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadSuccess"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="this.api.fileupload"
-                        name="file"
-                    >
-                        <img v-if="coverUrl" :src="coverUrl" class="avatar">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
-                        </div>
-                        <div slot="tip" class="el-upload__tip">
-                            <p>展示宽度为220，高度140，JPG/PNG/GIF，3MB以内</p>
-                        </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item label="竞赛封面长图（选填）">
-                    <el-upload
-                        class="avatar-uploader avatar-uploader-lg"
-                        accept=".jpg,.png,.jpeg,.gif"
-                        :on-remove="handleLgRemove"
-                        :on-error="uploadError"
-                        :on-success="uploadLgSuccess"
-                        :before-remove="beforeRemove"
-                        :limit="1"
-                        :on-exceed="handleExceed"
-                        :action="this.api.fileupload"
-                        name="file"
-                    >
-                        <img v-if="carouselUrl" :src="carouselUrl" class="avatar-lg">
-                        <div class="uploader-default" v-else>
-                            <i class="el-icon-plus"></i>
-                            <p>上传封面</p>
-                        </div>
-                        <div slot="tip" class="el-upload__tip">
-                            <p>展示宽度为1920，高度300，JPG/PNG/GIF，3MB以内</p>
-                        </div>
-                    </el-upload>
-                </el-form-item>
-                <el-form-item label="竞赛名称">
-                    <div class="d-inline-block">
-                        <el-input placeholder="请输入竞赛名称" v-model="name" clearable></el-input>
-                    </div>
-                </el-form-item>
-                <el-form-item label="主办方">
-                    <div class="inline-input">
-                        <div class="input-wrap" v-for="(item,index) in sponsorList" :key="index">
-                            <el-input placeholder="主办方名称" v-model="sponsorList[index]"></el-input>
-                            <i v-if="sponsorList.length > 1" class="remove" @click="delSponsor(index)"></i>
-                            <button v-if="index == 0" class="add-btn" @click="addSponsor">
-                                <i class="el-icon-plus"></i>
-                                <span>添加</span>
-                            </button>
-                        </div>
-                    </div>
-                </el-form-item>
-                <el-form-item label="承办方（选填）">
-                    <div class="inline-input">
-                        <div class="input-wrap" v-for="(item,index) in undertakerList" :key="index">
-                            <el-input placeholder="承办方名称" v-model="undertakerList[index]"></el-input>
-                            <i v-if="undertakerList.length > 1" class="remove" @click="delOrganizer(index)"></i>
-                            <button v-if="index == 0" class="add-btn" @click="addOrganizer">
-                                <i class="el-icon-plus"></i>
-                                <span>添加</span>
-                            </button>
-                        </div>
-                    </div>
-                    <button v-if="!undertakerList.length" class="add-btn" @click="addOrganizer">
-                        <i class="el-icon-plus"></i>
-                        <span>添加</span>
-                    </button>
-                </el-form-item>
-                <el-form-item label="报名时间">
-                    <el-date-picker v-model="signupTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-                </el-form-item>
-                <el-form-item label="竞赛时间">
-                    <el-date-picker v-model="playTime" value-format="yyyy-MM-dd HH:mm:ss" type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
-                </el-form-item>
-                <el-form-item label="竞赛详情">
-                    <quill :border="true" v-model="description" :height="400" />
-                </el-form-item>
-                <el-form-item>
-                    <el-button v-throttle @click="save(1)">保存</el-button>
-                    <el-button type="primary" v-if="publishStatus == 1" v-throttle @click="save(0)">发布</el-button>
-                </el-form-item>
-            </el-form>
-        </div>
-    </div>
-</template>
-
-<script>
-import quill from "@/components/quill";
-import util from "@/libs/util";
-import { mapActions } from "vuex";
-
-export default {
-    name: "matchDetail",
-    data() {
-        return {
-            id: this.$route.query.id,
-            coverUrl: "",
-            carouselUrl: "",
-            publishStatus: 0,
-            uploadList: [],
-            uploadDataList: [],
-            name: "",
-            sponsor: "",
-            sponsorList: [""],
-            undertaker: "",
-            undertakerList: [],
-            signUpStartTime: "",
-            signUpEndTime: "",
-            signupTime: "",
-            playTime: "",
-            playStartTime: "",
-            playEndTime: "",
-            description: ""
-        };
-    },
-    components: {
-        quill
-    },
-    watch: {
-        signupTime: function(val) {
-            if (val) {
-                this.signUpStartTime = val[0];
-                this.signUpEndTime = val[1];
-            } else {
-                this.signUpStartTime = "";
-                this.signUpEndTime = "";
-            }
-        },
-        playTime: function(val) {
-            if (val) {
-                this.playStartTime = val[0];
-                this.playEndTime = val[1];
-            } else {
-                this.playStartTime = "";
-                this.playEndTime = "";
-            }
-        }
-    },
-    mounted() {
-        this.getData();
-        this.commitId();
-    },
-    methods: {
-        ...mapActions("match", [
-            "setMatchId"
-        ]),
-        save(status) {
-            this.sponsor = this.sponsorList.filter(d => d).join();
-            this.undertaker = this.undertakerList.filter(d => d).join();
-
-            if (!this.name) return util.warningMsg("请填写竞赛名称");
-            if (status == 0) {
-                if (!this.sponsor) return util.warningMsg("请填写主办方");
-                if (!this.signUpStartTime) return util.warningMsg("请选择报名时间");
-            }
-            let now = new Date().getTime();
-            let signUpStartTime = new Date(this.signUpStartTime).getTime();
-            let signUpEndTime = new Date(this.signUpEndTime).getTime();
-            let playStartTime = new Date(this.playStartTime).getTime();
-            // if(signUpStartTime && now > signUpStartTime) return this.$$message.warning('报名时间不能早于当前时间')
-            if (!this.playStartTime && status == 0) return util.warningMsg("请选择竞赛时间");
-            if (playStartTime && playStartTime < signUpEndTime) return util.warningMsg("竞赛时间不能早于报名结束时间");
-            if (!this.description && status == 0) return util.warningMsg("请填写竞赛详情");
-
-            let data = {
-                id: this.id,
-                coverUrl: this.coverUrl,
-                carouselUrl: this.carouselUrl,
-                description: this.description,
-                founderId: 1,
-                name: this.name,
-                playEndTime: this.playEndTime,
-                playStartTime: this.playStartTime,
-                publishStatus: status ? this.publishStatus : 0,
-                signUpEndTime: this.signUpEndTime,
-                signUpStartTime: this.signUpStartTime,
-                sponsor: this.sponsor,
-                undertaker: this.undertaker
-            };
-            if (this.id) {
-                this.$put(this.api.editContest, data).then(res => {
-                    util.successMsg("修改成功");
-                    this.$router.back();
-                })
-                    .catch(err => {
-                    });
-            } else {
-                this.$post(this.api.addContest, data).then(res => {
-                    util.successMsg("创建成功");
-                    this.$router.back();
-                })
-                    .catch(err => {
-                    });
-            }
-        },
-        getData() {
-            this.$get(this.api.getContest + "/" + this.id)
-                .then(res => {
-                    let data = res.contest;
-                    this.coverUrl = data.coverUrl;
-                    this.carouselUrl = data.carouselUrl;
-                    this.description = data.description;
-                    this.name = data.name;
-                    this.playEndTime = data.playEndTime;
-                    this.playStartTime = data.playStartTime;
-                    this.publishStatus = data.publishStatus;
-                    this.signUpEndTime = data.signUpEndTime;
-                    this.signUpStartTime = data.signUpStartTime;
-                    this.sponsor = data.sponsor;
-                    this.undertaker = data.undertaker;
-
-                    this.signupTime = [data.signUpStartTime, data.signUpEndTime];
-                    this.playTime = [data.playStartTime, data.playEndTime];
-                    this.sponsorList = data.sponsor.split(",");
-                    this.undertakerList = data.undertaker.split(",");
-                })
-                .catch(err => {
-
-                });
-        },
-        commitId() {
-            this.setMatchId(this.id);
-        },
-        handleExceed(files, fileList) {
-            util.warningMsg(`当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`);
-        },
-        uploadSuccess(res, file, fileList) {
-            if (this.coverUrl) {
-                let fileName = this.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-                this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                }).catch(res => {
-                });
-            }
-            this.coverUrl = res.data.filesResult.fileUrl;
-        },
-        uploadLgSuccess(res, file, fileList) {
-            if (this.carouselUrl) {
-                let fileName = this.carouselUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-                this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                }).catch(res => {
-                });
-            }
-            this.carouselUrl = res.data.filesResult.fileUrl;
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            let fileName = this.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-            this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                this.coverUrl = "";
-            }).catch(res => {
-            });
-        },
-        handleLgRemove(file, fileList) {
-            let fileName = this.carouselUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-            this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                this.carouselUrl = "";
-            }).catch(res => {
-            });
-        },
-        uploadSure() {
-            this.BatchUpload = false;
-            this.pageNo = 1;
-            this.keyword = "";
-            this.getData();
-        },
-        goback() {
-            this.$confirm("确定返回？未更新的信息将不会保存。", "提示", {
-                type: "warning"
-            })
-                .then(() => {
-                    this.$router.push("/match");
-                })
-                .catch(() => {
-                });
-        },
-        addSponsor() {
-            this.sponsorList.push("");
-        },
-        delSponsor(index) {
-            this.sponsorList.splice(index, 1);
-        },
-        addOrganizer() {
-            this.undertakerList.push("");
-        },
-        delOrganizer(index) {
-            this.undertakerList.splice(index, 1);
-        }
-
-    }
-};
-</script>
-
-<style scoped lang="scss">
-$upload-width: 220px;
-$upload-height: 140px;
-$upload-lg-height: 150px;
-/deep/ .avatar-uploader {
-    .el-upload {
-        position: relative;
-        width: $upload-width;
-        height: $upload-height;
-        border: 1px dashed #d9d9d9;
-        border-radius: 6px;
-        cursor: pointer;
-        overflow: hidden;
-
-        &:hover {
-            border-color: #cb221c;
-        }
-
-        .uploader-default {
-            display: flex;
-            height: $upload-height;
-            flex-direction: column;
-            justify-content: center;
-            text-align: center;
-            background: rgba(0, 0, 0, 0.04);
-
-            i {
-                font-size: 20px;
-                font-weight: bold;
-                color: #8c939d;
-            }
-
-            p {
-                margin-top: 10px;
-                font-size: 14px;
-                color: rgba(0, 0, 0, 0.65);
-                line-height: 1;
-            }
-        }
-    }
-
-    &.avatar-uploader-lg {
-        .el-upload {
-            width: 100%;
-            max-width: 960px;
-            height: $upload-lg-height;
-
-            .uploader-default {
-                height: $upload-lg-height;
-            }
-        }
-    }
-
-    .avatar {
-        display: block;
-        width: $upload-width;
-        height: $upload-height;
-    }
-
-    .avatar-lg {
-        display: block;
-        width: 100%;
-        height: $upload-lg-height;
-    }
-
-    .el-upload__tip {
-        margin-top: 0;
-
-        p {
-            font-size: 14px;
-            color: rgba(0, 0, 0, 0.45);
-            line-height: 1;
-
-            &:first-child {
-                margin-bottom: 5px;
-            }
-        }
-    }
-}
-
-/deep/ .d-inline-block {
-    width: 216px;
-
-    .el-select, .el-input {
-        width: 100%;
-    }
-}
-
-.inline-input {
-    .input-wrap {
-        display: flex;
-        align-items: center;
-        margin-bottom: 10px;
-
-        .el-input {
-            display: inline-block;
-            width: 216px;
-            margin-right: 8px;
-        }
-
-        .remove {
-            width: 16px;
-            height: 16px;
-            background: url("../../../../assets/img/close.png") 0 0/cover no-repeat;
-            cursor: pointer;
-        }
-    }
-
-    .add-btn {
-        margin-left: 32px;
-    }
-}
-
-.add-btn {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    width: 216px;
-    line-height: 32px;
-    font-size: 14px;
-    color: rgba(0, 0, 0, 0.65);
-    background-color: transparent;
-    border: 1px dashed rgba(0, 0, 0, 0.15);
-    border-radius: 4px;
-    cursor: pointer;
-
-    i {
-        margin-right: 8px;
-        font-size: 14px;
-        font-weight: bold;
-    }
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/match/manage/index.vue b/src/pages/match/manage/index.vue
index a8f9d5c..be5e5a3 100644
--- a/src/pages/match/manage/index.vue
+++ b/src/pages/match/manage/index.vue
@@ -28,11 +28,12 @@ import MatchDetail from "./matchDetail";
 import MatchProgress from "./matchProgress";
 import notice from "./notice";
 import MatchSignup from "./matchSignup";
+import { mapState } from "vuex";
 export default {
     name: "matchManage",
     data() {
         return {
-            name: '',
+            name: this.$route.query.name,
             active: this.$route.query.tab || "first",
             tabs: {
                 first: "大赛详情",
@@ -42,6 +43,11 @@ export default {
             }
         };
     },
+    computed: {
+      ...mapState("user", [
+        'page'
+      ])
+    },
     components: {
         MatchDetail,
         MatchProgress,
@@ -50,16 +56,15 @@ export default {
     },
     methods: {
         back() {
-          this.handleSave(0) && this.$router.back()
+          this.handleSave(0) && this.backPage()
         },
         // 判断是否需要confirm
         handleSave(i) {
           // 如果是赛事详情，则要判断是否已经保存，未保存则提示是否保存
           if (this.active === 'first') {
             const detail = this.$refs.detail
-            console.log(11, detail.updateTime, i)
             if (detail.updateTime > 1) {
-              this.$confirm(`编辑的内容未保存，是否保存？`, '提示', {
+              this.$confirm(`编辑的内容未保存，是否保存并且发布？`, '提示', {
                 type: 'warning'
               }).then(() => {
                 detail.save(1)
@@ -76,11 +81,11 @@ export default {
           }
         },
         backPage(){
-          this.$router.back()
+          this.$router.push(`/match?page=${this.page}`)
         },
         tabSwitch(i) {
           this.active = i
-          this.$router.push(`/match/manage?id=${this.$route.query.id}&tab=${i}`)
+          this.$router.push(`/match/manage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`)
         },
         backOrTab(i) {
           i ? this.tabSwitch(i) : this.backPage()
diff --git a/src/pages/match/manage/matchDetail.vue b/src/pages/match/manage/matchDetail.vue
index de41a32..7a8ce9a 100644
--- a/src/pages/match/manage/matchDetail.vue
+++ b/src/pages/match/manage/matchDetail.vue
@@ -164,7 +164,7 @@ export default {
             form: {
               id: this.$route.query.id,
               platformSource: 1, // 平台来源(0:中台，1：职站)
-              ztOpen: 0, // 中台是否开启(0开启 1未开启 默认0)
+              isOpen: 0, // 职站是否开启(0开启 1未开启 默认0)
               name: '',
               sponsor: '',
               undertaker: '',
@@ -295,7 +295,6 @@ export default {
     methods: {
       getData() {
         this.$post(`${this.api.getContest}?contestId=${this.form.id}`).then(({ contest }) => {
-          this.$parent.name = contest.name
           this.signupTime = [contest.signUpStartTime, contest.signUpEndTime]
           this.playTime = [contest.playStartTime, contest.playEndTime]
           this.sponsorList = contest.sponsor.split(",")
@@ -470,6 +469,7 @@ export default {
 
           this.submiting = true
           form.publishStatus = status
+          form.isOpen = 0 // 发布后变为启用
           if (this.form.id) {
               delete form.contestAnnexList
               this.$post(this.api.editContest, form).then(res => {
diff --git a/src/pages/match/manage/notice.vue b/src/pages/match/manage/notice.vue
index ec4bcfd..5456ad8 100644
--- a/src/pages/match/manage/notice.vue
+++ b/src/pages/match/manage/notice.vue
@@ -119,6 +119,8 @@ export default {
             }).catch(() => {
               row.isOpen = 1
             })
+          } else {
+            this.$put(`${this.api.disableAnnouncement}?id=${row.id}&isDisable=${val}`).then(res => {}).catch(err => {})
           }
         },
         add() {
diff --git a/src/pages/match/manage/noticeDetail.vue b/src/pages/match/manage/noticeDetail.vue
index 0ac503e..61aeaa5 100644
--- a/src/pages/match/manage/noticeDetail.vue
+++ b/src/pages/match/manage/noticeDetail.vue
@@ -64,7 +64,8 @@ export default {
               contestId: this.$route.query.contestId,
               announcementText: '',
               announcementTitle: '',
-              announcementAnnexList: []
+              announcementAnnexList: [],
+              isOpen: 1
             },
             updateTime: 0,
             fileName: '',
@@ -114,12 +115,14 @@ export default {
             if (!form.announcementText) return util.warningMsg('请填写正文')
             form.status = status
             if (form.id) {
+                form.isOpen = 0
                 delete form.announcementAnnexList
                 this.$post(this.api.amendmentAnnouncement, form).then(res => {
                     util.successMsg("修改成功")
                     this.$router.back()
                 }).catch(err => {})
             } else {
+              form.isOpen = status ? 0 : 1
               this.$post(this.api.addAnnouncement, form).then(res => {
                 util.successMsg("创建成功")
                 this.$router.back()
diff --git a/src/setting.js b/src/setting.js
index 9889aa3..bd19c57 100644
--- a/src/setting.js
+++ b/src/setting.js
@@ -5,34 +5,24 @@ const url = location.host;
 const isDev = process.env.NODE_ENV === "development"; // 开发环境
 const isHh = url.includes("10.196.131.73"); //是否河海版本
 const isCH = url.includes("124.71.12.62"); //是否巢湖版本
-const isBeta = url.includes("120.78.198.231"); //是否职站测试
 const isPro = url.includes("occupationlab.com"); //是否职站生产
 const isTest = url.includes('121.37.12.51'); //是否中台测试服
 
 let bankPath = `${location.origin}/banksystem` // 银行系统地址
 let jumpPath = `${location.origin}/judgmentPoint`
-let host = `${location.origin}:9000/`
-let title = '职站服务端管理系统'
+let host = `${location.origin}/`
+let uploadURL = `https://121.37.12.51/`
+let title = (isHh || isCH) ? '教师管理端' : '职站服务端管理系统'
 
-if (isHh) {
-    // 河海
-    host = "http://10.196.131.73/";
-    title = "教师管理端";
-} else if (isCH) {
-    // 巢湖
-    host = "http://124.71.12.62/";
-    title = "教师管理端";
-} else if (isBeta) {
-    // 职站测试
-    host = "http://120.78.198.231/";
-} else if (isPro) {
+if (isPro) {
     // 职站生产
+    uploadURL = `https://www.huorantech.cn/`
     bankPath = `https://www.huorantech.cn/banksystem`
     jumpPath = `https://www.huorantech.cn/judgmentPoint/`
 } else if (isDev) {
     jumpPath = "http://192.168.31.125:8087/";
     bankPath = `http://192.168.31.125:8093`
-    host = "http://121.37.12.51:9000/"; // 中台测试服
+    host = "http://121.37.12.51/"; // 中台测试服
     // host = "http://192.168.31.151:9000/"; // 榕
     // host = 'http://192.168.31.137:9000/'; // 赓
 }
@@ -92,7 +82,7 @@ const Setting = {
     dynamicRoute: true,
     // 文件上传
     upload: {
-        apiURL: "http://121.37.12.51:9000/",
+        apiURL: uploadURL,
         maxSize: 30
     }
 };
diff --git a/src/store/modules/match.js b/src/store/modules/match.js
index bcec2e4..ed970a1 100644
--- a/src/store/modules/match.js
+++ b/src/store/modules/match.js
@@ -4,24 +4,14 @@
 export default {
     namespaced: true,
     state: {
-        matchId: "",
-        wait: false,
-        waitIndex: 0
+      page: 1
     },
     mutations: {
-        SET_MATCH_ID: (state, id) => {
-            state.matchId = id;
-        },
-        setWait: (state, wait) => {
-            state.wait = wait;
-        },
-        setWaitIndex: (state, waitIndex) => {
-            state.waitIndex = waitIndex;
-        }
+      SET_PAGE: (state, page) => {
+        state.page = page
+      }
     },
     actions: {
-        setMatchId({ state, commit }, id) {
-            commit("SET_MATCH_ID", id);
-        }
+      
     }
 };
\ No newline at end of file
diff --git a/src/styles/layout/index.scss b/src/styles/layout/index.scss
index 53b7eba..06aea86 100644
--- a/src/styles/layout/index.scss
+++ b/src/styles/layout/index.scss
@@ -10,7 +10,7 @@ body,
 }
 
 body {
-  min-width: 1500px;
+  min-width: 1280px;
   font-family: 'PingFang SC', "Helvetica Neue", Helvetica, "microsoft yahei", arial, STHeiTi, sans-serif;
   font-size: 14px;
   background: rgba(0, 0, 0, 0.05);