joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity
1,044 Commits 20 Branches 0 Tags 448 MiB
99ffd6d36c
Commit Graph

418 Commits

Author SHA1 Message Date
zyy
9049d793cc desc: 修改琏计划界面样式，修改界面交互 2019-08-13 15:54:26 +08:00
ival
a779d6ad29 Merge remote-tracking branch 'remotes/origin/master' into test 2019-08-12 18:30:33 +08:00
fan
0b5cfcc9a7 调整：代码修改 2019-08-12 13:40:34 +08:00
fan
9623c98994 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_loading2 2019-08-12 10:59:28 +08:00
fan
a9d00b042e 调整：代码修改 2019-08-12 10:57:38 +08:00
ival
98e6755aba 修改解析错误的问题 2019-08-12 10:41:24 +08:00
fan
358b3cf6d0 调整：代码修改 2019-08-12 10:14:19 +08:00
fan
367edf0118 调整：代码修改 2019-08-09 17:38:20 +08:00
ival
bfddddf7e6 修改代码 2019-08-09 17:25:45 +08:00
ival
6fad38621b 修改运行图编辑因为家在地图数据而报错的问题 2019-08-09 16:57:07 +08:00
ival
378be47db0 Merge remote-tracking branch 'remotes/origin/master' into test 2019-08-09 15:24:05 +08:00
ival
e466d49036 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-09 15:23:14 +08:00
ival
32a75526ee 修改导入 2019-08-09 15:23:01 +08:00
fan
40b71c5a4d 调整：代码修改 2019-08-09 15:17:19 +08:00
ival
66a13e6ede 修改运行图 2019-08-09 09:33:35 +08:00
zyy
a288a21456 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:34:41 +08:00
zyy
b20686c0fa desc: 修改 订阅综合演练房间号发送判断，修改代码格式 2019-08-08 18:34:35 +08:00
ival
c89c781735 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 18:09:52 +08:00
ival
4f9478d495 修改代码格式 2019-08-08 18:09:10 +08:00
fan
62d9b6fc5d 调整：title修改 2019-08-08 18:00:30 +08:00
fan
212fce48bb 调整：代码调整 2019-08-08 17:26:50 +08:00
fan
a504f3cd90 调整：剧本加载页面位置跳转 2019-08-08 17:06:18 +08:00
zyy
399006e31f desc: 修改传入select默认值 2019-08-08 16:54:49 +08:00
zyy
40ab6b247b Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/beijing_01/menus/index.vue
 2019-08-08 16:48:06 +08:00
zyy
6c5469ec90 修改代码格式 2019-08-08 16:47:34 +08:00
fan
6c7c08483f Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:45:37 +08:00
fan
aac75df8f7 调整：控制模式模式跳转disable状态调整 2019-08-08 16:45:22 +08:00
ival
01b871fa77 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 16:37:31 +08:00
ival
3adc1aafb1 修改界面菜单栏加载后出发 缩放按钮重新调整位置 
删除代码中的无用代码
 2019-08-08 16:37:15 +08:00
fan
b7679a6337 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 16:26:54 +08:00
fan
e379696f46 调整：位置跳转测试 2019-08-08 16:26:34 +08:00
zyy
a250833772 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 16:03:15 +08:00
zyy
ff101dd603 删除debugger 2019-08-08 16:02:58 +08:00
fan
503991a758 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 15:59:17 +08:00
fan
4a36ed4d3e 调整：修改修改列车识别号操作 2019-08-08 15:59:07 +08:00
zyy
c3f600b015 优化代码 2019-08-08 15:57:36 +08:00
zyy
837ba489b6 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:47:39 +08:00
zyy
2443fd102c desc: 调整站台字段 2019-08-08 14:47:34 +08:00
fan
33844220d3 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 14:37:39 +08:00
zyy
debecfba5a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 14:08:09 +08:00
zyy
ea67901aa1 修改格式 2019-08-08 14:08:02 +08:00
fan
6b21fefaeb Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient 2019-08-08 13:47:39 +08:00
fan
bcf73c78c2 调整：代码迁移+列车调整 2019-08-08 13:47:30 +08:00
ival
45295404c3 1. 修改福州线，取消扣车被禁用的问题 
2. 修改i18n的获取当前语言的函数
 2019-08-08 13:23:54 +08:00
zyy
af61917dbf Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/theme/factory.js
 2019-08-08 09:48:14 +08:00
zyy
f231ffd6f1 desc: 增加成都四号线地图配置 2019-08-08 09:47:39 +08:00
ival
9ffce4d702 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-08 09:37:46 +08:00
ival
c855925ae3 修改配置 2019-08-08 09:37:35 +08:00
fan
05e4fd73bb 调整：列车调整 2019-08-08 09:35:28 +08:00
zyy
fe9b59e2de Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-07 16:23:11 +08:00
zyy
d70953a130 desc: 增加成都四号线模型， 修改地图删除逻辑 2019-08-07 16:23:04 +08:00
ival
0cbe7901c7 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-07 15:32:50 +08:00
ival
7feea79e44 成都三号线运行图解析 2019-08-07 15:32:35 +08:00
zyy
83faa429fe 修改列车详情显示问题 2019-08-07 11:22:33 +08:00
zyy
f492d38c47 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-07 10:24:21 +08:00
zyy
e3a8d5c525 desc: 修改代码 2019-08-07 10:24:13 +08:00
ival
3751748979 修改lz zc 等鼠标事件统一接口处理 2019-08-07 09:16:55 +08:00
ival
a02a948f17 修改bug 2019-08-06 18:42:18 +08:00
ival
165362dfcb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 17:46:55 +08:00
ival
b6baa2e420 修改 设置设备名称的设置方法 2019-08-06 17:46:41 +08:00
zyy
888756dc35 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 
# Conflicts:
#	src/jmap/shape/Section/EMouse.js
 2019-08-06 17:02:32 +08:00
zyy
37c13f6672 调整代码格式，福州线状态处理 2019-08-06 17:02:04 +08:00
ival
167e483b10 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 17:00:36 +08:00
ival
f85139b4ae 修改鼠标关联操作 2019-08-06 17:00:24 +08:00
zyy
e4364c600e Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 13:56:48 +08:00
zyy
8fe358896e desc: 修改车次窗菜单BUG 2019-08-06 13:56:42 +08:00
ival
86c5a5f58f 抽离车次窗配置 2019-08-06 13:19:30 +08:00
ival
7573e30a31 修改皮肤配置 2019-08-06 13:09:11 +08:00
ival
d4b995675d 提出字体粗细配置 2019-08-06 13:02:55 +08:00
zyy
e71c68f7bc 修改signal 状态管理 2019-08-06 10:54:22 +08:00
zyy
71381ff174 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-06 10:11:43 +08:00
zyy
98a0533b20 修改代码格式 2019-08-06 10:11:32 +08:00
ival
ea0a3b9d16 修改默认选中状态，无未选中 2019-08-06 09:32:55 +08:00
ival
2ee8e24897 增加鼠标操作 2019-08-06 09:27:12 +08:00
ival
3ae415d6e9 修改背景线，鼠标特效 2019-08-05 18:42:37 +08:00
ival
530a1c473e 修改 代码接口名称 2019-08-05 17:46:41 +08:00
ival
44481b2cbb 修改代码bug 2019-08-05 17:36:16 +08:00
ival
fb33bde94c 设置状态时，无需关注model变化，render时，model已经引用到view上 2019-08-05 17:24:20 +08:00
ival
78e7e344aa 修改操作问题 2019-08-05 17:09:16 +08:00
ival
79bd163d8f Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 16:55:47 +08:00
ival
d2887ee34e 调整道岔名称的y轴设置 2019-08-05 16:55:36 +08:00
zyy
d7a80d3bc3 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 16:43:59 +08:00
zyy
87177a347b desc: 修改代码 2019-08-05 16:43:52 +08:00
ival
b8fb7fc210 修改代码 2019-08-05 16:21:43 +08:00
ival
1e5ad7e522 修改bug 2019-08-05 16:17:46 +08:00
ival
efa91ae5a0 Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 16:14:53 +08:00
ival
7c526a94c6 修改代码 2019-08-05 16:14:40 +08:00
fan
6bc62094ba Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 2019-08-05 15:20:04 +08:00
fan
dbc16a1172 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
 2019-08-05 15:19:32 +08:00
fan
a55ab7b57e Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 
# Conflicts:
#	src/jmap/config/skinStyle/chengdu_03.js
 2019-08-05 15:18:40 +08:00
fan
fd8b2402ad 调整：列车成都线调整 2019-08-05 15:13:49 +08:00
ival
9792a2547a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 15:13:41 +08:00
ival
6f73920532 增加信号机变现变化处理 2019-08-05 15:13:31 +08:00
zyy
386f79128a Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 15:12:13 +08:00
zyy
d45c154fe0 修改代码 2019-08-05 15:12:06 +08:00
ival
555664aaeb Merge branch 'master' of https://git.qcloud.com/joylink/jl-nclient 2019-08-05 15:01:03 +08:00
ival
042e6c0e59 修改区段名称的问题 2019-08-05 15:00:51 +08:00
fan
824c6ed834 Merge branch 'master' of https://git.cloud.tencent.com/joylink/jl-nclient into master_列车配置项结构调整 2019-08-05 13:36:14 +08:00
fan
15d0ea03e5 调整：列车调整 2019-08-05 13:36:00 +08:00
zyy
6b5c1790c6 修改代码 2019-08-05 10:36:41 +08:00