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

Merge branch 'dev' of https://git.qcloud.com/joylink/jl-nclient into dev

Browse Source
This commit is contained in:
zyy 2019-10-08 16:08:19 +08:00
commit 88c1212af0
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ibp/constant/ibpData.js
View File

File diff suppressed because one or more lines are too long

2
src/ibp/mouseController.js
View File

@ -79,6 +79,8 @@ class MouseController extends Eventful {
if (eventTool.notLeftMouse(e)) { if (eventTool.notLeftMouse(e)) {
return; return;
} }
e.event.preventDefault();
e.event.stopPropagation();
const em = new EventModel(e); const em = new EventModel(e);
this.eventTarget = em.eventTarget; this.eventTarget = em.eventTarget;
if (this.eventTarget && this.eventTarget._type === deviceType.Background) { if (this.eventTarget && this.eventTarget._type === deviceType.Background) {

15
src/views/ibp/ibpDraft/ibpEdit/ibpOperate/index.vue
View File

@ -158,15 +158,18 @@
stationOptions:[ stationOptions:[
{ {
value: 'Station_203_0.07533', value: 'Station_203_0.07533',
label: '通化门站' // label: '通化门站'
}, label: '车站一'
{
value: 'Station_209_0.95175',
label: '后卫寨站'
}, },
{ {
value: 'Station_207_0.62282', value: 'Station_207_0.62282',
label: '枣园站' // label: '枣园站'
label: '车站二'
},
{
value: 'Station_209_0.95175',
label: '车站三'
// label: '后卫寨站'
} }
], ],
stationCode: '', stationCode: '',