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

南京二号线行调调整

Browse Source
This commit is contained in:
fan 2021-10-12 15:50:02 +08:00
parent 720a638720
commit b3b5780a27
4 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/jmapNew/config/skinCode/nanjing_02.js
View File

@ -285,7 +285,7 @@ class SkinCode extends defaultStyle {
this[deviceType.StationStand] = {
// 哈尔滨一号线站台元素 站台 站台紧急关闭 扣车元素 停站时间 运行等级 跳停
elemnetType:['gapStand', 'emergentArrow', 'detainNormal', 'level', 'jump', 'trainStop', 'trainDepart', 'stationPlatform'],
elemnetType:['gapStand', 'emergentArrow', 'detainNormal', 'level', 'jump', 'trainStop', 'trainDepart'],
// 站台
gapStand:{
// 层级
@ -314,13 +314,14 @@ class SkinCode extends defaultStyle {
detainNormal:{
z:0,
position: 1, // 扣车标识在站台上显示方向
special:true,
special:false,
text: 'H', // 扣车显示内容
insideOffset: { x: 15, y: -28 }, // 内站台扣车偏移量
outsideOffset: { x:15, y: 22 }, // 外站台扣车偏移量
centerTrainColor: '#ff0', // 中心扣车颜色
andCenterTrainColor: '#ff0', // 车站+中心扣车颜色
detainTrainTextColor: '#ff0', // 车站扣除文字颜色
noDetainTrainColor: '#8D918F', // 无扣车文字颜色
fontSize: 14, // 字体大小
fontWeight: 'bolder',
textVerticalAlign: 'middle' // 车站扣车 文字垂直对齐方式

4
src/jmapNew/shape/graph/StationStand/detain/EDetain.js
View File

@ -24,6 +24,7 @@ class EDetain extends Group {
this.detain = new Text({
zlevel: this.model.zlevel,
z: this.model.z,
_subType: 'StandDetain',
position: [0, 0],
style: {
x: detainX,
@ -77,6 +78,9 @@ class EDetain extends Group {
} else if (model.ibpHoldTrain) {
this.showMode(deviceParam);
this.setColor(deviceParam.ibpDetainTrainColor);
} else if (deviceParam.noDetainTrainColor) {
this.showMode(deviceParam);
this.setColor(deviceParam.noDetainTrainColor);
}
}
}

2
src/jmapNew/theme/nanjing_02/menus/menuButton.vue
View File

@ -653,7 +653,7 @@ export default {
});
},
handleIbpShow() {
if (this.selectedObj._type == 'StationStand' && this.$store.state.menuOperation.subType == 'StationPlatform') {
if (this.selectedObj._type == 'StationStand' && (this.$store.state.menuOperation.subType == 'StationPlatform' || this.$store.state.menuOperation.subType == 'StandDetain')) {
if (!(this.selectedObj.assignSkip || this.selectedObj.allSkip || this.selectedObj.centerHoldTrain || this.selectedObj.stationHoldTrain)) {
this.allowCancle = false;
} else {

37
src/views/newMap/displayBaSiDi/tmt.vue
View File

@ -44,9 +44,21 @@
</div>
<div v-if="operationType === 'show'">
<el-table :data="tableData" border style="width: 100%;margin-top: 20px;" height="200">
<el-table-column prop="date" label="方向" />
<el-table-column prop="name" label="列车号" />
<el-table-column prop="address" label="位置" />
<el-table-column prop="date" label="方向">
<template slot-scope="scope">
<span>{{ scope.row.right ? '>':'<' }}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="列车号">
<template slot-scope="scope">
<span>{{ getTrainCode(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column prop="address" label="位置">
<template slot-scope="scope">
<span>{{ getSectionPosition(scope.row.sectionCode) }}</span>
</template>
</el-table-column>
<el-table-column prop="address" label="ARS" />
<el-table-column prop="address" label="晚点" />
</el-table>
@ -54,7 +66,11 @@
<div v-else-if="operationType === 'create'" style="display: flex;justify-content: space-between;">
<div>
<el-table :data="tableData" border style="width: 280px;margin-top: 20px;" height="200">
<el-table-column prop="date" label="方向" width="60" />
<el-table-column prop="date" label="方向" width="60">
<template slot-scope="scope">
<span>{{ scope.row.right ? '>':'<' }}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="列车号" width="157">
<template slot-scope="scope">
<span>{{ getTrainCode(scope.row) }}</span>
@ -109,7 +125,11 @@
<div>
<div style="margin-top: 20px;height: 20px;">插入位置（之前）：</div>
<el-table :data="tableData" border style="width: 280px;" height="180">
<el-table-column prop="date" label="方向" width="60" />
<el-table-column prop="date" label="方向" width="60">
<template slot-scope="scope">
<span>{{ scope.row.right ? '>':'<' }}</span>
</template>
</el-table-column>
<el-table-column prop="name" label="列车号" width="157">
<template slot-scope="scope">
<span>{{ getTrainCode(scope.row) }}</span>
@ -329,12 +349,15 @@ export default {
this.activeIndex = tab;
},
trainFind() {
if (this.trainCode) {
const train = this.$store.getters['map/getDeviceByCode'](this.trainCode);
this.tableData = [train];
this.tableData = train ? [train] : [];
} else { this.tableData = []; }
this.operationType = 'show';
},
resetTrainCode() {
this.trainCode = '';
this.tableData = [];
},
changeOperationType(type) {
this.operationType = type;
@ -400,7 +423,9 @@ export default {
});
},
getTrainCode(train) {
if (train) {
return train.destinationCode + train.serviceNumber + (train.tripNumber.substr(1, 2));
}
},
getSectionPosition(sectionCode) {
const section = this.$store.getters['map/getDeviceByCode'](sectionCode);