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:
zyy 2020-04-07 16:19:24 +08:00
parent 1f6b627768
commit 402a383bf6
3 changed files with 7 additions and 8 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">

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);