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
This commit is contained in:
fan 2020-09-09 10:29:06 +08:00
commit 201252dbf9
2 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/jmapNew/shape/Section/index.js
View File

@ -718,7 +718,6 @@ export default class Section extends Group {
lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
});
}
// this.protectiveTimeRelease();
}
// /** 延时释放*/
@ -741,25 +740,6 @@ export default class Section extends Group {
// }
// }
/** 保护区段延时解锁 时间计时*/
protectiveTimeRelease() {
// console.log(this.model);
// this.releaseName.setStyle('text', '20');
// this.section.setStyle({
// stroke: this.style.Section.line.protectiveLockColor,
// lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
// });
// this.release && this.release.show();
// this.release && this.release.setStyle({
// stroke: this.style.Section.line.protectiveLockColor,
// lineWidth: this.style.Section.line.width + this.style.Section.line.beyondWidth
// });
// this.release && this.release.animateStyle(true, [
// { time: 1000, styles: { stroke: this.style.Section.line.protectiveLockColor } },
// { time: 2000, styles: { stroke: this.style.Section.line.protectiveTimeReleaseColor } }
// ]);
}
/** 区段切除*/
sectionCutOff() {
const lineWidth = this.style.Section.line.width + (this.model.status != '01' ? this.style.Section.line.beyondWidth : 0);

30
src/jmapNew/theme/xian_02/menus/dialog/trainDestination.vue
View File

@ -41,7 +41,7 @@
<el-col :span="12">
<el-select v-model="addModel.operation" placeholder="请选择">
<el-option
v-for="item in typeList"
v-for="item in typeList1"
:key="item.value"
:label="item.label"
:value="item.value"
@ -50,7 +50,7 @@
</el-col>
</el-row>
<el-row class="option_box">
<div v-for="(item, index) in optionObject[addModel.operation]" :key="index" class="content_list" :class="{'active': item.active}" @click="handleOption(item)">{{ item.name }}</div>
<div v-for="(item, index) in optionObject" :key="index" class="content_list" :class="{'active': item.active}" @click="handleOption(item)">{{ item.name }}</div>
</el-row>
<el-row class="option_result_box" />
<el-row justify="center" class="button-group">
@ -81,13 +81,16 @@ export default {
return {
trainNoList: [],
selected: null,
optionObject: {},
optionObject: [],
typeList: [
{ label: '往返运营', value: 'NORMAL_OPERATION' },
{ label: '末班运营', value: 'LAST_OPERATION' },
{ label: '非运营', value: 'NON_OPERATION' },
{ label: '末班非运营', value: 'LAST_NON_OPERATION' }
],
typeList1: [
{ label: '往返运营', value: 'NORMAL_OPERATION' }
],
addModel: {
groupNumber: '',
serviceNumber: '',
@ -133,7 +136,7 @@ export default {
if (!this.dialogShow) {
this.addModel.groupNumber = selected.groupNumber;
this.addModel.serviceNumber = selected.serviceNumber;
this.addModel.destinationCode = parseInt(selected.destinationCode) || selected.destinationCode;
this.addModel.destinationCode = parseInt(selected.destinationCode) || 0;
this.addModel.trainDestinationCode = '';
this.trainDestinationCode = '';
}
@ -154,20 +157,23 @@ export default {
const lable = this.typeList.find(ele => ele.value == item.type);
item['active'] = false;
item['name'] = `${item.code} ${item.description} ${lable.label}`;
if (this.optionObject[item.type]) {
this.optionObject[item.type].push(item);
} else {
this.optionObject[item.type] = [item];
}
item['code'] = `0000${item.code}`;
item['code'] = item['code'].substring(item['code'].length - 4);
// if (this.optionObject[item.type]) {
// this.optionObject[item.type].push(item);
// } else {
// this.optionObject[item.type] = [item];
// }
this.optionObject.push(item);
});
},
handleOption(item) {
this.addModel.trainDestinationCode = `${parseInt(item.code)}`;
for (const key in this.optionObject) {
this.optionObject[key].forEach(item => {
// for (const key in this.optionObject) {
this.optionObject.forEach(item => {
item.active = false;
});
}
// }
item.active = true;
this.trainDestinationCode = item.code;
},