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:
zyy 2020-08-06 15:08:07 +08:00
commit 0e9b731e93
9 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/jmapNew/config/skinCode/foshan_01.js
View File

@ -579,8 +579,8 @@ class SkinCode extends defaultStyle {
trainHSDATextFontSize: 8// 列车HDSA字号 trainHSDATextFontSize: 8// 列车HDSA字号
}, },
trainNumber: { trainNumber: {
targetCodePrefix: '000', // 目的地码前缀 targetCodePrefix: '00', // 目的地码前缀
defaultTargetCode: 'AAA', // 默认目的地码 defaultTargetCode: 'AA', // 默认目的地码
trainTargetTextAlign: 'left', // 车次号文字显示位置 trainTargetTextAlign: 'left', // 车次号文字显示位置
trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量 trainNumberOffset: { x: 1, y: 1}// 目的地码偏移量
}, },

2
src/jmapNew/theme/beijing_01/menus/menuBar.vue
View File

@ -977,7 +977,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

2
src/jmapNew/theme/chengdu_01/menus/menuBar.vue
View File

@ -457,7 +457,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

2
src/jmapNew/theme/chengdu_03/menus/menuBar.vue
View File

@ -898,7 +898,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

2
src/jmapNew/theme/foshan_01/menus/menuBar.vue
View File

@ -1047,7 +1047,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

2
src/jmapNew/theme/fuzhou_01/menus/menuBar.vue
View File

@ -707,7 +707,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

2
src/jmapNew/theme/ningbo_01/menus/menuBar.vue
View File

@ -985,7 +985,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

2
src/jmapNew/theme/xian_01/menus/menuBar.vue
View File

@ -711,7 +711,7 @@ export default {
$menuItemPadding: 5px; $menuItemPadding: 5px;
#menuBar { #menuBar {
z-index: 10; z-index: 36;
position: absolute; position: absolute;
width: inherit; width: inherit;
height: $height; height: $height;

7
src/views/newMap/newMapdraft/ciConfig.vue
View File

@ -93,7 +93,7 @@ export default {
focus: false, focus: false,
booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch', booleanList: ['upRight', 'lockFirst', 'switchSingleHandle', 'signalApproachOnlyOne', 'signalApproachOnlyNpSwitch',
'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen', 'routeNameUseEndOppositeSignalName', 'generateTbRoute', 'tbRouteNameUseEndOppositeSignalName', 'routeSignalAlwaysGreen',
'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'overlapSettingByTrigger'], 'routeApartByOverlap', 'overlapOnlySwitch', 'overlapSwitchNpOnly', 'overlapSignalOppositeSwitchNpOnly', 'overlapOnlyOneSwitch', 'generateCycle', 'routeButton', 'overlapSettingByTrigger', 'generateFls'],
selectList: [], selectList: [],
numberList: ['overlapReleaseTime', 'routeReleaseTime'], numberList: ['overlapReleaseTime', 'routeReleaseTime'],
optionsMap: { optionsMap: {
@ -118,7 +118,8 @@ export default {
routeReleaseTime: '默认进路解锁时间', routeReleaseTime: '默认进路解锁时间',
generateCycle: '是否生成自动折返', generateCycle: '是否生成自动折返',
routeButton: '是否生成进路结束按钮', routeButton: '是否生成进路结束按钮',
overlapSettingByTrigger: '延续保护的建立方式：是-通过触发建立，否-随进路建立' overlapSettingByTrigger: '延续保护的建立方式：是-通过触发建立，否-随进路建立',
generateFls: '是否生成侧防：是-生成侧防，不要联动道岔，否-不生成侧防，用联动道岔'
} }
}; };
}, },
@ -209,7 +210,7 @@ export default {
instance.confirmButtonLoading = false; instance.confirmButtonLoading = false;
instance.confirmButtonText = '确定'; instance.confirmButtonText = '确定';
instance.dangerouslyUseHTMLString = true; instance.dangerouslyUseHTMLString = true;
instance.message = ` instance.message = `
<strong>生成并保存联锁关系成功！</strong><br/> <strong>生成并保存联锁关系成功！</strong><br/>
<span>生成自动信号数据${resp.data.autoSignalCount}条；</span><br/> <span>生成自动信号数据${resp.data.autoSignalCount}条；</span><br/>
<span>生成进路数据${resp.data.routeCount}条；</span><br/> <span>生成进路数据${resp.data.routeCount}条；</span><br/>