diff --git a/src/api/competition.js b/src/api/competition.js index 9f6b53b27..30f7082de 100644 --- a/src/api/competition.js +++ b/src/api/competition.js @@ -37,6 +37,23 @@ export function participantCompleteCompetition(id, group) { }); } +/** 分页获取地图下的实操列表 */ +export function getQuestionListByMapId(params) { + return request({ + url: `/api/v1/competitionPractical`, + method: 'get', + params + }); +} + +// 加载实操及内容 +export function loadQuestionList(data) { + return request({ + url: `/api/v1/competitionPractical/distribute`, + method: 'post', + data + }); +} /** 竞赛报名 */ export function postSignUp(id, data) { return request({ diff --git a/src/jmapNew/config/skinCode/bejing_01.js b/src/jmapNew/config/skinCode/bejing_01.js index b894c34d1..ca1198906 100644 --- a/src/jmapNew/config/skinCode/bejing_01.js +++ b/src/jmapNew/config/skinCode/bejing_01.js @@ -559,6 +559,12 @@ class SkinCode extends defaultStyle { trainBodyFillColor: '#725A64', // 列车车身填充颜色 trainNameFormat: 'serviceNumber:tripNumber'// 列车显示格式 }, + soonerOrLater: { + level: 3, + earlyColor: '#00FF00', + lateColor: '#F4A460', + normalColor: '#FFF' + }, directionArrow: { }, hsda: { diff --git a/src/jmapNew/config/skinCode/haerbin_01.js b/src/jmapNew/config/skinCode/haerbin_01.js index abde2a07c..7075919f8 100644 --- a/src/jmapNew/config/skinCode/haerbin_01.js +++ b/src/jmapNew/config/skinCode/haerbin_01.js @@ -560,6 +560,7 @@ class SkinCode extends defaultStyle { trainNameFormat: 'tripNumber:serviceNumber:groupNumber'// 列车显示格式 }, soonerOrLater: { + level: 5, earlyColor: '#00FF00', severeEarlyColor: '#0000FF', lateColor: '#FF00FF', diff --git a/src/jmapNew/config/skinCode/xian_01.js b/src/jmapNew/config/skinCode/xian_01.js index 7cc4b492b..3d9189ad3 100644 --- a/src/jmapNew/config/skinCode/xian_01.js +++ b/src/jmapNew/config/skinCode/xian_01.js @@ -233,7 +233,8 @@ class SkinCode extends defaultStyle { trainColor: '#E4EF50', // 车站扣车颜色 centerTrainColor: '#FFFFFF', // 中心扣车颜色 andCenterTrainColor: '#F61107', // 车站+中心扣车颜色 - detainTrainTextColor: '#E4EF50' // 车站扣除文字颜色 + detainTrainTextColor: '#E4EF50', // 车站扣除文字颜色 + circle: true // 空心圆环 }, stopTime: { // 停站时间 position: 1, // 运行时间方向 diff --git a/src/jmapNew/shape/StationStand/EDetain.js b/src/jmapNew/shape/StationStand/EDetain.js index 284c796da..1f17152cb 100644 --- a/src/jmapNew/shape/StationStand/EDetain.js +++ b/src/jmapNew/shape/StationStand/EDetain.js @@ -1,5 +1,6 @@ import Group from 'zrender/src/container/Group'; import Text from 'zrender/src/graphic/Text'; +import Circle from 'zrender/src/graphic/shape/Circle'; class EDetain extends Group { constructor(model) { @@ -29,6 +30,24 @@ class EDetain extends Group { textVerticalAlign: style.textStyle.textVerticalAlign } }); + if (style.StationStand.detainCar.circle) { + const offsetX = model.right ? 8 : -8; + this.circleDetain = new Circle({ + zlevel: model.zlevel, + z: model.z, + shape: { + cx: model.x + offsetX, + cy: model.y - 3, + r: 2 + }, + style: { + fill: '#000', + lineWidth: 1, + stroke: '#FFf' + } + }); + this.add(this.circleDetain); + } this.add(this.detain); } } diff --git a/src/jmapNew/shape/Train/TrainBody.js b/src/jmapNew/shape/Train/TrainBody.js index 3599e5ab8..3c60f575a 100644 --- a/src/jmapNew/shape/Train/TrainBody.js +++ b/src/jmapNew/shape/Train/TrainBody.js @@ -308,7 +308,7 @@ export default class TrainBody extends Group { } } setSoonerOrLater(dt) { - if (this.style.Train.soonerOrLater) { + if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 5) { if (dt > 120) { this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.severeEarlyColor}); this.delayTime && this.delayTime.setStyle({textFill: this.style.Train.soonerOrLater.severeEarlyColor}); @@ -325,7 +325,14 @@ export default class TrainBody extends Group { this.trainBodyBox && this.trainBodyBox.setColor({stroke: this.style.Train.soonerOrLater.normalColor}); this.delayTime && this.delayTime.setStyle({textFill: this.style.Train.soonerOrLater.normalColor}); } + } else if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 3) { + if (dt > 0) { + } else if (dt < 0) { + + } else { + + } } } formatChangePosition(model, style) { diff --git a/src/utils/baseUrl.js b/src/utils/baseUrl.js index 7bdd7df48..e9046878d 100644 --- a/src/utils/baseUrl.js +++ b/src/utils/baseUrl.js @@ -2,10 +2,10 @@ export function getBaseUrl() { let BASE_API; if (process.env.NODE_ENV === 'development') { // BASE_API = 'https://joylink.club/jlcloud'; - // BASE_API = 'https://test.joylink.club/jlcloud'; + BASE_API = 'https://test.joylink.club/jlcloud'; // BASE_API = 'http://192.168.3.5:9000'; // 袁琪 // BASE_API = 'http://192.168.3.6:9000'; // 旭强 - BASE_API = 'http://192.168.3.41:9000'; // 张赛 + // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://192.168.3.82:9000'; // 杜康 // BASE_API = 'http://192.168.3.41:9000'; // 张赛 // BASE_API = 'http://b29z135112.zicp.vip'; diff --git a/src/views/competitionManage/index.vue b/src/views/competitionManage/index.vue index 15a61bff5..b7c1e32a6 100644 --- a/src/views/competitionManage/index.vue +++ b/src/views/competitionManage/index.vue @@ -70,6 +70,15 @@ export default { name: '修改', handleClick: this.update, type: '' + }, + { + name: '报名地址', + handleClick: this.showApplyUrl, + type: '' + }, + { + name: '参赛地址', + handleClick: this.showJoinUrl } ] } @@ -106,6 +115,12 @@ export default { }, update(index, row) { this.$refs.createRace.doShow(row); + }, + showJoinUrl(index, row) { + this.$messageBox(`${row.name}参赛路径：${window.location.protocol}//${window.location.host}/jsxt/login?raceId=${row.id}`); + }, + showApplyUrl(index, row) { + this.$messageBox(`${row.name}报名路径：${window.location.protocol}//${window.location.host}/jsxtApply?raceId=${row.id}`); } } }; diff --git a/src/views/jsxt/refereeList/index.vue b/src/views/jsxt/refereeList/index.vue index f12a79a56..fcb33ed9b 100644 --- a/src/views/jsxt/refereeList/index.vue +++ b/src/views/jsxt/refereeList/index.vue @@ -1,81 +1,61 @@ +