joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of https://git.code.tencent.com/lian-cbtc/jl-client into test

Browse Source 
# Conflicts:
#	src/views/competitionManage/index.vue
This commit is contained in:
zyy 2020-05-22 15:45:16 +08:00
commit e535b1e5d1
5 changed files with 73 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/jmapNew/config/skinCode/xian_01.js
View File

@ -591,7 +591,13 @@ class SkinCode extends defaultStyle {
tripNumberPrefix: '0000', // 车次号前缀
defaultDirectionCode: 'D', // 默认车次号1
defaultTripNumber: 'CCC', // 默认车次号2
trainTargetOffset: { x: 42, y: 1}// 列车车次号偏移
trainTargetOffset: { x: 42, y: 1}, // 列车车次号偏移
smallColor: '#70ECEE', // 小交路颜色
bigColor: '#FFFFFF', // 大交路颜色
inboundColor: '#00FF00', // 回库颜色
planTypeColor: '#FFFFFF', // 计划车颜色
manualTypeColor: '#FF0', // 人工车
headTypeColor: '#FF0' // 头码车
},
trainTargetNumber: {
groupNumberPrefix: '000', // 车组号前缀

18
src/jmapNew/shape/Train/TrainBody.js
View File

@ -307,6 +307,24 @@ export default class TrainBody extends Group {
return new BoundingRect(0, 0, 0, 0);
}
}
setPlanRoutingTypeColor(planRoutingTypes) {
if (planRoutingTypes === 'BIG') {
this.style.Train.trainTarget.bigColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.bigColor});
} else if (planRoutingTypes === 'SMALL') {
this.style.Train.trainTarget.smallColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.smallColor});
} else if (planRoutingTypes === 'INBOUND') {
this.style.Train.trainTarget.inboundColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.inboundColor});
}
}
setTrainTypeColor(type) {
if (type === 'PLAN') {
this.style.Train.trainTarget.planTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.planTypeColor});
} else if (type === 'MANUAL') {
this.style.Train.trainTarget.manualTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.manualTypeColor});
} else if (type === 'HEAD') {
this.style.Train.trainTarget.headTypeColor && this.textTrainTarget && this.textTrainTarget.setStyle({textFill: this.style.Train.trainTarget.headTypeColor});
}
}
setSoonerOrLater(dt) {
if (this.style.Train.soonerOrLater && this.style.Train.soonerOrLater.level === 5) {
if (dt > 120) {

8
src/jmapNew/shape/Train/index.js
View File

@ -408,6 +408,8 @@ export default class Train extends Group {
this.setHoldStatus(model.hold);
this.setJumpStatus(model.jump);
this.setSoonerOrLater(model.dt);
this.setPlanRoutingTypeColor(model.planRoutingType);
this.setTrainTypeColor(model.type);
const style = this.style;
if (style.Section.trainPosition.display) {
this.updateSection(object);
@ -427,6 +429,12 @@ export default class Train extends Group {
// this.setTrainTypeStatus(model.type); // 根据列车类型设置列车识别号样式
// }
}
setTrainTypeColor(type) {
this.trainB && this.trainB.setTrainTypeColor(type);
}
setPlanRoutingTypeColor(planRoutingType) {
this.trainB && this.trainB.setPlanRoutingTypeColor(planRoutingType);
}
// 是否根据车身上车组号、服务号、车次号、目的地码显示情况改变列车长度
isChangeTrainWidth(model, style) {
if (!style.Train.trainBody.changeTrainWidth) { return; }

2
src/views/competitionManage/create.vue
View File

@ -14,7 +14,7 @@
/>
</el-select>
</el-form-item>
<el-form-item label="开启日期:" prop="startDate">
<el-form-item label="开始日期:" prop="startDate">
<el-date-picker
v-model="formModel.startDate"
type="date"

52
src/views/competitionManage/index.vue
View File

@ -2,6 +2,7 @@
<div>
<QueryListPage ref="queryListPage" :pager-config="pagerConfig" :query-form="queryForm" :query-list="queryList" />
<create-race ref="createRace" :map-list="mapList" @refresh="refresh" />
<input id="competition-manage-url" v-model="url" style="opacity: 0;">
</div>
</template>
@ -92,7 +93,8 @@ export default {
]
},
mapList: [],
currentModel: {}
currentModel: {},
url: ''
};
},
computed: {
@ -121,25 +123,49 @@ export default {
this.$refs.createRace.doShow(row);
},
showJoinUrl(index, row) {
const url = `${window.location.protocol}//${window.location.host}/jsxt/login?raceId=${row.id}`;
this.url = url;
this.$messageBox();
this.$alert(`${row.name}参赛地址：${window.location.protocol}//${window.location.host}/jsxt/login?raceId=${row.id}`, '', {
confirmButtonText: '确定',
showClose: false,
callback: action => {}
this.$confirm(`${row.name}参赛路径：${url}`, '参赛路径', {
confirmButtonText: '复制路径',
cancelButtonText: '关闭',
type: 'success'
}).then(() => {
const inputText = document.getElementById('competition-manage-url');
inputText.select(); // 选择对象
document.execCommand('Copy'); // 执行浏览器复制命令
this.$message.success('参赛路径已经复制到粘贴板');
});
},
showApplyUrl(index, row) {
this.$alert(`${row.name}报名地址：${window.location.protocol}//${window.location.host}/jsxtApply?raceId=${row.id}`, '', {
confirmButtonText: '确定',
showClose: false,
callback: action => {}
// this.$messageBox(`${row.name}报名路径：${window.location.protocol}//${window.location.host}/jsxtApply?raceId=${row.id}`);
const url = `${window.location.protocol}//${window.location.host}/jsxtApply?raceId=${row.id}`;
this.url = url;
this.$messageBox();
this.$confirm(`${row.name}报名路径：${url}`, '报名路径', {
confirmButtonText: '复制路径',
cancelButtonText: '关闭',
type: 'success'
}).then(() => {
const inputText = document.getElementById('competition-manage-url');
inputText.select(); // 选择对象
document.execCommand('Copy'); // 执行浏览器复制命令
this.$message.success('报名路径已经复制到粘贴板');
});
},
showRefereeUrl(index, row) {
this.$alert(`${row.name}裁判地址：${window.location.protocol}//${window.location.host}/refereeJsxt/login?raceId=${row.id}`, '', {
confirmButtonText: '确定',
showClose: false,
callback: action => {}
const url = `${window.location.protocol}//${window.location.host}/refereeJsxt/login?raceId=${row.id}`;
this.url = url;
this.$messageBox();
this.$confirm(`${row.name}裁判地址：${url}`, '报名路径', {
confirmButtonText: '复制路径',
cancelButtonText: '关闭',
type: 'success'
}).then(() => {
const inputText = document.getElementById('competition-manage-url');
inputText.select(); // 选择对象
document.execCommand('Copy'); // 执行浏览器复制命令
this.$message.success('报名路径已经复制到粘贴板');
});
}
}