From dbf89c8a9b3b983b90f76775dff252f593c4195c Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Mon, 4 Sep 2023 11:42:25 +0800 Subject: [PATCH] fix --- public/index.html | 49 +-- src/api/index.js | 2 + src/pages/course/list/index.vue | 498 ++++++++++++++++-------------- src/pages/index/list/index.vue | 8 +- src/pages/match/details/index.vue | 35 ++- src/setting.js | 4 +- 6 files changed, 326 insertions(+), 270 deletions(-) diff --git a/public/index.html b/public/index.html index 2d6bb08..0b1b861 100644 --- a/public/index.html +++ b/public/index.html @@ -1,22 +1,33 @@ - - - - - - - - - 职站——为院校打造一站式虚拟仿真实训教学数智云平台 - - - -
- - - - + + + + + + + + + 职站——为院校打造一站式虚拟仿真实训教学数智云平台 + + + + +
+ + + diff --git a/src/api/index.js b/src/api/index.js index 6de39a0..8ffbb47 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -215,4 +215,6 @@ export default { courseRankings: `occupationlab/occupationlab/data/kanban/courseRankings`, platformLoginStatistics: `users/users/user/platformLoginStatistics`, activityRanking: `occupationlab/occupationlab/data/kanban/activityRanking`, + + listByEntity: `product/productLogo/listByEntity`, }; \ No newline at end of file diff --git a/src/pages/course/list/index.vue b/src/pages/course/list/index.vue index ca29762..8b2a653 100644 --- a/src/pages/course/list/index.vue +++ b/src/pages/course/list/index.vue @@ -1,221 +1,252 @@ @@ -225,9 +256,9 @@ export default { padding: 100px 0 130px; text-align: center; background: url(../../../assets/img/course-bg2.png) (73px 50px)/250px auto no-repeat, - url(../../../assets/img/course-bg4.png) (top left)/auto no-repeat, - url(../../../assets/img/course-bg3.png) (top right)/auto no-repeat, - url(../../../assets/img/course-bg1.png) 0 0/100% 100% no-repeat; + url(../../../assets/img/course-bg4.png) (top left) / auto no-repeat, + url(../../../assets/img/course-bg3.png) (top right) / auto no-repeat, + url(../../../assets/img/course-bg1.png) 0 0/100% 100% no-repeat; h6 { margin-bottom: 25px; font-size: 26px; @@ -269,8 +300,8 @@ export default { border-bottom: 3px solid transparent; cursor: pointer; &.active { - color: #007EFF; - border-color: #007EFF; + color: #007eff; + border-color: #007eff; } } } @@ -305,14 +336,14 @@ export default { .courses { position: relative; padding: 10px 0 20px; - background: url(../../../assets/img/course3.png) 0 0/auto no-repeat; + background: url(../../../assets/img/course3.png) 0 0 / auto no-repeat; .course-bg { - position: absolute; - top: 0; - right: 0; - width: 602px; - height: 100%; - background: url(../../../assets/img/course4.png) (0 -100px)/140% 140% no-repeat; + position: absolute; + top: 0; + right: 0; + width: 602px; + height: 100%; + background: url(../../../assets/img/course4.png) (0 -100px)/140% 140% no-repeat; } ul { position: relative; @@ -334,11 +365,11 @@ export default { img { width: 100%; height: 165px; - transition: .3s; + transition: 0.3s; } .title { margin: 10px 0 5px; - color: #0B1D30; + color: #0b1d30; font-size: 16px; word-wrap: break-word; word-break: break-all; @@ -352,7 +383,7 @@ export default { background-color: #f00; } .desc { - color: #757F92; + color: #757f92; font-size: 14px; display: -webkit-box; -webkit-box-orient: vertical; @@ -366,36 +397,37 @@ export default { } } .type { - display: inline-block; - padding: 2px 10px; - border-radius: 20px; - color: #1cdbb8; - border: 1px solid; + display: inline-block; + padding: 2px 10px; + border-radius: 20px; + color: #1cdbb8; + border: 1px solid; } .metas { - display: flex; - justify-content: space-between; - align-items: center; - margin-top: 10px; + display: flex; + justify-content: space-between; + align-items: center; + margin-top: 10px; } .meta { - color: #a9a9a9; - font-size: 12px; + color: #a9a9a9; + font-size: 12px; } .collect { - font-size: 20px; + font-size: 20px; } &:hover { - box-shadow: 0px 5px 12px 4px rgba(142, 123, 253, 0.09), 0px 3px 6px 0px rgba(142, 123, 253, 0.12), 0px 1px 2px -2px rgba(142, 123, 253, 0.16); + box-shadow: 0px 5px 12px 4px rgba(142, 123, 253, 0.09), 0px 3px 6px 0px rgba(142, 123, 253, 0.12), + 0px 1px 2px -2px rgba(142, 123, 253, 0.16); img { - transform: scale(1.05); + transform: scale(1.05); } } } @media (max-width: 1700px) { - li { - width: calc(25% - 20px); - } + li { + width: calc(25% - 20px); + } } } } diff --git a/src/pages/index/list/index.vue b/src/pages/index/list/index.vue index 0303aaa..d25753a 100644 --- a/src/pages/index/list/index.vue +++ b/src/pages/index/list/index.vue @@ -352,9 +352,9 @@ alt="">
-

售前咨询

+

产品咨询

郭晶

+ style="margin-bottom: 5px">郭老师

17671782660

@@ -396,7 +396,9 @@ export default { methods: { toPart (i) { this.active = i - document.querySelector(`#part${i}`).scrollIntoView() + document.querySelector(`#part${i}`).scrollIntoView({ + behavior: 'smooth' + }) }, // 置顶 topping () { diff --git a/src/pages/match/details/index.vue b/src/pages/match/details/index.vue index 59fd3fc..67ccd99 100644 --- a/src/pages/match/details/index.vue +++ b/src/pages/match/details/index.vue @@ -1166,19 +1166,28 @@ export default { }, // 移除参赛人员 removePar (e, stage) { - this.$confirm('确定要移除该成员吗？', '提示', { - type: 'warning' - }).then(() => { - this.$post(this.api.cancelParticipant, { - accountId: e.id, - competitionId: this.id, - stageId: stage.stageId, - teamId: this.info.teamId - }).then(res => { - util.successMsg('移除成功') - this.getInfo() - }).catch(res => { }) - }).catch(() => { }) + const item = this.form.competitionStage.find(e => e.stageId == stage.stageId) + if (item) { + // 该阶段已经开始比赛则不能修改 + const now = new Date() + if (now >= new Date(item.startTime) && now <= new Date(item.endTime)) { + return util.errorMsg('该阶段比赛已经开始，无法修改允许参赛人员！') + } else { + this.$confirm('确定要移除该成员吗？', '提示', { + type: 'warning' + }).then(() => { + this.$post(this.api.cancelParticipant, { + accountId: e.id, + competitionId: this.id, + stageId: stage.stageId, + teamId: this.info.teamId + }).then(res => { + util.successMsg('移除成功') + this.getInfo() + }).catch(res => { }) + }).catch(() => { }) + } + } }, // 选择参赛人员 selectPar (row) { diff --git a/src/setting.js b/src/setting.js index 1009bd2..7abfe4f 100644 --- a/src/setting.js +++ b/src/setting.js @@ -28,8 +28,8 @@ if (isPro) { uploadURL = `http://121.37.12.51/` host = "http://121.37.12.51/"; // 测试服 // host = 'https://www.occupationlab.com/' // 正式服 - // host = "http://192.168.31.152:9000/"; // 榕 - host = "http://192.168.31.51:9000/"; // 赓 + // host = "http://192.168.31.217:9000/"; // 榕 + // host = "http://192.168.31.51:9000/"; // 赓 } const Setting = {