From c66744edd9f800422df12f3182c38d5fde9bee67 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Thu, 30 Jun 2022 14:27:50 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setting.js | 18 +- src/store/index.js | 4 + src/utils/api.js | 294 ++++++------- src/views/Login.vue | 5 +- src/views/match/add/index.vue | 12 +- src/views/match/list/index.vue | 29 +- src/views/match/list/manage/matchDetail.vue | 450 -------------------- src/views/match/manage/index.vue | 14 +- src/views/match/manage/notice.vue | 2 + src/views/match/manage/noticeDetail.vue | 1 + src/views/system/manageLog.vue | 2 +- 11 files changed, 178 insertions(+), 653 deletions(-) delete mode 100644 src/views/match/list/manage/matchDetail.vue diff --git a/src/setting.js b/src/setting.js index 0d504f8..f555548 100644 --- a/src/setting.js +++ b/src/setting.js @@ -2,18 +2,18 @@ * 业务配置 * */ const url = location.host; -const isDev = process.env.NODE_ENV === 'development'; // 开发环境 -const isPro = url.includes('www.huorantech.cn'); //正式服 +const isDev = process.env.NODE_ENV === 'development' // 开发环境 +const isPro = url.includes('huorantech.cn') //正式服 let jumpPath = `${location.origin}/judgmentPoint` -let host = `${location.origin}:9000/` +let host = `${location.origin}/` if (isDev) { - jumpPath = "http://192.168.31.125:8087/"; // 本地调试-需要启动本地判分点系统 - host = 'http://121.37.12.51:9000/' - // host = 'http://192.168.31.151:9000/'// 榕 - // host = 'http://192.168.31.137:9000/'// 赓 + jumpPath = 'http://192.168.31.125:8087/' // 本地调试-需要启动本地判分点系统 + host = 'http://121.37.12.51/' + host = 'http://192.168.31.151:9000/'// 榕 + // host = 'http://192.168.31.137:9000/'// 赓 } else if (isPro) { - jumpPath = "http://www.huorantech.cn/judgmentPoint/"; + jumpPath = 'https://www.huorantech.cn/judgmentPoint/' } @@ -24,7 +24,7 @@ const Setting = { platformId: 3, // 平台标识，1职站，2数据平台，3中台，4合伙人 jumpPath, // 判分点系统跳转路径前缀 apiBaseURL: host, // 请求路径前缀 - uploadURL: 'http://121.37.12.51:9000/', // 阿里云oss域名 + uploadURL: isDev ? 'http://121.37.12.51/' : location.origin + '/', // 阿里云oss域名 // 平台列表 platformList: [ { diff --git a/src/store/index.js b/src/store/index.js index 733f155..d3b1c2b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -22,6 +22,7 @@ const store = new Vuex.Store({ btns: [], routes: [], customerPage: 1, + matchPage: 1 }, actions: { setSystemId({ state,commit },systemId) { @@ -83,6 +84,9 @@ const store = new Vuex.Store({ SET_C_PAGE: (state, page) => { state.customerPage = page }, + SET_M_PAGE: (state, page) => { + state.matchPage = page + }, } }); diff --git a/src/utils/api.js b/src/utils/api.js index 6fdeeeb..22639f8 100644 --- a/src/utils/api.js +++ b/src/utils/api.js @@ -10,12 +10,12 @@ export default { verification: `${host}users/users/user/captcha`,// 验证码图片 保留host bindPhoneOrEmail: `users/users/userAccount/bindPhoneOrEmail`,// 绑定手机 sendPhoneOrEmailCode: `users/users/userAccount/sendPhoneOrEmailCode`,// 手机验证码 - getUserRolesPermissionMenu: `users/user-role/getUserRolesPermissionMenu`, + getUserRolesPermissionMenu: `users/users/user-role/getUserRolesPermissionMenu`, staffTemplate: `http://www.huorantech.cn/template/%E6%89%B9%E9%87%8F%E5%AF%BC%E5%85%A5%E5%91%98%E5%B7%A5%E6%A8%A1%E6%9D%BF.xlsx`, // 后台账号模板 - checkEmailOrPhone: `occupationlab/architecture/checkEmailOrPhone`, // 新增学生前:校验手机号或者邮箱 - checkWorkNumOrAccount: `occupationlab/architecture/checkWorkNumOrAccount`, // 新增/编辑学生前:校验学号或者学生账号 + checkEmailOrPhone: `occupationlab/occupationlab/architecture/checkEmailOrPhone`, // 新增学生前:校验手机号或者邮箱 + checkWorkNumOrAccount: `occupationlab/occupationlab/architecture/checkWorkNumOrAccount`, // 新增/编辑学生前:校验学号或者学生账号 // 订单管理 orderAdd: `nakadai/nakadai/order/add`,// 订单添加 @@ -27,8 +27,6 @@ export default { ship: `nakadai/nakadai/orderOther/ship`,// 处理时的订单发货管理-post getOrderOtherTime: `nakadai/nakadai/orderOther/getOrderOtherTime`, - queryAccountIsExist: `liuwanr/userInfo/queryServerAccountIsExist`, //查询账号是否存在 - // 客户管理 delCustomers: `nakadai/nakadai/customer/delCustomers`, updateCustomer: `nakadai/nakadai/customer/updateCustomer`, @@ -49,8 +47,6 @@ export default { queryCustomerIndustryClass: `nakadai/nakadai/hrIndustryClass/queryIndustryClass`, queryCustomerIndustry: `nakadai/nakadai/hrIndustry/queryIndustry`, querySchoolData: `nakadai/nakadai/school/querySchool`, - queryPhone: `liuwanr/user/queryPhone`, - queryPlatform: `liuwanr/userInfo/queryPlatform`, getAListOfClientBusinessManagers: `nakadai/nakadai/customer/getAListOfClientBusinessManagers`, getBusinessManagerOrder: `nakadai/nakadai/customer/getBusinessManagerOrder`, @@ -73,74 +69,55 @@ export default { viewUserDetailsforNakadai: `users/users/userAccount/viewUserDetailsforNakadai`, oneClickEnableVerification: `users/users/userAccount/oneClickEnableVerification`, - queryOrder: `liuwanr/order/queryOrder`, //查询订单 - queryOrderDetails: `liuwanr/order/queryOrderDetails`, //查询订单详情 - queryOrderCustomer: `liuwanr/order/queryOrderCustomer`, //查询订单客户 - - queryOrderCustomerContact: `liuwanr/order/queryOrderCustomerContact`, //查询订单客户联系人 - - addOrder: `liuwanr/order/addOrder`, //添加订单 - updateOrder: `liuwanr/order/updateOrder`, //编辑订单 - deleteOrder: `liuwanr/order/deleteOrder`, //删除订单 - bindingApplication: `liuwanr/order/bindingApplicationPermissions`, //绑定应用权限 - queryCoursePermissions: `liuwanr/order/queryCoursePermissions`, //查询应用权限 - queryCourseList: `liuwanr/order/queryCourseList`, //查询订单课程列表 - isDeliverGoods: `liuwanr/order/isDeliverGoods`, //是否上架课程 - - //服务配置 - deleteServiceConfig: `liuwanr/serviceConfig/deleteServiceConfig`, //删除服务配置 - updateServiceConfig: `liuwanr/serviceConfig/updateServiceConfig`, //更新服务配置 - addServiceConfig: `liuwanr/serviceConfig/addServiceConfig`, //添加服务配置 - queryServiceConfigDetails: `liuwanr/serviceConfig/queryServiceConfigDetails`, //查询服务配置详情 - queryServiceConfig: `nakadai/serviceConfiguration/getAllService`, //查询服务配置 + queryServiceConfig: `nakadai/nakadai/serviceConfiguration/getAllService`, //查询服务配置 // 项目管理 - 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`, // 复制项目管理 + 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/getBcJudgmentPoint`, // 获取编程类判分点列表(分页) - getLcJudgmentPoint: `judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页) - addProjectJudgment: `occupationlab/projectJudgment/addProjectJudgment`, // 添加项目管理、判分点中间表 - updateProjectJudgment: `occupationlab/projectJudgment/updateProjectJudgment`, // 判分点中间表批量更新 - deleteProjectJudgment: `occupationlab/projectJudgment/deleteProjectJudgment`, // 判分点中间表批量删除 + getBcJudgmentPoint: `judgment/judgment/bcJudgmentPoint/getBcJudgmentPoint`, // 获取编程类判分点列表(分页) + getLcJudgmentPoint: `judgment/judgment/lcJudgmentPoint/queryAllJudgmentPoint`, // 获取流程类判分点列表(分页) + addProjectJudgment: `occupationlab/occupationlab/projectJudgment/addProjectJudgment`, // 添加项目管理、判分点中间表 + updateProjectJudgment: `occupationlab/occupationlab/projectJudgment/updateProjectJudgment`, // 判分点中间表批量更新 + deleteProjectJudgment: `occupationlab/occupationlab/projectJudgment/deleteProjectJudgment`, // 判分点中间表批量删除 // 系统后台 - deleteModelClass: `nakadai/model/reference/deleteModelClass`, - modelClassList: `nakadai/model/reference/modelClassList`, - saveReferenceCategory: `nakadai/model/reference/saveReferenceCategory`, - updateModelClass: `nakadai/model/reference/updateModelClass`, - checkIsShowBySystemId: `nakadai/model/reference/checkIsShowBySystemId`, - modifyIsShowState: `nakadai/model/reference/modifyIsShowState`, + deleteModelClass: `nakadai/nakadai/model/reference/deleteModelClass`, + modelClassList: `nakadai/nakadai/model/reference/modelClassList`, + saveReferenceCategory: `nakadai/nakadai/model/reference/saveReferenceCategory`, + updateModelClass: `nakadai/nakadai/model/reference/updateModelClass`, + checkIsShowBySystemId: `nakadai/nakadai/model/reference/checkIsShowBySystemId`, + modifyIsShowState: `nakadai/nakadai/model/reference/modifyIsShowState`, - delModelInfoBySystemId: `nakadai/model/reference/demo/delModelInfoBySystemId`, - deleteReferenceDemo: `nakadai/model/reference/demo/deleteReferenceDemo`, - referenceFindById: `nakadai/model/reference/demo/findById`, - saveReferenceDemo: `nakadai/model/reference/demo/saveReferenceDemo`, - referenceDemoList: `nakadai/model/reference/demo/referenceDemoList`, - getAllModelList: `nakadai/model/reference/demo/getAllModelList`, - synchronizationMdel: `nakadai/model/reference/demo/synchronizationMdel`, + delModelInfoBySystemId: `nakadai/nakadai/model/reference/demo/delModelInfoBySystemId`, + deleteReferenceDemo: `nakadai/nakadai/model/reference/demo/deleteReferenceDemo`, + referenceFindById: `nakadai/nakadai/model/reference/demo/findById`, + saveReferenceDemo: `nakadai/nakadai/model/reference/demo/saveReferenceDemo`, + referenceDemoList: `nakadai/nakadai/model/reference/demo/referenceDemoList`, + getAllModelList: `nakadai/nakadai/model/reference/demo/getAllModelList`, + synchronizationMdel: `nakadai/nakadai/model/reference/demo/synchronizationMdel`, - deleteSourceModelCategory: `nakadai/model/category/deleteSourceModelCategory`, - categorySave: `nakadai/model/category/save`, - sourceModelClassification: `nakadai/model/category/sourceModelClassification`, - updateSourceModelCategory: `nakadai/model/category/updateSourceModelCategory`, + deleteSourceModelCategory: `nakadai/nakadai/model/category/deleteSourceModelCategory`, + categorySave: `nakadai/nakadai/model/category/save`, + sourceModelClassification: `nakadai/nakadai/model/category/sourceModelClassification`, + updateSourceModelCategory: `nakadai/nakadai/model/category/updateSourceModelCategory`, - bulkDisable: `nakadai/model/demo/bulkDisable`, - deleteSysModelDemo: `nakadai/model/demo/deleteSysModelDemo`, - modelFindById: `nakadai/model/demo/findById`, - saveSysModelDemo: `nakadai/model/demo/saveSysModelDemo`, - sysModelDemoList: `nakadai/model/demo/sysModelDemoList`, - updateSysModelDemo: `nakadai/model/demo/updateSysModelDemo`, - runPythonCode: `nakadai/model/demo/runPythonCode`, - getAllModelListBySys: `nakadai/model/demo/getAllModelListBySys`, + bulkDisable: `nakadai/nakadai/model/demo/bulkDisable`, + deleteSysModelDemo: `nakadai/nakadai/model/demo/deleteSysModelDemo`, + modelFindById: `nakadai/nakadai/model/demo/findById`, + saveSysModelDemo: `nakadai/nakadai/model/demo/saveSysModelDemo`, + sysModelDemoList: `nakadai/nakadai/model/demo/sysModelDemoList`, + updateSysModelDemo: `nakadai/nakadai/model/demo/updateSysModelDemo`, + runPythonCode: `nakadai/nakadai/model/demo/runPythonCode`, + getAllModelListBySys: `nakadai/nakadai/model/demo/getAllModelListBySys`, // 课程管理三级联查 courseDiscipline: `nakadai/nakadai/subject/courseDiscipline`, //课程学科类别 @@ -153,19 +130,19 @@ export default { modifyCourse: `nakadai/nakadai/curriculum/modifyCourse`, //编辑课程 delCourse: `nakadai/nakadai/curriculum/delCourse`, //单个、批量删除课程 isShelves: `nakadai/nakadai/curriculum/isShelves`, //上下架课程 - getInternalProjectBySystemId: `occupationlab/projectManage/getInternalProjectBySystemId`, //根据系统id、项目权限获取系统内置项目 + getInternalProjectBySystemId: `occupationlab/occupationlab/projectManage/getInternalProjectBySystemId`, //根据系统id、项目权限获取系统内置项目 checkConfig: `nakadai/nakadai/curriculum/checkConfig`, // 课程章节管理 - addChapter: `nakadai/curriculum/chapter/addChapter`, //添加章节 - editChapter: `nakadai/curriculum/chapter/editChapter`, //修改章节 - deleteChapter: `nakadai/curriculum/chapter/deleteChapter`, //根据id删除章节 - queryChaptersAndSubsections: `nakadai/curriculum/chapter/queryChaptersAndSubsections`, //根据课程id查询章节小节,树状结构 - reorder: `nakadai/curriculum/chapter/reorder`, //编辑排序 + addChapter: `nakadai/nakadai/curriculum/chapter/addChapter`, //添加章节 + editChapter: `nakadai/nakadai/curriculum/chapter/editChapter`, //修改章节 + deleteChapter: `nakadai/nakadai/curriculum/chapter/deleteChapter`, //根据id删除章节 + queryChaptersAndSubsections: `nakadai/nakadai/curriculum/chapter/queryChaptersAndSubsections`, //根据课程id查询章节小节,树状结构 + reorder: `nakadai/nakadai/curriculum/chapter/reorder`, //编辑排序 // 课程小节管理 - addSubsection: `nakadai/curriculum/subsection/addSubsection`, //添加小节 - deleteSubsection: `nakadai/curriculum/subsection/deleteSubsection`, //根据id删除小节 - editSubsection: `nakadai/curriculum/subsection/editSubsection`, //修改小节 - getSubsection: `nakadai/curriculum/subsection/getSubsection`, //根据小节id获取预览文件地址 + addSubsection: `nakadai/nakadai/curriculum/subsection/addSubsection`, //添加小节 + deleteSubsection: `nakadai/nakadai/curriculum/subsection/deleteSubsection`, //根据id删除小节 + editSubsection: `nakadai/nakadai/curriculum/subsection/editSubsection`, //修改小节 + getSubsection: `nakadai/nakadai/curriculum/subsection/getSubsection`, //根据小节id获取预览文件地址 // 阿里云文件/视频管理 fileDeletion: `${uploadURL}oss/manage/fileDeletion`, // 删除OSS文件 @@ -181,19 +158,6 @@ export default { queryCourseProfessionalClass: `nakadai/nakadai/subject/courseProfessionalClass`, //查询专业类 queryCourseProfessional: `nakadai/nakadai/subject/courseProfessional`, //查询专业 - queryAppConfig: `liuwanr/course/queryAppConfig`, //查询应用配置 - queryTrainingConfig: `liuwanr/course/queryConfig`, //查询实训配置 - deleteTrainingConfig: `liuwanr/course/deleteTrainingConfig`, //删除实训配置 - isShow: `liuwanr/course/isShow`, //是否展示项目控制 - queryCourseDetailsTC: `liuwanr/course/queryCourseDetailsTC`, //查询课程详情课程权限 - - queryLinkDetails: `liuwanr/course/queryLinkDetails`, //查询环节详情 - addCourseLink: `liuwanr/course/addCourseLink`, //添加课程环节 - updateLink: `liuwanr/course/updateLink`, //更新环节 - - uploadFiles: `liuwanr/aliyun/uploadFiles`, //上传文件 - downloadFiles: `liuwanr/aliyun/downloadFiles`, //下载文件 - // 数据管理 getIdQueryTable: `data/data/table/getIdQueryTable`, getTableByClassification: `data/data/table/getTableByClassification`, @@ -209,7 +173,7 @@ export default { staticPreview: `data/data/staticPreview`, editTableName: `data/data/table/editTableName`, updateTableCommit: `data/data/updateTableCommit`, - getLevel: `data/category/getLevel`, + getLevel: `data/data/category/getLevel`, getAllTableInfoByCategoryId: `data/data/product/getAllTableInfoByCategoryId`, // 产品管理 @@ -222,93 +186,93 @@ export default { getAllTableIdBycategoryId: `data/data/product/getAllTableIdBycategoryId`, // 关键词 - addKeyword: `data/keyword/addKeyword`, - deleteKeyword: `data/keyword/deleteKeyword`, - getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`, + addKeyword: `data/data/keyword/addKeyword`, + deleteKeyword: `data/data/keyword/deleteKeyword`, + getKeywordByCategoryId: `data/data/keyword/getKeywordByCategoryId`, // 后台账号 - deleteArch: `nakadai/staffAccountArchitecture/delete`, - saveArch: `nakadai/staffAccountArchitecture/save`, - treeListArch: `nakadai/staffAccountArchitecture/treeList`, - updateArch: `nakadai/staffAccountArchitecture/update`, - delStaff: `nakadai/backstageStaff/delStaff`, - modifyStaff: `nakadai/backstageStaff/modifyStaff`, - saveStaff: `nakadai/backstageStaff/saveStaff`, - staffDetail: `nakadai/backstageStaff/staffDetail`, - staffList: `nakadai/backstageStaff/staffList`, - importStaff: `${host}nakadai/backstageStaff/importStaff`, - exportFailure: `${host}nakadai/backstageStaff/exportFailure`, + deleteArch: `nakadai/nakadai/staffAccountArchitecture/delete`, + saveArch: `nakadai/nakadai/staffAccountArchitecture/save`, + treeListArch: `nakadai/nakadai/staffAccountArchitecture/treeList`, + updateArch: `nakadai/nakadai/staffAccountArchitecture/update`, + delStaff: `nakadai/nakadai/backstageStaff/delStaff`, + modifyStaff: `nakadai/nakadai/backstageStaff/modifyStaff`, + saveStaff: `nakadai/nakadai/backstageStaff/saveStaff`, + staffDetail: `nakadai/nakadai/backstageStaff/staffDetail`, + staffList: `nakadai/nakadai/backstageStaff/staffList`, + importStaff: `${host}nakadai/nakadai/backstageStaff/importStaff`, + exportFailure: `${host}nakadai/nakadai/backstageStaff/exportFailure`, // 角色管理 - 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`, //查询所有菜单 // 日志管理 - logAdd: `nakadai/log/add`, - logDel: `nakadai/log/delete`, - logGet: `nakadai/log/get`, - logManagementList: `nakadai/log/logManagementList`, - platformLogList: `nakadai/log/platformLogList`, - listUpdate: `nakadai/log/update`, - checkRepeat: `nakadai/log/checkRepeat`, - logWithdrawal: `nakadai/log/logWithdrawal`, + logAdd: `nakadai/nakadai/log/add`, + logDel: `nakadai/nakadai/log/delete`, + logGet: `nakadai/nakadai/log/get`, + logManagementList: `nakadai/nakadai/log/logManagementList`, + platformLogList: `nakadai/nakadai/log/platformLogList`, + listUpdate: `nakadai/nakadai/log/update`, + checkRepeat: `nakadai/nakadai/log/checkRepeat`, + logWithdrawal: `nakadai/nakadai/log/logWithdrawal`, // 合伙人 - deleteParner: `nakadai/partnerClassification/delete`, - saveParner: `nakadai/partnerClassification/save`, - listParner: `nakadai/partnerClassification/treeList`, - updateParner: `nakadai/partnerClassification/update`, + deleteParner: `nakadai/nakadai/partnerClassification/delete`, + saveParner: `nakadai/nakadai/partnerClassification/save`, + listParner: `nakadai/nakadai/partnerClassification/treeList`, + updateParner: `nakadai/nakadai/partnerClassification/update`, - delPartnerAccount: `nakadai/partnerAccount/delPartnerAccount`, - modifyPartnerAccount: `nakadai/partnerAccount/modifyPartnerAccount`, - partnerAccountDetail: `nakadai/partnerAccount/partnerAccountDetail`, - partnerAccountList: `nakadai/partnerAccount/partnerAccountList`, - savePartnerAccount: `nakadai/partnerAccount/savePartnerAccount`, - generateInvitationCode: `nakadai/partnerAccount/generateInvitationCode`, - generationQrCode: `nakadai/partnerAccount/generationQrCode`, - queryUserInfoByPhone: `nakadai/partner-team/queryUserInfoByPhone`, - getAllTeam: `nakadai/partnerClassification/getAllTeam`, - partnerRemoval: `nakadai/partnerAccount/partnerRemoval`, - generateTransferCode: `nakadai/partnerAccount/generateTransferCode`, - transferAdmin: `nakadai/partnerAccount/transferAdmin`, - transferTeam: `nakadai/partnerAccount/transferTeam`, - partnerAccountMergeList: `nakadai/partnerAccount/partnerAccountMergeList`, + delPartnerAccount: `nakadai/nakadai/partnerAccount/delPartnerAccount`, + modifyPartnerAccount: `nakadai/nakadai/partnerAccount/modifyPartnerAccount`, + partnerAccountDetail: `nakadai/nakadai/partnerAccount/partnerAccountDetail`, + partnerAccountList: `nakadai/nakadai/partnerAccount/partnerAccountList`, + savePartnerAccount: `nakadai/nakadai/partnerAccount/savePartnerAccount`, + generateInvitationCode: `nakadai/nakadai/partnerAccount/generateInvitationCode`, + generationQrCode: `nakadai/nakadai/partnerAccount/generationQrCode`, + queryUserInfoByPhone: `nakadai/nakadai/partner-team/queryUserInfoByPhone`, + getAllTeam: `nakadai/nakadai/partnerClassification/getAllTeam`, + partnerRemoval: `nakadai/nakadai/partnerAccount/partnerRemoval`, + generateTransferCode: `nakadai/nakadai/partnerAccount/generateTransferCode`, + transferAdmin: `nakadai/nakadai/partnerAccount/transferAdmin`, + transferTeam: `nakadai/nakadai/partnerAccount/transferTeam`, + partnerAccountMergeList: `nakadai/nakadai/partnerAccount/partnerAccountMergeList`, // 赛事 - contestPageConditionQueryByNakadai: `occupationlab/enterprise/match/contest/contestPageConditionQueryByNakadai`, - 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`, + contestPageConditionQueryByNakadai: `occupationlab/occupationlab/enterprise/match/contest/contestPageConditionQueryByNakadai`, + 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`, }; \ No newline at end of file diff --git a/src/views/Login.vue b/src/views/Login.vue index dd5dc6d..0f58088 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -308,7 +308,6 @@ export default { .login-wrap { position: relative; width: 100%; - height: 100%; background-image: url(../assets/img/login-bg.png); background-size: 100%; } @@ -322,8 +321,8 @@ export default { /deep/ .ms-login { position: relative; width: 1200px; - height: calc(92vh - 60px); - margin: 60px auto 20px; + height: calc(92vh - 40px); + margin: 60px auto 0; background-image: url(../assets/img/login-input.png); box-shadow:0px 0px 79px 0px rgba(11,15,65,0.36); background-repeat: no-repeat; diff --git a/src/views/match/add/index.vue b/src/views/match/add/index.vue index 21be398..7873e21 100644 --- a/src/views/match/add/index.vue +++ b/src/views/match/add/index.vue @@ -401,7 +401,7 @@ export default { }).catch(res => {}) }, handleAnnexRemove(file, fileList) { - this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {}) + file.url && this.$del(`${this.api.fileDeletion}?keys=${file.url}`).then(res => {}).catch(res => {}) }, // 预览附件 previewFile(item) { @@ -436,6 +436,7 @@ export default { this.submiting = true form.publishStatus = status + form.ztOpen = status ? 0 : 1 // 保存则禁用，发布则启用 if (this.form.id) { this.$put(this.api.editContest, form).then(res => { this.submiting = false; @@ -631,7 +632,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; @@ -652,6 +653,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/views/match/list/index.vue b/src/views/match/list/index.vue index 5818eae..81258c6 100644 --- a/src/views/match/list/index.vue +++ b/src/views/match/list/index.vue @@ -52,7 +52,7 @@ - + @@ -62,27 +62,23 @@ {{ rangeList.find(e => e.id === scope.row.competitionScope).name }} - - + + - + - - + + - - - - - - - \ No newline at end of file diff --git a/src/views/match/manage/index.vue b/src/views/match/manage/index.vue index 17f14be..1152a65 100644 --- a/src/views/match/manage/index.vue +++ b/src/views/match/manage/index.vue @@ -32,7 +32,7 @@ export default { name: "matchManage", data() { return { - name: '', + name: this.$route.query.name, active: this.$route.query.tab || "first", tabs: { first: "大赛详情", @@ -49,20 +49,19 @@ export default { MatchSignup }, mounted() { - // console.log(33, this.$refs.detail.form) + }, 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) @@ -79,15 +78,16 @@ export default { } }, backPage(){ - this.$router.back() + this.$router.push(`/match?page=${this.$store.state.matchPage}`) }, tabSwitch(i) { this.active = i - this.$router.push(`/matchManage?id=${this.$route.query.id}&tab=${i}`) + this.$router.push(`/matchManage?id=${this.$route.query.id}&tab=${i}&name=${this.name}`) }, backOrTab(i) { i ? this.tabSwitch(i) : this.backPage() }, + // tab回调 tabChange(i) { this.handleSave(i) && this.tabSwitch(i) } diff --git a/src/views/match/manage/notice.vue b/src/views/match/manage/notice.vue index a0a0cfa..112f95c 100644 --- a/src/views/match/manage/notice.vue +++ b/src/views/match/manage/notice.vue @@ -120,6 +120,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/views/match/manage/noticeDetail.vue b/src/views/match/manage/noticeDetail.vue index e6403b3..8d694d8 100644 --- a/src/views/match/manage/noticeDetail.vue +++ b/src/views/match/manage/noticeDetail.vue @@ -114,6 +114,7 @@ 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("修改成功") diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue index 92371e4..9c4188c 100644 --- a/src/views/system/manageLog.vue +++ b/src/views/system/manageLog.vue @@ -43,7 +43,7 @@