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-04-07 16:45:48 +08:00
commit 0079b698e3
5 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/i18n/langs/zh/map.js
View File

@ -13,7 +13,7 @@ export default {
create: '创建', create: '创建',
dataVerification: '数据校验', dataVerification: '数据校验',
edit3d: '三维编辑', edit3d: '三维编辑',
publish3d:"三维发布", publish3d: '三维发布',
logicalView: '逻辑视图', logicalView: '逻辑视图',
physicalView: '物理视图', physicalView: '物理视图',
mixedView: '混合视图', mixedView: '混合视图',
@ -296,10 +296,10 @@ export default {
signalPositionX: '信号机x:', signalPositionX: '信号机x:',
signalPositionY: '信号机y:', signalPositionY: '信号机y:',
signalPosition: '信号机坐标:', signalPosition: '信号机坐标:',
signalNamePositionX: '信号机名字偏移量 x:', signalNamePositionX: '信号机名称偏移量 x:',
signalNamePositionY: '信号机名字偏移量 y:', signalNamePositionY: '信号机名称偏移量 y:',
signalNamePosition: '信号机名字偏移量:', signalNamePosition: '信号机名称偏移量:',
signalNameRotated: '信号机名字是否旋转:', signalNameRotated: '信号机名称是否旋转:',
signalButtonShow: '是否显示按钮:', signalButtonShow: '是否显示按钮:',
signalButtonPositionX: '按钮x:', signalButtonPositionX: '按钮x:',
signalButtonPositionY: '按钮y:', signalButtonPositionY: '按钮y:',

4
src/jmapNew/theme/chengdu_01/menus/menuDialog/systemLogout.vue
View File

@ -12,10 +12,10 @@
> >
<el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules"> <el-form ref="form" size="small" label-width="80px" :model="addModel" :rules="rules">
<el-form-item label="名字:" prop="console"> <el-form-item label="名字:" prop="console">
<span style="color: #000;">{{ this.addModel.console }}</span> <span style="color: #000;">{{ addModel.console }}</span>
</el-form-item> </el-form-item>
<el-form-item label="用户:" prop="user"> <el-form-item label="用户:" prop="user">
<span style="color: #000;">{{ this.addModel.user }}</span> <span style="color: #000;">{{ addModel.user }}</span>
</el-form-item> </el-form-item>
<hr style="height:1px;border:none;border-top:1px solid #555555;width: 316px;position: absolute; left: 2px"> <hr style="height:1px;border:none;border-top:1px solid #555555;width: 316px;position: absolute; left: 2px">
<el-form-item label="密码:" prop="password" style="margin-top: 40px"> <el-form-item label="密码:" prop="password" style="margin-top: 40px">

90
src/jmapNew/theme/haerbin_01/menus/menuStationStand.vue
View File

@ -52,51 +52,51 @@ export default {
menu: [], menu: [],
menuNormal: { menuNormal: {
Local: [ Local: [
{ // {
label: this.$t('menu.menuStationStand.detainTrain'), // label: this.$t('menu.menuStationStand.detainTrain'),
handler: this.setDetainTrain, // handler: this.setDetainTrain,
cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN // cmdType:CMD.Stand.CMD_STAND_SET_HOLD_TRAIN
}, // },
{ // {
label: this.$t('menu.menuStationStand.cancelDetainTrain'), // label: this.$t('menu.menuStationStand.cancelDetainTrain'),
handler: this.cancelDetainTrain, // handler: this.cancelDetainTrain,
cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN // cmdType:CMD.Stand.CMD_STAND_CANCEL_HOLD_TRAIN
}, // },
{ // {
label: this.$t('menu.menuStationStand.cancelDetainTrainForce'), // label: this.$t('menu.menuStationStand.cancelDetainTrainForce'),
handler: this.cancelDetainTrainForce, // handler: this.cancelDetainTrainForce,
cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN // cmdType:CMD.Stand.CMD_STAND_FORCE_CANCEL_HOLD_TRAIN
}, // },
{ // {
label: this.$t('menu.menuStationStand.jumpStop'), // label: this.$t('menu.menuStationStand.jumpStop'),
handler: this.setJumpStop, // handler: this.setJumpStop,
cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP // cmdType:CMD.Stand.CMD_STAND_SET_JUMP_STOP
}, // },
{ // {
label: this.$t('menu.menuStationStand.cancelJumpStop'), // label: this.$t('menu.menuStationStand.cancelJumpStop'),
handler: this.cancelJumpStop, // handler: this.cancelJumpStop,
cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP // cmdType:CMD.Stand.CMD_STAND_CANCEL_JUMP_STOP
}, // },
{ // {
label: this.$t('menu.menuStationStand.setRunLevel'), // label: this.$t('menu.menuStationStand.setRunLevel'),
handler: this.setRunLevel, // handler: this.setRunLevel,
cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME // cmdType:CMD.Stand.CMD_STAND_SET_RUN_TIME
}, // },
{ // {
label: this.$t('menu.menuStationStand.setEarlyDeparture'), // label: this.$t('menu.menuStationStand.setEarlyDeparture'),
handler: this.earlyDeparture, // handler: this.earlyDeparture,
cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART // cmdType:CMD.Stand.CMD_STAND_EARLY_DEPART
}, // },
{ // {
label: this.$t('menu.menuStationStand.setBackStrategy'), // label: this.$t('menu.menuStationStand.setBackStrategy'),
handler: this.setBackStrategy, // handler: this.setBackStrategy,
cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY // cmdType:CMD.Stand.CMD_STAND_SET_REENTRY_STRATEGY
}, // },
{ // {
label: this.$t('menu.menuStationStand.getStationStandStatus'), // label: this.$t('menu.menuStationStand.getStationStandStatus'),
handler: this.detail, // handler: this.detail,
cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS // cmdType:CMD.Stand.CMD_STAND_VIEW_STATUS
} // }
], ],
Center: [ Center: [
// { // {

3
src/jmapNew/theme/ningbo_01/menus/index.vue
View File

@ -92,6 +92,9 @@ export default {
</script> </script>
<style> <style>
.menus{
height:0px;
}
.menus .pop-menu { .menus .pop-menu {
background: #F0F0F0; background: #F0F0F0;
} }

1
src/views/newMap/newMapdraft/mapoperate/signal/index.vue
View File

@ -256,7 +256,6 @@ export default {
}, },
deviceSelect(selected) { deviceSelect(selected) {
if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() != 'selectSingalCode'.toUpperCase()) { if (selected && selected._type.toUpperCase() === 'Signal'.toUpperCase() && this.field.toUpperCase() != 'selectSingalCode'.toUpperCase()) {
console.log(selected, selected.positionPoint, 'selected');
this.$refs.dataform.resetFields(); this.$refs.dataform.resetFields();
this.activeName = 'first'; this.activeName = 'first';
this.editModel = deepAssign(this.editModel, selected); this.editModel = deepAssign(this.editModel, selected);